Title: [96878] trunk/Source/WebKit/chromium
- Revision
- 96878
- Author
- jam...@google.com
- Date
- 2011-10-06 17:16:26 -0700 (Thu, 06 Oct 2011)
Log Message
[chromium] Remove obsolete WebWidgetClient::didActivateAcceleratedCompositing call
https://bugs.webkit.org/show_bug.cgi?id=69576
Reviewed by Darin Fisher.
The chromium implementation of this function went away at r104017.
* public/WebWidgetClient.h:
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (96877 => 96878)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-10-06 23:58:10 UTC (rev 96877)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-10-07 00:16:26 UTC (rev 96878)
@@ -1,3 +1,16 @@
+2011-10-06 James Robinson <jam...@chromium.org>
+
+ [chromium] Remove obsolete WebWidgetClient::didActivateAcceleratedCompositing call
+ https://bugs.webkit.org/show_bug.cgi?id=69576
+
+ Reviewed by Darin Fisher.
+
+ The chromium implementation of this function went away at r104017.
+
+ * public/WebWidgetClient.h:
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
+
2011-10-06 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r96861.
Modified: trunk/Source/WebKit/chromium/public/WebWidgetClient.h (96877 => 96878)
--- trunk/Source/WebKit/chromium/public/WebWidgetClient.h 2011-10-06 23:58:10 UTC (rev 96877)
+++ trunk/Source/WebKit/chromium/public/WebWidgetClient.h 2011-10-07 00:16:26 UTC (rev 96878)
@@ -51,13 +51,12 @@
// scrolled by the specified dx and dy amounts.
virtual void didScrollRect(int dx, int dy, const WebRect& clipRect) { }
- // Called when the compositor enables or disables.
- // FIXME: Remove when all implementations switch over to didEnable.../didDisable...
- virtual void didActivateAcceleratedCompositing(bool active) { }
-
// Called when the compositor is enabled or disabled.
// The WebCompositor identifier can be used on the compositor thread to get access
// to the WebCompositor instance associated with this WebWidget.
+ // If there is no WebCompositor associated with this WebWidget (for example if
+ // threaded compositing is not enabled) then calling WebCompositor::fromIdentifier()
+ // for the specified identifier will return 0.
virtual void didActivateCompositor(int compositorIdentifier) { }
virtual void didDeactivateCompositor() { }
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (96877 => 96878)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2011-10-06 23:58:10 UTC (rev 96877)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2011-10-07 00:16:26 UTC (rev 96878)
@@ -2632,18 +2632,15 @@
if (!active) {
m_isAcceleratedCompositingActive = false;
- // We need to finish all GL rendering before sending
- // didActivateAcceleratedCompositing(false) to prevent
+ // We need to finish all GL rendering before sending didDeactivateCompositor() to prevent
// flickering when compositing turns off.
if (m_layerTreeHost)
m_layerTreeHost->finishAllRendering();
- m_client->didActivateAcceleratedCompositing(false);
m_client->didDeactivateCompositor();
} else if (m_layerTreeHost) {
m_isAcceleratedCompositingActive = true;
updateLayerTreeViewport();
- m_client->didActivateAcceleratedCompositing(true);
m_client->didActivateCompositor(m_layerTreeHost->compositorIdentifier());
} else {
TRACE_EVENT("WebViewImpl::setIsAcceleratedCompositingActive(true)", this, 0);
@@ -2659,7 +2656,6 @@
m_layerTreeHost = CCLayerTreeHost::create(this, m_nonCompositedContentHost->topLevelRootLayer()->platformLayer(), ccSettings);
if (m_layerTreeHost) {
updateLayerTreeViewport();
- m_client->didActivateAcceleratedCompositing(true);
m_client->didActivateCompositor(m_layerTreeHost->compositorIdentifier());
m_isAcceleratedCompositingActive = true;
m_compositorCreationFailed = false;
@@ -2667,7 +2663,6 @@
m_pageOverlay->update();
} else {
m_isAcceleratedCompositingActive = false;
- m_client->didActivateAcceleratedCompositing(false);
m_client->didDeactivateCompositor();
m_compositorCreationFailed = true;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
