Diff
Modified: trunk/Source/WebCore/ChangeLog (124844 => 124845)
--- trunk/Source/WebCore/ChangeLog 2012-08-07 03:59:24 UTC (rev 124844)
+++ trunk/Source/WebCore/ChangeLog 2012-08-07 03:59:53 UTC (rev 124845)
@@ -1,3 +1,16 @@
+2012-08-06 James Robinson <[email protected]>
+
+ [chromium] Add gyp variable to control which compositor target is depended on
+ https://bugs.webkit.org/show_bug.cgi?id=93165
+
+ Reviewed by Adam Barth.
+
+ This adds a use_libcc_for_compositor gyp variable to control whether webcore_platform links in the compositor
+ code from the webcore_chromium_compositor target or from cc from the chromium repo.
+
+ * WebCore.gyp/WebCore.gyp:
+ * WebCore.gypi:
+
2012-08-06 Shinya Kawanaka <[email protected]>
Crash in GenericEventQueue::timerFired since the owner of GenericEventQueue is deleted during dispatching events.
Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (124844 => 124845)
--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-08-07 03:59:24 UTC (rev 124844)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-08-07 03:59:53 UTC (rev 124845)
@@ -46,6 +46,10 @@
# binary and increasing the speed of gdb.
'enable_svg%': 1,
+ # If set to 1, links against the cc library from the chromium repository
+ # instead of the compositor implementation files in platform/graphics/chromium
+ 'use_libcc_for_compositor%': 0,
+
'enable_wexit_time_destructors': 1,
'use_harfbuzz_ng%': 0,
@@ -2077,7 +2081,6 @@
'webcore_dom',
'webcore_html',
'webcore_platform',
- 'webcore_chromium_compositor',
'webcore_remaining',
'webcore_rendering',
# Exported.
@@ -2148,6 +2151,15 @@
'webcore_svg',
],
}],
+ ['use_libcc_for_compositor==1', {
+ 'dependencies': [
+ '<(chromium_src_dir)/cc/cc.gyp:cc'
+ ],
+ }, { # use_libcc_for_compositor==0
+ 'dependencies': [
+ 'webcore_chromium_compositor'
+ ],
+ }]
],
},
{
Modified: trunk/Source/WebCore/WebCore.gypi (124844 => 124845)
--- trunk/Source/WebCore/WebCore.gypi 2012-08-07 03:59:24 UTC (rev 124844)
+++ trunk/Source/WebCore/WebCore.gypi 2012-08-07 03:59:53 UTC (rev 124845)
@@ -3645,6 +3645,8 @@
'platform/graphics/chromium/AnimationTranslationUtil.h',
'platform/graphics/chromium/Canvas2DLayerBridge.cpp',
'platform/graphics/chromium/Canvas2DLayerBridge.h',
+ 'platform/graphics/chromium/CompositorHUDFontAtlas.cpp',
+ 'platform/graphics/chromium/CompositorHUDFontAtlas.h',
'platform/graphics/chromium/CrossProcessFontLoading.h',
'platform/graphics/chromium/CrossProcessFontLoading.mm',
'platform/graphics/chromium/DrawingBufferChromium.cpp',
@@ -8255,8 +8257,6 @@
'platform/graphics/chromium/BitmapSkPictureCanvasLayerTextureUpdater.h',
'platform/graphics/chromium/CanvasLayerTextureUpdater.cpp',
'platform/graphics/chromium/CanvasLayerTextureUpdater.h',
- 'platform/graphics/chromium/CompositorHUDFontAtlas.cpp',
- 'platform/graphics/chromium/CompositorHUDFontAtlas.h',
'platform/graphics/chromium/ContentLayerChromium.cpp',
'platform/graphics/chromium/ContentLayerChromium.h',
'platform/graphics/chromium/FrameBufferSkPictureCanvasLayerTextureUpdater.cpp',
Modified: trunk/Source/WebKit/chromium/DEPS (124844 => 124845)
--- trunk/Source/WebKit/chromium/DEPS 2012-08-07 03:59:24 UTC (rev 124844)
+++ trunk/Source/WebKit/chromium/DEPS 2012-08-07 03:59:53 UTC (rev 124845)
@@ -87,6 +87,8 @@
# webkit dependencies
'webkit': Var('chromium_svn')+'/webkit@'+Var('chromium_rev'),
+ 'cc':
+ Var('chromium_svn')+'/cc@'+Var('chromium_rev'),
'gpu':
Var('chromium_svn')+'/gpu@'+Var('chromium_rev'),
'ipc':
@@ -116,7 +118,7 @@
'tools/win':
Var('chromium_svn')+'/tools/win@'+Var('chromium_rev'),
'ui':
- Var('chromium_svn')+'/ui@'+Var('chromium_rev'), # needed by app
+ Var('chromium_svn')+'/ui@'+Var('chromium_rev'),
# other third party
'third_party/pyftpdlib/src':
