Title: [127020] trunk/Source/WebKit/chromium
- Revision
- 127020
- Author
- jam...@google.com
- Date
- 2012-08-29 10:59:09 -0700 (Wed, 29 Aug 2012)
Log Message
[chromium] CCThreadImpl / WebCompositorImpl shouldn't compile from webkit when use_libcc_for_compositor=1
https://bugs.webkit.org/show_bug.cgi?id=94995
Reviewed by Adam Barth.
* WebKit.gyp:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (127019 => 127020)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-08-29 17:47:54 UTC (rev 127019)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-08-29 17:59:09 UTC (rev 127020)
@@ -1,3 +1,12 @@
+2012-08-29 James Robinson <jam...@chromium.org>
+
+ [chromium] CCThreadImpl / WebCompositorImpl shouldn't compile from webkit when use_libcc_for_compositor=1
+ https://bugs.webkit.org/show_bug.cgi?id=94995
+
+ Reviewed by Adam Barth.
+
+ * WebKit.gyp:
+
2012-08-28 Shawn Singh <shawnsi...@chromium.org>
[chromium] Do not clip root layer's subtree to viewport
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (127019 => 127020)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2012-08-29 17:47:54 UTC (rev 127019)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2012-08-29 17:59:09 UTC (rev 127020)
@@ -836,6 +836,12 @@
'dependencies': [
'<(chromium_src_dir)/webkit/compositor/compositor.gyp:webkit_compositor',
],
+ 'sources!': [
+ '../../WebCore/platform/chromium/support/CCThreadImpl.cpp',
+ '../../WebCore/platform/chromium/support/CCThreadImpl.h',
+ '../../WebCore/platform/chromium/support/WebCompositorImpl.cpp',
+ '../../WebCore/platform/chromium/support/WebCompositorImpl.h',
+ ],
}, { # else: use_libcc_for_compositor==0
'sources': [
'<@(webkit_compositor_bindings_files)',
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
