Enable webkit_compositor_unittests

These are unit tests of the webkit compositor bindings that bind the
WebKit Platform Web*Layer* family of APIs to cc. They currently depend
on some test utilities in cc.

Also updates snapshot to WebKit r127194

BUG=

Review URL: https://chromiumcodereview.appspot.com/10909020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154307 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 35 insertions, 8 deletions

diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp
index f4b0334..e24b71d 100644
--- a/cc/cc_tests.gyp
+++ b/cc/cc_tests.gyp
@@ -40,6 +40,8 @@
       'CCThreadedTest.h',
       'CCTiledLayerImplTest.cpp',
       'CCTimerTest.cpp',
+    ],
+    'cc_tests_support_files': [
       'test/CCAnimationTestCommon.cpp',
       'test/CCAnimationTestCommon.h',
       'test/CCLayerTestCommon.cpp',
@@ -60,7 +62,7 @@
       'test/FakeWebGraphicsContext3D.h',
       'test/FakeWebScrollbarThemeGeometry.h',
       'test/MockCCQuadCuller.h',
-    ]
+    ],
   },
   'conditions': [
     ['use_libcc_for_compositor==1 and component!="shared_library"', {
@@ -69,15 +71,16 @@
           'target_name': 'cc_unittests',
           'type': 'executable',
           'dependencies': [
-            '<(DEPTH)/base/base.gyp:test_support_base',
-            '<(DEPTH)/testing/gtest.gyp:gtest',
-            '<(DEPTH)/testing/gmock.gyp:gmock',
-            '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support',
-            '<(DEPTH)/skia/skia.gyp:skia',
+            '../base/base.gyp:test_support_base',
+            '../testing/gtest.gyp:gtest',
+            '../testing/gmock.gyp:gmock',
+            '../webkit/support/webkit_support.gyp:webkit_support',
+            '../skia/skia.gyp:skia',
             # We have to depend on WTF directly to pick up the correct defines for WTF headers - for instance USE_SYSTEM_MALLOC.
-            '<(DEPTH)/third_party/WebKit/Source/WTF/WTF.gyp/WTF.gyp:wtf',
-            '<(DEPTH)/third_party/WebKit/Source/Platform/Platform.gyp/Platform.gyp:webkit_platform',
+            '../third_party/WebKit/Source/WTF/WTF.gyp/WTF.gyp:wtf',
+            '../third_party/WebKit/Source/Platform/Platform.gyp/Platform.gyp:webkit_platform',
             'cc.gyp:cc',
+            'cc_test_support',
           ],
           'defines': [
             'WTF_USE_ACCELERATED_COMPOSITING=1',
@@ -92,6 +95,30 @@
             'test/run_all_unittests.cc',
           ],
         },
+        {
+          'target_name': 'cc_test_support',
+          'type': 'static_library',
+          'defines': [
+            'WTF_USE_ACCELERATED_COMPOSITING=1',
+          ],
+          'include_dirs': [
+            'stubs',
+            'test',
+            '.',
+            '..',
+          ],
+          'dependencies': [
+            '../ui/gl/gl.gyp:gl',
+            '../testing/gtest.gyp:gtest',
+            '../testing/gmock.gyp:gmock',
+            '../skia/skia.gyp:skia',
+            '../third_party/WebKit/Source/WTF/WTF.gyp/WTF.gyp:wtf',
+            '../third_party/WebKit/Source/Platform/Platform.gyp/Platform.gyp:webkit_platform',
+          ],
+          'sources': [
+            '<@(cc_tests_support_files)',
+          ],
+        },
       ],
     }, {
       'targets': [