Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1537)

Unified Diff: Source/web/WebViewImpl.cpp

Issue 298803009: Remove no-op did(De)activateCompositor calls (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/web/WebPopupMenuImpl.cpp ('k') | public/web/WebWidgetClient.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebViewImpl.cpp
diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp
index d5d58bfc4e7c71b3c1172802bd7e7c4310123fa1..d60b1b8a9c1ed0e7bda7f7c8c3097e88902e522f 100644
--- a/Source/web/WebViewImpl.cpp
+++ b/Source/web/WebViewImpl.cpp
@@ -3854,7 +3854,6 @@ void WebViewImpl::setIsAcceleratedCompositingActive(bool active)
if (!active) {
m_isAcceleratedCompositingActive = false;
- m_client->didDeactivateCompositor();
if (!m_layerTreeViewCommitsDeferred
&& blink::Platform::current()->isThreadedCompositingEnabled()) {
ASSERT(m_layerTreeView);
@@ -3869,8 +3868,6 @@ void WebViewImpl::setIsAcceleratedCompositingActive(bool active)
updateLayerTreeViewport();
if (m_pageOverlays)
m_pageOverlays->update();
-
- m_client->didActivateCompositor();
} else {
TRACE_EVENT0("webkit", "WebViewImpl::setIsAcceleratedCompositingActive(true)");
@@ -3891,7 +3888,6 @@ void WebViewImpl::setIsAcceleratedCompositingActive(bool active)
m_layerTreeView->setOverhangBitmap(overhangImage->nativeImageForCurrentFrame()->bitmap());
#endif
updateLayerTreeViewport();
- m_client->didActivateCompositor();
m_isAcceleratedCompositingActive = true;
if (m_pageOverlays)
m_pageOverlays->update();
@@ -3908,7 +3904,6 @@ void WebViewImpl::setIsAcceleratedCompositingActive(bool active)
// crbug.com/322276 and crbug.com/364716.
ASSERT(m_client->allowsBrokenNullLayerTreeView());
m_isAcceleratedCompositingActive = false;
- m_client->didDeactivateCompositor();
m_page->settings().setAcceleratedCompositingEnabled(false);
m_page->updateAcceleratedCompositingSettings();
}
« no previous file with comments | « Source/web/WebPopupMenuImpl.cpp ('k') | public/web/WebWidgetClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698