Modified: trunk/Source/WebKit/chromium/ChangeLog (128822 => 128823)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-09-17 23:36:21 UTC (rev 128822)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-09-17 23:53:07 UTC (rev 128823)
@@ -1,3 +1,14 @@
+2012-09-17 James Robinson <[email protected]>
+
+ [chromium] Move a FilterOperationsTest and WebInputEventConversionTest back to webkit_unittest_files variable
+ https://bugs.webkit.org/show_bug.cgi?id=96964
+
+ Reviewed by Adrienne Walker.
+
+ These targets are really webkit unit tests and shouldn't be guarded by use_libcc_for_compositor.
+
+ * WebKit.gypi:
+
2012-09-17 Rick Byers <[email protected]>
Send GestureTapDownCancel to WebCore
Modified: trunk/Source/WebKit/chromium/WebKit.gypi (128822 => 128823)
--- trunk/Source/WebKit/chromium/WebKit.gypi 2012-09-17 23:36:21 UTC (rev 128822)
+++ trunk/Source/WebKit/chromium/WebKit.gypi 2012-09-17 23:53:07 UTC (rev 128823)
@@ -62,6 +62,7 @@
'tests/DecimalTest.cpp',
'tests/DragImageTest.cpp',
'tests/EventListenerTest.cpp',
+ 'tests/FilterOperationsTest.cpp',
'tests/FrameLoaderClientImplTest.cpp',
'tests/FrameTestHelpers.cpp',
'tests/FrameTestHelpers.h',
@@ -101,6 +102,7 @@
'tests/WebCompositorInitializer.h',
'tests/WebCompositorInputHandlerImplTest.cpp',
'tests/WebFrameTest.cpp',
+ 'tests/WebInputEventConversionTest.cpp',
'tests/WebMediaPlayerClientImplTest.cpp',
'tests/WebPageNewSerializerTest.cpp',
'tests/WebPageSerializerTest.cpp',
@@ -165,7 +167,6 @@
'tests/FakeWebCompositorOutputSurface.h',
'tests/FakeWebGraphicsContext3D.h',
'tests/FakeWebScrollbarThemeGeometry.h',
- 'tests/FilterOperationsTest.cpp',
'tests/FloatQuadTest.cpp',
'tests/LayerChromiumTest.cpp',
'tests/MockCCQuadCuller.h',
@@ -177,7 +178,6 @@
'tests/TreeSynchronizerTest.cpp',
'tests/WebAnimationTest.cpp',
'tests/WebFloatAnimationCurveTest.cpp',
- 'tests/WebInputEventConversionTest.cpp',
'tests/WebLayerTest.cpp',
'tests/WebLayerTreeViewTest.cpp',
'tests/WebLayerTreeViewTestCommon.h',
