Diff
Modified: trunk/Source/WebCore/ChangeLog (127799 => 127800)
--- trunk/Source/WebCore/ChangeLog 2012-09-06 23:41:29 UTC (rev 127799)
+++ trunk/Source/WebCore/ChangeLog 2012-09-06 23:50:59 UTC (rev 127800)
@@ -1,3 +1,15 @@
+2012-09-06 James Robinson <[email protected]>
+
+ [chromium] Don't link cc in to WebKit.dll when use_libcc_for_compositor=1
+ https://bugs.webkit.org/show_bug.cgi?id=96024
+
+ Reviewed by Adam Barth.
+
+ When use_libcc_for_compositor=1, the implementation of the compositor guts are provided through PlatformSupport.
+ We don't need to link anything in to WebKit.dll.
+
+ * WebCore.gyp/WebCore.gyp:
+
2012-09-06 Simon Fraser <[email protected]>
Parcel up logic related to sticky positioning into a Constraints class that will later be used for threaded scrolling
Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (127799 => 127800)
--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-09-06 23:41:29 UTC (rev 127799)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-09-06 23:50:59 UTC (rev 127800)
@@ -46,8 +46,6 @@
# 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,
@@ -2214,12 +2212,8 @@
'webcore_svg',
],
}],
- ['use_libcc_for_compositor==1', {
+ ['use_libcc_for_compositor==0', {
'dependencies': [
- '<(chromium_src_dir)/cc/cc.gyp:cc'
- ],
- }, { # use_libcc_for_compositor==0
- 'dependencies': [
'webcore_chromium_compositor'
],
}]
Modified: trunk/Source/WebKit/chromium/ChangeLog (127799 => 127800)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-09-06 23:41:29 UTC (rev 127799)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-09-06 23:50:59 UTC (rev 127800)
@@ -1,5 +1,17 @@
2012-09-06 James Robinson <[email protected]>
+ [chromium] Don't link cc in to WebKit.dll when use_libcc_for_compositor=1
+ https://bugs.webkit.org/show_bug.cgi?id=96024
+
+ Reviewed by Adam Barth.
+
+ When use_libcc_for_compositor=1, the implementation of the compositor guts are provided through PlatformSupport.
+ We don't need to link anything in to WebKit.dll.
+
+ * WebKit.gyp:
+
+2012-09-06 James Robinson <[email protected]>
+
[chromium] Use WebCompositorSupport functions instead of WebCompositor statics
https://bugs.webkit.org/show_bug.cgi?id=96007
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (127799 => 127800)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2012-09-06 23:41:29 UTC (rev 127799)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2012-09-06 23:50:59 UTC (rev 127800)
@@ -54,7 +54,7 @@
# stored as is. Otherwise, a concatenated file is stored.
'debug_devtools%': 0,
- # If set to 1, links against the compositor bindings from the chromium repository
+ # If set to 1, uses the compositor bindings provided by PlatformSupport
# instead of the compositor-implementation binding files in WebKit/chromium/src.
'use_libcc_for_compositor%': 0,
@@ -838,9 +838,6 @@
},
}],
['use_libcc_for_compositor==1', {
- 'dependencies': [
- '<(chromium_src_dir)/webkit/compositor_bindings/compositor_bindings.gyp:webkit_compositor_bindings',
- ],
'sources!': [
'../../WebCore/platform/chromium/support/CCThreadImpl.cpp',
'../../WebCore/platform/chromium/support/CCThreadImpl.h',
Modified: trunk/Source/WebKit/chromium/WebKit.gypi (127799 => 127800)
--- trunk/Source/WebKit/chromium/WebKit.gypi 2012-09-06 23:41:29 UTC (rev 127799)
+++ trunk/Source/WebKit/chromium/WebKit.gypi 2012-09-06 23:50:59 UTC (rev 127800)
@@ -101,8 +101,8 @@
'tests/TreeTestHelpers.h',
'tests/URLTestHelpers.cpp',
'tests/URLTestHelpers.h',
+ 'tests/WebCompositorInitializer.h',
'tests/WebCompositorInputHandlerImplTest.cpp',
- 'tests/WebCompositorInitializer.h',
'tests/WebFrameTest.cpp',
'tests/WebMediaPlayerClientImplTest.cpp',
'tests/WebPageNewSerializerTest.cpp',
