Diff
Modified: trunk/Source/WebCore/ChangeLog (96812 => 96813)
--- trunk/Source/WebCore/ChangeLog 2011-10-06 15:35:01 UTC (rev 96812)
+++ trunk/Source/WebCore/ChangeLog 2011-10-06 15:36:39 UTC (rev 96813)
@@ -1,3 +1,14 @@
+2011-10-06 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r96791.
+ http://trac.webkit.org/changeset/96791
+ https://bugs.webkit.org/show_bug.cgi?id=69528
+
+ webkit_unit_tests broken on Mac and Win (Requested by
+ hwennborg on #webkit).
+
+ * platform/graphics/chromium/cc/CCLayerTreeHost.h:
+
2011-10-05 Mikhail Naganov <[email protected]>
Web Inspector: [Chromium] Heap Snapshot colors legend help popup is not shown.
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h (96812 => 96813)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h 2011-10-06 15:35:01 UTC (rev 96812)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h 2011-10-06 15:36:39 UTC (rev 96813)
@@ -54,10 +54,9 @@
virtual void applyScrollDelta(const IntSize&) = 0;
virtual PassRefPtr<GraphicsContext3D> createLayerTreeHostContext3D() = 0;
virtual void didRecreateGraphicsContext(bool success) = 0;
-
- // Used in the non-threaded path
+#if !USE(THREADED_COMPOSITING)
virtual void scheduleComposite() = 0;
-
+#endif
protected:
virtual ~CCLayerTreeHostClient() { }
};
Modified: trunk/Source/WebKit/chromium/ChangeLog (96812 => 96813)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-10-06 15:35:01 UTC (rev 96812)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-10-06 15:36:39 UTC (rev 96813)
@@ -1,3 +1,17 @@
+2011-10-06 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r96791.
+ http://trac.webkit.org/changeset/96791
+ https://bugs.webkit.org/show_bug.cgi?id=69528
+
+ webkit_unit_tests broken on Mac and Win (Requested by
+ hwennborg on #webkit).
+
+ * features.gypi:
+ * src/WebViewImpl.h:
+ * tests/CCLayerTreeHostTest.cpp:
+ (WTF::CCLayerTreeHostTest::CCLayerTreeHostTest):
+
2011-10-06 Hans Wennborg <[email protected]>
[Chromium] WebKit.gyp fix to unbreak Linux(shared) build after r96791
Modified: trunk/Source/WebKit/chromium/features.gypi (96812 => 96813)
--- trunk/Source/WebKit/chromium/features.gypi 2011-10-06 15:35:01 UTC (rev 96812)
+++ trunk/Source/WebKit/chromium/features.gypi 2011-10-06 15:36:39 UTC (rev 96813)
@@ -107,6 +107,7 @@
# through GYP_DEFINES.
'variables': {
'use_accelerated_compositing%': 1,
+ 'use_threaded_compositing%': 0,
'enable_svg%': 1,
'enable_touch_events%': 1,
'use_skia_gpu%': 0,
@@ -115,6 +116,7 @@
'enable_css3_flexbox%': 0,
},
'use_accelerated_compositing%': '<(use_accelerated_compositing)',
+ 'use_threaded_compositing%': '<(use_threaded_compositing)',
'enable_svg%': '<(enable_svg)',
'enable_touch_events%': '<(enable_touch_events)',
'use_skia%': '<(use_skia)',
@@ -139,6 +141,11 @@
'ENABLE_ACCELERATED_2D_CANVAS=1',
],
}],
+ ['use_accelerated_compositing==1 and use_threaded_compositing==1', {
+ 'feature_defines': [
+ 'WTF_USE_THREADED_COMPOSITING=1',
+ ],
+ }],
['touchui==1', {
'enable_touch_icon_loading': 1,
}],
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.h (96812 => 96813)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.h 2011-10-06 15:35:01 UTC (rev 96812)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.h 2011-10-06 15:36:39 UTC (rev 96813)
@@ -223,8 +223,9 @@
virtual void applyScrollDelta(const WebCore::IntSize&);
virtual PassRefPtr<WebCore::GraphicsContext3D> createLayerTreeHostContext3D();
virtual void didRecreateGraphicsContext(bool success);
-
+#if !USE(THREADED_COMPOSITING)
virtual void scheduleComposite();
+#endif
// WebViewImpl
@@ -451,6 +452,9 @@
#if USE(ACCELERATED_COMPOSITING)
void setIsAcceleratedCompositingActive(bool);
+#if !USE(THREADED_COMPOSITING)
+ void doComposite();
+#endif
void doPixelReadbackToCanvas(WebCanvas*, const WebCore::IntRect&);
void reallocateRenderer();
void updateLayerTreeViewport();
Modified: trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp (96812 => 96813)
--- trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp 2011-10-06 15:35:01 UTC (rev 96812)
+++ trunk/Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp 2011-10-06 15:36:39 UTC (rev 96813)
@@ -24,6 +24,8 @@
#include "config.h"
+#if USE(THREADED_COMPOSITING)
+
#include "cc/CCLayerTreeHost.h"
#include "cc/CCLayerImpl.h"
@@ -168,7 +170,9 @@
{
}
+#if !USE(THREADED_COMPOSITING)
virtual void scheduleComposite() { }
+#endif
private:
explicit MockLayerTreeHostClient(TestHooks* testHooks) : m_testHooks(testHooks) { }
@@ -212,7 +216,11 @@
{
m_webThread = adoptPtr(webKitPlatformSupport()->createThread("CCLayerTreeHostTest"));
WebCompositor::setThread(m_webThread.get());
+#if USE(THREADED_COMPOSITING)
m_settings.enableCompositorThread = true;
+#else
+ m_settings.enableCompositorThread = false;
+#endif
}
void doBeginTest();
@@ -708,3 +716,5 @@
}
} // namespace
+
+#endif
