WIP RasterCanvasLayerAllocator experiment 2

skia/BUILD.gn

Index: skia/BUILD.gn
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 27dbb6a0052b23ed097fdae379ef797a8d62003a..23f5a0aeb1ac5ec6670cef5b51b80d1e064ea940 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -213,7 +213,6 @@ component("skia") {
     "ext/image_operations.cc",
     "ext/opacity_filter_canvas.cc",
     "ext/platform_device.cc",
-    "ext/platform_device_linux.cc",
     "ext/platform_device_mac.cc",
     "ext/platform_device_win.cc",
     "ext/recursive_gaussian_convolution.cc",
@@ -385,15 +384,18 @@ component("skia") {
     ]
   }
 
-  # Select the right BitmapPlatformDevice.
+  # Select the right LayerAllocator.
+  # (Platforms which only have Skia for a 'native' graphics system
+  # don't get one.)
   if (is_win) {
-    sources += [ "ext/bitmap_platform_device_win.cc" ]
+    sources += [
+      "ext/bitmap_platform_device_win.cc",
+      "ext/layer_allocator_win.cc",
+    ]
   } else if (is_mac) {
     sources += [ "ext/bitmap_platform_device_mac.cc" ]
   } else if (use_cairo) {
-    sources += [ "ext/bitmap_platform_device_cairo.cc" ]
-  } else if (!is_ios) {
-    sources += [ "ext/bitmap_platform_device_skia.cc" ]
+    sources += [ "ext/layer_allocator_cairo.cc" ]
   }
 
   if (is_clang && !is_nacl) {
@@ -431,7 +433,6 @@ component("skia") {
 
   if (is_android) {
     set_sources_assignment_filter([])
-    sources += [ "ext/platform_device_linux.cc" ]
     set_sources_assignment_filter(sources_assignment_filter)
     deps += [
       "//third_party/android_tools:cpu_features",