Removed unnecessary parameter from didActivateCompositor()

The parameter to didActivateCompositor() is meaningless. Hence, removed it. The other chromium side changes are here
https://codereview.chromium.org/137893025/

BUG=None

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

git-svn-id: svn://svn.chromium.org/blink/trunk@170535 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent f4b05c52
...@@ -264,7 +264,7 @@ void WebPagePopupImpl::setIsAcceleratedCompositingActive(bool enter) ...@@ -264,7 +264,7 @@ void WebPagePopupImpl::setIsAcceleratedCompositingActive(bool enter)
m_widgetClient->didDeactivateCompositor(); m_widgetClient->didDeactivateCompositor();
} else if (m_layerTreeView) { } else if (m_layerTreeView) {
m_isAcceleratedCompositingActive = true; m_isAcceleratedCompositingActive = true;
m_widgetClient->didActivateCompositor(0); m_widgetClient->didActivateCompositor();
} else { } else {
TRACE_EVENT0("webkit", "WebPagePopupImpl::setIsAcceleratedCompositingActive(true)"); TRACE_EVENT0("webkit", "WebPagePopupImpl::setIsAcceleratedCompositingActive(true)");
...@@ -272,7 +272,7 @@ void WebPagePopupImpl::setIsAcceleratedCompositingActive(bool enter) ...@@ -272,7 +272,7 @@ 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(0); m_widgetClient->didActivateCompositor();
m_isAcceleratedCompositingActive = true; m_isAcceleratedCompositingActive = true;
m_layerTreeView->setDeviceScaleFactor(m_widgetClient->deviceScaleFactor()); m_layerTreeView->setDeviceScaleFactor(m_widgetClient->deviceScaleFactor());
} else { } else {
......
...@@ -214,7 +214,7 @@ void WebPopupMenuImpl::enterForceCompositingMode(bool enter) ...@@ -214,7 +214,7 @@ void WebPopupMenuImpl::enterForceCompositingMode(bool enter)
m_client->didDeactivateCompositor(); m_client->didDeactivateCompositor();
} else if (m_layerTreeView) { } else if (m_layerTreeView) {
m_isAcceleratedCompositingActive = true; m_isAcceleratedCompositingActive = true;
m_client->didActivateCompositor(0); m_client->didActivateCompositor();
} else { } else {
TRACE_EVENT0("webkit", "WebPopupMenuImpl::enterForceCompositingMode(true)"); TRACE_EVENT0("webkit", "WebPopupMenuImpl::enterForceCompositingMode(true)");
...@@ -222,7 +222,7 @@ void WebPopupMenuImpl::enterForceCompositingMode(bool enter) ...@@ -222,7 +222,7 @@ void WebPopupMenuImpl::enterForceCompositingMode(bool enter)
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(0); m_client->didActivateCompositor();
m_isAcceleratedCompositingActive = true; m_isAcceleratedCompositingActive = true;
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));
......
...@@ -3738,7 +3738,7 @@ void WebViewImpl::setIsAcceleratedCompositingActive(bool active) ...@@ -3738,7 +3738,7 @@ void WebViewImpl::setIsAcceleratedCompositingActive(bool active)
if (m_pageOverlays) if (m_pageOverlays)
m_pageOverlays->update(); m_pageOverlays->update();
m_client->didActivateCompositor(0); m_client->didActivateCompositor();
} else { } else {
TRACE_EVENT0("webkit", "WebViewImpl::setIsAcceleratedCompositingActive(true)"); TRACE_EVENT0("webkit", "WebViewImpl::setIsAcceleratedCompositingActive(true)");
...@@ -3759,7 +3759,7 @@ void WebViewImpl::setIsAcceleratedCompositingActive(bool active) ...@@ -3759,7 +3759,7 @@ void WebViewImpl::setIsAcceleratedCompositingActive(bool active)
m_layerTreeView->setOverhangBitmap(overhangImage->nativeImageForCurrentFrame()->bitmap()); m_layerTreeView->setOverhangBitmap(overhangImage->nativeImageForCurrentFrame()->bitmap());
#endif #endif
updateLayerTreeViewport(); updateLayerTreeViewport();
m_client->didActivateCompositor(0); m_client->didActivateCompositor();
m_isAcceleratedCompositingActive = true; m_isAcceleratedCompositingActive = true;
m_compositorCreationFailed = false; m_compositorCreationFailed = false;
if (m_pageOverlays) if (m_pageOverlays)
......
...@@ -62,7 +62,8 @@ public: ...@@ -62,7 +62,8 @@ public:
// The parameter to didActivateCompositor() is meaningless. // The parameter to didActivateCompositor() is meaningless.
// FIXME: The older definiton of didActivateCompositor (i.e with arguments) // FIXME: The older definiton of didActivateCompositor (i.e with arguments)
// and all its corresponding call is to removed once the dependent chromium // and all its corresponding call is to removed once the dependent chromium
// side patch https://codereview.chromium.org/137893025/ lands. // side patch https://codereview.chromium.org/137893025/ lands and all overrides
// of older definition are removed from chromium side.
virtual void didActivateCompositor() { } virtual void didActivateCompositor() { }
virtual void didActivateCompositor(int deprecated) { } virtual void didActivateCompositor(int deprecated) { }
virtual void didDeactivateCompositor() { } virtual void didDeactivateCompositor() { }
......
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