Use WebKit compositor in ui::Layer

ui/gfx/compositor/compositor.gyp

Index: ui/gfx/compositor/compositor.gyp
diff --git a/ui/gfx/compositor/compositor.gyp b/ui/gfx/compositor/compositor.gyp
index d5e38b717cc5be34cd43db7c999aee139040bcc7..4b0a3079dfc596c4d435d087cb80b1a6760f9bf3 100644
--- a/ui/gfx/compositor/compositor.gyp
+++ b/ui/gfx/compositor/compositor.gyp
@@ -29,6 +29,7 @@
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/ui/gfx/gl/gl.gyp:gl',
         '<(DEPTH)/ui/ui.gyp:ui',
+        '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
       ],
       'defines': [
         'COMPOSITOR_IMPLEMENTATION',
@@ -39,6 +40,8 @@
         'compositor_export.h',
         'compositor_gl.cc',
         'compositor_gl.h',
+        'compositor_cc.cc',
+        'compositor_cc.h',
         'compositor_observer.h',
         'compositor_stub.cc',
         'compositor_win.cc',
@@ -77,6 +80,21 @@
             ['exclude', '^compositor_win.cc'],
           ],
         }],
+        ['use_webkit_compositor == 1', {
+            'sources/': [
+              ['exclude', '^compositor_(gl|win|stub).(h|cc)$'],
+            ],
+            'dependencies': [
+              '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
+              '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_gpu',
+            ],
+          }, {
+            'sources!': [

[jonathan.backer, 2011/10/18 15:28:26]

Maybe I'm not reading this correctly, but it looks like you're excluding sources
that you want to include.

[piman, 2011/10/19 17:53:23]

This is the "else" clause (i.e. use_webkit_compositor != 1), so I'm removing the
_cc files ('sources!')

+              'compositor_cc.cc',
+              'compositor_cc.h',
+            ],
+          }
+        ],
       ],
     },
     {
@@ -91,6 +109,7 @@
         '<(DEPTH)/ui/ui.gyp:gfx_resources',
         '<(DEPTH)/ui/ui.gyp:ui',
         '<(DEPTH)/ui/ui.gyp:ui_resources',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support',
         'compositor',
       ],
       'sources': [