summaryrefslogtreecommitdiff
path: root/Source/WebKit/chromium/WebKit.gypi
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-08-21 10:57:44 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-08-21 10:57:44 +0200
commit5ef7c8a6a70875d4430752d146bdcb069605d71d (patch)
treef6256640b6c46d7da221435803cae65326817ba2 /Source/WebKit/chromium/WebKit.gypi
parentdecad929f578d8db641febc8740649ca6c574638 (diff)
downloadqtwebkit-5ef7c8a6a70875d4430752d146bdcb069605d71d.tar.gz
Imported WebKit commit 356d83016b090995d08ad568f2d2c243aa55e831 (http://svn.webkit.org/repository/webkit/trunk@126147)
New snapshot including various build fixes for newer Qt 5
Diffstat (limited to 'Source/WebKit/chromium/WebKit.gypi')
-rw-r--r--Source/WebKit/chromium/WebKit.gypi33
1 files changed, 33 insertions, 0 deletions
diff --git a/Source/WebKit/chromium/WebKit.gypi b/Source/WebKit/chromium/WebKit.gypi
index 9d041a18d..fc86f83b3 100644
--- a/Source/WebKit/chromium/WebKit.gypi
+++ b/Source/WebKit/chromium/WebKit.gypi
@@ -52,6 +52,7 @@
'src/js/Images/segmentSelectedEndChromium.png',
],
'webkit_unittest_files': [
+ 'tests/AnimationTranslationUtilTest.cpp',
'tests/ArenaTestHelpers.h',
'tests/AssociatedURLLoaderTest.cpp',
'tests/Canvas2DLayerBridgeTest.cpp',
@@ -139,6 +140,7 @@
'tests/PODArenaTest.cpp',
'tests/PODIntervalTreeTest.cpp',
'tests/PODRedBlackTreeTest.cpp',
+ 'tests/PopupContainerTest.cpp',
'tests/CCPrioritizedTextureTest.cpp',
'tests/RegionTest.cpp',
'tests/RenderTableCellTest.cpp',
@@ -160,6 +162,7 @@
'tests/WebFrameTest.cpp',
'tests/WebLayerTest.cpp',
'tests/WebLayerTreeViewTest.cpp',
+ 'tests/WebLayerTreeViewTestCommon.h',
'tests/WebMediaPlayerClientImplTest.cpp',
'tests/WebPageNewSerializerTest.cpp',
'tests/WebPageSerializerTest.cpp',
@@ -173,6 +176,36 @@
'tests/WebViewTest.cpp',
],
+ 'webkit_compositor_bindings_files': [
+ 'src/WebAnimationCurveCommon.cpp',
+ 'src/WebAnimationCurveCommon.h',
+ 'src/WebAnimationImpl.cpp',
+ 'src/WebAnimationImpl.h',
+ 'src/WebCompositorInputHandlerImpl.cpp',
+ 'src/WebCompositorInputHandlerImpl.h',
+ 'src/WebContentLayerImpl.cpp',
+ 'src/WebContentLayerImpl.h',
+ 'src/WebExternalTextureLayerImpl.cpp',
+ 'src/WebExternalTextureLayerImpl.h',
+ 'src/WebFloatAnimationCurve.cpp',
+ 'src/WebIOSurfaceLayerImpl.cpp',
+ 'src/WebIOSurfaceLayerImpl.h',
+ 'src/WebImageLayerImpl.cpp',
+ 'src/WebImageLayerImpl.h',
+ 'src/WebLayerImpl.cpp',
+ 'src/WebLayerImpl.h',
+ 'src/WebLayerTreeView.cpp',
+ 'src/WebLayerTreeViewImpl.cpp',
+ 'src/WebLayerTreeViewImpl.h',
+ 'src/WebScrollbarLayerImpl.cpp',
+ 'src/WebScrollbarLayerImpl.h',
+ 'src/WebSolidColorLayerImpl.cpp',
+ 'src/WebSolidColorLayerImpl.h',
+ 'src/WebTransformAnimationCurve.cpp',
+ 'src/WebVideoLayerImpl.cpp',
+ 'src/WebVideoLayerImpl.h',
+ ],
+
'conditions': [
['OS=="win"', {
'webkit_unittest_files': [