Diff
Modified: trunk/Source/WebCore/ChangeLog (97801 => 97802)
--- trunk/Source/WebCore/ChangeLog 2011-10-18 22:58:38 UTC (rev 97801)
+++ trunk/Source/WebCore/ChangeLog 2011-10-18 23:02:02 UTC (rev 97802)
@@ -1,3 +1,12 @@
+2011-10-18 James Robinson <[email protected]>
+
+ [chromium] Remove USE(THREADED_COMPOSITING) from the tree, this is controlled by a runtime setting
+ https://bugs.webkit.org/show_bug.cgi?id=70356
+
+ Reviewed by Kenneth Russell.
+
+ * platform/graphics/chromium/cc/CCLayerTreeHost.h:
+
2011-10-18 Ojan Vafai <[email protected]>
cleanup some FIXMEs in RenderFlexibleBox
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h (97801 => 97802)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h 2011-10-18 22:58:38 UTC (rev 97801)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.h 2011-10-18 23:02:02 UTC (rev 97802)
@@ -54,9 +54,10 @@
virtual void applyScrollDelta(const IntSize&) = 0;
virtual PassRefPtr<GraphicsContext3D> createLayerTreeHostContext3D() = 0;
virtual void didRecreateGraphicsContext(bool success) = 0;
-#if !USE(THREADED_COMPOSITING)
+
+ // Used only in the single-threaded path.
virtual void scheduleComposite() = 0;
-#endif
+
protected:
virtual ~CCLayerTreeHostClient() { }
};
Modified: trunk/Source/WebKit/chromium/ChangeLog (97801 => 97802)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-10-18 22:58:38 UTC (rev 97801)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-10-18 23:02:02 UTC (rev 97802)
@@ -1,3 +1,16 @@
+2011-10-18 James Robinson <[email protected]>
+
+ [chromium] Remove USE(THREADED_COMPOSITING) from the tree, this is controlled by a runtime setting
+ https://bugs.webkit.org/show_bug.cgi?id=70356
+
+ Reviewed by Kenneth Russell.
+
+ * features.gypi:
+ * src/WebLayerTreeViewImpl.cpp:
+ (WebKit::WebLayerTreeViewImpl::scheduleComposite):
+ * src/WebLayerTreeViewImpl.h:
+ * src/WebViewImpl.h:
+
2011-10-18 Antoine Labour <[email protected]>
Enable out-of-thread compositing in WebKit compositor API
Modified: trunk/Source/WebKit/chromium/features.gypi (97801 => 97802)
--- trunk/Source/WebKit/chromium/features.gypi 2011-10-18 22:58:38 UTC (rev 97801)
+++ trunk/Source/WebKit/chromium/features.gypi 2011-10-18 23:02:02 UTC (rev 97802)
@@ -107,7 +107,6 @@
# through GYP_DEFINES.
'variables': {
'use_accelerated_compositing%': 1,
- 'use_threaded_compositing%': 0,
'enable_skia_text%': 0,
'enable_svg%': 1,
'enable_touch_events%': 1,
@@ -117,7 +116,6 @@
'enable_mutation_observers%': 0,
},
'use_accelerated_compositing%': '<(use_accelerated_compositing)',
- 'use_threaded_compositing%': '<(use_threaded_compositing)',
'enable_skia_text%': '<(enable_skia_text)',
'enable_svg%': '<(enable_svg)',
'enable_touch_events%': '<(enable_touch_events)',
@@ -143,11 +141,6 @@
'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/WebLayerTreeViewImpl.cpp (97801 => 97802)
--- trunk/Source/WebKit/chromium/src/WebLayerTreeViewImpl.cpp 2011-10-18 22:58:38 UTC (rev 97801)
+++ trunk/Source/WebKit/chromium/src/WebLayerTreeViewImpl.cpp 2011-10-18 23:02:02 UTC (rev 97802)
@@ -101,12 +101,10 @@
m_client->didRebindGraphicsContext(success);
}
-#if !USE(THREADED_COMPOSITING)
void WebLayerTreeViewImpl::scheduleComposite()
{
if (m_client)
m_client->scheduleComposite();
}
-#endif
} // namespace WebKit
Modified: trunk/Source/WebKit/chromium/src/WebLayerTreeViewImpl.h (97801 => 97802)
--- trunk/Source/WebKit/chromium/src/WebLayerTreeViewImpl.h 2011-10-18 22:58:38 UTC (rev 97801)
+++ trunk/Source/WebKit/chromium/src/WebLayerTreeViewImpl.h 2011-10-18 23:02:02 UTC (rev 97802)
@@ -45,9 +45,9 @@
virtual void applyScrollDelta(const WebCore::IntSize&);
virtual PassRefPtr<WebCore::GraphicsContext3D> createLayerTreeHostContext3D();
virtual void didRecreateGraphicsContext(bool success);
-#if !USE(THREADED_COMPOSITING)
+
+ // Only used in the single threaded path.
virtual void scheduleComposite();
-#endif
WebLayerTreeViewClient* m_client;
};
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.h (97801 => 97802)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.h 2011-10-18 22:58:38 UTC (rev 97801)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.h 2011-10-18 23:02:02 UTC (rev 97802)
@@ -228,9 +228,7 @@
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
@@ -457,9 +455,7 @@
#if USE(ACCELERATED_COMPOSITING)
void setIsAcceleratedCompositingActive(bool);
-#if !USE(THREADED_COMPOSITING)
void doComposite();
-#endif
void doPixelReadbackToCanvas(WebCanvas*, const WebCore::IntRect&);
void reallocateRenderer();
void updateLayerTreeViewport();
