Use WebKit compositor in ui::Layer

ui/gfx/compositor/compositor.gyp

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'target_defaults': {
     'sources/': [
@@ skipping 11 matching lines @@
   'targets': [
     {
       'target_name': 'compositor',
       'type': '<(component)',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '<(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',
       ],
       'sources': [
         'compositor.cc',
         'compositor.h',
         'compositor_export.h',
         'compositor_gl.cc',
         'compositor_gl.h',
+        'compositor_cc.cc',
+        'compositor_cc.h',
         'compositor_observer.h',
         'compositor_stub.cc',
         'compositor_win.cc',
         'layer.cc',
         'layer.h',
         'layer_animator.cc',
         'layer_animator.h',
         'layer_animator_delegate.h',
       ],
       'conditions': [
@@ skipping 18 matching lines @@
               '-ldxerr.lib',
               '-ldxguid.lib',
             ]
           },
         }],
         ['OS == "win" and views_compositor == 0', {
           'sources/': [
             ['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',
+            ],
+          }
+        ],
       ],
     },
     {
       'target_name': 'compositor_unittests',
       'type': 'executable',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:test_support_base',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(DEPTH)/ui/gfx/gl/gl.gyp:gl',
         '<(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': [
         'layer_unittest.cc',
         'run_all_unittests.cc',
         'test_compositor.cc',
         'test_compositor.h',
         'test_compositor_host.h',
         'test_compositor_host_linux.cc',
         'test_compositor_host_win.cc',
@@ skipping 13 matching lines @@
         }],
         ['OS!="mac"', {
           'dependencies': [
             '<(DEPTH)/chrome/chrome.gyp:packed_resources',
            ],
         }],
       ],
     },
   ],
 }