Google Git
Sign in
chromium / chromium / src / 7486e37f46..2eff7cfefd / .
diff --git a/DEPS b/DEPS
index b162100..8f5c4ba5 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': 'e4d45bf5ba413e5a26d4f6c24886bbd104b14885',
+  'skia_revision': '4833950b754d076e725d592e53bfd2ed22d6d669',
   # 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': 'c5e8f7690bbb9e99851f08fdf45930da4cd62dab',
+  'v8_revision': '83590c42b904df2d425277df4633b492b5c1791d',
   # 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': '12eea8135482911c054e53b482b4176cbd629d97',
+  'pdfium_revision': 'af680b17e0e1b94e40afa6a01ba3bbdead2d6035',
   # 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': 'b0384fe60f101e921782716d3a7a1881de5b37ea',
+  'catapult_revision': '64ea47945411d898b07fe423bbd8cbf6e897ff96',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libFuzzer
   # and whatever else without interference from each other.

diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
index 38a6119..205ea2b2 100644
--- a/build/config/BUILDCONFIG.gn
+++ b/build/config/BUILDCONFIG.gn

@@ -137,7 +137,7 @@
   # to configure warnings.
   is_clang =
       current_os == "mac" || current_os == "ios" || current_os == "chromeos" ||
-      current_os == "fuchsia" ||
+      current_os == "fuchsia" || current_os == "win" ||
       (current_os == "linux" && current_cpu != "s390x" &&
        current_cpu != "s390" && current_cpu != "ppc64" &&
        current_cpu != "ppc" && current_cpu != "mips" && current_cpu != "mips64")

diff --git a/cc/BUILD.gn b/cc/BUILD.gn
index 7aef17d..11e0b15 100644
--- a/cc/BUILD.gn
+++ b/cc/BUILD.gn

@@ -297,8 +297,6 @@
     "resources/resource_pool.h",
     "resources/resource_provider.cc",
     "resources/resource_provider.h",
-    "resources/resource_settings.cc",
-    "resources/resource_settings.h",
     "resources/resource_util.h",
     "resources/returned_resource.h",
     "resources/scoped_resource.cc",

diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc
index 6b326b8..0e32438 100644
--- a/cc/layers/picture_layer_impl_unittest.cc
+++ b/cc/layers/picture_layer_impl_unittest.cc

@@ -81,7 +81,7 @@
     LayerTreeSettings settings;
     settings.layer_transforms_should_scale_layer_contents = true;
     settings.create_low_res_tiling = true;
-    settings.resource_settings.buffer_to_texture_target_map =
+    settings.buffer_to_texture_target_map =
         DefaultBufferToTextureTargetMapForTesting();
     return settings;
   }

diff --git a/cc/output/renderer_settings.h b/cc/output/renderer_settings.h
index a2576ac..9dcdec0 100644
--- a/cc/output/renderer_settings.h
+++ b/cc/output/renderer_settings.h

@@ -8,7 +8,7 @@
 #include <stddef.h>
 
 #include "cc/cc_export.h"
-#include "cc/resources/resource_settings.h"
+#include "cc/output/buffer_to_texture_target_map.h"
 
 namespace cc {
 
@@ -18,7 +18,6 @@
   RendererSettings(const RendererSettings& other);
   ~RendererSettings();
 
-  ResourceSettings resource_settings;
   bool allow_antialiasing = true;
   bool force_antialiasing = false;
   bool force_blending_with_shaders = false;
@@ -30,10 +29,11 @@
   bool show_overdraw_feedback = false;
   bool enable_color_correct_rendering = false;
 
-  // TODO(staraz): Move |refresh_rate| out. It's only used by
-  // TestCompositorFrameSink
   double refresh_rate = 60.0;
   int highp_threshold_min = 0;
+  size_t texture_id_allocation_chunk_size = 64;
+  bool use_gpu_memory_buffer_resources = false;
+  BufferToTextureTargetMap buffer_to_texture_target_map;
 
   // Determines whether we disallow non-exact matches when finding resources
   // in ResourcePool. Only used for layout or pixel tests, as non-deterministic

diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc
index 2990d57a..8d5a3fc 100644
--- a/cc/resources/resource_provider.cc
+++ b/cc/resources/resource_provider.cc

@@ -374,12 +374,12 @@
 ResourceProvider::Settings::Settings(
     ContextProvider* compositor_context_provider,
     bool delegated_sync_points_required,
-    const ResourceSettings& resource_settings)
-    : default_resource_type(resource_settings.use_gpu_memory_buffer_resources
+    bool use_gpu_memory_buffer_resources,
+    bool enable_color_correct_rasterization)
+    : default_resource_type(use_gpu_memory_buffer_resources
                                 ? RESOURCE_TYPE_GPU_MEMORY_BUFFER
                                 : RESOURCE_TYPE_GL_TEXTURE),
-      enable_color_correct_rasterization(
-          resource_settings.enable_color_correct_rasterization),
+      enable_color_correct_rasterization(enable_color_correct_rasterization),
       delegated_sync_points_required(delegated_sync_points_required) {
   if (!compositor_context_provider) {
     default_resource_type = RESOURCE_TYPE_BITMAP;
@@ -419,11 +419,15 @@
     SharedBitmapManager* shared_bitmap_manager,
     gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
     BlockingTaskRunner* blocking_main_thread_task_runner,
+    size_t id_allocation_chunk_size,
     bool delegated_sync_points_required,
-    const ResourceSettings& resource_settings)
+    bool use_gpu_memory_buffer_resources,
+    bool enable_color_correct_rasterization,
+    const BufferToTextureTargetMap& buffer_to_texture_target_map)
     : settings_(compositor_context_provider,
                 delegated_sync_points_required,
-                resource_settings),
+                use_gpu_memory_buffer_resources,
+                enable_color_correct_rasterization),
       compositor_context_provider_(compositor_context_provider),
       shared_bitmap_manager_(shared_bitmap_manager),
       gpu_memory_buffer_manager_(gpu_memory_buffer_manager),
@@ -431,10 +435,9 @@
       lost_context_provider_(false),
       next_id_(1),
       next_child_(1),
-      buffer_to_texture_target_map_(
-          resource_settings.buffer_to_texture_target_map),
+      buffer_to_texture_target_map_(buffer_to_texture_target_map),
       tracing_id_(g_next_resource_provider_tracing_id.GetNext()) {
-  DCHECK(resource_settings.texture_id_allocation_chunk_size);
+  DCHECK(id_allocation_chunk_size);
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // In certain cases, ThreadTaskRunnerHandle isn't set (Android Webview).
@@ -450,8 +453,8 @@
 
   DCHECK(!texture_id_allocator_);
   GLES2Interface* gl = ContextGL();
-  texture_id_allocator_.reset(new TextureIdAllocator(
-      gl, resource_settings.texture_id_allocation_chunk_size));
+  texture_id_allocator_.reset(
+      new TextureIdAllocator(gl, id_allocation_chunk_size));
 }
 
 ResourceProvider::~ResourceProvider() {

diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h
index be8f38f..2b664ff 100644
--- a/cc/resources/resource_provider.h
+++ b/cc/resources/resource_provider.h

@@ -31,7 +31,6 @@
 #include "cc/output/renderer_settings.h"
 #include "cc/resources/release_callback_impl.h"
 #include "cc/resources/resource_format.h"
-#include "cc/resources/resource_settings.h"
 #include "cc/resources/return_callback.h"
 #include "cc/resources/shared_bitmap.h"
 #include "cc/resources/single_release_callback_impl.h"
@@ -81,12 +80,16 @@
     RESOURCE_TYPE_BITMAP,
   };
 
-  ResourceProvider(ContextProvider* compositor_context_provider,
-                   SharedBitmapManager* shared_bitmap_manager,
-                   gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
-                   BlockingTaskRunner* blocking_main_thread_task_runner,
-                   bool delegated_sync_points_required,
-                   const ResourceSettings& resource_settings);
+  ResourceProvider(
+      ContextProvider* compositor_context_provider,
+      SharedBitmapManager* shared_bitmap_manager,
+      gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
+      BlockingTaskRunner* blocking_main_thread_task_runner,
+      size_t id_allocation_chunk_size,
+      bool delegated_sync_points_required,
+      bool use_gpu_memory_buffer_resources,
+      bool enable_color_correct_rasterization,
+      const BufferToTextureTargetMap& buffer_to_texture_target_map);
   ~ResourceProvider() override;
 
   void Initialize();
@@ -762,8 +765,9 @@
   // Holds const settings for the ResourceProvider. Never changed after init.
   struct Settings {
     Settings(ContextProvider* compositor_context_provider,
-             bool delegated_sync_points_needed,
-             const ResourceSettings& resource_settings);
+             bool delegated_sync_points_required,
+             bool use_gpu_memory_buffer_resources,
+             bool enable_color_correct_rasterization);
 
     int max_texture_size = 0;
     bool use_texture_storage_ext = false;

diff --git a/cc/resources/resource_provider_unittest.cc b/cc/resources/resource_provider_unittest.cc
index 12ecd09..b804afbb 100644
--- a/cc/resources/resource_provider_unittest.cc
+++ b/cc/resources/resource_provider_unittest.cc

@@ -103,24 +103,6 @@
   return shared_bitmap;
 }
 
-static ResourceSettings CreateResourceSettings(
-    size_t texture_id_allocation_chunk_size) {
-  ResourceSettings resource_settings;
-  resource_settings.texture_id_allocation_chunk_size =
-      texture_id_allocation_chunk_size;
-  resource_settings.use_gpu_memory_buffer_resources =
-      kUseGpuMemoryBufferResources;
-  resource_settings.enable_color_correct_rasterization =
-      kEnableColorCorrectRendering;
-  resource_settings.buffer_to_texture_target_map =
-      DefaultBufferToTextureTargetMapForTesting();
-  return resource_settings;
-}
-
-static ResourceSettings CreateResourceSettings() {
-  return CreateResourceSettings(1);
-}
-
 class TextureStateTrackingContext : public TestWebGraphicsContext3D {
  public:
   MOCK_METHOD2(bindTexture, void(GLenum target, GLuint texture));
@@ -467,15 +449,18 @@
     child_gpu_memory_buffer_manager_ =
         gpu_memory_buffer_manager_->CreateClientGpuMemoryBufferManager();
 
-    ResourceSettings resource_settings = CreateResourceSettings();
     resource_provider_ = base::MakeUnique<ResourceProvider>(
         context_provider_.get(), shared_bitmap_manager_.get(),
-        gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(),
-        kDelegatedSyncPointsRequired, resource_settings);
+        gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 1,
+        kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+        kEnableColorCorrectRendering,
+        DefaultBufferToTextureTargetMapForTesting());
     child_resource_provider_ = base::MakeUnique<ResourceProvider>(
         child_context_provider_.get(), shared_bitmap_manager_.get(),
         child_gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(),
-        child_needs_sync_token, resource_settings);
+        1, child_needs_sync_token, kUseGpuMemoryBufferResources,
+        kEnableColorCorrectRendering,
+        DefaultBufferToTextureTargetMapForTesting());
   }
 
   ResourceProviderTest() : ResourceProviderTest(true) {}
@@ -1642,8 +1627,10 @@
   std::unique_ptr<ResourceProvider> child_resource_provider(
       base::MakeUnique<ResourceProvider>(
           child_context_provider.get(), shared_bitmap_manager_.get(),
-          gpu_memory_buffer_manager_.get(), nullptr,
-          kDelegatedSyncPointsRequired, CreateResourceSettings()));
+          gpu_memory_buffer_manager_.get(), nullptr, 1,
+          kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+          kEnableColorCorrectRendering,
+          DefaultBufferToTextureTargetMapForTesting()));
 
   gfx::Size size(1, 1);
   ResourceFormat format = RGBA_8888;
@@ -2160,11 +2147,12 @@
     child_context_provider->BindToCurrentThread();
     auto shared_bitmap_manager = base::MakeUnique<TestSharedBitmapManager>();
 
-    ResourceSettings resource_settings = CreateResourceSettings();
     std::unique_ptr<ResourceProvider> child_resource_provider(
         base::MakeUnique<ResourceProvider>(
             child_context_provider.get(), shared_bitmap_manager.get(), nullptr,
-            nullptr, kDelegatedSyncPointsRequired, resource_settings));
+            nullptr, 1, kDelegatedSyncPointsRequired,
+            kUseGpuMemoryBufferResources, kEnableColorCorrectRendering,
+            DefaultBufferToTextureTargetMapForTesting()));
 
     std::unique_ptr<TextureStateTrackingContext> parent_context_owned(
         new TextureStateTrackingContext);
@@ -2177,7 +2165,9 @@
     std::unique_ptr<ResourceProvider> parent_resource_provider(
         base::MakeUnique<ResourceProvider>(
             parent_context_provider.get(), shared_bitmap_manager.get(), nullptr,
-            nullptr, kDelegatedSyncPointsRequired, resource_settings));
+            nullptr, 1, kDelegatedSyncPointsRequired,
+            kUseGpuMemoryBufferResources, kEnableColorCorrectRendering,
+            DefaultBufferToTextureTargetMapForTesting()));
 
     gfx::Size size(1, 1);
     ResourceFormat format = RGBA_8888;
@@ -2812,8 +2802,10 @@
   std::unique_ptr<ResourceProvider> resource_provider(
       base::MakeUnique<ResourceProvider>(
           context_provider.get(), shared_bitmap_manager_.get(),
-          gpu_memory_buffer_manager_.get(), nullptr,
-          kDelegatedSyncPointsRequired, CreateResourceSettings()));
+          gpu_memory_buffer_manager_.get(), nullptr, 1,
+          kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+          kEnableColorCorrectRendering,
+          DefaultBufferToTextureTargetMapForTesting()));
 
   gfx::Size size(1, 1);
   ResourceFormat format = RGBA_8888;
@@ -2890,8 +2882,10 @@
   std::unique_ptr<ResourceProvider> resource_provider(
       base::MakeUnique<ResourceProvider>(
           context_provider.get(), shared_bitmap_manager_.get(),
-          gpu_memory_buffer_manager_.get(), nullptr,
-          kDelegatedSyncPointsRequired, CreateResourceSettings()));
+          gpu_memory_buffer_manager_.get(), nullptr, 1,
+          kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+          kEnableColorCorrectRendering,
+          DefaultBufferToTextureTargetMapForTesting()));
 
   gfx::Size size(1, 1);
   ResourceFormat format = RGBA_8888;
@@ -2932,8 +2926,10 @@
   std::unique_ptr<ResourceProvider> resource_provider(
       base::MakeUnique<ResourceProvider>(
           context_provider.get(), shared_bitmap_manager_.get(),
-          gpu_memory_buffer_manager_.get(), nullptr,
-          kDelegatedSyncPointsRequired, CreateResourceSettings()));
+          gpu_memory_buffer_manager_.get(), nullptr, 1,
+          kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+          kEnableColorCorrectRendering,
+          DefaultBufferToTextureTargetMapForTesting()));
 
   gfx::Size size(1, 1);
   ResourceFormat format = RGBA_8888;
@@ -2975,8 +2971,10 @@
   std::unique_ptr<ResourceProvider> resource_provider(
       base::MakeUnique<ResourceProvider>(
           context_provider.get(), shared_bitmap_manager_.get(),
-          gpu_memory_buffer_manager_.get(), nullptr,
-          kDelegatedSyncPointsRequired, CreateResourceSettings()));
+          gpu_memory_buffer_manager_.get(), nullptr, 1,
+          kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+          kEnableColorCorrectRendering,
+          DefaultBufferToTextureTargetMapForTesting()));
 
   gfx::Size size(1, 1);
   ResourceFormat format = RGBA_8888;
@@ -3029,8 +3027,10 @@
   std::unique_ptr<ResourceProvider> resource_provider(
       base::MakeUnique<ResourceProvider>(
           nullptr, shared_bitmap_manager_.get(),
-          gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(),
-          kDelegatedSyncPointsRequired, CreateResourceSettings()));
+          gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 1,
+          kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+          kEnableColorCorrectRendering,
+          DefaultBufferToTextureTargetMapForTesting()));
 
   gpu::SyncToken release_sync_token;
   bool lost_resource = false;
@@ -3077,8 +3077,10 @@
     std::unique_ptr<ResourceProvider> resource_provider(
         base::MakeUnique<ResourceProvider>(
             context_provider.get(), shared_bitmap_manager,
-            gpu_memory_buffer_manager, main_thread_task_runner,
-            kDelegatedSyncPointsRequired, CreateResourceSettings()));
+            gpu_memory_buffer_manager, main_thread_task_runner, 1,
+            kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+            kEnableColorCorrectRendering,
+            DefaultBufferToTextureTargetMapForTesting()));
 
     unsigned texture_id = 1;
     gpu::SyncToken sync_token(gpu::CommandBufferNamespace::GPU_IO, 0,
@@ -3220,8 +3222,10 @@
   std::unique_ptr<ResourceProvider> resource_provider(
       base::MakeUnique<ResourceProvider>(
           context_provider.get(), shared_bitmap_manager_.get(),
-          gpu_memory_buffer_manager_.get(), nullptr,
-          kDelegatedSyncPointsRequired, CreateResourceSettings()));
+          gpu_memory_buffer_manager_.get(), nullptr, 1,
+          kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+          kEnableColorCorrectRendering,
+          DefaultBufferToTextureTargetMapForTesting()));
 
   gpu::SyncToken sync_token(gpu::CommandBufferNamespace::GPU_IO, 0,
                             gpu::CommandBufferId::FromUnsafeValue(0x12), 0x34);
@@ -3288,8 +3292,10 @@
   std::unique_ptr<ResourceProvider> resource_provider(
       base::MakeUnique<ResourceProvider>(
           context_provider.get(), shared_bitmap_manager_.get(),
-          gpu_memory_buffer_manager_.get(), nullptr,
-          kDelegatedSyncPointsRequired, CreateResourceSettings()));
+          gpu_memory_buffer_manager_.get(), nullptr, 1,
+          kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+          kEnableColorCorrectRendering,
+          DefaultBufferToTextureTargetMapForTesting()));
 
   gpu::SyncToken sync_token(gpu::CommandBufferNamespace::GPU_IO, 0,
                             gpu::CommandBufferId::FromUnsafeValue(0x12), 0x34);
@@ -3342,8 +3348,10 @@
   std::unique_ptr<ResourceProvider> resource_provider(
       base::MakeUnique<ResourceProvider>(
           context_provider.get(), shared_bitmap_manager_.get(),
-          gpu_memory_buffer_manager_.get(), nullptr,
-          kDelegatedSyncPointsRequired, CreateResourceSettings()));
+          gpu_memory_buffer_manager_.get(), nullptr, 1,
+          kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+          kEnableColorCorrectRendering,
+          DefaultBufferToTextureTargetMapForTesting()));
 
   gpu::SyncToken sync_token;
   const GLuint64 current_fence_sync = context->GetNextFenceSync();
@@ -3462,8 +3470,10 @@
   std::unique_ptr<ResourceProvider> resource_provider(
       base::MakeUnique<ResourceProvider>(
           context_provider.get(), shared_bitmap_manager_.get(),
-          gpu_memory_buffer_manager_.get(), nullptr,
-          kDelegatedSyncPointsRequired, CreateResourceSettings()));
+          gpu_memory_buffer_manager_.get(), nullptr, 1,
+          kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+          kEnableColorCorrectRendering,
+          DefaultBufferToTextureTargetMapForTesting()));
 
   gfx::Size size(2, 2);
   gfx::Vector2d offset(0, 0);
@@ -3518,8 +3528,10 @@
   std::unique_ptr<ResourceProvider> resource_provider(
       base::MakeUnique<ResourceProvider>(
           context_provider.get(), shared_bitmap_manager_.get(),
-          gpu_memory_buffer_manager_.get(), nullptr,
-          kDelegatedSyncPointsRequired, CreateResourceSettings()));
+          gpu_memory_buffer_manager_.get(), nullptr, 1,
+          kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+          kEnableColorCorrectRendering,
+          DefaultBufferToTextureTargetMapForTesting()));
 
   gfx::Size size(2, 2);
 
@@ -3572,8 +3584,10 @@
   std::unique_ptr<ResourceProvider> resource_provider(
       base::MakeUnique<ResourceProvider>(
           context_provider.get(), shared_bitmap_manager_.get(),
-          gpu_memory_buffer_manager_.get(), nullptr,
-          kDelegatedSyncPointsRequired, CreateResourceSettings()));
+          gpu_memory_buffer_manager_.get(), nullptr, 1,
+          kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+          kEnableColorCorrectRendering,
+          DefaultBufferToTextureTargetMapForTesting()));
 
   gfx::Size size(2, 2);
   const ResourceFormat formats[2] = {RGBA_8888, BGRA_8888};
@@ -3629,8 +3643,10 @@
   std::unique_ptr<ResourceProvider> resource_provider(
       base::MakeUnique<ResourceProvider>(
           context_provider.get(), shared_bitmap_manager_.get(),
-          gpu_memory_buffer_manager_.get(), nullptr,
-          kDelegatedSyncPointsRequired, CreateResourceSettings()));
+          gpu_memory_buffer_manager_.get(), nullptr, 1,
+          kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+          kEnableColorCorrectRendering,
+          DefaultBufferToTextureTargetMapForTesting()));
 
   id = resource_provider->CreateResource(
       size, ResourceProvider::TEXTURE_HINT_IMMUTABLE, format,
@@ -3706,8 +3722,10 @@
   std::unique_ptr<ResourceProvider> resource_provider(
       base::MakeUnique<ResourceProvider>(
           context_provider.get(), shared_bitmap_manager_.get(),
-          gpu_memory_buffer_manager_.get(), nullptr,
-          kDelegatedSyncPointsRequired, CreateResourceSettings()));
+          gpu_memory_buffer_manager_.get(), nullptr, 1,
+          kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+          kEnableColorCorrectRendering,
+          DefaultBufferToTextureTargetMapForTesting()));
   int texture_id = 123;
 
   ResourceId id = resource_provider->CreateResource(
@@ -3736,8 +3754,10 @@
   std::unique_ptr<ResourceProvider> resource_provider(
       base::MakeUnique<ResourceProvider>(
           context_provider.get(), shared_bitmap_manager_.get(),
-          gpu_memory_buffer_manager_.get(), nullptr,
-          kDelegatedSyncPointsRequired, CreateResourceSettings()));
+          gpu_memory_buffer_manager_.get(), nullptr, 1,
+          kDelegatedSyncPointsRequired, kUseGpuMemoryBufferResources,
+          kEnableColorCorrectRendering,
+          DefaultBufferToTextureTargetMapForTesting()));
   int texture_id = 123;
   uint8_t pixels[8];
 
@@ -3790,8 +3810,9 @@
     std::unique_ptr<ResourceProvider> resource_provider(
         base::MakeUnique<ResourceProvider>(
             context_provider.get(), shared_bitmap_manager.get(), nullptr,
-            nullptr, kDelegatedSyncPointsRequired,
-            CreateResourceSettings(kTextureAllocationChunkSize)));
+            nullptr, kTextureAllocationChunkSize, kDelegatedSyncPointsRequired,
+            kUseGpuMemoryBufferResources, kEnableColorCorrectRendering,
+            DefaultBufferToTextureTargetMapForTesting()));
 
     ResourceId id = resource_provider->CreateResource(
         size, ResourceProvider::TEXTURE_HINT_IMMUTABLE, format,
@@ -3808,8 +3829,9 @@
     std::unique_ptr<ResourceProvider> resource_provider(
         base::MakeUnique<ResourceProvider>(
             context_provider.get(), shared_bitmap_manager.get(), nullptr,
-            nullptr, kDelegatedSyncPointsRequired,
-            CreateResourceSettings(kTextureAllocationChunkSize)));
+            nullptr, kTextureAllocationChunkSize, kDelegatedSyncPointsRequired,
+            kUseGpuMemoryBufferResources, kEnableColorCorrectRendering,
+            DefaultBufferToTextureTargetMapForTesting()));
 
     ResourceId id = resource_provider->CreateResource(
         size, ResourceProvider::TEXTURE_HINT_IMMUTABLE, format,

diff --git a/cc/resources/resource_settings.cc b/cc/resources/resource_settings.cc
deleted file mode 100644
index bd9ce41b5..0000000
--- a/cc/resources/resource_settings.cc
+++ /dev/null

@@ -1,15 +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.
-
-#include "cc/resources/resource_settings.h"
-
-namespace cc {
-
-ResourceSettings::ResourceSettings() = default;
-
-ResourceSettings::ResourceSettings(const ResourceSettings& other) = default;
-
-ResourceSettings::~ResourceSettings() = default;
-
-}  // namespace cc

diff --git a/cc/resources/resource_settings.h b/cc/resources/resource_settings.h
deleted file mode 100644
index a7ab9b69..0000000
--- a/cc/resources/resource_settings.h
+++ /dev/null

@@ -1,29 +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 CC_RESOURCES_RESOURCE_SETTINGS_H_
-#define CC_RESOURCES_RESOURCE_SETTINGS_H_
-
-#include "cc/cc_export.h"
-#include "cc/output/buffer_to_texture_target_map.h"
-
-namespace cc {
-
-// ResourceSettings contains all the settings that are needed to create a
-// ResourceProvider.
-class CC_EXPORT ResourceSettings {
- public:
-  ResourceSettings();
-  ResourceSettings(const ResourceSettings& other);
-  ~ResourceSettings();
-
-  size_t texture_id_allocation_chunk_size = 64;
-  bool use_gpu_memory_buffer_resources = false;
-  bool enable_color_correct_rasterization = false;
-  BufferToTextureTargetMap buffer_to_texture_target_map;
-};
-
-}  // namespace cc
-
-#endif  // CC_RESOURCES_RESOURCE_SETTINGS_H_

diff --git a/cc/surfaces/display.cc b/cc/surfaces/display.cc
index 586b9c2..a46731ff 100644
--- a/cc/surfaces/display.cc
+++ b/cc/surfaces/display.cc

@@ -184,11 +184,13 @@
 
 void Display::InitializeRenderer() {
   // Not relevant for display compositor since it's not delegated.
-  constexpr bool delegated_sync_points_required = false;
+  bool delegated_sync_points_required = false;
   resource_provider_.reset(new ResourceProvider(
       output_surface_->context_provider(), bitmap_manager_,
-      gpu_memory_buffer_manager_, nullptr, delegated_sync_points_required,
-      settings_.resource_settings));
+      gpu_memory_buffer_manager_, nullptr,
+      settings_.texture_id_allocation_chunk_size,
+      delegated_sync_points_required, settings_.use_gpu_memory_buffer_resources,
+      false, settings_.buffer_to_texture_target_map));
 
   if (output_surface_->context_provider()) {
     DCHECK(texture_mailbox_deleter_);

diff --git a/cc/test/fake_resource_provider.h b/cc/test/fake_resource_provider.h
index e092031..c40850d 100644
--- a/cc/test/fake_resource_provider.h
+++ b/cc/test/fake_resource_provider.h

@@ -9,6 +9,7 @@
 
 #include "base/memory/ptr_util.h"
 #include "cc/output/buffer_to_texture_target_map.h"
+#include "cc/output/renderer_settings.h"
 #include "cc/resources/resource_provider.h"
 #include "ui/gfx/buffer_types.h"
 
@@ -19,41 +20,41 @@
   static std::unique_ptr<FakeResourceProvider> Create(
       ContextProvider* context_provider,
       SharedBitmapManager* shared_bitmap_manager) {
-    ResourceSettings resource_settings;
-    resource_settings.texture_id_allocation_chunk_size = 1;
-    resource_settings.buffer_to_texture_target_map =
-        DefaultBufferToTextureTargetMapForTesting();
-    return base::WrapUnique(
-        new FakeResourceProvider(context_provider, shared_bitmap_manager,
-                                 nullptr, nullptr, true, resource_settings));
+    return base::WrapUnique(new FakeResourceProvider(
+        context_provider, shared_bitmap_manager, nullptr, nullptr, 1, true,
+        false, false, DefaultBufferToTextureTargetMapForTesting()));
   }
 
   static std::unique_ptr<FakeResourceProvider> Create(
       ContextProvider* context_provider,
       SharedBitmapManager* shared_bitmap_manager,
       gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager) {
-    ResourceSettings resource_settings;
-    resource_settings.texture_id_allocation_chunk_size = 1;
-    resource_settings.buffer_to_texture_target_map =
-        DefaultBufferToTextureTargetMapForTesting();
     return base::WrapUnique(new FakeResourceProvider(
         context_provider, shared_bitmap_manager, gpu_memory_buffer_manager,
-        nullptr, true, resource_settings));
+        nullptr, 1, true, false, false,
+        DefaultBufferToTextureTargetMapForTesting()));
   }
 
  private:
-  FakeResourceProvider(ContextProvider* context_provider,
-                       SharedBitmapManager* shared_bitmap_manager,
-                       gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
-                       BlockingTaskRunner* blocking_main_thread_task_runner,
-                       bool delegated_sync_points_required,
-                       const ResourceSettings resource_settings)
+  FakeResourceProvider(
+      ContextProvider* context_provider,
+      SharedBitmapManager* shared_bitmap_manager,
+      gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
+      BlockingTaskRunner* blocking_main_thread_task_runner,
+      size_t id_allocation_chunk_size,
+      bool delegated_sync_points_required,
+      bool use_gpu_memory_buffer_resources,
+      bool enable_color_correct_rendering,
+      const BufferToTextureTargetMap& buffer_to_texture_target_map)
       : ResourceProvider(context_provider,
                          shared_bitmap_manager,
                          gpu_memory_buffer_manager,
                          blocking_main_thread_task_runner,
+                         id_allocation_chunk_size,
                          delegated_sync_points_required,
-                         resource_settings) {}
+                         use_gpu_memory_buffer_resources,
+                         enable_color_correct_rendering,
+                         buffer_to_texture_target_map) {}
 };
 
 }  // namespace cc

diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc
index ddf318c5..6e18025 100644
--- a/cc/test/layer_tree_test.cc
+++ b/cc/test/layer_tree_test.cc

@@ -829,7 +829,7 @@
   // Disable latency recovery to make the scheduler more predictable in its
   // actions and less dependent on timings to make decisions.
   settings_.enable_latency_recovery = false;
-  settings_.resource_settings.buffer_to_texture_target_map =
+  settings_.buffer_to_texture_target_map =
       DefaultBufferToTextureTargetMapForTesting();
   InitializeSettings(&settings_);
 
@@ -858,10 +858,8 @@
       TestContextProvider::CreateWorker();
 
   RendererSettings renderer_settings;
-  // Spend less time waiting for BeginFrame because the output is
-  // mocked out.
   renderer_settings.refresh_rate = 200.0;
-  renderer_settings.resource_settings.buffer_to_texture_target_map =
+  renderer_settings.buffer_to_texture_target_map =
       DefaultBufferToTextureTargetMapForTesting();
   auto compositor_frame_sink = CreateCompositorFrameSink(
       renderer_settings, std::move(shared_context_provider),

diff --git a/cc/test/pixel_test.cc b/cc/test/pixel_test.cc
index f0482a7..31898ab 100644
--- a/cc/test/pixel_test.cc
+++ b/cc/test/pixel_test.cc

@@ -39,7 +39,8 @@
       disable_picture_quad_image_filtering_(false),
       output_surface_client_(new FakeOutputSurfaceClient),
       main_thread_task_runner_(
-          BlockingTaskRunner::Create(base::ThreadTaskRunnerHandle::Get())) {}
+          BlockingTaskRunner::Create(base::ThreadTaskRunnerHandle::Get())) {
+}
 PixelTest::~PixelTest() {}
 
 bool PixelTest::RunPixelTest(RenderPassList* pass_list,
@@ -166,11 +167,14 @@
   shared_bitmap_manager_.reset(new TestSharedBitmapManager);
   gpu_memory_buffer_manager_.reset(new TestGpuMemoryBufferManager);
   // Not relevant for display compositor since it's not delegated.
-  constexpr bool delegated_sync_points_required = false;
+  bool delegated_sync_points_required = false;
   resource_provider_ = base::MakeUnique<ResourceProvider>(
       output_surface_->context_provider(), shared_bitmap_manager_.get(),
-      gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(),
-      delegated_sync_points_required, settings_.resource_settings);
+      gpu_memory_buffer_manager_.get(), main_thread_task_runner_.get(), 1,
+      delegated_sync_points_required,
+      settings_.renderer_settings.use_gpu_memory_buffer_resources,
+      settings_.enable_color_correct_rasterization,
+      settings_.buffer_to_texture_target_map);
 
   texture_mailbox_deleter_ = base::MakeUnique<TextureMailboxDeleter>(
       base::ThreadTaskRunnerHandle::Get());
@@ -192,12 +196,13 @@
       new PixelTestOutputSurface(base::MakeUnique<SoftwareOutputDevice>()));
   output_surface_->BindToClient(output_surface_client_.get());
   shared_bitmap_manager_.reset(new TestSharedBitmapManager());
-  constexpr bool delegated_sync_points_required =
-      false;  // Meaningless for software.
+  bool delegated_sync_points_required = false;  // Meaningless for software.
   resource_provider_ = base::MakeUnique<ResourceProvider>(
       nullptr, shared_bitmap_manager_.get(), gpu_memory_buffer_manager_.get(),
-      main_thread_task_runner_.get(), delegated_sync_points_required,
-      settings_.resource_settings);
+      main_thread_task_runner_.get(), 1, delegated_sync_points_required,
+      settings_.renderer_settings.use_gpu_memory_buffer_resources,
+      settings_.enable_color_correct_rasterization,
+      settings_.buffer_to_texture_target_map);
   auto renderer = base::MakeUnique<SoftwareRenderer>(
       &settings_.renderer_settings, output_surface_.get(),
       resource_provider_.get());

diff --git a/cc/tiles/tile_manager_unittest.cc b/cc/tiles/tile_manager_unittest.cc
index d36a7824..3b61ba6 100644
--- a/cc/tiles/tile_manager_unittest.cc
+++ b/cc/tiles/tile_manager_unittest.cc

@@ -87,7 +87,7 @@
   LayerTreeSettings CreateSettings() override {
     LayerTreeSettings settings;
     settings.create_low_res_tiling = true;
-    settings.resource_settings.buffer_to_texture_target_map =
+    settings.buffer_to_texture_target_map =
         DefaultBufferToTextureTargetMapForTesting();
     return settings;
   }
@@ -2055,7 +2055,7 @@
 
   LayerTreeSettings CreateSettings() override {
     LayerTreeSettings settings;
-    settings.resource_settings.buffer_to_texture_target_map =
+    settings.buffer_to_texture_target_map =
         DefaultBufferToTextureTargetMapForTesting();
     return settings;
   }
@@ -2334,7 +2334,7 @@
   LayerTreeSettings CreateSettings() override {
     LayerTreeSettings settings;
     settings.enable_checker_imaging = true;
-    settings.resource_settings.buffer_to_texture_target_map =
+    settings.buffer_to_texture_target_map =
         DefaultBufferToTextureTargetMapForTesting();
     return settings;
   }

diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 3dfcae27..a0b3611 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc

@@ -2489,8 +2489,11 @@
       compositor_frame_sink_->shared_bitmap_manager(),
       compositor_frame_sink_->gpu_memory_buffer_manager(),
       task_runner_provider_->blocking_main_thread_task_runner(),
+      settings_.renderer_settings.texture_id_allocation_chunk_size,
       compositor_frame_sink_->capabilities().delegated_sync_points_required,
-      settings_.resource_settings);
+      settings_.renderer_settings.use_gpu_memory_buffer_resources,
+      settings_.enable_color_correct_rasterization,
+      settings_.buffer_to_texture_target_map);
 
   // Since the new context may be capable of MSAA, update status here. We don't
   // need to check the return value since we are recreating all resources

diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
index 1d526b4..b207e5b 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc

@@ -130,8 +130,8 @@
     LayerTreeSettings settings;
     settings.enable_surface_synchronization = true;
     settings.minimum_occlusion_tracking_size = gfx::Size();
-    settings.resource_settings.texture_id_allocation_chunk_size = 1;
-    settings.resource_settings.buffer_to_texture_target_map =
+    settings.renderer_settings.texture_id_allocation_chunk_size = 1;
+    settings.buffer_to_texture_target_map =
         DefaultBufferToTextureTargetMapForTesting();
     return settings;
   }

diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index 9a7e2f9..b74965d 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc

@@ -3461,7 +3461,7 @@
   LayerTreeHostTestUIResource() : num_ui_resources_(0) {}
 
   void InitializeSettings(LayerTreeSettings* settings) override {
-    settings->resource_settings.texture_id_allocation_chunk_size = 1;
+    settings->renderer_settings.texture_id_allocation_chunk_size = 1;
   }
 
   void BeginTest() override { PostSetNeedsCommitToMainThread(); }

diff --git a/cc/trees/layer_tree_host_unittest_context.cc b/cc/trees/layer_tree_host_unittest_context.cc
index c3584d3..1c630f04 100644
--- a/cc/trees/layer_tree_host_unittest_context.cc
+++ b/cc/trees/layer_tree_host_unittest_context.cc

@@ -1133,7 +1133,7 @@
  public:
   UIResourceLostTest() : time_step_(0) {}
   void InitializeSettings(LayerTreeSettings* settings) override {
-    settings->resource_settings.texture_id_allocation_chunk_size = 1;
+    settings->renderer_settings.texture_id_allocation_chunk_size = 1;
   }
   void BeginTest() override { PostSetNeedsCommitToMainThread(); }
   void AfterTest() override {}

diff --git a/cc/trees/layer_tree_host_unittest_copyrequest.cc b/cc/trees/layer_tree_host_unittest_copyrequest.cc
index c4c48ed..77a8ad7 100644
--- a/cc/trees/layer_tree_host_unittest_copyrequest.cc
+++ b/cc/trees/layer_tree_host_unittest_copyrequest.cc

@@ -860,7 +860,7 @@
  protected:
   void InitializeSettings(LayerTreeSettings* settings) override {
     // Always allocate only a single texture at a time through ResourceProvider.
-    settings->resource_settings.texture_id_allocation_chunk_size = 1;
+    settings->renderer_settings.texture_id_allocation_chunk_size = 1;
   }
 
   std::unique_ptr<OutputSurface> CreateDisplayOutputSurfaceOnThread(

diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h
index 0a5a564..fd3432e 100644
--- a/cc/trees/layer_tree_settings.h
+++ b/cc/trees/layer_tree_settings.h

@@ -15,7 +15,6 @@
 #include "cc/output/managed_memory_policy.h"
 #include "cc/output/renderer_settings.h"
 #include "cc/resources/resource_format.h"
-#include "cc/resources/resource_settings.h"
 #include "cc/scheduler/scheduler_settings.h"
 #include "cc/tiles/tile_manager_settings.h"
 #include "third_party/skia/include/core/SkColor.h"
@@ -33,7 +32,6 @@
   TileManagerSettings ToTileManagerSettings() const;
 
   RendererSettings renderer_settings;
-  ResourceSettings resource_settings;
   bool single_thread_proxy_scheduler = true;
   bool main_frame_before_activation_enabled = false;
   bool using_synchronous_renderer_compositor = false;
@@ -88,6 +86,7 @@
   size_t decoded_image_cache_budget_bytes = 128 * 1024 * 1024;
   size_t decoded_image_working_set_budget_bytes = 128 * 1024 * 1024;
   int max_preraster_distance_in_screen_pixels = 1000;
+  BufferToTextureTargetMap buffer_to_texture_target_map;
   ResourceFormat preferred_tile_format;
 
   bool enable_color_correct_rasterization = false;

diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc
index fb8514f1..52b9502 100644
--- a/chrome/browser/devtools/devtools_sanity_browsertest.cc
+++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc

@@ -1813,10 +1813,14 @@
   }
 };
 
+// TODO(hans): Temporarily disable while enabling Clang by default on Windows
+// over the weekend. (crbug.com/727458)
+#if !(defined(OS_WIN) && defined(__clang__))
 IN_PROC_BROWSER_TEST_F(DevToolsReattachAfterCrashTest,
                        TestReattachAfterCrashOnTimeline) {
   RunTestWithPanel("timeline");
 }
+#endif
 
 IN_PROC_BROWSER_TEST_F(DevToolsReattachAfterCrashTest,
                        TestReattachAfterCrashOnNetwork) {

diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index 0c6d628..840f7ef 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc

@@ -2009,6 +2009,10 @@
 // TODO(jam): http://crbug.com/350550
 #if !(defined(OS_CHROMEOS) && defined(ADDRESS_SANITIZER))
 
+// TODO(hans): Temporarily disable while enabling Clang by default on Windows
+// over the weekend. (crbug.com/727458)
+#if !(defined(OS_WIN) && defined(__clang__))
+
 // Checks that prerenderers will terminate when the RenderView crashes.
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderRendererCrash) {
   std::unique_ptr<TestPrerender> prerender = PrerenderTestURL(
@@ -2026,6 +2030,7 @@
   prerender->WaitForStop();
 }
 #endif
+#endif
 
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
                        PrerenderPageWithFragment) {

diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
index 2577ba21..1c2caa7 100644
--- a/content/browser/compositor/gpu_process_transport_factory.cc
+++ b/content/browser/compositor/gpu_process_transport_factory.cc

@@ -793,9 +793,9 @@
     data->display->SetOutputIsSecure(secure);
 }
 
-const cc::ResourceSettings& GpuProcessTransportFactory::GetResourceSettings()
+const cc::RendererSettings& GpuProcessTransportFactory::GetRendererSettings()
     const {
-  return renderer_settings_.resource_settings;
+  return renderer_settings_;
 }
 
 void GpuProcessTransportFactory::AddObserver(

diff --git a/content/browser/compositor/gpu_process_transport_factory.h b/content/browser/compositor/gpu_process_transport_factory.h
index 9ce2a46..ed3db87 100644
--- a/content/browser/compositor/gpu_process_transport_factory.h
+++ b/content/browser/compositor/gpu_process_transport_factory.h

@@ -23,7 +23,6 @@
 #include "ui/compositor/compositor.h"
 
 namespace cc {
-class ResourceSettings;
 class SingleThreadTaskGraphRunner;
 class SoftwareOutputDevice;
 class SurfaceManager;
@@ -53,7 +52,7 @@
   double GetRefreshRate() const override;
   gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;
   cc::TaskGraphRunner* GetTaskGraphRunner() override;
-  const cc::ResourceSettings& GetResourceSettings() const override;
+  const cc::RendererSettings& GetRendererSettings() const override;
   void AddObserver(ui::ContextFactoryObserver* observer) override;
   void RemoveObserver(ui::ContextFactoryObserver* observer) override;
 

diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
index b332498..e16100c 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc

@@ -388,13 +388,13 @@
   settings.use_partial_raster = compositor_deps->IsPartialRasterEnabled();
   settings.enable_elastic_overscroll =
       compositor_deps->IsElasticOverscrollEnabled();
-  settings.resource_settings.use_gpu_memory_buffer_resources =
+  settings.renderer_settings.use_gpu_memory_buffer_resources =
       compositor_deps->IsGpuMemoryBufferCompositorResourcesEnabled();
   settings.enable_color_correct_rasterization =
       cmd.HasSwitch(switches::kEnableColorCorrectRendering);
   settings.renderer_settings.enable_color_correct_rendering =
       cmd.HasSwitch(switches::kEnableColorCorrectRendering);
-  settings.resource_settings.buffer_to_texture_target_map =
+  settings.buffer_to_texture_target_map =
       compositor_deps->GetBufferToTextureTargetMap();
 
   // Build LayerTreeSettings from command line args.

diff --git a/third_party/WebKit/LayoutTests/platform/mac/animations/skew-notsequential-compositor-expected.png b/third_party/WebKit/LayoutTests/animations/skew-notsequential-compositor-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/animations/skew-notsequential-compositor-expected.png
rename to third_party/WebKit/LayoutTests/animations/skew-notsequential-compositor-expected.png
Binary files differ

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

diff --git a/third_party/WebKit/LayoutTests/platform/mac/compositing/culling/filter-occlusion-blur-expected.png b/third_party/WebKit/LayoutTests/compositing/culling/filter-occlusion-blur-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/compositing/culling/filter-occlusion-blur-expected.png
rename to third_party/WebKit/LayoutTests/compositing/culling/filter-occlusion-blur-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/compositing/culling/filter-occlusion-blur-large-expected.png b/third_party/WebKit/LayoutTests/compositing/culling/filter-occlusion-blur-large-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/compositing/culling/filter-occlusion-blur-large-expected.png
rename to third_party/WebKit/LayoutTests/compositing/culling/filter-occlusion-blur-large-expected.png
Binary files differ

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

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

diff --git a/third_party/WebKit/LayoutTests/platform/mac/compositing/lots-of-img-layers-with-opacity-expected.png b/third_party/WebKit/LayoutTests/compositing/lots-of-img-layers-with-opacity-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/compositing/lots-of-img-layers-with-opacity-expected.png
rename to third_party/WebKit/LayoutTests/compositing/lots-of-img-layers-with-opacity-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/compositing/overflow/mask-with-filter-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/mask-with-filter-expected.png
rename to third_party/WebKit/LayoutTests/compositing/overflow/mask-with-filter-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/compositing/overflow/tiled-mask-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/compositing/overflow/tiled-mask-expected.png
rename to third_party/WebKit/LayoutTests/compositing/overflow/tiled-mask-expected.png
Binary files differ

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

diff --git a/third_party/WebKit/LayoutTests/platform/mac/compositing/video/video-reflection-expected.png b/third_party/WebKit/LayoutTests/compositing/video/video-reflection-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/compositing/video/video-reflection-expected.png
rename to third_party/WebKit/LayoutTests/compositing/video/video-reflection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/filters/filter-change-repaint-composited-expected.png b/third_party/WebKit/LayoutTests/css3/filters/filter-change-repaint-composited-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/css3/filters/filter-change-repaint-composited-expected.png
rename to third_party/WebKit/LayoutTests/css3/filters/filter-change-repaint-composited-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/filters/filter-change-repaint-expected.png b/third_party/WebKit/LayoutTests/css3/filters/filter-change-repaint-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/css3/filters/filter-change-repaint-expected.png
rename to third_party/WebKit/LayoutTests/css3/filters/filter-change-repaint-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/css3/filters/filter-repaint-composited-fallback-crash-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/css3/filters/filter-repaint-composited-fallback-crash-expected.png
rename to third_party/WebKit/LayoutTests/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/css3/filters/filter-repaint-composited-fallback-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/css3/filters/filter-repaint-composited-fallback-expected.png
rename to third_party/WebKit/LayoutTests/css3/filters/filter-repaint-composited-fallback-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/inspector/tracing/timeline-misc/timeline-search-expected.txt b/third_party/WebKit/LayoutTests/inspector/tracing/timeline-misc/timeline-search-expected.txt
new file mode 100644
index 0000000..2b820f19
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/inspector/tracing/timeline-misc/timeline-search-expected.txt

@@ -0,0 +1,10 @@
+Test search in Timeline FlameChart View.
+
+2010: B TimeStamp CrRendererMain
+2011: X RasterTask CompositorTileWorker
+2100: S Painting CrRendererMain
+2210: X Paint CrRendererMain
+2260: X RasterTask CompositorTileWorker
+2280: X RasterTask CompositorTileWorker
+2010: B TimeStamp CrRendererMain
+

diff --git a/third_party/WebKit/LayoutTests/inspector/tracing/timeline-misc/timeline-search.html b/third_party/WebKit/LayoutTests/inspector/tracing/timeline-misc/timeline-search.html
new file mode 100644
index 0000000..f3139dd99
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/inspector/tracing/timeline-misc/timeline-search.html

@@ -0,0 +1,66 @@
+<html>
+<head>
+<script src="../../../http/tests/inspector/inspector-test.js"></script>
+<script src="../../../http/tests/inspector/timeline-test.js"></script>
+<script>
+
+function test()
+{
+    var sessionId = "4.20";
+    var mainThread = 1;
+    var rasterThread = 2;
+    var pid = 100;
+
+    var testData = [
+        { "args": { "sessionId": sessionId }, "cat": "disabled-by-default-devtools.timeline", "name": "TracingStartedInPage", "ph": "I", "pid": pid, "tid": mainThread, "ts": 100, },
+        { "args": { "name": "Renderer" }, "cat": "__metadata", "name": "process_name", "ph": "M", "pid": pid, "tid": mainThread, "ts": 0 },
+        { "args": { "name": "CrRendererMain" }, "cat": "__metadata", "name": "thread_name", "ph": "M", "pid": pid, "tid": mainThread, "ts": 0 },
+        { "args": { "name": "CompositorTileWorker" }, "cat": "__metadata", "name": "thread_name", "ph": "M", "pid": pid, "tid": rasterThread, "ts": 0 },
+
+        {"name": "Program",   "ts": 2000000, "ph": "B", "tid": mainThread, "pid": pid, "cat":"disabled-by-default-devtools.timeline", "args": {}},
+        {"name": "TimeStamp", "ts": 2010000, "ph": "B", "tid": mainThread, "pid": pid, "cat":"disabled-by-default-devtools.timeline", "args": {"data":{"message":"Painting"}}},
+        {"name": "TimeStamp", "ts": 2020000, "ph": "I", "tid": mainThread, "pid": pid, "cat":"disabled-by-default-devtools.timeline", "args": {"data":{"message":"bar11"}}},
+        {"name": "Painting",  "ts": 2100000, "ph": "S", "id": 100, "tid": mainThread, "pid": pid, "cat": "blink.console", "args": {} },
+        {"name": "TimeStamp", "ts": 2120000, "ph": "I", "tid": mainThread, "pid": pid, "cat":"disabled-by-default-devtools.timeline", "args": {"data":{"message":"bar12"}}},
+        {"name": "TimeStamp", "ts": 2180000, "ph": "E", "tid": mainThread, "pid": pid, "cat":"disabled-by-default-devtools.timeline", "args": {}},
+        {"name": "Layout",    "ts": 2190000, "ph": "X", "dur": 100000, "tid": mainThread, "pid": pid, "cat":"disabled-by-default-devtools.timeline", "args": {"beginData": { "frame": 0x12345678 }, "endData": { "rootNode": 1} }},
+        {"name": "Paint",     "ts": 2210000, "ph": "X", "dur": 100000, "tid": mainThread, "pid": pid, "cat":"disabled-by-default-devtools.timeline", "args": {"data":{"message":"foo13"}}},
+        {"name": "TimeStamp", "ts": 2380000, "ph": "I", "tid": mainThread, "pid": pid, "cat":"disabled-by-default-devtools.timeline", "args": {"data":{"message":"bar13"}}},
+        {"name": "Painting",  "ts": 2382000, "ph": "F", "id": 100, "tid": mainThread, "pid": pid, "cat": "blink.console", "args": {} },
+        {"name": "Program",   "ts": 2400000, "ph": "E", "tid": mainThread, "pid": pid, "cat":"disabled-by-default-devtools.timeline", "args": {}},
+
+        {"name": "RasterTask", "ts": 2011000, "ph": "X", "dur": 1000, "tid": rasterThread, "pid": pid, "cat":"disabled-by-default-devtools.timeline", "args": {"data":{}}},
+        {"name": "RasterTask", "ts": 2260000, "ph": "X", "dur": 1000, "tid": rasterThread, "pid": pid, "cat":"disabled-by-default-devtools.timeline", "args": {"data":{}}},
+        {"name": "DecodeImage", "ts": 2270000, "ph": "X", "dur": 1000, "tid": rasterThread, "pid": pid, "cat":"disabled-by-default-devtools.timeline", "args": {"data":{}}},
+        {"name": "RasterTask", "ts": 2280000, "ph": "X", "dur": 1000, "tid": rasterThread, "pid": pid, "cat":"disabled-by-default-devtools.timeline", "args": {"data":{}}},
+    ];
+
+    var timeline = UI.panels.timeline;
+    var model = InspectorTest.createPerformanceModelWithEvents(testData);
+    timeline._setModel(model);
+    var flameChartView = timeline._flameChart;
+    var searchConfig = new UI.SearchableView.SearchConfig('Paint', false, false);
+    flameChartView.performSearch(searchConfig, true, false);
+    for (var i = 0; i < 7; ++i) {
+        var selection = timeline._currentModelSelectionData().selection;
+        if (!selection || selection.type() !== Timeline.TimelineSelection.Type.TraceEvent) {
+            InspectorTest.addResult(`Invalid selection type: ${selection && selection.type()}`);
+            continue;
+        }
+        var event = selection.object();
+        InspectorTest.addResult(`${event.startTime}: ${event.phase} ${event.name} ${event.thread.name()}`);
+        flameChartView.jumpToNextSearchResult();
+    }
+    InspectorTest.completeTest();
+}
+
+</script>
+</head>
+
+<body onload="runTest()">
+<p>
+Test search in Timeline FlameChart View.</a>
+</p>
+
+</body>
+</html>

diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/color-profile-video-seek-filter-expected.png b/third_party/WebKit/LayoutTests/media/color-profile-video-seek-filter-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/media/color-profile-video-seek-filter-expected.png
rename to third_party/WebKit/LayoutTests/media/color-profile-video-seek-filter-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/color-profile-video-seek-object-fit-expected.png b/third_party/WebKit/LayoutTests/media/color-profile-video-seek-object-fit-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/media/color-profile-video-seek-object-fit-expected.png
rename to third_party/WebKit/LayoutTests/media/color-profile-video-seek-object-fit-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/video-canvas-alpha-expected.png b/third_party/WebKit/LayoutTests/media/video-canvas-alpha-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/media/video-canvas-alpha-expected.png
rename to third_party/WebKit/LayoutTests/media/video-canvas-alpha-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/media/video-remove-insert-repaints-expected.png b/third_party/WebKit/LayoutTests/media/video-remove-insert-repaints-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/media/video-remove-insert-repaints-expected.png
rename to third_party/WebKit/LayoutTests/media/video-remove-insert-repaints-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/animations/skew-notsequential-compositor-expected.png b/third_party/WebKit/LayoutTests/platform/linux/animations/skew-notsequential-compositor-expected.png
deleted file mode 100644
index f1fb3b5..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/animations/skew-notsequential-compositor-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/lots-of-img-layers-expected.png b/third_party/WebKit/LayoutTests/platform/linux/compositing/lots-of-img-layers-expected.png
deleted file mode 100644
index 1d5e388..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/compositing/lots-of-img-layers-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/lots-of-img-layers-with-opacity-expected.png b/third_party/WebKit/LayoutTests/platform/linux/compositing/lots-of-img-layers-with-opacity-expected.png
deleted file mode 100644
index 504660f..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/compositing/lots-of-img-layers-with-opacity-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
deleted file mode 100644
index fff540df..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/mask-with-filter-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/perpendicular-layer-sorting-expected.png b/third_party/WebKit/LayoutTests/platform/linux/compositing/perpendicular-layer-sorting-expected.png
deleted file mode 100644
index f6472ac..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/compositing/perpendicular-layer-sorting-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-blur-hw-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-blur-hw-expected.png
deleted file mode 100644
index f92bdbb..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-blur-hw-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-brightness-clamping-hw-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-brightness-clamping-hw-expected.png
deleted file mode 100644
index 359468a..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-brightness-clamping-hw-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-brightness-hw-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-brightness-hw-expected.png
deleted file mode 100644
index 4d27e489d..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-brightness-hw-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-combined-hw-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-combined-hw-expected.png
deleted file mode 100644
index c42e028..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-combined-hw-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-drop-shadow-hw-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-drop-shadow-hw-expected.png
deleted file mode 100644
index 91f798b..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-drop-shadow-hw-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-saturate-hw-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-saturate-hw-expected.png
deleted file mode 100644
index 94d27c6..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-saturate-hw-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-sepia-hw-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-sepia-hw-expected.png
deleted file mode 100644
index 61e3630..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-sepia-hw-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/filter-change-repaint-composited-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/filters/filter-change-repaint-composited-expected.png
deleted file mode 100644
index 3e6040d..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/filter-change-repaint-composited-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/filter-change-repaint-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/filters/filter-change-repaint-expected.png
deleted file mode 100644
index 8495c55..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/filter-change-repaint-expected.png
+++ /dev/null
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
deleted file mode 100644
index 4aff4f1..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/filter-repaint-composited-fallback-crash-expected.png
+++ /dev/null
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
deleted file mode 100644
index 4aff4f1..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/filter-repaint-composited-fallback-expected.png
+++ /dev/null
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
deleted file mode 100644
index 8540526d..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/masking/mask-luminance-svg-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/masking/mask-repeat-round-content-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/masking/mask-repeat-round-content-expected.png
deleted file mode 100644
index 6cfcdcf..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/masking/mask-repeat-round-content-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/masking/mask-repeat-space-border-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/masking/mask-repeat-space-border-expected.png
deleted file mode 100644
index a6775fa..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/masking/mask-repeat-space-border-expected.png
+++ /dev/null
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
deleted file mode 100644
index de6fac53..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/masking/mask-repeat-space-content-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/masking/mask-repeat-space-padding-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/masking/mask-repeat-space-padding-expected.png
deleted file mode 100644
index 5ea7d5e..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/css3/masking/mask-repeat-space-padding-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/008-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/008-expected.png
deleted file mode 100644
index 54121bed..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/block/float/008-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/vertical-lr/002-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/vertical-lr/002-expected.png
deleted file mode 100644
index b592b4df..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/vertical-lr/002-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/vertical-rl/002-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/vertical-rl/002-expected.png
deleted file mode 100644
index 7ab4b2b..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/block/positioning/vertical-rl/002-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/huge-mac-input-clamped-width-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/huge-mac-input-clamped-width-expected.png
deleted file mode 100644
index ab190136..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/huge-mac-input-clamped-width-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/images/color-profile-layer-expected.png b/third_party/WebKit/LayoutTests/platform/linux/images/color-profile-layer-expected.png
deleted file mode 100644
index 9576de2..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/images/color-profile-layer-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/images/color-profile-layer-filter-expected.png b/third_party/WebKit/LayoutTests/platform/linux/images/color-profile-layer-filter-expected.png
deleted file mode 100644
index e575d50..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/images/color-profile-layer-filter-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/color-profile-video-seek-filter-expected.png b/third_party/WebKit/LayoutTests/platform/linux/media/color-profile-video-seek-filter-expected.png
deleted file mode 100644
index 2b5e0b3..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/media/color-profile-video-seek-filter-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/color-profile-video-seek-object-fit-expected.png b/third_party/WebKit/LayoutTests/platform/linux/media/color-profile-video-seek-object-fit-expected.png
deleted file mode 100644
index c4a1a2f..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/media/color-profile-video-seek-object-fit-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/video-canvas-alpha-expected.png b/third_party/WebKit/LayoutTests/platform/linux/media/video-canvas-alpha-expected.png
deleted file mode 100644
index 6af9546..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/media/video-canvas-alpha-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/media/video-remove-insert-repaints-expected.png b/third_party/WebKit/LayoutTests/platform/linux/media/video-remove-insert-repaints-expected.png
deleted file mode 100644
index 47efc6a..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/media/video-remove-insert-repaints-expected.png
+++ /dev/null
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
deleted file mode 100644
index 52b7c89..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/custom/object-sizing-no-width-height-expected.png
+++ /dev/null
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
deleted file mode 100644
index bf174b54..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-objectBoundingBox-expected.png
+++ /dev/null
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
deleted file mode 100644
index 65d6380..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-userSpaceOnUse-expected.png
+++ /dev/null
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
deleted file mode 100644
index bf174b54..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-objectBoundingBox-expected.png
+++ /dev/null
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
deleted file mode 100644
index 65d6380..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-userSpaceOnUse-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/overflow/overflow-on-outermost-svg-element-defaults-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/overflow/overflow-on-outermost-svg-element-defaults-expected.png
deleted file mode 100644
index 5c73f57..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/overflow/overflow-on-outermost-svg-element-defaults-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/overflow/overflow-on-outermost-svg-element-ignore-attribute-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/overflow/overflow-on-outermost-svg-element-ignore-attribute-2-expected.png
deleted file mode 100644
index 5c73f57..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/overflow/overflow-on-outermost-svg-element-ignore-attribute-2-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/overflow/overflow-on-outermost-svg-element-ignore-attribute-3-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/overflow/overflow-on-outermost-svg-element-ignore-attribute-3-expected.png
deleted file mode 100644
index 5c73f57..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/overflow/overflow-on-outermost-svg-element-ignore-attribute-3-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/overflow/overflow-on-outermost-svg-element-in-xhtml-defaults-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/overflow/overflow-on-outermost-svg-element-in-xhtml-defaults-expected.png
deleted file mode 100644
index 0c0220f..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/overflow/overflow-on-outermost-svg-element-in-xhtml-defaults-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/absolute-sized-document-scrollbars-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/absolute-sized-document-scrollbars-expected.png
deleted file mode 100644
index 7d88073..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/svg/zoom/page/absolute-sized-document-scrollbars-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug137388-2-expected.png b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug137388-2-expected.png
deleted file mode 100644
index e543c7d..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug137388-2-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/transforms/3d/point-mapping/3d-point-mapping-deep-expected.png b/third_party/WebKit/LayoutTests/platform/linux/transforms/3d/point-mapping/3d-point-mapping-deep-expected.png
deleted file mode 100644
index d30d202..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/transforms/3d/point-mapping/3d-point-mapping-deep-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/color-matching/image-color-matching-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/color-matching/image-color-matching-expected.png
new file mode 100644
index 0000000..5ad4f9e
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/color-matching/image-color-matching-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/geometry/video-fixed-scrolling-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/geometry/video-fixed-scrolling-expected.png
new file mode 100644
index 0000000..8c74c21
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/geometry/video-fixed-scrolling-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/geometry/video-opacity-overlay-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/geometry/video-opacity-overlay-expected.png
new file mode 100644
index 0000000..658a7c4
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/geometry/video-opacity-overlay-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/gestures/gesture-tapHighlight-pixel-rotated-div-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/gestures/gesture-tapHighlight-pixel-rotated-div-expected.png
new file mode 100644
index 0000000..35e95006
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/gestures/gesture-tapHighlight-pixel-rotated-div-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/layers-inside-overflow-scroll-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/layers-inside-overflow-scroll-expected.png
new file mode 100644
index 0000000..e29c777
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/layers-inside-overflow-scroll-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/lots-of-img-layers-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/lots-of-img-layers-expected.png
deleted file mode 100644
index 1d5e388..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/lots-of-img-layers-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/lots-of-img-layers-with-opacity-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/lots-of-img-layers-with-opacity-expected.png
deleted file mode 100644
index 504660f..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/lots-of-img-layers-with-opacity-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/masks/mask-with-added-filters-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/masks/mask-with-added-filters-expected.png
new file mode 100644
index 0000000..ae5f6f7
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/masks/mask-with-added-filters-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/masks/mask-with-removed-filters-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/masks/mask-with-removed-filters-expected.png
new file mode 100644
index 0000000..14c7efa
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/masks/mask-with-removed-filters-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/overflow/mask-with-filter-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/overflow/mask-with-filter-expected.png
deleted file mode 100644
index fff540df..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/overflow/mask-with-filter-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/overflow/overflow-compositing-descendant-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/overflow/overflow-compositing-descendant-expected.png
new file mode 100644
index 0000000..0182a883
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/overflow/overflow-compositing-descendant-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/overflow/scaled-mask-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/overflow/scaled-mask-expected.png
new file mode 100644
index 0000000..c98959e
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/overflow/scaled-mask-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/overflow/scroll-ancestor-update-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/overflow/scroll-ancestor-update-expected.png
new file mode 100644
index 0000000..28bb838
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/overflow/scroll-ancestor-update-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/perpendicular-layer-sorting-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/perpendicular-layer-sorting-expected.png
deleted file mode 100644
index f6472ac..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/perpendicular-layer-sorting-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/reflections/animation-inside-reflection-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/reflections/animation-inside-reflection-expected.png
new file mode 100644
index 0000000..e738eac
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/reflections/animation-inside-reflection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/reflections/load-video-in-reflection-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/reflections/load-video-in-reflection-expected.png
new file mode 100644
index 0000000..1714c987
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/reflections/load-video-in-reflection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/reflections/nested-reflection-mask-change-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/reflections/nested-reflection-mask-change-expected.png
new file mode 100644
index 0000000..2c2cc64
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/reflections/nested-reflection-mask-change-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/self-painting-layers-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/self-painting-layers-expected.png
new file mode 100644
index 0000000..1a987ba
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/self-painting-layers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/video-frame-size-change-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/video-frame-size-change-expected.png
new file mode 100644
index 0000000..ad074ba
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/disable-spinvalidation/compositing/video-frame-size-change-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-background-image-cover-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-background-image-cover-expected.png
deleted file mode 100644
index e4d4f8c..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-background-image-cover-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-background-image-repeat-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-background-image-repeat-expected.png
deleted file mode 100644
index ace784a..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-background-image-repeat-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-background-image-space-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-background-image-space-expected.png
deleted file mode 100644
index da8ce41..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-background-image-space-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-border-image-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-border-image-expected.png
deleted file mode 100644
index 6f101d5..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-border-image-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-border-image-source-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-border-image-source-expected.png
deleted file mode 100644
index 94cb1a3..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-border-image-source-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-border-radius-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-border-radius-expected.png
deleted file mode 100644
index f4365827..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-border-radius-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-filter-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-filter-expected.png
deleted file mode 100644
index ac212269..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-filter-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-group-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-group-expected.png
deleted file mode 100644
index ffd531b..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-group-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-iframe-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-iframe-expected.png
deleted file mode 100644
index 975e5fd6..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-iframe-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-image-canvas-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-image-canvas-expected.png
deleted file mode 100644
index 2dbcf9a..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-image-canvas-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-image-canvas-pattern-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-image-canvas-pattern-expected.png
deleted file mode 100644
index 5dd87ff..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-image-canvas-pattern-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-image-canvas-svg-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-image-canvas-svg-expected.png
deleted file mode 100644
index 68885d2..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-image-canvas-svg-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-image-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-image-expected.png
deleted file mode 100644
index eb1051c..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-image-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-image-profile-match-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-image-profile-match-expected.png
deleted file mode 100644
index 1cf0831..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-image-profile-match-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-layer-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-layer-expected.png
deleted file mode 100644
index d91a693..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-layer-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-layer-filter-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-layer-filter-expected.png
deleted file mode 100644
index 6d681b7..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-layer-filter-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-object-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-object-expected.png
deleted file mode 100644
index b2c39bb..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-object-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-svg-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-svg-expected.png
deleted file mode 100644
index 0e3dbec..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/color-profile-svg-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/cross-fade-background-size-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/cross-fade-background-size-expected.png
deleted file mode 100644
index 09bf797..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/cross-fade-background-size-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/exif-orientation-height-image-document-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/exif-orientation-height-image-document-expected.png
deleted file mode 100644
index e2fc9cae..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/exif-orientation-height-image-document-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/jpeg-yuv-progressive-image-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/jpeg-yuv-progressive-image-expected.png
deleted file mode 100644
index fec0280a..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/jpeg-yuv-progressive-image-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png
deleted file mode 100644
index 8025909..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png
deleted file mode 100644
index d7efc45..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu/fast/canvas/canvas-arc-circumference-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu/fast/canvas/canvas-arc-circumference-expected.png
deleted file mode 100644
index 61f628a..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu/fast/canvas/canvas-arc-circumference-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu/fast/canvas/canvas-drawImage-video-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu/fast/canvas/canvas-drawImage-video-expected.png
deleted file mode 100644
index 564b4dc..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu/fast/canvas/canvas-drawImage-video-expected.png
+++ /dev/null
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
deleted file mode 100644
index d8fdd0c..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu/fast/canvas/canvas-toDataURL-webp-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu/fast/canvas/canvas-toDataURL-webp-expected.png
deleted file mode 100644
index e897dd9c..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu/fast/canvas/canvas-toDataURL-webp-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu/fast/canvas/yuv-video-on-accelerated-canvas-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu/fast/canvas/yuv-video-on-accelerated-canvas-expected.png
deleted file mode 100644
index a23bd9d..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/gpu/fast/canvas/yuv-video-on-accelerated-canvas-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/css1/pseudo/pseudo_elements_in_selectors-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/css1/pseudo/pseudo_elements_in_selectors-expected.png
new file mode 100644
index 0000000..8eb7716a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/css1/pseudo/pseudo_elements_in_selectors-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/023-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/023-expected.png
new file mode 100644
index 0000000..a007f79
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/023-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/040-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/040-expected.png
new file mode 100644
index 0000000..0ff5526
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/040-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-cell-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-cell-expected.png
new file mode 100644
index 0000000..35651b1
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-cell-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-column-group-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-column-group-expected.png
new file mode 100644
index 0000000..a6ad508
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-column-group-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-row-group-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-row-group-collapsed-border-expected.png
new file mode 100644
index 0000000..b8b87ef
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-row-group-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-row-group-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-row-group-expected.png
new file mode 100644
index 0000000..4bd187d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-row-group-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_layers-hide-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_layers-hide-collapsed-border-expected.png
new file mode 100644
index 0000000..ff4fd6a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_layers-hide-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_layers-hide-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_layers-hide-expected.png
new file mode 100644
index 0000000..ccf013c6
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_layers-hide-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_layers-show-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_layers-show-collapsed-border-expected.png
new file mode 100644
index 0000000..06fd3954
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_layers-show-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_layers-show-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_layers-show-expected.png
new file mode 100644
index 0000000..475491f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_layers-show-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-column-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-column-collapsed-border-expected.png
new file mode 100644
index 0000000..0a6d8af3
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-column-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-column-group-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-column-group-expected.png
new file mode 100644
index 0000000..dd6bf6fd
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-column-group-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-expected.png
new file mode 100644
index 0000000..31d690b
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-row-group-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-row-group-expected.png
new file mode 100644
index 0000000..72d561a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-row-group-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-cell-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-cell-expected.png
new file mode 100644
index 0000000..15a91c49
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-cell-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png
new file mode 100644
index 0000000..14783be
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-expected.png
new file mode 100644
index 0000000..f79ae8ade
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-expected.png
new file mode 100644
index 0000000..cd74901
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png
new file mode 100644
index 0000000..73df624
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/001-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/001-expected.png
new file mode 100644
index 0000000..13746729
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/empty-cells-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/empty-cells-expected.png
new file mode 100644
index 0000000..9af691d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/fast/table/empty-cells-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png
deleted file mode 100644
index 52b7c89..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-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
deleted file mode 100644
index fff540df..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/mask-with-filter-expected.png
+++ /dev/null
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
deleted file mode 100644
index ba320740..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/prefer_compositing_to_lcd_text/compositing/overflow/tiled-mask-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/compositing/visibility/visibility-image-layers-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/compositing/visibility/visibility-image-layers-expected.png
deleted file mode 100644
index 365ad04e..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/compositing/visibility/visibility-image-layers-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/compositing/visibility/visibility-simple-video-layer-expected.png b/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/compositing/visibility/visibility-simple-video-layer-expected.png
deleted file mode 100644
index 13255e5..0000000
--- a/third_party/WebKit/LayoutTests/platform/linux/virtual/threaded/compositing/visibility/visibility-simple-video-layer-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/compositing/lots-of-img-layers-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/compositing/lots-of-img-layers-expected.png
deleted file mode 100644
index 1d5e388..0000000
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/compositing/lots-of-img-layers-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/compositing/lots-of-img-layers-with-opacity-expected.png b/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/compositing/lots-of-img-layers-with-opacity-expected.png
deleted file mode 100644
index 504660f..0000000
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/disable-spinvalidation/compositing/lots-of-img-layers-with-opacity-expected.png
+++ /dev/null
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
deleted file mode 100644
index fff540df..0000000
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/mask-with-filter-expected.png
+++ /dev/null
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
deleted file mode 100644
index ba320740..0000000
--- a/third_party/WebKit/LayoutTests/platform/mac/virtual/prefer_compositing_to_lcd_text/compositing/overflow/tiled-mask-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/animations/skew-notsequential-compositor-expected.png b/third_party/WebKit/LayoutTests/platform/win/animations/skew-notsequential-compositor-expected.png
deleted file mode 100644
index f9c7afc..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/animations/skew-notsequential-compositor-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/3d-corners-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/3d-corners-expected.png
deleted file mode 100644
index 33be2a54..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/3d-corners-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/color-matching/image-color-matching-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/color-matching/image-color-matching-expected.png
index 07d4e96..0dfec438 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/color-matching/image-color-matching-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/color-matching/image-color-matching-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/culling/filter-occlusion-blur-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/culling/filter-occlusion-blur-expected.png
deleted file mode 100644
index de721ce..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/culling/filter-occlusion-blur-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/culling/filter-occlusion-blur-large-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/culling/filter-occlusion-blur-large-expected.png
deleted file mode 100644
index fa534224..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/culling/filter-occlusion-blur-large-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/flat-with-transformed-child-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/flat-with-transformed-child-expected.png
index 1df31f5..ba38a6eb 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/flat-with-transformed-child-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/flat-with-transformed-child-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/geometry/layer-due-to-layer-children-deep-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/geometry/layer-due-to-layer-children-deep-expected.png
index 31c891b..46b862e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/geometry/layer-due-to-layer-children-deep-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/geometry/layer-due-to-layer-children-deep-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/geometry/vertical-scroll-composited-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/geometry/vertical-scroll-composited-expected.png
deleted file mode 100644
index f08c2b5..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/geometry/vertical-scroll-composited-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/geometry/video-fixed-scrolling-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/geometry/video-fixed-scrolling-expected.png
index 1b32cd33..f68d3292 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/geometry/video-fixed-scrolling-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/geometry/video-fixed-scrolling-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/geometry/video-opacity-overlay-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/geometry/video-opacity-overlay-expected.png
index 98ad39a..7f79a01 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/geometry/video-opacity-overlay-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/geometry/video-opacity-overlay-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 4896c06..e9a7997 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/layers-inside-overflow-scroll-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/layers-inside-overflow-scroll-expected.png
index b8d97fc0..76d0c9f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/layers-inside-overflow-scroll-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/layers-inside-overflow-scroll-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/lots-of-img-layers-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/lots-of-img-layers-expected.png
deleted file mode 100644
index a8afe292..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/lots-of-img-layers-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/lots-of-img-layers-with-opacity-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/lots-of-img-layers-with-opacity-expected.png
deleted file mode 100644
index b9471ee1..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/lots-of-img-layers-with-opacity-expected.png
+++ /dev/null
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 0f3703a5..3e2ed27d 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 8079d94b..5fe00e95 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/mask-with-filter-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/mask-with-filter-expected.png
deleted file mode 100644
index 6e9aeb8..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/mask-with-filter-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/overflow-compositing-descendant-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/overflow-compositing-descendant-expected.png
index f545d204..074b2c7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/overflow-compositing-descendant-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/overflow-compositing-descendant-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 002d64a..ab15b686 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/scroll-ancestor-update-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/scroll-ancestor-update-expected.png
index 5fe1c73..9929aa1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/scroll-ancestor-update-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/scroll-ancestor-update-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
deleted file mode 100644
index 005e10d..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/overflow/tiled-mask-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/perpendicular-layer-sorting-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/perpendicular-layer-sorting-expected.png
deleted file mode 100644
index 364c128..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/perpendicular-layer-sorting-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/reflections/animation-inside-reflection-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/reflections/animation-inside-reflection-expected.png
index c5922a4..e13bbda 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/reflections/animation-inside-reflection-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/reflections/animation-inside-reflection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/reflections/load-video-in-reflection-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/reflections/load-video-in-reflection-expected.png
index 4953c76..956bb6c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/reflections/load-video-in-reflection-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/reflections/load-video-in-reflection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/reflections/nested-reflection-mask-change-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/reflections/nested-reflection-mask-change-expected.png
index 42c1fdb4..d959991 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/reflections/nested-reflection-mask-change-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/reflections/nested-reflection-mask-change-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/self-painting-layers-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/self-painting-layers-expected.png
index 1fe7ca6..0d11305 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/self-painting-layers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/self-painting-layers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/video-frame-size-change-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/video-frame-size-change-expected.png
index a876119..0598733e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/video-frame-size-change-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/video-frame-size-change-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/video/video-reflection-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/video/video-reflection-expected.png
deleted file mode 100644
index 3928dfe..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/video/video-reflection-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/visibility/visibility-image-layers-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/visibility/visibility-image-layers-expected.png
index ef17003..365ad04e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/visibility/visibility-image-layers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/visibility/visibility-image-layers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/compositing/visibility/visibility-simple-video-layer-expected.png b/third_party/WebKit/LayoutTests/platform/win/compositing/visibility/visibility-simple-video-layer-expected.png
index c55c7d26..13255e5 100644
--- a/third_party/WebKit/LayoutTests/platform/win/compositing/visibility/visibility-simple-video-layer-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/compositing/visibility/visibility-simple-video-layer-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 f5ffaf3c..867970a 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/padding_inline-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/box_properties/padding_inline-expected.png
index 4843da8..3defaa0 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/pseudo/firstline-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/pseudo/firstline-expected.png
index 6ee9175..984a7970 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/pseudo_elements_in_selectors-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/pseudo/pseudo_elements_in_selectors-expected.png
index 2522337..4b2bebe 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/text_transform-expected.png b/third_party/WebKit/LayoutTests/platform/win/css1/text_properties/text_transform-expected.png
index 29714786..0225bfd4 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/css2.1/t0803-c5502-mrgn-r-02-c-expected.png b/third_party/WebKit/LayoutTests/platform/win/css2.1/t0803-c5502-mrgn-r-02-c-expected.png
index a735571..813020b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css2.1/t0803-c5502-mrgn-r-02-c-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css2.1/t0803-c5502-mrgn-r-02-c-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css2.1/t0803-c5505-mrgn-02-c-expected.png b/third_party/WebKit/LayoutTests/platform/win/css2.1/t0803-c5505-mrgn-02-c-expected.png
index 2afb8d9..29facdf 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css2.1/t0803-c5505-mrgn-02-c-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css2.1/t0803-c5505-mrgn-02-c-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css2.1/t1002-c5523-width-02-b-g-expected.png b/third_party/WebKit/LayoutTests/platform/win/css2.1/t1002-c5523-width-02-b-g-expected.png
index 035f1cc0..4ba869e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css2.1/t1002-c5523-width-02-b-g-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css2.1/t1002-c5523-width-02-b-g-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/blending/background-blend-mode-overlapping-accelerated-elements-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/blending/background-blend-mode-overlapping-accelerated-elements-expected.png
index 4ea065b5..d2435119 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/blending/background-blend-mode-overlapping-accelerated-elements-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/blending/background-blend-mode-overlapping-accelerated-elements-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-blur-hw-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-blur-hw-expected.png
index d06a6e2..f92bdbb 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-blur-hw-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-blur-hw-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-brightness-clamping-hw-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-brightness-clamping-hw-expected.png
index c37f39b4..359468a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-brightness-clamping-hw-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-brightness-clamping-hw-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-brightness-hw-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-brightness-hw-expected.png
index 9085e3b..4d27e489d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-brightness-hw-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-brightness-hw-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-combined-hw-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-combined-hw-expected.png
index c071fc80..c42e028 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-combined-hw-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-combined-hw-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-drop-shadow-hw-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-drop-shadow-hw-expected.png
index 0e6c901..91f798b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-drop-shadow-hw-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-drop-shadow-hw-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-saturate-hw-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-saturate-hw-expected.png
index b032ce75..94d27c6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-saturate-hw-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-saturate-hw-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-sepia-hw-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-sepia-hw-expected.png
index daa8f0e60..61e3630 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-sepia-hw-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-sepia-hw-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/filters/filter-change-repaint-composited-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/filters/filter-change-repaint-composited-expected.png
deleted file mode 100644
index 4fab3906..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/css3/filters/filter-change-repaint-composited-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/filters/filter-change-repaint-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/filters/filter-change-repaint-expected.png
deleted file mode 100644
index c847a97..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/css3/filters/filter-change-repaint-expected.png
+++ /dev/null
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
deleted file mode 100644
index 71098077..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/css3/filters/filter-repaint-composited-fallback-crash-expected.png
+++ /dev/null
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
deleted file mode 100644
index 71098077..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/css3/filters/filter-repaint-composited-fallback-expected.png
+++ /dev/null
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 71ff6727d..8540526d 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-round-content-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/masking/mask-repeat-round-content-expected.png
index 2bc6279..6cfcdcf 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/masking/mask-repeat-round-content-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/masking/mask-repeat-round-content-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/masking/mask-repeat-space-border-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/masking/mask-repeat-space-border-expected.png
index fe24a5c..a6775fa 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/masking/mask-repeat-space-border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/masking/mask-repeat-space-border-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 2703986..de6fac53 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/masking/mask-repeat-space-padding-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/masking/mask-repeat-space-padding-expected.png
index 8511fa8..5ea7d5e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/css3/masking/mask-repeat-space-padding-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/css3/masking/mask-repeat-space-padding-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/float/008-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/float/008-expected.png
index d5df635..54121bed 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/float/008-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/float/008-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/float/021-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/float/021-expected.png
index 0c1afb9..2a269cb 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/float/021-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/float/021-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/margin-collapse/104-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/margin-collapse/104-expected.png
index 9798029f..572d03dd 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/margin-collapse/104-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/margin-collapse/104-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/relative-overflow-block-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/relative-overflow-block-expected.png
index a9e651bb..321202e3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/relative-overflow-block-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/relative-overflow-block-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/relative-overflow-replaced-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/relative-overflow-replaced-expected.png
index bbecd33..28cf2af 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/relative-overflow-replaced-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/relative-overflow-replaced-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/relative-overflow-replaced-float-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/relative-overflow-replaced-float-expected.png
index 616ddd6..4ff01c3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/relative-overflow-replaced-float-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/relative-overflow-replaced-float-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/vertical-lr/002-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/vertical-lr/002-expected.png
index 06eb30e..b592b4df 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/vertical-lr/002-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/vertical-lr/002-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/vertical-rl/002-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/vertical-rl/002-expected.png
index 25ea1723..7ab4b2b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/vertical-rl/002-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/block/positioning/vertical-rl/002-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 cee7f52..fd30785b 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 4959247..695ed0b 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 4ad5437..47a904e9 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/clip/overflow-border-radius-composited-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/clip/overflow-border-radius-composited-expected.png
index ef88e79fa..92182e0 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 79baddc8..4b27a522 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/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 bfbcba0..29477d1 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/forms/button-default-title-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/button-default-title-expected.png
index be4c64c..d661015 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/huge-mac-input-clamped-width-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/huge-mac-input-clamped-width-expected.png
index 1a34551b..ab190136 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/huge-mac-input-clamped-width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/huge-mac-input-clamped-width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/text/input-appearance-selection-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/text/input-appearance-selection-expected.png
index 6ecc7ca..b5a612a2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/text/input-appearance-selection-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/text/input-appearance-selection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/forms/text/input-table-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/forms/text/input-table-expected.png
index 341ac6b..a6aa760a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/forms/text/input-table-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/forms/text/input-table-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/frames/iframe-scrolling-attribute-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/frames/iframe-scrolling-attribute-expected.png
index e94f4d3..1789675 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/frames/iframe-scrolling-attribute-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/frames/iframe-scrolling-attribute-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/gradients/css3-color-stop-units-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/gradients/css3-color-stop-units-expected.png
index a9111d5..57a1ccc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/gradients/css3-color-stop-units-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/gradients/css3-color-stop-units-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/hidpi/scrollbar-appearance-increase-device-scale-factor-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/hidpi/scrollbar-appearance-increase-device-scale-factor-expected.png
index 26dafa7f..b43b4ac8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/hidpi/scrollbar-appearance-increase-device-scale-factor-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/hidpi/scrollbar-appearance-increase-device-scale-factor-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 6734d498..a0eca746 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/lists/olstart-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/lists/olstart-expected.png
index eaa4085a..24914e8 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/sub-pixel/transformed-iframe-copy-on-scroll-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/sub-pixel/transformed-iframe-copy-on-scroll-expected.png
index da4bff1b7..0dacdaa 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/sub-pixel/transformed-iframe-copy-on-scroll-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/sub-pixel/transformed-iframe-copy-on-scroll-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/023-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/023-expected.png
index f66afe2..c9ec18e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/023-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/023-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 939c3a5..4891941 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/backgr_border-table-cell-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_border-table-cell-expected.png
index d6edda4..5ce5ff34 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_border-table-cell-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_border-table-cell-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_border-table-column-group-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_border-table-column-group-collapsed-border-expected.png
index e8e662a..35e58f9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_border-table-column-group-collapsed-border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_border-table-column-group-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_border-table-column-group-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_border-table-column-group-expected.png
index f4f4fb6..fb115c3f0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_border-table-column-group-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_border-table-column-group-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_border-table-row-group-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_border-table-row-group-collapsed-border-expected.png
index 723cab6b..3ece3851 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_border-table-row-group-collapsed-border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_border-table-row-group-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_border-table-row-group-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_border-table-row-group-expected.png
index f583cd6..7a3caa1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_border-table-row-group-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_border-table-row-group-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_layers-hide-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_layers-hide-collapsed-border-expected.png
index e0a9ee3..6ebc24d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_layers-hide-collapsed-border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_layers-hide-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_layers-hide-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_layers-hide-expected.png
index a0cc9ce..7e521f1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_layers-hide-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_layers-hide-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_layers-show-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_layers-show-collapsed-border-expected.png
index 3a8bc95..9f8cef1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_layers-show-collapsed-border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_layers-show-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_layers-show-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_layers-show-expected.png
index 5e9c2967..c7e716b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_layers-show-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_layers-show-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_position-table-column-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_position-table-column-collapsed-border-expected.png
index e96fd0ab..84b99c3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_position-table-column-collapsed-border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_position-table-column-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_position-table-column-group-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_position-table-column-group-expected.png
index 3d21bf9..a94f4ad0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_position-table-column-group-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_position-table-column-group-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_position-table-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_position-table-expected.png
index 76744a32..50bb27f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_position-table-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_position-table-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_position-table-row-group-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_position-table-row-group-expected.png
index dbb5bdb..3f8af54 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_position-table-row-group-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_position-table-row-group-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_simple-table-cell-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_simple-table-cell-expected.png
index 529f5e2..73edcfb 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_simple-table-cell-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_simple-table-cell-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png
index 94d5370..c78033a4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_simple-table-column-group-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_simple-table-column-group-expected.png
index bc391d8..11b3e31 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_simple-table-column-group-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_simple-table-column-group-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_simple-table-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_simple-table-expected.png
index 72935ff..4bb8141 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_simple-table-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_simple-table-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png
index 670c3bdd..ab954cc 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/border-collapsing/001-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/border-collapsing/001-expected.png
index 06f40e11..869fe38 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/border-collapsing/001-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/border-collapsing/001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/table/empty-cells-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/table/empty-cells-expected.png
index 2bb78cf1..d361c46 100644
--- a/third_party/WebKit/LayoutTests/platform/win/fast/table/empty-cells-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/fast/table/empty-cells-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 216814f..6ddfaf3 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/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 691246d..52b7c89 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/images/color-profile-layer-expected.png b/third_party/WebKit/LayoutTests/platform/win/images/color-profile-layer-expected.png
index 19ac0d89..9576de2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/images/color-profile-layer-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/images/color-profile-layer-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/images/color-profile-layer-filter-expected.png b/third_party/WebKit/LayoutTests/platform/win/images/color-profile-layer-filter-expected.png
index 0857f456..e575d50 100644
--- a/third_party/WebKit/LayoutTests/platform/win/images/color-profile-layer-filter-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/images/color-profile-layer-filter-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/images/rendering-broken-0px-images-quirk-expected.png b/third_party/WebKit/LayoutTests/platform/win/images/rendering-broken-0px-images-quirk-expected.png
index cadd0f3..5e9b68f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/images/rendering-broken-0px-images-quirk-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/images/rendering-broken-0px-images-quirk-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/images/rendering-broken-block-flow-images-expected.png b/third_party/WebKit/LayoutTests/platform/win/images/rendering-broken-block-flow-images-expected.png
index 70bfe94..6305872f6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/images/rendering-broken-block-flow-images-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/images/rendering-broken-block-flow-images-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/media/color-profile-video-seek-filter-expected.png b/third_party/WebKit/LayoutTests/platform/win/media/color-profile-video-seek-filter-expected.png
deleted file mode 100644
index 5fcb88be..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/media/color-profile-video-seek-filter-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/media/color-profile-video-seek-object-fit-expected.png b/third_party/WebKit/LayoutTests/platform/win/media/color-profile-video-seek-object-fit-expected.png
deleted file mode 100644
index 226f7ca9..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/media/color-profile-video-seek-object-fit-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/media/controls/video-controls-with-cast-rendering-expected.png b/third_party/WebKit/LayoutTests/platform/win/media/controls/video-controls-with-cast-rendering-expected.png
index d712dfd..630ee03 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/controls/video-controls-with-cast-rendering-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/media/controls/video-controls-with-cast-rendering-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/media/controls/video-overlay-cast-dark-rendering-expected.png b/third_party/WebKit/LayoutTests/platform/win/media/controls/video-overlay-cast-dark-rendering-expected.png
index 53c148f..de8dd57 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/controls/video-overlay-cast-dark-rendering-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/media/controls/video-overlay-cast-dark-rendering-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/media/controls/video-overlay-cast-light-rendering-expected.png b/third_party/WebKit/LayoutTests/platform/win/media/controls/video-overlay-cast-light-rendering-expected.png
index 643b449a..b224ee5 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/controls/video-overlay-cast-light-rendering-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/media/controls/video-overlay-cast-light-rendering-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/media/track/track-cue-rendering-horizontal-expected.png b/third_party/WebKit/LayoutTests/platform/win/media/track/track-cue-rendering-horizontal-expected.png
index ae97747..0e235c2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/track/track-cue-rendering-horizontal-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/media/track/track-cue-rendering-horizontal-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/media/track/track-cue-rendering-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/win/media/track/track-cue-rendering-vertical-expected.png
index 5b38b29..48e0371c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/track/track-cue-rendering-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/media/track/track-cue-rendering-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/media/video-aspect-ratio-expected.png b/third_party/WebKit/LayoutTests/platform/win/media/video-aspect-ratio-expected.png
index 6078229f..93040a7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/video-aspect-ratio-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/media/video-aspect-ratio-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/media/video-canvas-alpha-expected.png b/third_party/WebKit/LayoutTests/platform/win/media/video-canvas-alpha-expected.png
deleted file mode 100644
index 2810de4..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/media/video-canvas-alpha-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/media/video-colorspace-yuv420-expected.png b/third_party/WebKit/LayoutTests/platform/win/media/video-colorspace-yuv420-expected.png
index 0b34064..e13ab12 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/video-colorspace-yuv420-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/media/video-colorspace-yuv420-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/media/video-colorspace-yuv422-expected.png b/third_party/WebKit/LayoutTests/platform/win/media/video-colorspace-yuv422-expected.png
index f1c2691..80a77c7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/video-colorspace-yuv422-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/media/video-colorspace-yuv422-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/media/video-layer-crash-expected.png b/third_party/WebKit/LayoutTests/platform/win/media/video-layer-crash-expected.png
index ac7f1069..d774debb 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/video-layer-crash-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/media/video-layer-crash-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/media/video-remove-insert-repaints-expected.png b/third_party/WebKit/LayoutTests/platform/win/media/video-remove-insert-repaints-expected.png
deleted file mode 100644
index 4ae9de3..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/media/video-remove-insert-repaints-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/media/video-replaces-poster-expected.png b/third_party/WebKit/LayoutTests/platform/win/media/video-replaces-poster-expected.png
index 669ea47..07b5f1ae 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/video-replaces-poster-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/media/video-replaces-poster-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/media/video-zoom-controls-expected.png b/third_party/WebKit/LayoutTests/platform/win/media/video-zoom-controls-expected.png
index 50f96d70..3c3be1f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/media/video-zoom-controls-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/media/video-zoom-controls-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/document-flipped-blocks-writing-mode-scroll-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/document-flipped-blocks-writing-mode-scroll-expected.png
index 356a9d90..068ca5d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/document-flipped-blocks-writing-mode-scroll-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/document-flipped-blocks-writing-mode-scroll-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/inline-style-change-in-scrolled-view-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/inline-style-change-in-scrolled-view-expected.png
index a69e068..15c364c1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/inline-style-change-in-scrolled-view-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/inline-style-change-in-scrolled-view-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/overflow-scroll-body-appear-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/overflow-scroll-body-appear-expected.png
index e69493ae..1aabd53b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/overflow-scroll-body-appear-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/overflow-scroll-body-appear-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.png
index 2bb6c8d..bf93322 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/repaint-in-scrolled-view-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/repaint-in-scrolled-view-expected.png
index 9ed4d41..3e6b0b62 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/repaint-in-scrolled-view-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/repaint-in-scrolled-view-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.png
index 6eb1bf6..88f2cac 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/text-xy-updates-SVGList-expected.png b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/text-xy-updates-SVGList-expected.png
index 5277885..27fba04 100644
--- a/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/text-xy-updates-SVGList-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/paint/invalidation/svg/text-xy-updates-SVGList-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/printing/return-from-printing-mode-expected.png b/third_party/WebKit/LayoutTests/platform/win/printing/return-from-printing-mode-expected.png
index a5ac5fe6..fb14192 100644
--- a/third_party/WebKit/LayoutTests/platform/win/printing/return-from-printing-mode-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/printing/return-from-printing-mode-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 0579031..245dcda 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/custom/bug45331-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/custom/bug45331-expected.png
index f03292a1a..2bdccc7e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/custom/bug45331-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/custom/bug45331-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 691246d..52b7c89 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/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 04ce50d..bf174b54 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 a1f2b084..65d6380 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 04ce50d..bf174b54 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 a1f2b084..65d6380 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/overflow/overflow-on-outermost-svg-element-defaults-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/overflow/overflow-on-outermost-svg-element-defaults-expected.png
index 29fc0c5..5c73f57 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/overflow/overflow-on-outermost-svg-element-defaults-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/overflow/overflow-on-outermost-svg-element-defaults-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/overflow/overflow-on-outermost-svg-element-ignore-attribute-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/overflow/overflow-on-outermost-svg-element-ignore-attribute-2-expected.png
index 29fc0c5..5c73f57 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/overflow/overflow-on-outermost-svg-element-ignore-attribute-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/overflow/overflow-on-outermost-svg-element-ignore-attribute-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/overflow/overflow-on-outermost-svg-element-ignore-attribute-3-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/overflow/overflow-on-outermost-svg-element-ignore-attribute-3-expected.png
index 29fc0c5..5c73f57 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/overflow/overflow-on-outermost-svg-element-ignore-attribute-3-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/overflow/overflow-on-outermost-svg-element-ignore-attribute-3-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/overflow/overflow-on-outermost-svg-element-in-xhtml-defaults-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/overflow/overflow-on-outermost-svg-element-in-xhtml-defaults-expected.png
index 512ff412..0c0220f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/overflow/overflow-on-outermost-svg-element-in-xhtml-defaults-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/overflow/overflow-on-outermost-svg-element-in-xhtml-defaults-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 caa2293..db740bd 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/absolute-sized-document-scrollbars-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/absolute-sized-document-scrollbars-expected.png
index 272fa9a..7d88073 100644
--- a/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/absolute-sized-document-scrollbars-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/svg/zoom/page/absolute-sized-document-scrollbars-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 1e4b997..55e52007 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 6314b89..6174a8e 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/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 f80638a..71ed71d 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/mozilla/bugs/bug11944-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug11944-expected.png
index 362bc25..18abcb1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug11944-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug11944-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug137388-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug137388-2-expected.png
index 2a8dea6..e543c7d 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug137388-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug137388-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug22019-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug22019-expected.png
index 0b031c8..169bdc5 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug22019-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug22019-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 3bbd1b3..fbc95ffb7 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/bug46480-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug46480-1-expected.png
index 233730f..97d69be 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug46480-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug46480-1-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug50695-1-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug50695-1-expected.png
index a7e843bc..3d473f54 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug50695-1-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug50695-1-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 3be0384..3e865736 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/core/bloomberg-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/core/bloomberg-expected.png
index c7c9ca6..f42c35f 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/other/nestedTables-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/other/nestedTables-expected.png
index c71040a..f2789c2 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_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 283e9a8a..dde94d2b 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_overflow_dirty_reflow_tbody-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_tbody-expected.png
index 1290558f..4d99bb7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_tbody-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_tbody-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody_sibling-expected.png b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody_sibling-expected.png
index 601ada6..b154d02 100644
--- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody_sibling-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody_sibling-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/transforms/3d/general/perspective-units-expected.png b/third_party/WebKit/LayoutTests/platform/win/transforms/3d/general/perspective-units-expected.png
index 1e11cc3..f755bf2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/transforms/3d/general/perspective-units-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/transforms/3d/general/perspective-units-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/transforms/3d/point-mapping/3d-point-mapping-2-expected.png b/third_party/WebKit/LayoutTests/platform/win/transforms/3d/point-mapping/3d-point-mapping-2-expected.png
index ca6fe49f..66a464e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/transforms/3d/point-mapping/3d-point-mapping-2-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/transforms/3d/point-mapping/3d-point-mapping-2-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/transforms/3d/point-mapping/3d-point-mapping-deep-expected.png b/third_party/WebKit/LayoutTests/platform/win/transforms/3d/point-mapping/3d-point-mapping-deep-expected.png
index f00b352..d30d202 100644
--- a/third_party/WebKit/LayoutTests/platform/win/transforms/3d/point-mapping/3d-point-mapping-deep-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/transforms/3d/point-mapping/3d-point-mapping-deep-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/transforms/3d/point-mapping/3d-point-mapping-expected.png b/third_party/WebKit/LayoutTests/platform/win/transforms/3d/point-mapping/3d-point-mapping-expected.png
index 4184694b..bb6c16a1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/transforms/3d/point-mapping/3d-point-mapping-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/transforms/3d/point-mapping/3d-point-mapping-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/transforms/3d/point-mapping/3d-point-mapping-origins-expected.png b/third_party/WebKit/LayoutTests/platform/win/transforms/3d/point-mapping/3d-point-mapping-origins-expected.png
index c518b72..e80862e6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/transforms/3d/point-mapping/3d-point-mapping-origins-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/transforms/3d/point-mapping/3d-point-mapping-origins-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/transforms/3d/point-mapping/3d-point-mapping-preserve-3d-expected.png b/third_party/WebKit/LayoutTests/platform/win/transforms/3d/point-mapping/3d-point-mapping-preserve-3d-expected.png
index 00eb55f..b63572b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/transforms/3d/point-mapping/3d-point-mapping-preserve-3d-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/transforms/3d/point-mapping/3d-point-mapping-preserve-3d-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/3d-corners-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/3d-corners-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/linux/compositing/3d-corners-expected.png
rename to third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/3d-corners-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/color-matching/image-color-matching-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/color-matching/image-color-matching-expected.png
new file mode 100644
index 0000000..0dfec438
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/color-matching/image-color-matching-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/culling/filter-occlusion-blur-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/culling/filter-occlusion-blur-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/linux/compositing/culling/filter-occlusion-blur-expected.png
rename to third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/culling/filter-occlusion-blur-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/culling/filter-occlusion-blur-large-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/culling/filter-occlusion-blur-large-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/linux/compositing/culling/filter-occlusion-blur-large-expected.png
rename to third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/culling/filter-occlusion-blur-large-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/flat-with-transformed-child-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/flat-with-transformed-child-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/linux/compositing/flat-with-transformed-child-expected.png
rename to third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/flat-with-transformed-child-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/geometry/layer-due-to-layer-children-deep-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/geometry/layer-due-to-layer-children-deep-expected.png
index 31c891b..46b862e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/geometry/layer-due-to-layer-children-deep-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/geometry/layer-due-to-layer-children-deep-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/geometry/vertical-scroll-composited-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/geometry/vertical-scroll-composited-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/linux/compositing/geometry/vertical-scroll-composited-expected.png
rename to third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/geometry/vertical-scroll-composited-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/geometry/video-fixed-scrolling-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/geometry/video-fixed-scrolling-expected.png
new file mode 100644
index 0000000..f68d3292
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/geometry/video-fixed-scrolling-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/geometry/video-opacity-overlay-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/geometry/video-opacity-overlay-expected.png
new file mode 100644
index 0000000..7f79a01
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/geometry/video-opacity-overlay-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/gestures/gesture-tapHighlight-pixel-rotated-div-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/gestures/gesture-tapHighlight-pixel-rotated-div-expected.png
new file mode 100644
index 0000000..e9a7997
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/gestures/gesture-tapHighlight-pixel-rotated-div-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/layers-inside-overflow-scroll-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/layers-inside-overflow-scroll-expected.png
new file mode 100644
index 0000000..76d0c9f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/layers-inside-overflow-scroll-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/lots-of-img-layers-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/lots-of-img-layers-expected.png
deleted file mode 100644
index a8afe292..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/lots-of-img-layers-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/lots-of-img-layers-with-opacity-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/lots-of-img-layers-with-opacity-expected.png
deleted file mode 100644
index b9471ee1..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/lots-of-img-layers-with-opacity-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/masks/mask-with-added-filters-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/masks/mask-with-added-filters-expected.png
new file mode 100644
index 0000000..3e2ed27d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/masks/mask-with-added-filters-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/masks/mask-with-removed-filters-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/masks/mask-with-removed-filters-expected.png
new file mode 100644
index 0000000..5fe00e95
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/masks/mask-with-removed-filters-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/overflow/mask-with-filter-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/overflow/mask-with-filter-expected.png
index 6e9aeb8..fff540df 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/overflow/mask-with-filter-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/overflow/mask-with-filter-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/overflow/overflow-compositing-descendant-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/overflow/overflow-compositing-descendant-expected.png
new file mode 100644
index 0000000..074b2c7
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/overflow/overflow-compositing-descendant-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/overflow/scaled-mask-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/overflow/scaled-mask-expected.png
new file mode 100644
index 0000000..ab15b686
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/overflow/scaled-mask-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/overflow/scroll-ancestor-update-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/overflow/scroll-ancestor-update-expected.png
new file mode 100644
index 0000000..9929aa1
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/overflow/scroll-ancestor-update-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/win/virtual/disable-spinvalidation/compositing/overflow/tiled-mask-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/linux/compositing/overflow/tiled-mask-expected.png
rename to third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/overflow/tiled-mask-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/perpendicular-layer-sorting-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/perpendicular-layer-sorting-expected.png
index 364c128..f6472ac 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/perpendicular-layer-sorting-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/perpendicular-layer-sorting-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/reflections/animation-inside-reflection-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/reflections/animation-inside-reflection-expected.png
new file mode 100644
index 0000000..e13bbda
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/reflections/animation-inside-reflection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/reflections/load-video-in-reflection-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/reflections/load-video-in-reflection-expected.png
new file mode 100644
index 0000000..956bb6c
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/reflections/load-video-in-reflection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/reflections/nested-reflection-mask-change-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/reflections/nested-reflection-mask-change-expected.png
new file mode 100644
index 0000000..d959991
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/reflections/nested-reflection-mask-change-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/self-painting-layers-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/self-painting-layers-expected.png
new file mode 100644
index 0000000..0d11305
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/self-painting-layers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/video-frame-size-change-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/video-frame-size-change-expected.png
new file mode 100644
index 0000000..0598733e
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/video-frame-size-change-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/video/video-reflection-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/video/video-reflection-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/linux/compositing/video/video-reflection-expected.png
rename to third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/video/video-reflection-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/visibility/visibility-image-layers-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/visibility/visibility-image-layers-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/linux/compositing/visibility/visibility-image-layers-expected.png
rename to third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/visibility/visibility-image-layers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/compositing/visibility/visibility-simple-video-layer-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/visibility/visibility-simple-video-layer-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/linux/compositing/visibility/visibility-simple-video-layer-expected.png
rename to third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/compositing/visibility/visibility-simple-video-layer-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/document-flipped-blocks-writing-mode-scroll-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/document-flipped-blocks-writing-mode-scroll-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/document-flipped-blocks-writing-mode-scroll-expected.png
rename to third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/document-flipped-blocks-writing-mode-scroll-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/inline-style-change-in-scrolled-view-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/inline-style-change-in-scrolled-view-expected.png
new file mode 100644
index 0000000..15c364c1
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/inline-style-change-in-scrolled-view-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/overflow-scroll-body-appear-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/overflow-scroll-body-appear-expected.png
index e69493ae..1aabd53b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/overflow-scroll-body-appear-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/overflow-scroll-body-appear-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.png
index 2bb6c8d..bf93322 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/repaint-in-scrolled-view-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/repaint-in-scrolled-view-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/linux/paint/invalidation/svg/repaint-in-scrolled-view-expected.png
rename to third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/repaint-in-scrolled-view-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.png
index 6eb1bf6..88f2cac 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/text-xy-updates-SVGList-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/text-xy-updates-SVGList-expected.png
new file mode 100644
index 0000000..27fba04
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/disable-spinvalidation/paint/invalidation/svg/text-xy-updates-SVGList-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-background-image-cover-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-background-image-cover-expected.png
index c98dad7..e4d4f8c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-background-image-cover-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-background-image-cover-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-background-image-repeat-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-background-image-repeat-expected.png
index ac812b8..ace784a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-background-image-repeat-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-background-image-repeat-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-background-image-space-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-background-image-space-expected.png
index f09159e..da8ce41 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-background-image-space-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-background-image-space-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-border-image-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-border-image-expected.png
index c63227a..6f101d5 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-border-image-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-border-image-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-border-image-source-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-border-image-source-expected.png
index 3902691..94cb1a3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-border-image-source-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-border-image-source-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-border-radius-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-border-radius-expected.png
index 060937e0..f4365827 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-border-radius-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-border-radius-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-filter-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-filter-expected.png
index f8d1e272..ac212269 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-filter-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-filter-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-group-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-group-expected.png
index 657701d..ffd531b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-group-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-group-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-iframe-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-iframe-expected.png
index 2cb8795..975e5fd6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-iframe-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-iframe-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-image-canvas-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-image-canvas-expected.png
index 57d4053..2dbcf9a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-image-canvas-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-image-canvas-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-image-canvas-pattern-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-image-canvas-pattern-expected.png
index 9f9f414..5dd87ff 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-image-canvas-pattern-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-image-canvas-pattern-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-image-canvas-svg-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-image-canvas-svg-expected.png
index 7430ea1..68885d2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-image-canvas-svg-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-image-canvas-svg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-image-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-image-expected.png
index 23f182ac..eb1051c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-image-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-image-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png
index 8025ba6..6e183a1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-image-profile-match-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-image-profile-match-expected.png
index 8deac3e..1cf0831 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-image-profile-match-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-image-profile-match-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-layer-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-layer-expected.png
index 34df10f..d91a693 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-layer-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-layer-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-layer-filter-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-layer-filter-expected.png
index 4a13efc..6d681b7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-layer-filter-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-layer-filter-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-object-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-object-expected.png
index 55dae2f..b2c39bb 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-object-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-object-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-svg-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-svg-expected.png
index 1287cea..0e3dbec 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-svg-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-svg-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-svg-fill-text-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-svg-fill-text-expected.png
index 12bb3a6..7937cbe 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-svg-fill-text-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/color-profile-svg-fill-text-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/cross-fade-background-size-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/cross-fade-background-size-expected.png
index 108cc2c..09bf797 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/cross-fade-background-size-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/cross-fade-background-size-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/exif-orientation-height-image-document-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/exif-orientation-height-image-document-expected.png
deleted file mode 100644
index 6ac657ca..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/exif-orientation-height-image-document-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/imagemap-circle-focus-ring-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/imagemap-circle-focus-ring-expected.png
index 63cb004..a64859b 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/imagemap-circle-focus-ring-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/imagemap-circle-focus-ring-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/imagemap-focus-ring-with-scale-transform-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/imagemap-focus-ring-with-scale-transform-expected.png
index 261021c..531f8e3 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/imagemap-focus-ring-with-scale-transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/imagemap-focus-ring-with-scale-transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/imagemap-focus-ring-zero-outline-width-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/imagemap-focus-ring-zero-outline-width-expected.png
index d7bfa1ca..bf76f47 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/imagemap-focus-ring-zero-outline-width-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/imagemap-focus-ring-zero-outline-width-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/imagemap-overflowing-circle-focus-ring-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/imagemap-overflowing-circle-focus-ring-expected.png
index 9d43e538..c520aaf 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/imagemap-overflowing-circle-focus-ring-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/imagemap-overflowing-circle-focus-ring-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/jpeg-yuv-progressive-image-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/jpeg-yuv-progressive-image-expected.png
deleted file mode 100644
index c877d843..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/jpeg-yuv-progressive-image-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/rendering-broken-0px-images-quirk-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/rendering-broken-0px-images-quirk-expected.png
index cadd0f3..5e9b68f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/rendering-broken-0px-images-quirk-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/rendering-broken-0px-images-quirk-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/rendering-broken-block-flow-images-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/rendering-broken-block-flow-images-expected.png
index 70bfe94..6305872f6 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/rendering-broken-block-flow-images-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/rendering-broken-block-flow-images-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png
deleted file mode 100644
index 4b5b0739..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png
deleted file mode 100644
index 580b697..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-arc-circumference-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-arc-circumference-expected.png
deleted file mode 100644
index a85a0c8b..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-arc-circumference-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-composite-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-composite-expected.png
index 8f11317..6608ddd 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-composite-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-composite-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-composite-shadow-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-composite-shadow-expected.png
index f31af9e..4f0bca2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-composite-shadow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-composite-shadow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-composite-video-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-composite-video-expected.png
index 9ddd6bf..a543272e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-composite-video-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-composite-video-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-composite-video-shadow-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-composite-video-shadow-expected.png
index c26c1fb..c443f94 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-composite-video-shadow-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-composite-video-shadow-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-drawImage-video-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-drawImage-video-expected.png
deleted file mode 100644
index b2ec632c..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-drawImage-video-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-incremental-repaint-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-incremental-repaint-expected.png
index 8cd5fba4..477a4f2 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-incremental-repaint-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-incremental-repaint-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
deleted file mode 100644
index 3f4f0ab..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-shadow-source-in-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-shadow-source-in-expected.png
index 000e080..bf0ffff4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-shadow-source-in-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-shadow-source-in-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-text-alignment-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-text-alignment-expected.png
index 6b2fbc4b..03d5a08 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-text-alignment-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-text-alignment-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-toDataURL-jpeg-maximum-quality-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-toDataURL-jpeg-maximum-quality-expected.png
index 966eacb..35ad9d8 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-toDataURL-jpeg-maximum-quality-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-toDataURL-jpeg-maximum-quality-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-toDataURL-webp-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-toDataURL-webp-expected.png
index 06cdb980..e897dd9c 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-toDataURL-webp-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/canvas-toDataURL-webp-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/fillrect_gradient-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/fillrect_gradient-expected.png
index f912c61..c7c14810 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/fillrect_gradient-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/fillrect_gradient-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/image-object-in-canvas-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/image-object-in-canvas-expected.png
index a885c4e..2f5493e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/image-object-in-canvas-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/image-object-in-canvas-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/yuv-video-on-accelerated-canvas-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/yuv-video-on-accelerated-canvas-expected.png
deleted file mode 100644
index 92e2d09..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/gpu/fast/canvas/yuv-video-on-accelerated-canvas-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/css1/box_properties/float_elements_in_series-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/css1/box_properties/float_elements_in_series-expected.png
index f5ffaf3c..867970a 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/css1/box_properties/float_elements_in_series-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/css1/box_properties/float_elements_in_series-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/css1/box_properties/padding_inline-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/css1/box_properties/padding_inline-expected.png
index 4843da8..3defaa0 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/css1/box_properties/padding_inline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/css1/box_properties/padding_inline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/css1/pseudo/firstline-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/css1/pseudo/firstline-expected.png
index 6ee9175..984a7970 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/css1/pseudo/firstline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/css1/pseudo/firstline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/css1/pseudo/pseudo_elements_in_selectors-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/css1/pseudo/pseudo_elements_in_selectors-expected.png
new file mode 100644
index 0000000..4b2bebe
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/css1/pseudo/pseudo_elements_in_selectors-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/css1/text_properties/text_transform-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/css1/text_properties/text_transform-expected.png
index 29714786..0225bfd4 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/css1/text_properties/text_transform-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/css1/text_properties/text_transform-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/023-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/023-expected.png
new file mode 100644
index 0000000..c9ec18e
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/023-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/040-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/040-expected.png
new file mode 100644
index 0000000..4891941
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/040-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_border-table-cell-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_border-table-cell-expected.png
new file mode 100644
index 0000000..5ce5ff34
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_border-table-cell-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_border-table-column-group-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_border-table-column-group-collapsed-border-expected.png
index e8e662a..35e58f9 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_border-table-column-group-collapsed-border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_border-table-column-group-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_border-table-column-group-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_border-table-column-group-expected.png
new file mode 100644
index 0000000..fb115c3f0
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_border-table-column-group-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_border-table-row-group-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_border-table-row-group-collapsed-border-expected.png
new file mode 100644
index 0000000..3ece3851
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_border-table-row-group-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_border-table-row-group-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_border-table-row-group-expected.png
new file mode 100644
index 0000000..7a3caa1
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_border-table-row-group-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_layers-hide-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_layers-hide-collapsed-border-expected.png
new file mode 100644
index 0000000..6ebc24d
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_layers-hide-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_layers-hide-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_layers-hide-expected.png
new file mode 100644
index 0000000..7e521f1
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_layers-hide-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_layers-show-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_layers-show-collapsed-border-expected.png
new file mode 100644
index 0000000..9f8cef1
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_layers-show-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_layers-show-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_layers-show-expected.png
new file mode 100644
index 0000000..c7e716b
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_layers-show-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_position-table-column-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_position-table-column-collapsed-border-expected.png
new file mode 100644
index 0000000..84b99c3
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_position-table-column-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_position-table-column-group-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_position-table-column-group-expected.png
new file mode 100644
index 0000000..a94f4ad0
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_position-table-column-group-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_position-table-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_position-table-expected.png
new file mode 100644
index 0000000..50bb27f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_position-table-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_position-table-row-group-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_position-table-row-group-expected.png
new file mode 100644
index 0000000..3f8af54
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_position-table-row-group-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_simple-table-cell-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_simple-table-cell-expected.png
new file mode 100644
index 0000000..73edcfb
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_simple-table-cell-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png
new file mode 100644
index 0000000..c78033a4
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-expected.png
new file mode 100644
index 0000000..11b3e31
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_simple-table-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_simple-table-expected.png
new file mode 100644
index 0000000..4bb8141
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_simple-table-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png
new file mode 100644
index 0000000..ab954cc
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/border-collapsing/001-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/border-collapsing/001-expected.png
new file mode 100644
index 0000000..869fe38
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/border-collapsing/001-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/empty-cells-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/empty-cells-expected.png
new file mode 100644
index 0000000..d361c46
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/fast/table/empty-cells-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png
index 691246d..52b7c89 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/new-remote-playback-pipeline/media/controls/video-controls-with-cast-rendering-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/new-remote-playback-pipeline/media/controls/video-controls-with-cast-rendering-expected.png
index d712dfd..630ee03 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/new-remote-playback-pipeline/media/controls/video-controls-with-cast-rendering-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/new-remote-playback-pipeline/media/controls/video-controls-with-cast-rendering-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/new-remote-playback-pipeline/media/controls/video-overlay-cast-dark-rendering-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/new-remote-playback-pipeline/media/controls/video-overlay-cast-dark-rendering-expected.png
index 53c148f..de8dd57 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/new-remote-playback-pipeline/media/controls/video-overlay-cast-dark-rendering-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/new-remote-playback-pipeline/media/controls/video-overlay-cast-dark-rendering-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/new-remote-playback-pipeline/media/controls/video-overlay-cast-light-rendering-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/new-remote-playback-pipeline/media/controls/video-overlay-cast-light-rendering-expected.png
index 643b449a..b224ee5 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/new-remote-playback-pipeline/media/controls/video-overlay-cast-light-rendering-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/new-remote-playback-pipeline/media/controls/video-overlay-cast-light-rendering-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/win/virtual/off-main-thread-fetch/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/linux/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png
rename to third_party/WebKit/LayoutTests/platform/win/virtual/off-main-thread-fetch/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png
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
deleted file mode 100644
index 6e9aeb8..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/mask-with-filter-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/nested-render-surfaces-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/nested-render-surfaces-expected.png
index 97a56bf..c323735f 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/nested-render-surfaces-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/nested-render-surfaces-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/overflow-compositing-descendant-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/overflow-compositing-descendant-expected.png
index f545d204..074b2c7 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/overflow-compositing-descendant-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/overflow-compositing-descendant-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 002d64a..ab15b686 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/scroll-ancestor-update-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scroll-ancestor-update-expected.png
index 5fe1c73..9929aa1 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scroll-ancestor-update-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/scroll-ancestor-update-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
deleted file mode 100644
index 005e10d..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/compositing/overflow/tiled-mask-expected.png
+++ /dev/null
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/scrollbars/scrollbars-on-positioned-content-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/scrollbars/scrollbars-on-positioned-content-expected.png
index 0f6e855..e1012fef 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/scrollbars/scrollbars-on-positioned-content-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/prefer_compositing_to_lcd_text/scrollbars/scrollbars-on-positioned-content-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/threaded/compositing/visibility/visibility-image-layers-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/threaded/compositing/visibility/visibility-image-layers-expected.png
index ef17003..365ad04e 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/threaded/compositing/visibility/visibility-image-layers-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/threaded/compositing/visibility/visibility-image-layers-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/threaded/compositing/visibility/visibility-simple-video-layer-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/threaded/compositing/visibility/visibility-simple-video-layer-expected.png
index c55c7d26..13255e5 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/threaded/compositing/visibility/visibility-simple-video-layer-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/threaded/compositing/visibility/visibility-simple-video-layer-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win/virtual/threaded/printing/return-from-printing-mode-expected.png b/third_party/WebKit/LayoutTests/platform/win/virtual/threaded/printing/return-from-printing-mode-expected.png
index a5ac5fe6..fb14192 100644
--- a/third_party/WebKit/LayoutTests/platform/win/virtual/threaded/printing/return-from-printing-mode-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win/virtual/threaded/printing/return-from-printing-mode-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 067e2da5..d88fcb5 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/fast/table/backgr_border-table-cell-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_border-table-cell-expected.png
index 49d749c..ea2e4ac 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_border-table-cell-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_border-table-cell-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_border-table-column-group-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_border-table-column-group-collapsed-border-expected.png
index 1c193407..e53370fd 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_border-table-column-group-collapsed-border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_border-table-column-group-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_border-table-column-group-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_border-table-column-group-expected.png
index 922c7db..0cf27a9 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_border-table-column-group-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_border-table-column-group-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_border-table-row-group-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_border-table-row-group-collapsed-border-expected.png
index 3ba7fa6..38a57ff3 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_border-table-row-group-collapsed-border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_border-table-row-group-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_border-table-row-group-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_border-table-row-group-expected.png
index 691e8bc..5bae825 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_border-table-row-group-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_border-table-row-group-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_layers-hide-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_layers-hide-collapsed-border-expected.png
index 29ec33b3..312f0965 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_layers-hide-collapsed-border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_layers-hide-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_layers-hide-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_layers-hide-expected.png
index 97adfc1..713c3ca 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_layers-hide-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_layers-hide-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_position-table-column-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_position-table-column-collapsed-border-expected.png
index 04a44c41..b9526cf5 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_position-table-column-collapsed-border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_position-table-column-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_position-table-column-group-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_position-table-column-group-expected.png
index 923d5672..8dafa1e 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_position-table-column-group-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_position-table-column-group-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_position-table-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_position-table-expected.png
index 15702f1..cf90f4e 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_position-table-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_position-table-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_position-table-row-group-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_position-table-row-group-expected.png
index 3772dc4a3..4e9f777 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_position-table-row-group-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_position-table-row-group-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_simple-table-cell-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_simple-table-cell-expected.png
index f1f0c04..9a544f4 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_simple-table-cell-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_simple-table-cell-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png
index 85ea7bf..01bd381 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_simple-table-column-group-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_simple-table-column-group-expected.png
index c5ceffe..b721af5 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_simple-table-column-group-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_simple-table-column-group-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_simple-table-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_simple-table-expected.png
index b9f681d..5f5165bf 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_simple-table-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_simple-table-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png
index e30d8ae..6f518750 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/fast/text/international/complex-character-based-fallback-expected.png b/third_party/WebKit/LayoutTests/platform/win7/fast/text/international/complex-character-based-fallback-expected.png
index 279e939..d8c954b 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/fast/text/international/complex-character-based-fallback-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/fast/text/international/complex-character-based-fallback-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/media/track/track-cue-rendering-vertical-expected.png b/third_party/WebKit/LayoutTests/platform/win7/media/track/track-cue-rendering-vertical-expected.png
index ff1abd0..8c3f85e 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/media/track/track-cue-rendering-vertical-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/media/track/track-cue-rendering-vertical-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/media/video-transformed-expected.png b/third_party/WebKit/LayoutTests/platform/win7/media/video-transformed-expected.png
index 698e9560..af8899e 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/media/video-transformed-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/media/video-transformed-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.png b/third_party/WebKit/LayoutTests/platform/win7/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.png
index 27dad6f..bb29c832 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-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 5c7358a5..d823e243 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/virtual/disable-spinvalidation/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.png b/third_party/WebKit/LayoutTests/platform/win7/virtual/disable-spinvalidation/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.png
index 27dad6f..bb29c832 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/virtual/disable-spinvalidation/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/virtual/disable-spinvalidation/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/css1/pseudo/firstline-expected.png b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/css1/pseudo/firstline-expected.png
index 067e2da5..d88fcb5 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/css1/pseudo/firstline-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/css1/pseudo/firstline-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-cell-expected.png b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-cell-expected.png
new file mode 100644
index 0000000..ea2e4ac
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-cell-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-column-group-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-column-group-collapsed-border-expected.png
index 1c193407..e53370fd 100644
--- a/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-column-group-collapsed-border-expected.png
+++ b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-column-group-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-column-group-expected.png b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-column-group-expected.png
new file mode 100644
index 0000000..0cf27a9
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-column-group-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-row-group-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-row-group-collapsed-border-expected.png
new file mode 100644
index 0000000..38a57ff3
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-row-group-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-row-group-expected.png b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-row-group-expected.png
new file mode 100644
index 0000000..5bae825
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-row-group-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_layers-hide-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_layers-hide-collapsed-border-expected.png
new file mode 100644
index 0000000..312f0965
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_layers-hide-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_layers-hide-expected.png b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_layers-hide-expected.png
new file mode 100644
index 0000000..713c3ca
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_layers-hide-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-column-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-column-collapsed-border-expected.png
new file mode 100644
index 0000000..b9526cf5
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-column-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-column-group-expected.png b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-column-group-expected.png
new file mode 100644
index 0000000..8dafa1e
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-column-group-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-expected.png b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-expected.png
new file mode 100644
index 0000000..cf90f4e
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-row-group-expected.png b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-row-group-expected.png
new file mode 100644
index 0000000..4e9f777
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-row-group-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-cell-expected.png b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-cell-expected.png
new file mode 100644
index 0000000..9a544f4
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-cell-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png
new file mode 100644
index 0000000..01bd381
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-expected.png b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-expected.png
new file mode 100644
index 0000000..b721af5
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-expected.png b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-expected.png
new file mode 100644
index 0000000..5f5165bf
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png
new file mode 100644
index 0000000..6f518750
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/gpu-rasterization/images/exif-orientation-height-image-document-expected.png b/third_party/WebKit/LayoutTests/virtual/gpu-rasterization/images/exif-orientation-height-image-document-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/virtual/gpu-rasterization/images/exif-orientation-height-image-document-expected.png
rename to third_party/WebKit/LayoutTests/virtual/gpu-rasterization/images/exif-orientation-height-image-document-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/gpu-rasterization/images/jpeg-yuv-progressive-image-expected.png b/third_party/WebKit/LayoutTests/virtual/gpu-rasterization/images/jpeg-yuv-progressive-image-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/virtual/gpu-rasterization/images/jpeg-yuv-progressive-image-expected.png
rename to third_party/WebKit/LayoutTests/virtual/gpu-rasterization/images/jpeg-yuv-progressive-image-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png b/third_party/WebKit/LayoutTests/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png
rename to third_party/WebKit/LayoutTests/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png b/third_party/WebKit/LayoutTests/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png
rename to third_party/WebKit/LayoutTests/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/gpu/fast/canvas/canvas-arc-circumference-expected.png b/third_party/WebKit/LayoutTests/virtual/gpu/fast/canvas/canvas-arc-circumference-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/virtual/gpu/fast/canvas/canvas-arc-circumference-expected.png
rename to third_party/WebKit/LayoutTests/virtual/gpu/fast/canvas/canvas-arc-circumference-expected.png
Binary files differ

diff --git a/third_party/WebKit/LayoutTests/platform/mac/virtual/gpu/fast/canvas/canvas-drawImage-video-expected.png b/third_party/WebKit/LayoutTests/virtual/gpu/fast/canvas/canvas-drawImage-video-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/virtual/gpu/fast/canvas/canvas-drawImage-video-expected.png
rename to third_party/WebKit/LayoutTests/virtual/gpu/fast/canvas/canvas-drawImage-video-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/virtual/gpu/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/virtual/gpu/fast/canvas/canvas-pattern-no-repeat-with-transformations-expected.png
rename to third_party/WebKit/LayoutTests/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/yuv-video-on-accelerated-canvas-expected.png b/third_party/WebKit/LayoutTests/virtual/gpu/fast/canvas/yuv-video-on-accelerated-canvas-expected.png
similarity index 100%
rename from third_party/WebKit/LayoutTests/platform/mac/virtual/gpu/fast/canvas/yuv-video-on-accelerated-canvas-expected.png
rename to third_party/WebKit/LayoutTests/virtual/gpu/fast/canvas/yuv-video-on-accelerated-canvas-expected.png
Binary files differ

diff --git a/third_party/WebKit/Source/core/exported/BUILD.gn b/third_party/WebKit/Source/core/exported/BUILD.gn
index 167b16c..c1e04e7 100644
--- a/third_party/WebKit/Source/core/exported/BUILD.gn
+++ b/third_party/WebKit/Source/core/exported/BUILD.gn

@@ -21,17 +21,27 @@
     "WebDataSourceImpl.cpp",
     "WebDataSourceImpl.h",
     "WebDateTimeSuggestion.cpp",
+    "WebDocument.cpp",
+    "WebElement.cpp",
+    "WebElementCollection.cpp",
     "WebFactory.cpp",
     "WebFactory.h",
     "WebFileChooserCompletionImpl.cpp",
     "WebFileChooserCompletionImpl.h",
+    "WebFormControlElement.cpp",
+    "WebFormElement.cpp",
     "WebHeap.cpp",
     "WebHistoryItem.cpp",
     "WebImageCache.cpp",
     "WebImageDecoder.cpp",
+    "WebInputElement.cpp",
     "WebInputMethodControllerImpl.cpp",
     "WebInputMethodControllerImpl.h",
+    "WebLabelElement.cpp",
     "WebMemoryStatistics.cpp",
+    "WebMetaElement.cpp",
+    "WebNode.cpp",
+    "WebOptionElement.cpp",
     "WebPageImportanceSignals.cpp",
     "WebPerformance.cpp",
     "WebPluginContainerBase.cpp",
@@ -43,6 +53,7 @@
     "WebScriptController.cpp",
     "WebScriptSource.cpp",
     "WebSecurityPolicy.cpp",
+    "WebSelectElement.cpp",
     "WebSelection.cpp",
     "WebSelector.cpp",
     "WebSerializedScriptValue.cpp",

diff --git a/third_party/WebKit/Source/web/WebDocument.cpp b/third_party/WebKit/Source/core/exported/WebDocument.cpp
similarity index 99%
rename from third_party/WebKit/Source/web/WebDocument.cpp
rename to third_party/WebKit/Source/core/exported/WebDocument.cpp
index 650132cf..a34e1f0 100644
--- a/third_party/WebKit/Source/web/WebDocument.cpp
+++ b/third_party/WebKit/Source/core/exported/WebDocument.cpp

@@ -53,7 +53,6 @@
 #include "core/layout/api/LayoutAPIShim.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/loader/DocumentLoader.h"
-#include "modules/accessibility/AXObjectCacheImpl.h"
 #include "platform/bindings/ScriptState.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "platform/wtf/PassRefPtr.h"

diff --git a/third_party/WebKit/Source/web/WebElement.cpp b/third_party/WebKit/Source/core/exported/WebElement.cpp
similarity index 100%
rename from third_party/WebKit/Source/web/WebElement.cpp
rename to third_party/WebKit/Source/core/exported/WebElement.cpp

diff --git a/third_party/WebKit/Source/web/WebElementCollection.cpp b/third_party/WebKit/Source/core/exported/WebElementCollection.cpp
similarity index 100%
rename from third_party/WebKit/Source/web/WebElementCollection.cpp
rename to third_party/WebKit/Source/core/exported/WebElementCollection.cpp

diff --git a/third_party/WebKit/Source/web/WebFormControlElement.cpp b/third_party/WebKit/Source/core/exported/WebFormControlElement.cpp
similarity index 96%
rename from third_party/WebKit/Source/web/WebFormControlElement.cpp
rename to third_party/WebKit/Source/core/exported/WebFormControlElement.cpp
index 6900d65..e91cc80c 100644
--- a/third_party/WebKit/Source/web/WebFormControlElement.cpp
+++ b/third_party/WebKit/Source/core/exported/WebFormControlElement.cpp

@@ -81,38 +81,43 @@
 }
 
 void WebFormControlElement::SetValue(const WebString& value, bool send_events) {
-  if (isHTMLInputElement(*private_))
+  if (isHTMLInputElement(*private_)) {
     Unwrap<HTMLInputElement>()->setValue(
         value, send_events ? kDispatchInputAndChangeEvent : kDispatchNoEvent);
-  else if (isHTMLTextAreaElement(*private_))
+  } else if (isHTMLTextAreaElement(*private_)) {
     Unwrap<HTMLTextAreaElement>()->setValue(
         value, send_events ? kDispatchInputAndChangeEvent : kDispatchNoEvent);
-  else if (isHTMLSelectElement(*private_))
+  } else if (isHTMLSelectElement(*private_)) {
     Unwrap<HTMLSelectElement>()->setValue(value, send_events);
+  }
 }
 
 void WebFormControlElement::SetAutofillValue(const WebString& value) {
   // The input and change events will be sent in setValue.
   if (isHTMLInputElement(*private_) || isHTMLTextAreaElement(*private_)) {
-    if (!Focused())
+    if (!Focused()) {
       Unwrap<Element>()->DispatchFocusEvent(nullptr, kWebFocusTypeForward,
                                             nullptr);
+    }
     Unwrap<Element>()->DispatchScopedEvent(
         Event::CreateBubble(EventTypeNames::keydown));
     Unwrap<TextControlElement>()->setValue(value, kDispatchInputAndChangeEvent);
     Unwrap<Element>()->DispatchScopedEvent(
         Event::CreateBubble(EventTypeNames::keyup));
-    if (!Focused())
+    if (!Focused()) {
       Unwrap<Element>()->DispatchBlurEvent(nullptr, kWebFocusTypeForward,
                                            nullptr);
+    }
   } else if (isHTMLSelectElement(*private_)) {
-    if (!Focused())
+    if (!Focused()) {
       Unwrap<Element>()->DispatchFocusEvent(nullptr, kWebFocusTypeForward,
                                             nullptr);
+    }
     Unwrap<HTMLSelectElement>()->setValue(value, true);
-    if (!Focused())
+    if (!Focused()) {
       Unwrap<Element>()->DispatchBlurEvent(nullptr, kWebFocusTypeForward,
                                            nullptr);
+    }
   }
 }
 

diff --git a/third_party/WebKit/Source/web/WebFormElement.cpp b/third_party/WebKit/Source/core/exported/WebFormElement.cpp
similarity index 100%
rename from third_party/WebKit/Source/web/WebFormElement.cpp
rename to third_party/WebKit/Source/core/exported/WebFormElement.cpp

diff --git a/third_party/WebKit/Source/web/WebInputElement.cpp b/third_party/WebKit/Source/core/exported/WebInputElement.cpp
similarity index 100%
rename from third_party/WebKit/Source/web/WebInputElement.cpp
rename to third_party/WebKit/Source/core/exported/WebInputElement.cpp

diff --git a/third_party/WebKit/Source/web/WebLabelElement.cpp b/third_party/WebKit/Source/core/exported/WebLabelElement.cpp
similarity index 100%
rename from third_party/WebKit/Source/web/WebLabelElement.cpp
rename to third_party/WebKit/Source/core/exported/WebLabelElement.cpp

diff --git a/third_party/WebKit/Source/web/WebMetaElement.cpp b/third_party/WebKit/Source/core/exported/WebMetaElement.cpp
similarity index 100%
rename from third_party/WebKit/Source/web/WebMetaElement.cpp
rename to third_party/WebKit/Source/core/exported/WebMetaElement.cpp

diff --git a/third_party/WebKit/Source/web/WebNode.cpp b/third_party/WebKit/Source/core/exported/WebNode.cpp
similarity index 94%
rename from third_party/WebKit/Source/web/WebNode.cpp
rename to third_party/WebKit/Source/core/exported/WebNode.cpp
index 858940f0..8f962e7 100644
--- a/third_party/WebKit/Source/web/WebNode.cpp
+++ b/third_party/WebKit/Source/core/exported/WebNode.cpp

@@ -56,6 +56,21 @@
 
 namespace blink {
 
+WebNode::WebNode() {}
+
+WebNode::WebNode(const WebNode& n) {
+  Assign(n);
+}
+
+WebNode& WebNode::operator=(const WebNode& n) {
+  Assign(n);
+  return *this;
+}
+
+WebNode::~WebNode() {
+  Reset();
+}
+
 void WebNode::Reset() {
   private_.Reset();
 }
@@ -100,6 +115,10 @@
   return WebNode(private_->nextSibling());
 }
 
+bool WebNode::IsNull() const {
+  return private_.IsNull();
+}
+
 bool WebNode::IsLink() const {
   return private_->IsLink();
 }
@@ -153,10 +172,11 @@
 
 WebElementCollection WebNode::GetElementsByHTMLTagName(
     const WebString& tag) const {
-  if (private_->IsContainerNode())
+  if (private_->IsContainerNode()) {
     return WebElementCollection(
         ToContainerNode(private_.Get())
             ->getElementsByTagNameNS(HTMLNames::xhtmlNamespaceURI, tag));
+  }
   return WebElementCollection();
 }
 

diff --git a/third_party/WebKit/Source/web/WebOptionElement.cpp b/third_party/WebKit/Source/core/exported/WebOptionElement.cpp
similarity index 100%
rename from third_party/WebKit/Source/web/WebOptionElement.cpp
rename to third_party/WebKit/Source/core/exported/WebOptionElement.cpp

diff --git a/third_party/WebKit/Source/web/WebSelectElement.cpp b/third_party/WebKit/Source/core/exported/WebSelectElement.cpp
similarity index 100%
rename from third_party/WebKit/Source/web/WebSelectElement.cpp
rename to third_party/WebKit/Source/core/exported/WebSelectElement.cpp

diff --git a/third_party/WebKit/Source/devtools/front_end/timeline/TimelineFlameChartDataProvider.js b/third_party/WebKit/Source/devtools/front_end/timeline/TimelineFlameChartDataProvider.js
index 9edd0b7..40eed87 100644
--- a/third_party/WebKit/Source/devtools/front_end/timeline/TimelineFlameChartDataProvider.js
+++ b/third_party/WebKit/Source/devtools/front_end/timeline/TimelineFlameChartDataProvider.js

@@ -272,6 +272,34 @@
   }
 
   /**
+   * @param {number} startTime
+   * @param {number} endTime
+   * @param {!TimelineModel.TimelineModelFilter} filter
+   * @return {!Array<number>}
+   */
+  search(startTime, endTime, filter) {
+    var result = [];
+    var entryTypes = Timeline.TimelineFlameChartDataProvider.EntryType;
+    this.timelineData();
+    for (var i = 0; i < this._entryData.length; ++i) {
+      if (this._entryType(i) !== entryTypes.Event)
+        continue;
+      var event = /** @type {!SDK.TracingModel.Event} */ (this._entryData[i]);
+      if (event.startTime > endTime)
+        continue;
+      if ((event.endTime || event.startTime) < startTime)
+        continue;
+      if (filter.accept(event))
+        result.push(i);
+    }
+    result.sort(
+        (a, b) => SDK.TracingModel.Event.compareStartTime(
+            /** @type {!SDK.TracingModel.Event} */ (this._entryData[a]),
+            /** @type {!SDK.TracingModel.Event} */ (this._entryData[b])));
+    return result;
+  }
+
+  /**
    * @param {number} level
    * @param {!TimelineModel.TimelineModel.PageFrame} frame
    */
@@ -925,15 +953,6 @@
 
   /**
    * @param {!SDK.TracingModel.Event} event
-   * @return {?Timeline.TimelineSelection} selection
-   */
-  selectionForEvent(event) {
-    var entryIndex = this._entryData.indexOf(event);
-    return this.createSelection(entryIndex);
-  }
-
-  /**
-   * @param {!SDK.TracingModel.Event} event
    * @return {boolean}
    */
   _isVisible(event) {

diff --git a/third_party/WebKit/Source/devtools/front_end/timeline/TimelineFlameChartView.js b/third_party/WebKit/Source/devtools/front_end/timeline/TimelineFlameChartView.js
index 9c613e1..15544ef 100644
--- a/third_party/WebKit/Source/devtools/front_end/timeline/TimelineFlameChartView.js
+++ b/third_party/WebKit/Source/devtools/front_end/timeline/TimelineFlameChartView.js

@@ -19,7 +19,7 @@
     this._delegate = delegate;
     /** @type {?Timeline.PerformanceModel} */
     this._model = null;
-    /** @type {!Array<!SDK.TracingModel.Event>|undefined} */
+    /** @type {!Array<number>|undefined} */
     this._searchResults;
     this._filters = filters;
 
@@ -268,15 +268,6 @@
   }
 
   /**
-   * @param {!SDK.TracingModel.Event} event
-   */
-  _highlightSearchResult(event) {
-    var timelineSelection = this._mainDataProvider.selectionForEvent(event);
-    if (timelineSelection)
-      this._delegate.select(timelineSelection);
-  }
-
-  /**
    * @override
    * @param {!Timeline.TimelineSelection} selection
    */
@@ -330,7 +321,9 @@
   jumpToNextSearchResult() {
     if (!this._searchResults || !this._searchResults.length)
       return;
-    var index = this._selectedSearchResult ? this._searchResults.indexOf(this._selectedSearchResult) : -1;
+    var index = typeof this._selectedSearchResult !== 'undefined' ?
+        this._searchResults.indexOf(this._selectedSearchResult) :
+        -1;
     this._selectSearchResult(mod(index + 1, this._searchResults.length));
   }
 
@@ -340,7 +333,8 @@
   jumpToPreviousSearchResult() {
     if (!this._searchResults || !this._searchResults.length)
       return;
-    var index = this._selectedSearchResult ? this._searchResults.indexOf(this._selectedSearchResult) : 0;
+    var index =
+        typeof this._selectedSearchResult !== 'undefined' ? this._searchResults.indexOf(this._selectedSearchResult) : 0;
     this._selectSearchResult(mod(index - 1, this._searchResults.length));
   }
 
@@ -364,9 +358,9 @@
    * @param {number} index
    */
   _selectSearchResult(index) {
-    this._selectedSearchResult = this._searchResults[index];
     this._searchableView.updateCurrentMatchIndex(index);
-    this._highlightSearchResult(this._selectedSearchResult);
+    this._selectedSearchResult = this._searchResults[index];
+    this._delegate.select(this._mainDataProvider.createSelection(this._selectedSearchResult));
   }
 
   /**
@@ -380,24 +374,12 @@
     if (!this._searchRegex)
       return;
 
-    // FIXME: search on all threads.
-    var events = this._model ? this._model.timelineModel().mainThreadEvents() : [];
-    var filters = [...this._filters, new Timeline.TimelineFilters.RegExp(this._searchRegex)];
-    var matches = [];
-    var startIndex = events.lowerBound(this._windowStartTime, (time, event) => time - event.startTime);
-    for (var index = startIndex; index < events.length; ++index) {
-      var event = events[index];
-      if (event.startTime > this._windowEndTime)
-        break;
-      if (TimelineModel.TimelineModel.isVisible(filters, event))
-        matches.push(event);
-    }
-
-    this._searchableView.updateSearchMatchesCount(matches.length);
-    this._searchResults = matches;
-    if (!shouldJump || !matches.length)
+    var regExpFilter = new Timeline.TimelineFilters.RegExp(this._searchRegex);
+    this._searchResults = this._mainDataProvider.search(this._windowStartTime, this._windowEndTime, regExpFilter);
+    this._searchableView.updateSearchMatchesCount(this._searchResults.length);
+    if (!shouldJump || !this._searchResults.length)
       return;
-    var selectedIndex = matches.indexOf(oldSelectedSearchResult);
+    var selectedIndex = this._searchResults.indexOf(oldSelectedSearchResult);
     if (selectedIndex === -1)
       selectedIndex = jumpBackwards ? this._searchResults.length - 1 : 0;
     this._selectSearchResult(selectedIndex);
@@ -407,7 +389,7 @@
    * @override
    */
   searchCanceled() {
-    if (this._selectedSearchResult)
+    if (typeof this._selectedSearchResult !== 'undefined')
       this._delegate.select(null);
     delete this._searchResults;
     delete this._selectedSearchResult;

diff --git a/third_party/WebKit/Source/platform/wtf/Vector.h b/third_party/WebKit/Source/platform/wtf/Vector.h
index da6afcd..9813133 100644
--- a/third_party/WebKit/Source/platform/wtf/Vector.h
+++ b/third_party/WebKit/Source/platform/wtf/Vector.h

@@ -1139,17 +1139,16 @@
   // insert(position, value)
   //     Insert a single element at |position|.
   // insert(position, buffer, size)
-  // insert(position, vector)
+  // InsertVector(position, vector)
   //     Insert multiple elements represented by either |buffer| and |size|
   //     or |vector| at |position|. The elements will be copied.
-  //
-  // TODO(yutak): Why not insertVector()?
   template <typename U>
   void insert(size_t position, U&&);
   template <typename U>
   void insert(size_t position, const U*, size_t);
   template <typename U, size_t otherCapacity, typename OtherAllocator>
-  void insert(size_t position, const Vector<U, otherCapacity, OtherAllocator>&);
+  void InsertVector(size_t position,
+                    const Vector<U, otherCapacity, OtherAllocator>&);
 
   // Insertion to the front. All of these functions will take O(size())-time.
   // All of the elements in the vector will be moved to the new locations.
@@ -1797,7 +1796,7 @@
 
 template <typename T, size_t inlineCapacity, typename Allocator>
 template <typename U, size_t otherCapacity, typename OtherAllocator>
-inline void Vector<T, inlineCapacity, Allocator>::insert(
+inline void Vector<T, inlineCapacity, Allocator>::InsertVector(
     size_t position,
     const Vector<U, otherCapacity, OtherAllocator>& val) {
   insert(position, val.begin(), val.size());

diff --git a/third_party/WebKit/Source/web/BUILD.gn b/third_party/WebKit/Source/web/BUILD.gn
index 3d10b41..2e294ec 100644
--- a/third_party/WebKit/Source/web/BUILD.gn
+++ b/third_party/WebKit/Source/web/BUILD.gn

@@ -102,16 +102,11 @@
     "WebDevToolsAgentImpl.h",
     "WebDevToolsFrontendImpl.cpp",
     "WebDevToolsFrontendImpl.h",
-    "WebDocument.cpp",
-    "WebElement.cpp",
-    "WebElementCollection.cpp",
     "WebEmbeddedWorkerImpl.cpp",
     "WebEmbeddedWorkerImpl.h",
     "WebExport.h",
     "WebFactoryImpl.cpp",
     "WebFactoryImpl.h",
-    "WebFormControlElement.cpp",
-    "WebFormElement.cpp",
     "WebFormElementObserverImpl.cpp",
     "WebFormElementObserverImpl.h",
     "WebFrame.cpp",
@@ -126,18 +121,13 @@
     "WebHitTestResult.cpp",
     "WebIDBKey.cpp",
     "WebIDBKeyRange.cpp",
-    "WebInputElement.cpp",
     "WebInputEvent.cpp",
     "WebKit.cpp",
-    "WebLabelElement.cpp",
     "WebLanguageDetectionDetails.cpp",
     "WebLeakDetector.cpp",
     "WebLocalFrameImpl.cpp",
     "WebLocalFrameImpl.h",
     "WebMediaDevicesRequest.cpp",
-    "WebMetaElement.cpp",
-    "WebNode.cpp",
-    "WebOptionElement.cpp",
     "WebPagePopupImpl.cpp",
     "WebPagePopupImpl.h",
     "WebPepperSocket.cpp",
@@ -151,7 +141,6 @@
     "WebRemoteFrameImpl.h",
     "WebScopedWindowFocusAllowedIndicator.cpp",
     "WebSearchableFormData.cpp",
-    "WebSelectElement.cpp",
     "WebSharedWorkerImpl.cpp",
     "WebSharedWorkerImpl.h",
     "WebSharedWorkerReportingProxyImpl.cpp",

diff --git a/third_party/WebKit/public/web/WebElement.h b/third_party/WebKit/public/web/WebElement.h
index f8200ec5..28a7497b 100644
--- a/third_party/WebKit/public/web/WebElement.h
+++ b/third_party/WebKit/public/web/WebElement.h

@@ -40,7 +40,7 @@
 struct WebRect;
 
 // Provides access to some properties of a DOM element node.
-class WebElement : public WebNode {
+class BLINK_EXPORT WebElement : public WebNode {
  public:
   WebElement() : WebNode() {}
   WebElement(const WebElement& e) : WebNode(e) {}
@@ -51,40 +51,40 @@
   }
   void Assign(const WebElement& e) { WebNode::Assign(e); }
 
-  BLINK_EXPORT bool IsFormControlElement() const;
+  bool IsFormControlElement() const;
   // If the element is editable, for example by being contenteditable or being
   // an <input> that isn't readonly or disabled.
-  BLINK_EXPORT bool IsEditable() const;
+  bool IsEditable() const;
   // Returns the qualified name, which may contain a prefix and a colon.
-  BLINK_EXPORT WebString TagName() const;
+  WebString TagName() const;
   // Check if this element has the specified local tag name, and the HTML
   // namespace. Tag name matching is case-insensitive.
-  BLINK_EXPORT bool HasHTMLTagName(const WebString&) const;
-  BLINK_EXPORT bool HasAttribute(const WebString&) const;
-  BLINK_EXPORT WebString GetAttribute(const WebString&) const;
-  BLINK_EXPORT void SetAttribute(const WebString& name, const WebString& value);
-  BLINK_EXPORT WebString TextContent() const;
-  BLINK_EXPORT WebString InnerHTML() const;
-  BLINK_EXPORT WebString AttributeLocalName(unsigned index) const;
-  BLINK_EXPORT WebString AttributeValue(unsigned index) const;
-  BLINK_EXPORT unsigned AttributeCount() const;
+  bool HasHTMLTagName(const WebString&) const;
+  bool HasAttribute(const WebString&) const;
+  WebString GetAttribute(const WebString&) const;
+  void SetAttribute(const WebString& name, const WebString& value);
+  WebString TextContent() const;
+  WebString InnerHTML() const;
+  WebString AttributeLocalName(unsigned index) const;
+  WebString AttributeValue(unsigned index) const;
+  unsigned AttributeCount() const;
 
   // If this element takes up space in the layout of the page.
-  BLINK_EXPORT bool HasNonEmptyLayoutSize() const;
+  bool HasNonEmptyLayoutSize() const;
 
   // Returns the bounds of the element in Visual Viewport. The bounds
   // have been adjusted to include any transformations, including page scale.
   // This function will update the layout if required.
-  BLINK_EXPORT WebRect BoundsInViewport() const;
+  WebRect BoundsInViewport() const;
 
   // Returns the image contents of this element or a null WebImage
   // if there isn't any.
-  BLINK_EXPORT WebImage ImageContents();
+  WebImage ImageContents();
 
 #if BLINK_IMPLEMENTATION
-  BLINK_EXPORT WebElement(Element*);
-  BLINK_EXPORT WebElement& operator=(Element*);
-  BLINK_EXPORT operator Element*() const;
+  WebElement(Element*);
+  WebElement& operator=(Element*);
+  operator Element*() const;
 #endif
 };
 

diff --git a/third_party/WebKit/public/web/WebFormControlElement.h b/third_party/WebKit/public/web/WebFormControlElement.h
index 3d223e1..d5dde9a8 100644
--- a/third_party/WebKit/public/web/WebFormControlElement.h
+++ b/third_party/WebKit/public/web/WebFormControlElement.h

@@ -41,7 +41,7 @@
 
 // Provides readonly access to some properties of a DOM form control element
 // node.
-class WebFormControlElement : public WebElement {
+class BLINK_EXPORT WebFormControlElement : public WebElement {
  public:
   WebFormControlElement() : WebElement() {}
   WebFormControlElement(const WebFormControlElement& e) : WebElement(e) {}
@@ -52,68 +52,68 @@
   }
   void Assign(const WebFormControlElement& e) { WebElement::Assign(e); }
 
-  BLINK_EXPORT bool IsEnabled() const;
-  BLINK_EXPORT bool IsReadOnly() const;
-  BLINK_EXPORT WebString FormControlName() const;
-  BLINK_EXPORT WebString FormControlType() const;
+  bool IsEnabled() const;
+  bool IsReadOnly() const;
+  WebString FormControlName() const;
+  WebString FormControlType() const;
 
-  BLINK_EXPORT bool IsAutofilled() const;
-  BLINK_EXPORT void SetAutofilled(bool);
+  bool IsAutofilled() const;
+  void SetAutofilled(bool);
 
   // Returns true if autocomplete attribute of the element is not set as "off".
-  BLINK_EXPORT bool AutoComplete() const;
+  bool AutoComplete() const;
 
   // Sets value for input element, textarea element and select element. For
   // select element it finds the option with value matches the given parameter
   // and make the option as the current selection.
-  BLINK_EXPORT void SetValue(const WebString&, bool send_events = false);
+  void SetValue(const WebString&, bool send_events = false);
   // Sets the autofilled value for input element, textarea element and select
   // element and sends a sequence of events to the element.
-  BLINK_EXPORT void SetAutofillValue(const WebString&);
+  void SetAutofillValue(const WebString&);
   // Returns value of element. For select element, it returns the value of
   // the selected option if present. If no selected option, an empty string
   // is returned. If element doesn't fall into input element, textarea element
   // and select element categories, a null string is returned.
-  BLINK_EXPORT WebString Value() const;
+  WebString Value() const;
   // Sets suggested value for element. For select element it finds the option
   // with value matches the given parameter and make the option as the suggested
   // selection. The goal of introducing suggested value is to not leak any
   // information to JavaScript.
-  BLINK_EXPORT void SetSuggestedValue(const WebString&);
+  void SetSuggestedValue(const WebString&);
   // Returns suggested value of element. If element doesn't fall into input
   // element, textarea element and select element categories, a null string is
   // returned.
-  BLINK_EXPORT WebString SuggestedValue() const;
+  WebString SuggestedValue() const;
 
   // Returns the non-sanitized, exact value inside the text input field
   // or insisde the textarea. If neither input element nor textarea element,
   // a null string is returned.
-  BLINK_EXPORT WebString EditingValue() const;
+  WebString EditingValue() const;
 
   // Sets character selection range.
-  BLINK_EXPORT void SetSelectionRange(int start, int end);
+  void SetSelectionRange(int start, int end);
   // Returned value represents a cursor/caret position at the current
   // selection's start for text input field or textarea. If neither input
   // element nor textarea element, 0 is returned.
-  BLINK_EXPORT int SelectionStart() const;
+  int SelectionStart() const;
   // Returned value represents a cursor/caret position at the current
   // selection's end for text input field or textarea. If neither input
   // element nor textarea element, 0 is returned.
-  BLINK_EXPORT int SelectionEnd() const;
+  int SelectionEnd() const;
 
   // Returns text-align(only left and right are supported. see crbug.com/482339)
   // of text of element.
-  BLINK_EXPORT WebString AlignmentForFormData() const;
+  WebString AlignmentForFormData() const;
 
   // Returns direction of text of element.
-  BLINK_EXPORT WebString DirectionForFormData() const;
+  WebString DirectionForFormData() const;
 
   // Returns the name that should be used for the specified |element| when
   // storing autofill data.  This is either the field name or its id, an empty
   // string if it has no name and no id.
-  BLINK_EXPORT WebString NameForAutofill() const;
+  WebString NameForAutofill() const;
 
-  BLINK_EXPORT WebFormElement Form() const;
+  WebFormElement Form() const;
 
 #if BLINK_IMPLEMENTATION
   WebFormControlElement(HTMLFormControlElement*);

diff --git a/third_party/WebKit/public/web/WebFormElement.h b/third_party/WebKit/public/web/WebFormElement.h
index 19b82e7..a1a9e451 100644
--- a/third_party/WebKit/public/web/WebFormElement.h
+++ b/third_party/WebKit/public/web/WebFormElement.h

@@ -41,7 +41,7 @@
 
 // A container for passing around a reference to a form element. Provides some
 // information about the form.
-class WebFormElement final : public WebElement {
+class BLINK_EXPORT WebFormElement final : public WebElement {
  public:
   ~WebFormElement() { Reset(); }
 
@@ -54,13 +54,12 @@
   }
   void Assign(const WebFormElement& element) { WebElement::Assign(element); }
 
-  BLINK_EXPORT bool AutoComplete() const;
-  BLINK_EXPORT WebString Action() const;
-  BLINK_EXPORT WebString GetName() const;
-  BLINK_EXPORT WebString Method() const;
+  bool AutoComplete() const;
+  WebString Action() const;
+  WebString GetName() const;
+  WebString Method() const;
 
-  BLINK_EXPORT void GetFormControlElements(
-      WebVector<WebFormControlElement>&) const;
+  void GetFormControlElements(WebVector<WebFormControlElement>&) const;
 
 #if BLINK_IMPLEMENTATION
   WebFormElement(HTMLFormElement*);

diff --git a/third_party/WebKit/public/web/WebInputElement.h b/third_party/WebKit/public/web/WebInputElement.h
index aded001..bfd85413 100644
--- a/third_party/WebKit/public/web/WebInputElement.h
+++ b/third_party/WebKit/public/web/WebInputElement.h

@@ -39,7 +39,7 @@
 class WebOptionElement;
 
 // Provides readonly access to some properties of a DOM input element node.
-class WebInputElement final : public WebFormControlElement {
+class BLINK_EXPORT WebInputElement final : public WebFormControlElement {
  public:
   WebInputElement() : WebFormControlElement() {}
   WebInputElement(const WebInputElement& element)
@@ -55,43 +55,43 @@
 
   // This returns true for all of textfield-looking types such as text,
   // password, search, email, url, and number.
-  BLINK_EXPORT bool IsTextField() const;
+  bool IsTextField() const;
   // This returns true only for type=text.
-  BLINK_EXPORT bool IsText() const;
-  BLINK_EXPORT bool IsEmailField() const;
-  BLINK_EXPORT bool IsPasswordField() const;
-  BLINK_EXPORT bool IsImageButton() const;
-  BLINK_EXPORT bool IsRadioButton() const;
-  BLINK_EXPORT bool IsCheckbox() const;
+  bool IsText() const;
+  bool IsEmailField() const;
+  bool IsPasswordField() const;
+  bool IsImageButton() const;
+  bool IsRadioButton() const;
+  bool IsCheckbox() const;
   // This has different behavior from 'maxLength' IDL attribute, it returns
   // defaultMaxLength() when no valid has been set, whereas 'maxLength' IDL
   // attribute returns -1.
-  BLINK_EXPORT int MaxLength() const;
-  BLINK_EXPORT void SetActivatedSubmit(bool);
-  BLINK_EXPORT int size() const;
-  BLINK_EXPORT void SetChecked(bool, bool send_events = false);
+  int MaxLength() const;
+  void SetActivatedSubmit(bool);
+  int size() const;
+  void SetChecked(bool, bool send_events = false);
   // Sets the value inside the text field without being sanitized. Can't be
   // used if a renderer doesn't exist or on a non text field type. Caret will
   // be moved to the end.
-  BLINK_EXPORT void SetEditingValue(const WebString&);
-  BLINK_EXPORT bool IsValidValue(const WebString&) const;
-  BLINK_EXPORT bool IsChecked() const;
-  BLINK_EXPORT bool IsMultiple() const;
+  void SetEditingValue(const WebString&);
+  bool IsValidValue(const WebString&) const;
+  bool IsChecked() const;
+  bool IsMultiple() const;
 
   // Associated <datalist> options which match to the current INPUT value.
-  BLINK_EXPORT WebVector<WebOptionElement> FilteredDataListOptions() const;
+  WebVector<WebOptionElement> FilteredDataListOptions() const;
 
   // Return the localized value for this input type.
-  BLINK_EXPORT WebString LocalizeValue(const WebString&) const;
+  WebString LocalizeValue(const WebString&) const;
 
   // Exposes the default value of the maxLength attribute.
-  BLINK_EXPORT static int DefaultMaxLength();
+  static int DefaultMaxLength();
 
   // If true, forces the text of the element to be visible.
-  BLINK_EXPORT void SetShouldRevealPassword(bool value);
+  void SetShouldRevealPassword(bool value);
 
   // Returns true if the text of the element should be visible.
-  BLINK_EXPORT bool ShouldRevealPassword() const;
+  bool ShouldRevealPassword() const;
 
 #if BLINK_IMPLEMENTATION
   WebInputElement(HTMLInputElement*);
@@ -105,7 +105,8 @@
 // This returns 0 if the specified WebElement is not a WebInputElement.
 BLINK_EXPORT WebInputElement* ToWebInputElement(WebElement*);
 // This returns 0 if the specified WebElement is not a WebInputElement.
-inline const WebInputElement* ToWebInputElement(const WebElement* element) {
+BLINK_EXPORT inline const WebInputElement* ToWebInputElement(
+    const WebElement* element) {
   return ToWebInputElement(const_cast<WebElement*>(element));
 }
 

diff --git a/third_party/WebKit/public/web/WebNode.h b/third_party/WebKit/public/web/WebNode.h
index a1af179b..a23a47d 100644
--- a/third_party/WebKit/public/web/WebNode.h
+++ b/third_party/WebKit/public/web/WebNode.h

@@ -50,58 +50,54 @@
 // is possible to safely static_cast an instance of one class to the appropriate
 // subclass based on the actual type of the wrapped blink::Node. For the same
 // reason, subclasses must not add any additional data members.
-class WebNode {
+class BLINK_EXPORT WebNode {
  public:
-  virtual ~WebNode() { Reset(); }
+  virtual ~WebNode();
 
-  WebNode() {}
-  WebNode(const WebNode& n) { Assign(n); }
-  WebNode& operator=(const WebNode& n) {
-    Assign(n);
-    return *this;
-  }
+  WebNode();
+  WebNode(const WebNode&);
+  WebNode& operator=(const WebNode&);
 
-  BLINK_EXPORT void Reset();
-  BLINK_EXPORT void Assign(const WebNode&);
+  void Reset();
+  void Assign(const WebNode&);
 
-  BLINK_EXPORT bool Equals(const WebNode&) const;
+  bool Equals(const WebNode&) const;
   // Required for using WebNodes in std maps.  Note the order used is
   // arbitrary and should not be expected to have any specific meaning.
-  BLINK_EXPORT bool LessThan(const WebNode&) const;
+  bool LessThan(const WebNode&) const;
 
-  bool IsNull() const { return private_.IsNull(); }
+  bool IsNull() const;
 
-  BLINK_EXPORT WebNode ParentNode() const;
-  BLINK_EXPORT WebString NodeValue() const;
-  BLINK_EXPORT WebDocument GetDocument() const;
-  BLINK_EXPORT WebNode FirstChild() const;
-  BLINK_EXPORT WebNode LastChild() const;
-  BLINK_EXPORT WebNode PreviousSibling() const;
-  BLINK_EXPORT WebNode NextSibling() const;
+  WebNode ParentNode() const;
+  WebString NodeValue() const;
+  WebDocument GetDocument() const;
+  WebNode FirstChild() const;
+  WebNode LastChild() const;
+  WebNode PreviousSibling() const;
+  WebNode NextSibling() const;
 
-  BLINK_EXPORT bool IsLink() const;
-  BLINK_EXPORT bool IsDocumentNode() const;
-  BLINK_EXPORT bool IsDocumentTypeNode() const;
-  BLINK_EXPORT bool IsCommentNode() const;
-  BLINK_EXPORT bool IsTextNode() const;
-  BLINK_EXPORT bool IsFocusable() const;
-  BLINK_EXPORT bool IsContentEditable() const;
-  BLINK_EXPORT bool IsElementNode() const;
-  BLINK_EXPORT void SimulateClick();
+  bool IsLink() const;
+  bool IsDocumentNode() const;
+  bool IsDocumentTypeNode() const;
+  bool IsCommentNode() const;
+  bool IsTextNode() const;
+  bool IsFocusable() const;
+  bool IsContentEditable() const;
+  bool IsElementNode() const;
+  void SimulateClick();
 
   // The argument should be lower-cased.
-  BLINK_EXPORT WebElementCollection
-  GetElementsByHTMLTagName(const WebString&) const;
+  WebElementCollection GetElementsByHTMLTagName(const WebString&) const;
 
   // https://developer.mozilla.org/en-US/docs/Web/API/Document/querySelector
   // If the JS API would have thrown this returns null instead.
-  BLINK_EXPORT WebElement QuerySelector(const WebString& selector) const;
+  WebElement QuerySelector(const WebString& selector) const;
 
-  BLINK_EXPORT bool Focused() const;
+  bool Focused() const;
 
-  BLINK_EXPORT WebPluginContainer* PluginContainer() const;
+  WebPluginContainer* PluginContainer() const;
 
-  BLINK_EXPORT bool IsInsideFocusableElementOrARIAWidget() const;
+  bool IsInsideFocusableElementOrARIAWidget() const;
 
   template <typename T>
   T To();
@@ -109,9 +105,9 @@
   const T ToConst() const;
 
 #if BLINK_IMPLEMENTATION
-  BLINK_EXPORT WebNode(Node*);
-  BLINK_EXPORT WebNode& operator=(Node*);
-  BLINK_EXPORT operator Node*() const;
+  WebNode(Node*);
+  WebNode& operator=(Node*);
+  operator Node*() const;
 
   template <typename T>
   T* Unwrap() {
@@ -135,20 +131,20 @@
   BLINK_EXPORT const type WebNode::ToConst<type>() const;
 
 #if BLINK_IMPLEMENTATION
-#define DEFINE_WEB_NODE_TYPE_CASTS(type, predicate) \
-  template <>                                       \
-  type WebNode::To<type>() {                        \
-    SECURITY_DCHECK(IsNull() || (predicate));       \
-    type result;                                    \
-    result.WebNode::Assign(*this);                  \
-    return result;                                  \
-  }                                                 \
-  template <>                                       \
-  const type WebNode::ToConst<type>() const {       \
-    SECURITY_DCHECK(IsNull() || (predicate));       \
-    type result;                                    \
-    result.WebNode::Assign(*this);                  \
-    return result;                                  \
+#define DEFINE_WEB_NODE_TYPE_CASTS(type, predicate)        \
+  template <>                                              \
+  BLINK_EXPORT type WebNode::To<type>() {                  \
+    SECURITY_DCHECK(IsNull() || (predicate));              \
+    type result;                                           \
+    result.WebNode::Assign(*this);                         \
+    return result;                                         \
+  }                                                        \
+  template <>                                              \
+  BLINK_EXPORT const type WebNode::ToConst<type>() const { \
+    SECURITY_DCHECK(IsNull() || (predicate));              \
+    type result;                                           \
+    result.WebNode::Assign(*this);                         \
+    return result;                                         \
   }
 #endif
 

diff --git a/third_party/WebKit/public/web/WebOptionElement.h b/third_party/WebKit/public/web/WebOptionElement.h
index e6f42544..1bb74b8 100644
--- a/third_party/WebKit/public/web/WebOptionElement.h
+++ b/third_party/WebKit/public/web/WebOptionElement.h

@@ -38,7 +38,7 @@
 class HTMLOptionElement;
 class WebString;
 
-class WebOptionElement final : public WebElement {
+class BLINK_EXPORT WebOptionElement final : public WebElement {
  public:
   WebOptionElement() : WebElement() {}
   WebOptionElement(const WebOptionElement& element) : WebElement(element) {}
@@ -49,9 +49,9 @@
   }
   void Assign(const WebOptionElement& element) { WebElement::Assign(element); }
 
-  BLINK_EXPORT WebString Value() const;
-  BLINK_EXPORT WebString GetText() const;
-  BLINK_EXPORT WebString Label() const;
+  WebString Value() const;
+  WebString GetText() const;
+  WebString Label() const;
 
 #if BLINK_IMPLEMENTATION
   WebOptionElement(HTMLOptionElement*);

diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
index 02af1d3..7539095 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl

@@ -1042,7 +1042,10 @@
     ],
 
     'clang_debug_bot_minimal_symbols_x86': [
-      'clang', 'debug_bot', 'minimal_symbols', 'x86',
+      # Now that the default win bots use clang, use a "clang" bot to make sure
+      # things stay compilable with msvc. TODO(thakis): Having a "clang" bot
+      # check that is very confusing, so rename the bot to "msvc".
+      'no_clang', 'debug_bot', 'minimal_symbols', 'x86',
     ],
 
     'clang_release_bot_minimal_symbols_x86': [
@@ -1050,15 +1053,24 @@
     ],
 
     'clang_minimal_symbols_shared_release_bot_x86_dcheck': [
-      'clang', 'minimal_symbols', 'shared_release_bot', 'x86', 'dcheck_always_on',
+      # Now that the default win bots use clang, use a "clang" bot to make sure
+      # things stay compilable with msvc. TODO(thakis): Having a "clang" bot
+      # check that is very confusing, so rename the bot to "msvc".
+      'no_clang', 'minimal_symbols', 'shared_release_bot', 'x86', 'dcheck_always_on',
     ],
 
     'clang_official_release_bot_minimal_symbols': [
-      'clang', 'official', 'release_bot', 'minimal_symbols',
+      # Now that the default win bots use clang, use a "clang" bot to make sure
+      # things stay compilable with msvc. TODO(thakis): Having a "clang" bot
+      # check that is very confusing, so rename the bot to "msvc".
+      'no_clang', 'official', 'release_bot', 'minimal_symbols',
     ],
 
     'clang_official_release_bot_minimal_symbols_x86': [
-      'clang', 'official', 'release_bot', 'minimal_symbols', 'x86',
+      # Now that the default win bots use clang, use a "clang" bot to make sure
+      # things stay compilable with msvc. TODO(thakis): Having a "clang" bot
+      # check that is very confusing, so rename the bot to "msvc".
+      'no_clang', 'official', 'release_bot', 'minimal_symbols', 'x86',
     ],
 
     'clang_official_optimize_release_bot_minimal_symbols_x86': [
@@ -1074,7 +1086,10 @@
     ],
 
     'clang_shared_release_bot_dcheck': [
-      'clang', 'shared_release_bot', 'dcheck_always_on',
+      # Now that the default win bots use clang, use a "clang" bot to make sure
+      # things stay compilable with msvc. TODO(thakis): Having a "clang" bot
+      # check that is very confusing, so rename the bot to "msvc".
+      'no_clang', 'shared_release_bot', 'dcheck_always_on',
     ],
 
     'clang_tot_asan_lsan_static_release': [
@@ -1497,7 +1512,10 @@
     ],
 
     'win_clang_debug_bot': [
-      'clang', 'debug_bot', 'minimal_symbols',
+      # Now that the default win bots use clang, use a "clang" bot to make sure
+      # things stay compilable with msvc. TODO(thakis): Having a "clang" bot
+      # check that is very confusing, so rename the bot to "msvc".
+      'no_clang', 'debug_bot', 'minimal_symbols',
     ],
 
     'windows_analyze': [
@@ -1587,11 +1605,11 @@
     },
 
     'chrome_pgo_phase_1': {
-      'gn_args': 'chrome_pgo_phase=1',
+      'gn_args': 'chrome_pgo_phase=1 is_clang=false',
     },
 
     'chrome_pgo_phase_2': {
-      'gn_args': 'chrome_pgo_phase=2',
+      'gn_args': 'chrome_pgo_phase=2 is_clang=false',
     },
 
     'chrome_with_codecs': {
@@ -1867,7 +1885,8 @@
     },
 
     'syzyasan': {
-      'gn_args': 'is_syzyasan=true',
+      # TODO(thakis): Figure out SyzyASan + clang story.
+      'gn_args': 'is_syzyasan=true is_clang=false',
     },
 
     'thin_lto': {

diff --git a/tools/perf/fetch_benchmark_deps.py b/tools/perf/fetch_benchmark_deps.py
index abde42f0..0a07d06 100755
--- a/tools/perf/fetch_benchmark_deps.py
+++ b/tools/perf/fetch_benchmark_deps.py

@@ -5,9 +5,11 @@
 
 """This module fetches and prints the dependencies given a benchmark."""
 
+import argparse
 import os
 import sys
 
+from core import benchmark_finders
 from core import path_util
 
 path_util.AddPyUtilsToPath()
@@ -57,21 +59,7 @@
   return [dep[prefix_len:] for dep in deps if dep]
 
 
-def _show_usage():
-  print ('Usage: %s benchmark_name\n'
-         'Fetch the dependencies of benchmark_name.' % sys.argv[0])
-
-
-def main(output=sys.stdout):
-  config = chromium_config.ChromiumConfig(
-      top_level_dir=path_util.GetPerfDir(),
-      benchmark_dirs=[os.path.join(path_util.GetPerfDir(), 'benchmarks')])
-
-  name = sys.argv[1]
-  benchmark = benchmark_runner.GetBenchmarkByName(name, config)
-  if not benchmark:
-    raise ValueError('No such benchmark: %s' % name)
-
+def FetchDepsForBenchmark(benchmark, output):
   # Download files according to specified benchmark.
   story_set = benchmark().CreateStorySet(None)
 
@@ -83,8 +71,35 @@
     print >> output, dep
 
 
-if __name__ == '__main__':
-  if len(sys.argv) != 2 or sys.argv[1][0] == '-':
-    _show_usage()
+def main(args, output):
+  parser = argparse.ArgumentParser(
+         description='Fetch the dependencies of perf benchmark(s).')
+  parser.add_argument('benchmark_name', type=str, nargs='?')
+  parser.add_argument('--force', '-f',
+                      help=('Force fetching all the benchmarks when '
+                            'benchmark_name is not specified'),
+                      action='store_true', default=False)
+
+  options = parser.parse_args(args)
+
+  if options.benchmark_name:
+    config = chromium_config.ChromiumConfig(
+        top_level_dir=path_util.GetPerfDir(),
+        benchmark_dirs=[os.path.join(path_util.GetPerfDir(), 'benchmarks')])
+    benchmark = benchmark_runner.GetBenchmarkByName(
+        options.benchmark_name, config)
+    if not benchmark:
+      raise ValueError('No such benchmark: %s' % options.benchmark_name)
+    FetchDepsForBenchmark(benchmark, output)
   else:
-    main()
+    if not options.force:
+      raw_input(
+          'No benchmark name is specified. Fetching all benchmark deps. '
+          'Press enter to continue...')
+    for b in benchmark_finders.GetAllBenchmarks():
+      print >> output, ('Fetch dependencies for benchmark %s:'
+                        % benchmark.Name())
+      FetchDepsForBenchmark(b, output)
+
+if __name__ == '__main__':
+  main(sys.argv[1:], sys.stdout)

diff --git a/tools/perf/fetch_benchmark_deps_unittest.py b/tools/perf/fetch_benchmark_deps_unittest.py
index 12ead09..96ccfe9 100644
--- a/tools/perf/fetch_benchmark_deps_unittest.py
+++ b/tools/perf/fetch_benchmark_deps_unittest.py

@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 import os
-import sys
 import unittest
 import StringIO
 
@@ -25,11 +24,6 @@
   py_utils.cloud_storage.GetFilesInDirectoryIfChanged
   """
 
-  def setUp(self):
-    """Override sys.argv as if it is called from command line."""
-    self._argv = sys.argv
-    sys.argv = ['./fetch_benchmark_deps', '']
-
   def _RunFetchBenchmarkDepsTest(self, benchmark_name,
                                  expected_fetched_file_paths=None):
     """Simulates './fetch_benchmark_deps [benchmark_name]'
@@ -42,7 +36,7 @@
       benchmark_name: benchmark name
       expected_fetched_file_paths: the expected result.
     """
-    sys.argv[1] = benchmark_name
+    args = [benchmark_name]
     output = StringIO.StringIO()
     with mock.patch('telemetry.wpr.archive_info.WprArchiveInfo'
                     '.DownloadArchivesIfNeeded') as mock_download:
@@ -50,7 +44,7 @@
                       '.GetFilesInDirectoryIfChanged') as mock_get:
         mock_download.return_value = True
         mock_get.GetFilesInDirectoryIfChanged.return_value = True
-        fetch_benchmark_deps.main(output)
+        fetch_benchmark_deps.main(args, output)
     for f in output.getvalue().splitlines():
       fullpath = os.path.join(path_util.GetChromiumSrcDir(), f)
       sha1path = fullpath + '.sha1'

diff --git a/ui/aura/mus/mus_context_factory.cc b/ui/aura/mus/mus_context_factory.cc
index fd6cd92..443f970d 100644
--- a/ui/aura/mus/mus_context_factory.cc
+++ b/ui/aura/mus/mus_context_factory.cc

@@ -81,8 +81,8 @@
   return raster_thread_helper_.task_graph_runner();
 }
 
-const cc::ResourceSettings& MusContextFactory::GetResourceSettings() const {
-  return renderer_settings_.resource_settings;
+const cc::RendererSettings& MusContextFactory::GetRendererSettings() const {
+  return renderer_settings_;
 }
 
 }  // namespace aura

diff --git a/ui/aura/mus/mus_context_factory.h b/ui/aura/mus/mus_context_factory.h
index 20d67f6b..a7624f5 100644
--- a/ui/aura/mus/mus_context_factory.h
+++ b/ui/aura/mus/mus_context_factory.h

@@ -18,10 +18,6 @@
 #include "ui/aura/aura_export.h"
 #include "ui/compositor/compositor.h"
 
-namespace cc {
-class ResourceSettings;
-}
-
 namespace gpu {
 class GpuChannelHost;
 }
@@ -51,7 +47,7 @@
   double GetRefreshRate() const override;
   gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;
   cc::TaskGraphRunner* GetTaskGraphRunner() override;
-  const cc::ResourceSettings& GetResourceSettings() const override;
+  const cc::RendererSettings& GetRendererSettings() const override;
   void AddObserver(ui::ContextFactoryObserver* observer) override {}
   void RemoveObserver(ui::ContextFactoryObserver* observer) override {}
 

diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index 78bc7f55..30eff8c7 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc

@@ -140,9 +140,10 @@
   // doesn't currently support partial raster.
   settings.use_partial_raster = !settings.use_zero_copy;
 
+  settings.buffer_to_texture_target_map =
+      context_factory_->GetRendererSettings().buffer_to_texture_target_map;
   if (command_line->HasSwitch(switches::kUIEnableRGBA4444Textures))
     settings.preferred_tile_format = cc::RGBA_4444;
-  settings.resource_settings = context_factory_->GetResourceSettings();
 
   settings.gpu_memory_policy.bytes_limit_when_visible = 512 * 1024 * 1024;
   settings.gpu_memory_policy.priority_cutoff_when_visible =
@@ -151,6 +152,9 @@
   settings.disallow_non_exact_resource_reuse =
       command_line->HasSwitch(cc::switches::kDisallowNonExactResourceReuse);
 
+  // TODO(staraz): LayerTreeSettings shouldn't have a RendererSettings.
+  settings.renderer_settings = context_factory_->GetRendererSettings();
+
   base::TimeTicks before_create = base::TimeTicks::Now();
 
   animation_host_ = cc::AnimationHost::CreateMainInstance();

diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
index a623386..74abc71d 100644
--- a/ui/compositor/compositor.h
+++ b/ui/compositor/compositor.h

@@ -45,7 +45,7 @@
 class LayerTreeDebugState;
 class LayerTreeHost;
 class LocalSurfaceId;
-class ResourceSettings;
+class RendererSettings;
 class SurfaceManager;
 class TaskGraphRunner;
 }
@@ -159,7 +159,7 @@
   virtual cc::TaskGraphRunner* GetTaskGraphRunner() = 0;
 
   // Gets the renderer settings.
-  virtual const cc::ResourceSettings& GetResourceSettings() const = 0;
+  virtual const cc::RendererSettings& GetRendererSettings() const = 0;
 
   virtual void AddObserver(ContextFactoryObserver* observer) = 0;
 

diff --git a/ui/compositor/compositor_util.cc b/ui/compositor/compositor_util.cc
index 63bc273..886e7aa 100644
--- a/ui/compositor/compositor_util.cc
+++ b/ui/compositor/compositor_util.cc

@@ -39,7 +39,7 @@
          format_idx <= static_cast<int>(gfx::BufferFormat::LAST);
          ++format_idx) {
       gfx::BufferFormat format = static_cast<gfx::BufferFormat>(format_idx);
-      renderer_settings.resource_settings
+      renderer_settings
           .buffer_to_texture_target_map[std::make_pair(usage, format)] =
           get_texture_target(format, usage);
     }

diff --git a/ui/compositor/test/fake_context_factory.cc b/ui/compositor/test/fake_context_factory.cc
index 906c1ee..cc0cd26 100644
--- a/ui/compositor/test/fake_context_factory.cc
+++ b/ui/compositor/test/fake_context_factory.cc

@@ -32,7 +32,7 @@
          format_idx <= static_cast<int>(gfx::BufferFormat::LAST);
          ++format_idx) {
       gfx::BufferFormat format = static_cast<gfx::BufferFormat>(format_idx);
-      renderer_settings_.resource_settings
+      renderer_settings_
           .buffer_to_texture_target_map[std::make_pair(usage, format)] =
           GL_TEXTURE_2D;
     }
@@ -73,8 +73,8 @@
   return &task_graph_runner_;
 }
 
-const cc::ResourceSettings& FakeContextFactory::GetResourceSettings() const {
-  return renderer_settings_.resource_settings;
+const cc::RendererSettings& FakeContextFactory::GetRendererSettings() const {
+  return renderer_settings_;
 }
 
 }  // namespace ui

diff --git a/ui/compositor/test/fake_context_factory.h b/ui/compositor/test/fake_context_factory.h
index 9be39d8..7db8233 100644
--- a/ui/compositor/test/fake_context_factory.h
+++ b/ui/compositor/test/fake_context_factory.h

@@ -14,7 +14,6 @@
 class CompositorFrame;
 class ContextProvider;
 class FakeCompositorFrameSink;
-class ResourceSettings;
 class TestTaskGraphRunner;
 class TestGpuMemoryBufferManager;
 }
@@ -36,7 +35,7 @@
   double GetRefreshRate() const override;
   gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;
   cc::TaskGraphRunner* GetTaskGraphRunner() override;
-  const cc::ResourceSettings& GetResourceSettings() const override;
+  const cc::RendererSettings& GetRendererSettings() const override;
   void AddObserver(ui::ContextFactoryObserver* observer) override {}
   void RemoveObserver(ui::ContextFactoryObserver* observer) override {}
 

diff --git a/ui/compositor/test/in_process_context_factory.cc b/ui/compositor/test/in_process_context_factory.cc
index 1c301a12..8d84e41 100644
--- a/ui/compositor/test/in_process_context_factory.cc
+++ b/ui/compositor/test/in_process_context_factory.cc

@@ -156,7 +156,7 @@
          format_idx <= static_cast<int>(gfx::BufferFormat::LAST);
          ++format_idx) {
       gfx::BufferFormat format = static_cast<gfx::BufferFormat>(format_idx);
-      renderer_settings_.resource_settings
+      renderer_settings_
           .buffer_to_texture_target_map[std::make_pair(usage, format)] =
           GL_TEXTURE_2D;
     }
@@ -328,9 +328,9 @@
   per_compositor_data_[compositor]->display->Resize(size);
 }
 
-const cc::ResourceSettings& InProcessContextFactory::GetResourceSettings()
+const cc::RendererSettings& InProcessContextFactory::GetRendererSettings()
     const {
-  return renderer_settings_.resource_settings;
+  return renderer_settings_;
 }
 
 void InProcessContextFactory::AddObserver(ContextFactoryObserver* observer) {

diff --git a/ui/compositor/test/in_process_context_factory.h b/ui/compositor/test/in_process_context_factory.h
index d2bf234..bb41ede54 100644
--- a/ui/compositor/test/in_process_context_factory.h
+++ b/ui/compositor/test/in_process_context_factory.h

@@ -19,7 +19,6 @@
 #include "ui/compositor/compositor.h"
 
 namespace cc {
-class ResourceSettings;
 class SurfaceManager;
 }
 
@@ -75,7 +74,7 @@
                                  base::TimeTicks timebase,
                                  base::TimeDelta interval) override {}
   void SetOutputIsSecure(ui::Compositor* compositor, bool secure) override {}
-  const cc::ResourceSettings& GetResourceSettings() const override;
+  const cc::RendererSettings& GetRendererSettings() const override;
   void AddObserver(ContextFactoryObserver* observer) override;
   void RemoveObserver(ContextFactoryObserver* observer) override;