Remove WebViewImpl::setIsAcceleratedCompositingActive

Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 322 matching lines @@
 #if ENABLE(OILPAN)
     deferrer->dispose();
 #else
     delete deferrer;
 #endif
     pageLoadDeferrerStack().removeLast();
 }
 
 void WebViewImpl::setMainFrame(WebFrame* frame)
 {
-    if (frame->isWebLocalFrame())
-        toWebLocalFrameImpl(frame)->initializeCoreFrame(&page()->frameHost(), 0, nullAtom, nullAtom);
-    else
+    if (frame->isWebLocalFrame()) {
+        WebLocalFrameImpl* localFrame = toWebLocalFrameImpl(frame);
+        localFrame->initializeCoreFrame(&page()->frameHost(), 0, nullAtom, nullAtom);
+        // Composited WebViews want repaints outside the frame visible rect.
+        localFrame->frame()->view()->setClipsRepaints(!m_layerTreeView);
+    } else {
         toWebRemoteFrameImpl(frame)->initializeCoreFrame(&page()->frameHost(), 0, nullAtom);
+    }
 }
 
 void WebViewImpl::setCredentialManagerClient(WebCredentialManagerClient* webCredentialManagerClient)
 {
     ASSERT(m_page);
     provideCredentialManagerClientTo(*m_page, new CredentialManagerClient(webCredentialManagerClient));
 }
 
 void WebViewImpl::setPrerendererClient(WebPrerendererClient* prerendererClient)
 {
@@ skipping 42 matching lines @@
     , m_operationsAllowed(WebDragOperationNone)
     , m_dragOperation(WebDragOperationNone)
     , m_devToolsEmulator(nullptr)
     , m_isTransparent(false)
     , m_tabsToLinks(false)
     , m_layerTreeView(0)
     , m_rootLayer(0)
     , m_rootGraphicsLayer(0)
     , m_rootTransformLayer(0)
     , m_graphicsLayerFactory(adoptPtr(new GraphicsLayerFactoryChromium(this)))
-    , m_isAcceleratedCompositingActive(false)
-    , m_layerTreeViewCommitsDeferred(false)
-    , m_layerTreeViewClosed(false)
     , m_matchesHeuristicsForGpuRasterization(false)
     , m_recreatingGraphicsContext(false)
     , m_flingModifier(0)
     , m_flingSourceDevice(false)
     , m_fullscreenController(FullscreenController::create(this))
     , m_showFPSCounter(false)
-    , m_showPaintRects(false)
-    , m_showDebugBorders(false)
     , m_continuousPaintingEnabled(false)
-    , m_showScrollBottleneckRects(false)
     , m_baseBackgroundColor(Color::white)
     , m_backgroundColorOverride(Color::transparent)
     , m_zoomFactorOverride(0)
     , m_userGestureObserved(false)
     , m_displayMode(WebDisplayModeBrowser)
 {
     Page::PageClients pageClients;
     pageClients.chromeClient = &m_chromeClientImpl;
     pageClients.contextMenuClient = &m_contextMenuClientImpl;
     pageClients.editorClient = &m_editorClientImpl;
@@ skipping 522 matching lines @@
     }
     m_showFPSCounter = show;
 }
 
 void WebViewImpl::setShowPaintRects(bool show)
 {
     if (m_layerTreeView) {
         TRACE_EVENT0("blink", "WebViewImpl::setShowPaintRects");
         m_layerTreeView->setShowPaintRects(show);
     }
-    m_showPaintRects = show;
     setFirstPaintInvalidationTrackingEnabledForShowPaintRects(show);
 }
 
 void WebViewImpl::setShowDebugBorders(bool show)
 {
     if (m_layerTreeView)
         m_layerTreeView->setShowDebugBorders(show);
-    m_showDebugBorders = show;
 }
 
 void WebViewImpl::setContinuousPaintingEnabled(bool enabled)
 {
     if (m_layerTreeView) {
         TRACE_EVENT0("blink", "WebViewImpl::setContinuousPaintingEnabled");
         // FIXME: allow emulation, fps counter and continuous painting at the same time: crbug.com/299837.
         m_layerTreeView->setContinuousPaintingEnabled(enabled && !m_devToolsEmulator->deviceEmulationEnabled());
     }
     m_continuousPaintingEnabled = enabled;
     if (m_client)
         m_client->scheduleAnimation();
 }
 
 void WebViewImpl::updateShowFPSCounterAndContinuousPainting()
 {
     if (m_layerTreeView) {
         // FIXME: allow emulation, fps counter and continuous painting at the same time: crbug.com/299837.
         m_layerTreeView->setContinuousPaintingEnabled(m_continuousPaintingEnabled && !m_devToolsEmulator->deviceEmulationEnabled());
         m_layerTreeView->setShowFPSCounter(m_showFPSCounter && !m_devToolsEmulator->deviceEmulationEnabled());
     }
 }
 
 void WebViewImpl::setShowScrollBottleneckRects(bool show)
 {
     if (m_layerTreeView)
         m_layerTreeView->setShowScrollBottleneckRects(show);
-    m_showScrollBottleneckRects = show;
 }
 
 void WebViewImpl::acceptLanguagesChanged()
 {
     if (!page())
         return;
 
     page()->acceptLanguagesChanged();
 }
 
@@ skipping 1716 matching lines @@
         break;
 
     default:
         notImplemented();
         break;
     }
 }
 
 bool WebViewImpl::isAcceleratedCompositingActive() const
 {
-    return m_isAcceleratedCompositingActive;
+    return m_rootLayer;
 }
 
 void WebViewImpl::willCloseLayerTreeView()
 {
-    setIsAcceleratedCompositingActive(false);
+    setRootGraphicsLayer(nullptr);

[enne (OOO), 2015/04/23 22:48:17]

This is the crash fix from https://codereview.chromium.org/1089783003 that I
rolled into this patch.

     m_layerTreeView = 0;
-    m_layerTreeViewClosed = true;
 }
 
 void WebViewImpl::didAcquirePointerLock()
 {
     if (page())
         page()->pointerLockController().didAcquirePointerLock();
 }
 
 void WebViewImpl::didNotAcquirePointerLock()
 {
@@ skipping 944 matching lines @@
 {
     // FIXME: This is wrong. The FrameView is responsible sending a resizeEvent
     // as part of layout. Layout is also responsible for sending invalidations
     // to the embedder. This method and all callers may be wrong. -- eseidel.
     if (mainFrameImpl()->frameView()) {
         // Enqueues the resize event.
         mainFrameImpl()->frame()->document()->enqueueResizeEvent();
     }
 
     if (m_client) {
-        if (isAcceleratedCompositingActive()) {
+        if (m_layerTreeView) {
             updateLayerTreeViewport();
         } else {
             WebRect damagedRect(0, 0, m_size.width, m_size.height);
             m_client->didInvalidateRect(damagedRect);
         }
     }
     if (m_pageOverlays)
         m_pageOverlays->update();
     m_devToolsEmulator->viewportChanged();
 }
@@ skipping 121 matching lines @@
     // Set any existing frames to be transparent.
     Frame* frame = m_page->mainFrame();
     while (frame) {
         if (frame->isLocalFrame())
             toLocalFrame(frame)->view()->setTransparent(isTransparent);
         frame = frame->tree().traverseNext();
     }
 
     // Future frames check this to know whether to be transparent.
     m_isTransparent = isTransparent;
+
+    if (m_layerTreeView)
+        m_layerTreeView->setHasTransparentBackground(this->isTransparent());
 }
 
 bool WebViewImpl::isTransparent() const
 {
     return m_isTransparent;
 }
 
 void WebViewImpl::setBaseBackgroundColor(WebColor color)
 {
     layout();
@@ skipping 80 matching lines @@
         return;
 
     // If we have no more stylesheets to load and we're past the body tag,
     // we should have something to paint and should start as soon as possible.
     if (m_page->deprecatedLocalMainFrame()->document()->body())
         resumeTreeViewCommits();
 }
 
 void WebViewImpl::resumeTreeViewCommits()
 {
-    if (m_layerTreeViewCommitsDeferred) {
-        if (m_layerTreeView)
-            m_layerTreeView->setDeferCommits(false);
-        m_layerTreeViewCommitsDeferred = false;
-    }
+    if (m_layerTreeView)
+        m_layerTreeView->setDeferCommits(false);
 }
 
 void WebViewImpl::postLayoutResize(WebLocalFrameImpl* webframe)
 {
     FrameView* view = webframe->frame()->view();
     if (webframe == mainFrame())
         view->resize(mainFrameSize());
     else
         view->resize(webframe->frameView()->layoutSize());
 }
@@ skipping 175 matching lines @@
 }
 
 void WebViewImpl::suppressInvalidations(bool enable)
 {
     if (m_client)
         m_client->suppressCompositorScheduling(enable);
 }
 
 void WebViewImpl::setRootGraphicsLayer(GraphicsLayer* layer)
 {
+    if (!m_layerTreeView)
+        return;
+
     suppressInvalidations(true);
 
     PinchViewport& pinchViewport = page()->frameHost().pinchViewport();
     pinchViewport.attachToLayerTree(layer, graphicsLayerFactory());
     if (layer) {
         m_rootGraphicsLayer = pinchViewport.rootGraphicsLayer();
         m_rootLayer = pinchViewport.rootGraphicsLayer()->platformLayer();
         m_rootTransformLayer = pinchViewport.rootGraphicsLayer();
+        updateRootLayerTransform();

[enne (OOO), 2015/04/23 22:48:17]

I rolled https://codereview.chromium.org/1097183004 into this patch.  It's just
a cleanup.

+        m_layerTreeView->setRootLayer(*m_rootLayer);
+        // We register viewport layers here since there may not be a layer
+        // tree view prior to this point.
+        page()->frameHost().pinchViewport().registerLayersWithTreeView(m_layerTreeView);
+        if (m_pageOverlays)
+            m_pageOverlays->update();
+
+        // TODO(enne): Work around page visibility changes not being
+        // propogated to the WebView in some circumstances.  This needs to
+        // be refreshed here when setting a new root layer to avoid being
+        // stuck in a presumed incorrectly invisible state.
+        bool visible = page()->visibilityState() == PageVisibilityStateVisible;

[enne (OOO), 2015/04/23 22:48:17]

This is the fix that made me revert the original patch.  The LayerTreeView could
get stuck in visible=false and the WebView would never be told that it was
visible, causing no frames to ever get put up on screen.

+        m_layerTreeView->setVisible(visible);
     } else {
         m_rootGraphicsLayer = nullptr;
         m_rootLayer = nullptr;
         m_rootTransformLayer = nullptr;
-    }
-
-    setIsAcceleratedCompositingActive(layer != 0);
-
-    updateRootLayerTransform();
-
-    if (m_layerTreeView) {
-        if (m_rootLayer) {
-            m_layerTreeView->setRootLayer(*m_rootLayer);
-            // We register viewport layers here since there may not be a layer
-            // tree view prior to this point.
-            page()->frameHost().pinchViewport().registerLayersWithTreeView(m_layerTreeView);
-        } else {
-            m_layerTreeView->clearRootLayer();
-            page()->frameHost().pinchViewport().clearLayersForTreeView(m_layerTreeView);
-        }
+        // This means that we're transitioning to a new page. Suppress
+        // commits until Blink generates invalidations so we don't
+        // attempt to paint too early in the next page load.
+        m_layerTreeView->setDeferCommits(true);
+        m_layerTreeView->clearRootLayer();
+        page()->frameHost().pinchViewport().clearLayersForTreeView(m_layerTreeView);
     }
 
     suppressInvalidations(false);
 }
 
 void WebViewImpl::scheduleCompositingLayerSync()
 {
     m_layerTreeView->setNeedsAnimate();
 }
 
 void WebViewImpl::invalidateRect(const IntRect& rect)
 {
-    if (m_isAcceleratedCompositingActive) {
-        ASSERT(m_layerTreeView);
+    if (m_layerTreeView)
         updateLayerTreeViewport();
-    } else if (m_client)
+    else if (m_client)
         m_client->didInvalidateRect(rect);
 }
 
 GraphicsLayerFactory* WebViewImpl::graphicsLayerFactory() const
 {
     return m_graphicsLayerFactory.get();
 }
 
 DeprecatedPaintLayerCompositor* WebViewImpl::compositor() const
 {
@@ skipping 46 matching lines @@
         m_layerTreeView = m_client->layerTreeView();
     }
 
     m_page->settings().setAcceleratedCompositingEnabled(m_layerTreeView != 0);
 
     // FIXME: only unittests, click to play, Android priting, and printing (for headers and footers)
     // make this assert necessary. We should make them not hit this code and then delete allowsBrokenNullLayerTreeView.
     ASSERT(m_layerTreeView || !m_client || m_client->allowsBrokenNullLayerTreeView());
 }
 
-void WebViewImpl::setIsAcceleratedCompositingActive(bool active)
-{
-    // In the middle of shutting down; don't try to spin back up a compositor.
-    // FIXME: compositing startup/shutdown should be refactored so that it
-    // turns on explicitly rather than lazily, which causes this awkwardness.
-    if (m_layerTreeViewClosed)
-        return;
-
-    ASSERT(!active || m_layerTreeView);
-    Platform::current()->histogramEnumeration("GPU.setIsAcceleratedCompositingActive", active * 2 + m_isAcceleratedCompositingActive, 4);
-
-    if (m_isAcceleratedCompositingActive == active)
-        return;
-
-    if (!m_client)
-        return;
-
-    if (!active) {
-        m_isAcceleratedCompositingActive = false;
-        if (!m_layerTreeViewCommitsDeferred) {
-            ASSERT(m_layerTreeView);
-            // This means that we're transitioning to a new page. Suppress commits until WebKit generates invalidations so
-            // we don't attempt to paint too early in the next page load.
-            m_layerTreeView->setDeferCommits(true);
-            m_layerTreeViewCommitsDeferred = true;
-        }
-    } else {
-        TRACE_EVENT0("blink", "WebViewImpl::setIsAcceleratedCompositingActive(true)");
-        m_layerTreeView->setRootLayer(*m_rootLayer);
-
-        bool visible = page()->visibilityState() == PageVisibilityStateVisible;
-        m_layerTreeView->setVisible(visible);
-        updateLayerTreeDeviceScaleFactor();
-        m_layerTreeView->setPageScaleFactorAndLimits(pageScaleFactor(), minimumPageScaleFactor(), maximumPageScaleFactor());
-        updateLayerTreeBackgroundColor();
-        m_layerTreeView->setHasTransparentBackground(isTransparent());
-        updateLayerTreeViewport();
-        m_isAcceleratedCompositingActive = true;
-        if (m_pageOverlays)
-            m_pageOverlays->update();
-        // FIXME: allow emulation, fps counter and continuous painting at the same time: crbug.com/299837.
-        m_layerTreeView->setShowFPSCounter(m_showFPSCounter && !m_devToolsEmulator->deviceEmulationEnabled());
-        m_layerTreeView->setShowPaintRects(m_showPaintRects);
-        m_layerTreeView->setShowDebugBorders(m_showDebugBorders);
-        m_layerTreeView->setContinuousPaintingEnabled(m_continuousPaintingEnabled && !m_devToolsEmulator->deviceEmulationEnabled());
-        m_layerTreeView->setShowScrollBottleneckRects(m_showScrollBottleneckRects);
-        m_layerTreeView->heuristicsForGpuRasterizationUpdated(m_matchesHeuristicsForGpuRasterization);
-    }
-    if (page() && page()->mainFrame()->isLocalFrame())
-        page()->deprecatedLocalMainFrame()->view()->setClipsRepaints(!m_isAcceleratedCompositingActive);
-}
-
 void WebViewImpl::updateMainFrameScrollPosition(const DoublePoint& scrollPosition, bool programmaticScroll)
 {
     if (!page()->mainFrame()->isLocalFrame())
         return;
 
     // FIXME(305811): Refactor for OOPI.
     FrameView* frameView = page()->deprecatedLocalMainFrame()->view();
     if (!frameView)
         return;
 
@@ skipping 101 matching lines @@
     WebContentDetectionResult content = m_client->detectContentAround(touchHit);
     if (!content.isValid())
         return false;
 
     m_client->scheduleContentIntent(content.intent());
     return true;
 }
 
 void WebViewImpl::setVisibilityState(WebPageVisibilityState visibilityState,
                                      bool isInitialState) {
-    if (!page())
-        return;
+    ASSERT(visibilityState == WebPageVisibilityStateVisible || visibilityState == WebPageVisibilityStateHidden || visibilityState == WebPageVisibilityStatePrerender);
 
-    ASSERT(visibilityState == WebPageVisibilityStateVisible || visibilityState == WebPageVisibilityStateHidden || visibilityState == WebPageVisibilityStatePrerender);
-    m_page->setVisibilityState(static_cast<PageVisibilityState>(static_cast<int>(visibilityState)), isInitialState);
+    if (page())
+        m_page->setVisibilityState(static_cast<PageVisibilityState>(static_cast<int>(visibilityState)), isInitialState);
 
     if (m_layerTreeView) {
         bool visible = visibilityState == WebPageVisibilityStateVisible;
         m_layerTreeView->setVisible(visible);
     }
 }
 
 bool WebViewImpl::requestPointerLock()
 {
     return m_client && m_client->requestPointerLock();
@@ skipping 57 matching lines @@
     return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
         || (constraints.minimumScale == constraints.maximumScale && constraints.minimumScale != -1);
 }
 
 void WebViewImpl::forceNextWebGLContextCreationToFail()
 {
     WebGLRenderingContext::forceNextWebGLContextCreationToFail();
 }
 
 } // namespace blink