Modified: trunk/Source/WebKit/chromium/ChangeLog (127892 => 127893)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-09-07 18:08:40 UTC (rev 127892)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-09-07 18:09:45 UTC (rev 127893)
@@ -1,5 +1,16 @@
2012-09-07 James Robinson <jam...@chromium.org>
+ [chromium] Move some CC unit tests into correct gyp variable
+ https://bugs.webkit.org/show_bug.cgi?id=96048
+
+ Reviewed by Adrienne Walker.
+
+ These tests are testing compositor internals, so they belong in the webkit_compositor_unittest_files variable.
+
+ * WebKit.gypi:
+
+2012-09-07 James Robinson <jam...@chromium.org>
+
[chromium] Remove dead CCActiveGestureAnimation code and related classes
https://bugs.webkit.org/show_bug.cgi?id=96075
Modified: trunk/Source/WebKit/chromium/WebKit.gypi (127892 => 127893)
--- trunk/Source/WebKit/chromium/WebKit.gypi 2012-09-07 18:08:40 UTC (rev 127892)
+++ trunk/Source/WebKit/chromium/WebKit.gypi 2012-09-07 18:09:45 UTC (rev 127893)
@@ -58,12 +58,10 @@
'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',
@@ -95,7 +93,6 @@
'tests/RegionTest.cpp',
'tests/RenderTableCellTest.cpp',
'tests/RenderTableRowTest.cpp',
- 'tests/ScrollbarLayerChromiumTest.cpp',
'tests/TilingDataTest.cpp',
'tests/TreeTestHelpers.cpp',
'tests/TreeTestHelpers.h',
@@ -162,14 +159,17 @@
'tests/CCTiledLayerTestCommon.h',
'tests/CCTimerTest.cpp',
'tests/CompositorFakeWebGraphicsContext3D.h',
+ 'tests/ContentLayerChromiumTest.cpp',
'tests/FakeCCLayerTreeHostClient.h',
'tests/FakeGraphicsContext3DTest.cpp',
'tests/FakeWebCompositorOutputSurface.h',
'tests/FakeWebGraphicsContext3D.h',
'tests/FakeWebScrollbarThemeGeometry.h',
'tests/FilterOperationsTest.cpp',
+ 'tests/FloatQuadTest.cpp',
'tests/LayerChromiumTest.cpp',
'tests/MockCCQuadCuller.h',
+ 'tests/ScrollbarLayerChromiumTest.cpp',
'tests/TextureCopierTest.cpp',
'tests/TextureLayerChromiumTest.cpp',
'tests/ThrottledTextureUploaderTest.cpp',
