[webkit-changes] [127175] trunk/Source/WebKit/chromium

Thu, 30 Aug 2012 13:01:26 -0700

Title: [127175] trunk/Source/WebKit/chromium
Revision
127175
Author
[email protected]
Date
2012-08-30 13:02:02 -0700 (Thu, 30 Aug 2012)

Log Message

[chromium] Make webkit_compositor specific unit test compilation conditional on gyp var
https://bugs.webkit.org/show_bug.cgi?id=95401

Reviewed by Dirk Pranke.

If use_libcc_for_compositor is set, these tests are being compiled and run elsewhere.

* WebKit.gyp:
* WebKit.gypi:
* WebKitUnitTests.gyp:

Modified Paths

Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (127174 => 127175)


--- trunk/Source/WebKit/chromium/ChangeLog	2012-08-30 20:01:23 UTC (rev 127174)
+++ trunk/Source/WebKit/chromium/ChangeLog	2012-08-30 20:02:02 UTC (rev 127175)
@@ -1,3 +1,16 @@
+2012-08-30  James Robinson  <[email protected]>
+
+        [chromium] Make webkit_compositor specific unit test compilation conditional on gyp var
+        https://bugs.webkit.org/show_bug.cgi?id=95401
+
+        Reviewed by Dirk Pranke.
+
+        If use_libcc_for_compositor is set, these tests are being compiled and run elsewhere.
+
+        * WebKit.gyp:
+        * WebKit.gypi:
+        * WebKitUnitTests.gyp:
+
 2012-08-27  James Robinson  <[email protected]>
 
         [chromium] Add CompositorSupport interface for constructing compositor classes

Modified: trunk/Source/WebKit/chromium/WebKit.gyp (127174 => 127175)


--- trunk/Source/WebKit/chromium/WebKit.gyp	2012-08-30 20:01:23 UTC (rev 127174)
+++ trunk/Source/WebKit/chromium/WebKit.gyp	2012-08-30 20:02:02 UTC (rev 127175)
@@ -738,6 +738,11 @@
                                       'WARNING_CFLAGS!': ['-Wglobal-constructors'],
                                     },
                                 }],
+                                ['use_libcc_for_compositor==0', {
+                                    'sources': [
+                                        '<@(webkit_compositor_unittest_files)',
+                                    ],
+                                }],
                             ],
                             'msvs_settings': {
                               'VCLinkerTool': {

Modified: trunk/Source/WebKit/chromium/WebKit.gypi (127174 => 127175)


--- trunk/Source/WebKit/chromium/WebKit.gypi	2012-08-30 20:01:23 UTC (rev 127174)
+++ trunk/Source/WebKit/chromium/WebKit.gypi	2012-08-30 20:02:02 UTC (rev 127175)
@@ -57,6 +57,63 @@
             'tests/AssociatedURLLoaderTest.cpp',
             'tests/Canvas2DLayerBridgeTest.cpp',
             'tests/Canvas2DLayerManagerTest.cpp',
+            'tests/ClipboardChromiumTest.cpp',
+            'tests/ContentLayerChromiumTest.cpp',
+            'tests/DateTimeFormatTest.cpp',
+            'tests/DecimalTest.cpp',
+            'tests/DragImageTest.cpp',
+            'tests/EventListenerTest.cpp',
+            'tests/FloatQuadTest.cpp',
+            'tests/FrameLoaderClientImplTest.cpp',
+            'tests/FrameTestHelpers.cpp',
+            'tests/FrameTestHelpers.h',
+            'tests/GraphicsLayerChromiumTest.cpp',
+            'tests/IDBAbortOnCorruptTest.cpp',
+            'tests/IDBBindingUtilitiesTest.cpp',
+            'tests/IDBDatabaseBackendTest.cpp',
+            'tests/IDBFakeBackingStore.h',
+            'tests/IDBKeyPathTest.cpp',
+            'tests/IDBLevelDBCodingTest.cpp',
+            'tests/IDBRequestTest.cpp',
+            'tests/ImageLayerChromiumTest.cpp',
+            'tests/KeyboardTest.cpp',
+            'tests/KURLTest.cpp',
+            'tests/LevelDBTest.cpp',
+            'tests/LinkHighlightTest.cpp',
+            'tests/ListenerLeakTest.cpp',
+            'tests/MemoryInfo.cpp',
+            'tests/MemoryInstrumentationTest.cpp',
+            'tests/OpaqueRectTrackingContentLayerDelegateTest.cpp',
+            'tests/OpenTypeVerticalDataTest.cpp',
+            'tests/PaintAggregatorTest.cpp',
+            'tests/PlatformGestureCurveTest.cpp',
+            'tests/PlatformContextSkiaTest.cpp',
+            'tests/PODArenaTest.cpp',
+            'tests/PODIntervalTreeTest.cpp',
+            'tests/PODRedBlackTreeTest.cpp',
+            'tests/PopupContainerTest.cpp',
+            'tests/RegionTest.cpp',
+            'tests/RenderTableCellTest.cpp',
+            'tests/RenderTableRowTest.cpp',
+            'tests/ScrollbarLayerChromiumTest.cpp',
+            'tests/TilingDataTest.cpp',
+            'tests/TreeTestHelpers.cpp',
+            'tests/TreeTestHelpers.h',
+            'tests/URLTestHelpers.cpp',
+            'tests/URLTestHelpers.h',
+            'tests/WebCompositorInputHandlerImplTest.cpp',
+            'tests/WebFrameTest.cpp',
+            'tests/WebMediaPlayerClientImplTest.cpp',
+            'tests/WebPageNewSerializerTest.cpp',
+            'tests/WebPageSerializerTest.cpp',
+            'tests/WebSocketDeflaterTest.cpp',
+            'tests/WebSocketExtensionDispatcherTest.cpp',
+            'tests/WebURLRequestTest.cpp',
+            'tests/WebURLResponseTest.cpp',
+            'tests/WebViewTest.cpp',
+        ],
+
+        'webkit_compositor_unittest_files': [
             'tests/CCActiveAnimationTest.cpp',
             'tests/CCAnimationTestCommon.cpp',
             'tests/CCAnimationTestCommon.h',
@@ -79,103 +136,49 @@
             'tests/CCMathUtilTest.cpp',
             'tests/CCOcclusionTrackerTest.cpp',
             'tests/CCOcclusionTrackerTestCommon.h',
+            'tests/CCPrioritizedTextureTest.cpp',
             'tests/CCQuadCullerTest.cpp',
             'tests/CCRenderSurfaceFiltersTest.cpp',
             'tests/CCRenderSurfaceTest.cpp',
+            'tests/CCRendererGLTest.cpp',
             'tests/CCResourceProviderTest.cpp',
             'tests/CCSchedulerStateMachineTest.cpp',
+            'tests/CCSchedulerTest.cpp',
             'tests/CCSchedulerTestCommon.h',
-            'tests/CCSchedulerTest.cpp',
             'tests/CCScopedTextureTest.cpp',
             'tests/CCScrollbarAnimationControllerLinearFadeTest.cpp',
             'tests/CCSolidColorLayerImplTest.cpp',
             'tests/CCTestCommon.h',
             'tests/CCTextureUpdateControllerTest.cpp',
-            'tests/CCTiledLayerImplTest.cpp',
-            'tests/CCTiledLayerTestCommon.h',
-            'tests/CCTiledLayerTestCommon.cpp',
             'tests/CCThreadTaskTest.cpp',
             'tests/CCThreadedTest.cpp',
             'tests/CCThreadedTest.h',
+            'tests/CCTiledLayerImplTest.cpp',
+            'tests/CCTiledLayerTestCommon.cpp',
+            'tests/CCTiledLayerTestCommon.h',
             'tests/CCTimerTest.cpp',
-            'tests/ClipboardChromiumTest.cpp',
             'tests/CompositorFakeWebGraphicsContext3D.h',
-            'tests/ContentLayerChromiumTest.cpp',
-            'tests/DateTimeFormatTest.cpp',
-            'tests/DecimalTest.cpp',
-            'tests/DragImageTest.cpp',
-            'tests/EventListenerTest.cpp',
             'tests/FakeCCLayerTreeHostClient.h',
             'tests/FakeGraphicsContext3DTest.cpp',
             'tests/FakeWebCompositorOutputSurface.h',
             'tests/FakeWebGraphicsContext3D.h',
             'tests/FakeWebScrollbarThemeGeometry.h',
             'tests/FilterOperationsTest.cpp',
-            'tests/FloatQuadTest.cpp',
-            'tests/FrameLoaderClientImplTest.cpp',
-            'tests/FrameTestHelpers.cpp',
-            'tests/FrameTestHelpers.h',
-            'tests/GraphicsLayerChromiumTest.cpp',
-            'tests/IDBAbortOnCorruptTest.cpp',
-            'tests/IDBBindingUtilitiesTest.cpp',
-            'tests/IDBDatabaseBackendTest.cpp',
-            'tests/IDBFakeBackingStore.h',
-            'tests/IDBKeyPathTest.cpp',
-            'tests/IDBLevelDBCodingTest.cpp',
-            'tests/IDBRequestTest.cpp',
-            'tests/ImageLayerChromiumTest.cpp',
-            'tests/KeyboardTest.cpp',
-            'tests/KURLTest.cpp',
             'tests/LayerChromiumTest.cpp',
-            'tests/CCRendererGLTest.cpp',
-            'tests/LevelDBTest.cpp',
-            'tests/LinkHighlightTest.cpp',
-            'tests/ListenerLeakTest.cpp',
-            'tests/MemoryInfo.cpp',
-            'tests/MemoryInstrumentationTest.cpp',
             'tests/MockCCQuadCuller.h',
-            'tests/OpaqueRectTrackingContentLayerDelegateTest.cpp',
-            'tests/OpenTypeVerticalDataTest.cpp',
-            'tests/PaintAggregatorTest.cpp',
-            'tests/PlatformGestureCurveTest.cpp',
-            'tests/PlatformContextSkiaTest.cpp',
-            'tests/PODArenaTest.cpp',
-            'tests/PODIntervalTreeTest.cpp',
-            'tests/PODRedBlackTreeTest.cpp',
-            'tests/PopupContainerTest.cpp',
-            'tests/CCPrioritizedTextureTest.cpp',
-            'tests/RegionTest.cpp',
-            'tests/RenderTableCellTest.cpp',
-            'tests/RenderTableRowTest.cpp',
-            'tests/ScrollbarLayerChromiumTest.cpp',
             'tests/TextureCopierTest.cpp',
             'tests/TextureLayerChromiumTest.cpp',
             'tests/ThrottledTextureUploaderTest.cpp',
             'tests/TiledLayerChromiumTest.cpp',
-            'tests/TilingDataTest.cpp',
             'tests/TreeSynchronizerTest.cpp',
-            'tests/TreeTestHelpers.cpp',
-            'tests/TreeTestHelpers.h',
-            'tests/URLTestHelpers.cpp',
-            'tests/URLTestHelpers.h',
             'tests/WebAnimationTest.cpp',
-            'tests/WebCompositorInputHandlerImplTest.cpp',
             'tests/WebFloatAnimationCurveTest.cpp',
-            'tests/WebFrameTest.cpp',
             'tests/WebLayerTest.cpp',
             'tests/WebLayerTreeViewTest.cpp',
             'tests/WebLayerTreeViewTestCommon.h',
-            'tests/WebMediaPlayerClientImplTest.cpp',
-            'tests/WebPageNewSerializerTest.cpp',
-            'tests/WebPageSerializerTest.cpp',
-            'tests/WebSocketDeflaterTest.cpp',
-            'tests/WebSocketExtensionDispatcherTest.cpp',
             'tests/WebTransformAnimationCurveTest.cpp',
+            'tests/WebTransformOperationsTest.cpp',
             'tests/WebTransformationMatrixTest.cpp',
-            'tests/WebTransformOperationsTest.cpp',
-            'tests/WebURLRequestTest.cpp',
-            'tests/WebURLResponseTest.cpp',
-            'tests/WebViewTest.cpp',
         ],
 
         'webkit_compositor_bindings_files': [

Modified: trunk/Source/WebKit/chromium/WebKitUnitTests.gyp (127174 => 127175)


--- trunk/Source/WebKit/chromium/WebKitUnitTests.gyp	2012-08-30 20:01:23 UTC (rev 127174)
+++ trunk/Source/WebKit/chromium/WebKitUnitTests.gyp	2012-08-30 20:02:02 UTC (rev 127175)
@@ -46,6 +46,8 @@
                 'chromium_src_dir': '../../../../..',
             }],
         ],
+
+        'use_libcc_for_compositor%': 0,
     },
     'targets': [
         {
@@ -103,6 +105,11 @@
                             'chromium_code': 1,
                             },
                         }],
+                        ['use_libcc_for_compositor==0', {
+                            'sources': [
+                                '<@(webkit_compositor_unittest_files)',
+                            ],
+                        }],
                     ],
                 }],
                 ['inside_chromium_build==1 and OS=="win" and component!="shared_library"', {

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to