Commit 4fb9f254 authored by enne@chromium.org's avatar enne@chromium.org

Remove no-op did(De)activateCompositor calls

These have been removed in Chrome and do nothing.

R=jochen@chromium.org
BUG=none

Review URL: https://codereview.chromium.org/298803009

git-svn-id: svn://svn.chromium.org/blink/trunk@175725 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent a538b144
...@@ -266,10 +266,8 @@ void WebPagePopupImpl::setIsAcceleratedCompositingActive(bool enter) ...@@ -266,10 +266,8 @@ void WebPagePopupImpl::setIsAcceleratedCompositingActive(bool enter)
if (!enter) { if (!enter) {
m_isAcceleratedCompositingActive = false; m_isAcceleratedCompositingActive = false;
m_widgetClient->didDeactivateCompositor();
} else if (m_layerTreeView) { } else if (m_layerTreeView) {
m_isAcceleratedCompositingActive = true; m_isAcceleratedCompositingActive = true;
m_widgetClient->didActivateCompositor();
} else { } else {
TRACE_EVENT0("webkit", "WebPagePopupImpl::setIsAcceleratedCompositingActive(true)"); TRACE_EVENT0("webkit", "WebPagePopupImpl::setIsAcceleratedCompositingActive(true)");
...@@ -277,12 +275,10 @@ void WebPagePopupImpl::setIsAcceleratedCompositingActive(bool enter) ...@@ -277,12 +275,10 @@ void WebPagePopupImpl::setIsAcceleratedCompositingActive(bool enter)
m_layerTreeView = m_widgetClient->layerTreeView(); m_layerTreeView = m_widgetClient->layerTreeView();
if (m_layerTreeView) { if (m_layerTreeView) {
m_layerTreeView->setVisible(true); m_layerTreeView->setVisible(true);
m_widgetClient->didActivateCompositor();
m_isAcceleratedCompositingActive = true; m_isAcceleratedCompositingActive = true;
m_layerTreeView->setDeviceScaleFactor(m_widgetClient->deviceScaleFactor()); m_layerTreeView->setDeviceScaleFactor(m_widgetClient->deviceScaleFactor());
} else { } else {
m_isAcceleratedCompositingActive = false; m_isAcceleratedCompositingActive = false;
m_widgetClient->didDeactivateCompositor();
} }
} }
} }
......
...@@ -105,13 +105,10 @@ void WebPopupMenuImpl::initialize(FramelessScrollView* widget, const WebRect& bo ...@@ -105,13 +105,10 @@ void WebPopupMenuImpl::initialize(FramelessScrollView* widget, const WebRect& bo
m_layerTreeView = m_client->layerTreeView(); m_layerTreeView = m_client->layerTreeView();
if (m_layerTreeView) { if (m_layerTreeView) {
m_layerTreeView->setVisible(true); m_layerTreeView->setVisible(true);
m_client->didActivateCompositor();
m_layerTreeView->setDeviceScaleFactor(m_client->deviceScaleFactor()); m_layerTreeView->setDeviceScaleFactor(m_client->deviceScaleFactor());
m_rootLayer = adoptPtr(Platform::current()->compositorSupport()->createContentLayer(this)); m_rootLayer = adoptPtr(Platform::current()->compositorSupport()->createContentLayer(this));
m_rootLayer->layer()->setBounds(m_size); m_rootLayer->layer()->setBounds(m_size);
m_layerTreeView->setRootLayer(*m_rootLayer->layer()); m_layerTreeView->setRootLayer(*m_rootLayer->layer());
} else {
m_client->didDeactivateCompositor();
} }
} }
......
...@@ -3854,7 +3854,6 @@ void WebViewImpl::setIsAcceleratedCompositingActive(bool active) ...@@ -3854,7 +3854,6 @@ void WebViewImpl::setIsAcceleratedCompositingActive(bool active)
if (!active) { if (!active) {
m_isAcceleratedCompositingActive = false; m_isAcceleratedCompositingActive = false;
m_client->didDeactivateCompositor();
if (!m_layerTreeViewCommitsDeferred if (!m_layerTreeViewCommitsDeferred
&& blink::Platform::current()->isThreadedCompositingEnabled()) { && blink::Platform::current()->isThreadedCompositingEnabled()) {
ASSERT(m_layerTreeView); ASSERT(m_layerTreeView);
...@@ -3869,8 +3868,6 @@ void WebViewImpl::setIsAcceleratedCompositingActive(bool active) ...@@ -3869,8 +3868,6 @@ void WebViewImpl::setIsAcceleratedCompositingActive(bool active)
updateLayerTreeViewport(); updateLayerTreeViewport();
if (m_pageOverlays) if (m_pageOverlays)
m_pageOverlays->update(); m_pageOverlays->update();
m_client->didActivateCompositor();
} else { } else {
TRACE_EVENT0("webkit", "WebViewImpl::setIsAcceleratedCompositingActive(true)"); TRACE_EVENT0("webkit", "WebViewImpl::setIsAcceleratedCompositingActive(true)");
...@@ -3891,7 +3888,6 @@ void WebViewImpl::setIsAcceleratedCompositingActive(bool active) ...@@ -3891,7 +3888,6 @@ void WebViewImpl::setIsAcceleratedCompositingActive(bool active)
m_layerTreeView->setOverhangBitmap(overhangImage->nativeImageForCurrentFrame()->bitmap()); m_layerTreeView->setOverhangBitmap(overhangImage->nativeImageForCurrentFrame()->bitmap());
#endif #endif
updateLayerTreeViewport(); updateLayerTreeViewport();
m_client->didActivateCompositor();
m_isAcceleratedCompositingActive = true; m_isAcceleratedCompositingActive = true;
if (m_pageOverlays) if (m_pageOverlays)
m_pageOverlays->update(); m_pageOverlays->update();
...@@ -3908,7 +3904,6 @@ void WebViewImpl::setIsAcceleratedCompositingActive(bool active) ...@@ -3908,7 +3904,6 @@ void WebViewImpl::setIsAcceleratedCompositingActive(bool active)
// crbug.com/322276 and crbug.com/364716. // crbug.com/322276 and crbug.com/364716.
ASSERT(m_client->allowsBrokenNullLayerTreeView()); ASSERT(m_client->allowsBrokenNullLayerTreeView());
m_isAcceleratedCompositingActive = false; m_isAcceleratedCompositingActive = false;
m_client->didDeactivateCompositor();
m_page->settings().setAcceleratedCompositingEnabled(false); m_page->settings().setAcceleratedCompositingEnabled(false);
m_page->updateAcceleratedCompositingSettings(); m_page->updateAcceleratedCompositingSettings();
} }
......
...@@ -58,10 +58,6 @@ public: ...@@ -58,10 +58,6 @@ public:
// Called when the Widget has changed size as a result of an auto-resize. // Called when the Widget has changed size as a result of an auto-resize.
virtual void didAutoResize(const WebSize& newSize) { } virtual void didAutoResize(const WebSize& newSize) { }
// Called when the compositor is enabled or disabled.
virtual void didActivateCompositor() { }
virtual void didDeactivateCompositor() { }
// Attempt to initialize compositing for this widget. If this is successful, // Attempt to initialize compositing for this widget. If this is successful,
// layerTreeView() will return a valid WebLayerTreeView. // layerTreeView() will return a valid WebLayerTreeView.
virtual void initializeLayerTreeView() { } virtual void initializeLayerTreeView() { }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment