Remove NonCompositedContentHost -- Take 2

Source/WebKit/chromium/src/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 41 matching lines @@
 #include "AutofillPopupMenuClient.h"
 #include "BatteryClientImpl.h"
 #include "CSSValueKeywords.h"
 #include "CompositionUnderlineVectorBuilder.h"
 #include "ContextFeaturesClientImpl.h"
 #include "DeviceOrientationClientProxy.h"
 #include "GeolocationClientProxy.h"
 #include "GraphicsLayerFactoryChromium.h"
 #include "HTMLNames.h"
 #include "LinkHighlight.h"
-#include "NonCompositedContentHost.h"
 #include "PageWidgetDelegate.h"
 #include "PrerendererClientImpl.h"
 #include "SpeechInputClientImpl.h"
 #include "SpeechRecognitionClientProxy.h"
 #include "TextFieldDecoratorImpl.h"
 #include "ValidationMessageClientImpl.h"
 #include "ViewportAnchor.h"
 #include "WebAccessibilityObject.h"
 #include "WebActiveWheelFlingParameters.h"
 #include "WebAutofillClient.h"
@@ skipping 1690 matching lines @@
     if (m_continuousPaintingEnabled) {
         ContinuousPainter::setNeedsDisplayRecursive(m_rootGraphicsLayer, m_pageOverlays.get());
         m_client->scheduleAnimation();
     }
 }
 
 void WebViewImpl::layout()
 {
     TRACE_EVENT0("webkit", "WebViewImpl::layout");
     PageWidgetDelegate::layout(m_page.get());
+    if (m_layerTreeView)
+        m_layerTreeView->setBackgroundColor(backgroundColor());
 
     if (m_linkHighlight)
         m_linkHighlight->updateGeometry();
 }
 
 void WebViewImpl::enterForceCompositingMode(bool enter)
 {
     if (page()->settings()->forceCompositingMode() == enter)
         return;
 
@@ skipping 1123 matching lines @@
 {
     if (!page())
         return;
 
     Frame* frame = page()->mainFrame();
     if (!frame || !frame->view())
         return;
 
     frame->view()->setUseFixedLayout(enable);
 
-    // Also notify the base layer, which RenderLayerCompositor does not see.
-    if (m_nonCompositedContentHost)
+    if (m_isAcceleratedCompositingActive)
         updateLayerTreeViewport();
 }
 
 
 void WebViewImpl::enableAutoResizeMode(const WebSize& minSize, const WebSize& maxSize)
 {
     m_shouldAutoResize = true;
     m_minAutoSize = minSize;
     m_maxAutoSize = maxSize;
     configureAutoResizeMode();
@@ skipping 583 matching lines @@
 {
     // Set any existing frames to be transparent.
     Frame* frame = m_page->mainFrame();
     while (frame) {
         frame->view()->setTransparent(isTransparent);
         frame = frame->tree()->traverseNext();
     }
 
     // Future frames check this to know whether to be transparent.
     m_isTransparent = isTransparent;
-
-    if (m_nonCompositedContentHost)
-        m_nonCompositedContentHost->setOpaque(!isTransparent);
 }
 
 bool WebViewImpl::isTransparent() const
 {
     return m_isTransparent;
 }
 
 void WebViewImpl::setIsActive(bool active)
 {
     if (page() && page()->focusController())
@@ skipping 74 matching lines @@
     if (m_layerTreeView)
         m_layerTreeView->didStopFlinging();
     resetSavedScrollAndScaleState();
 }
 
 void WebViewImpl::layoutUpdated(WebFrameImpl* webframe)
 {
     if (!m_client || webframe != mainFrameImpl())
         return;
 
+    if (m_layerTreeViewCommitsDeferred) {
+        // If we receive an invalidation from WebKit while in deferred commit mode,

[jamesr, 2013/05/28 18:27:50]

update the comment since this function isn't about invalidations

+        // that means it's time to start producing frames again so un-defer.
+        if (m_layerTreeView)
+            m_layerTreeView->setDeferCommits(false);
+        m_layerTreeViewCommitsDeferred = false;
+    }
+
     if (m_shouldAutoResize && mainFrameImpl()->frame() && mainFrameImpl()->frame()->view()) {
         WebSize frameSize = mainFrameImpl()->frame()->view()->frameRect().size();
         if (frameSize != m_size) {
             m_size = frameSize;
             m_client->didAutoResize(m_size);
             sendResizeEventAndRepaint();
         }
     }
 
     if (m_pageScaleConstraintsSet.constraintsDirty())
@@ skipping 172 matching lines @@
 }
 
 void WebViewImpl::setRootGraphicsLayer(GraphicsLayer* layer)
 {
     suppressInvalidations(true);
 
     m_rootGraphicsLayer = layer;
     m_rootLayer = layer ? layer->platformLayer() : 0;
 
     setIsAcceleratedCompositingActive(layer);
-    if (m_nonCompositedContentHost) {
-        GraphicsLayer* scrollLayer = 0;
-        if (layer) {
-            Document* document = page()->mainFrame()->document();
-            RenderView* renderView = document->renderView();
-            RenderLayerCompositor* compositor = renderView->compositor();
-            scrollLayer = compositor->scrollLayer();
-        }
-        m_nonCompositedContentHost->setScrollLayer(scrollLayer);
-    }
 
     if (m_layerTreeView) {
         if (m_rootLayer)
             m_layerTreeView->setRootLayer(*m_rootLayer);
         else
             m_layerTreeView->clearRootLayer();
     }
 
     suppressInvalidations(false);
 }
 
 void WebViewImpl::scheduleCompositingLayerSync()
 {
     m_layerTreeView->setNeedsRedraw();
 }
 
 void WebViewImpl::scrollRootLayerRect(const IntSize&, const IntRect&)
 {
     updateLayerTreeViewport();
 }
 
 void WebViewImpl::invalidateRect(const IntRect& rect)
 {
-    if (m_layerTreeViewCommitsDeferred) {
-        // If we receive an invalidation from WebKit while in deferred commit mode,
-        // that means it's time to start producing frames again so un-defer.
-        if (m_layerTreeView)
-            m_layerTreeView->setDeferCommits(false);
-        m_layerTreeViewCommitsDeferred = false;
-    }
     if (m_isAcceleratedCompositingActive) {
         ASSERT(m_layerTreeView);
-
-        if (!page())
-            return;
-
-        FrameView* view = page()->mainFrame()->view();
-        IntRect dirtyRect = view->windowToContents(rect);
         updateLayerTreeViewport();
-        m_nonCompositedContentHost->invalidateRect(dirtyRect);
     } else if (m_client)
         m_client->didInvalidateRect(rect);
 }
 
-NonCompositedContentHost* WebViewImpl::nonCompositedContentHost()
-{
-    return m_nonCompositedContentHost.get();
-}
-
-void WebViewImpl::setBackgroundColor(const WebCore::Color& color)
-{
-    WebCore::Color documentBackgroundColor = color.isValid() ? color : WebCore::Color::white;
-    WebColor webDocumentBackgroundColor = documentBackgroundColor.rgb();
-    m_nonCompositedContentHost->setBackgroundColor(documentBackgroundColor);
-    m_layerTreeView->setBackgroundColor(webDocumentBackgroundColor);
-}
-
 WebCore::GraphicsLayerFactory* WebViewImpl::graphicsLayerFactory() const
 {
     return m_graphicsLayerFactory.get();
 }
 
 void WebViewImpl::registerForAnimations(WebLayer* layer)
 {
     if (m_layerTreeView)
         m_layerTreeView->registerForAnimations(layer);
 }
 
 WebCore::GraphicsLayer* WebViewImpl::rootGraphicsLayer()
 {
     return m_rootGraphicsLayer;
 }
 
 void WebViewImpl::scheduleAnimation()
 {
     if (isAcceleratedCompositingActive()) {
         if (Platform::current()->isThreadedCompositingEnabled()) {
             ASSERT(m_layerTreeView);
             m_layerTreeView->setNeedsAnimate();
         } else
             m_client->scheduleAnimation();
     } else
             m_client->scheduleAnimation();
 }
 
-void WebViewImpl::paintRootLayer(GraphicsContext& context, const IntRect& contentRect)
-{
-    double paintStart = currentTime();
-    if (!page())
-        return;
-    FrameView* view = page()->mainFrame()->view();
-    context.setUseHighResMarkers(page()->deviceScaleFactor() > 1.5f);
-    view->paintContents(&context, contentRect);
-    double paintEnd = currentTime();
-    double pixelsPerSec = (contentRect.width() * contentRect.height()) / (paintEnd - paintStart);
-    WebKit::Platform::current()->histogramCustomCounts("Renderer4.AccelRootPaintDurationMS", (paintEnd - paintStart) * 1000, 0, 120, 30);
-    WebKit::Platform::current()->histogramCustomCounts("Renderer4.AccelRootPaintMegapixPerSecond", pixelsPerSec / 1000000, 10, 210, 30);
-
-    setBackgroundColor(view->documentBackgroundColor());
-}
-
 void WebViewImpl::setIsAcceleratedCompositingActive(bool active)
 {
     WebKit::Platform::current()->histogramEnumeration("GPU.setIsAcceleratedCompositingActive", active * 2 + m_isAcceleratedCompositingActive, 4);
 
     if (m_isAcceleratedCompositingActive == active)
         return;
 
     if (!active) {
         m_isAcceleratedCompositingActive = false;
         // We need to finish all GL rendering before sending didDeactivateCompositor() to prevent
@@ skipping 12 matching lines @@
             m_layerTreeViewCommitsDeferred = true;
         }
     } else if (m_layerTreeView) {
         m_isAcceleratedCompositingActive = true;
         updateLayerTreeViewport();
 
         m_client->didActivateCompositor(m_inputHandlerIdentifier);
     } else {
         TRACE_EVENT0("webkit", "WebViewImpl::setIsAcceleratedCompositingActive(true)");
 
-        m_nonCompositedContentHost = NonCompositedContentHost::create(this, graphicsLayerFactory());
-        m_nonCompositedContentHost->setShowDebugBorders(page()->settings()->showDebugBorders());
-        m_nonCompositedContentHost->setOpaque(!isTransparent());
-
         m_client->initializeLayerTreeView();
         m_layerTreeView = m_client->layerTreeView();
         if (m_layerTreeView) {
             m_layerTreeView->setRootLayer(*m_rootLayer);
 
             bool visible = page()->visibilityState() == PageVisibilityStateVisible;
             m_layerTreeView->setVisible(visible);
             m_layerTreeView->setDeviceScaleFactor(page()->deviceScaleFactor());
             m_layerTreeView->setPageScaleFactorAndLimits(pageScaleFactor(), minimumPageScaleFactor(), maximumPageScaleFactor());
+            m_layerTreeView->setBackgroundColor(backgroundColor());
             m_layerTreeView->setHasTransparentBackground(isTransparent());
             updateLayerTreeViewport();
             m_client->didActivateCompositor(m_inputHandlerIdentifier);
             m_isAcceleratedCompositingActive = true;
             m_compositorCreationFailed = false;
             if (m_pageOverlays)
                 m_pageOverlays->update();
             m_layerTreeView->setShowFPSCounter(m_showFPSCounter);
             m_layerTreeView->setShowPaintRects(m_showPaintRects);
             m_layerTreeView->setShowDebugBorders(m_showDebugBorders);
             m_layerTreeView->setContinuousPaintingEnabled(m_continuousPaintingEnabled);
         } else {
-            m_nonCompositedContentHost.clear();
             m_isAcceleratedCompositingActive = false;
             m_client->didDeactivateCompositor();
             m_compositorCreationFailed = true;
         }
     }
     if (page())
         page()->mainFrame()->view()->setClipsRepaints(!m_isAcceleratedCompositingActive);
 }
 
 WebInputHandler* WebViewImpl::createInputHandler()
@@ skipping 50 matching lines @@
 
     // Force a style recalc to remove all the composited layers.
     m_page->mainFrame()->document()->scheduleForcedStyleRecalc();
 
     if (m_pageOverlays)
         m_pageOverlays->update();
 }
 
 void WebViewImpl::updateLayerTreeViewport()
 {
-    if (!page() || !m_nonCompositedContentHost || !m_layerTreeView)
+    if (!page() || !m_layerTreeView)
         return;
 
-    FrameView* view = page()->mainFrame()->view();
-    m_nonCompositedContentHost->setViewport(m_size, view->contentsSize(), view->scrollPosition(), view->scrollOrigin());
     m_layerTreeView->setPageScaleFactorAndLimits(pageScaleFactor(), minimumPageScaleFactor(), maximumPageScaleFactor());
 }
 
 void WebViewImpl::selectAutofillSuggestionAtIndex(unsigned listIndex)
 {
     if (m_autofillPopupClient && listIndex < m_autofillPopupClient->getSuggestionsCount())
         m_autofillPopupClient->valueChanged(listIndex);
 }
 
 bool WebViewImpl::detectContentOnTouch(const WebPoint& position)
@@ skipping 86 matching lines @@
 }
 
 bool WebViewImpl::shouldDisableDesktopWorkarounds()
 {
     ViewportArguments arguments = mainFrameImpl()->frame()->document()->viewportArguments();
     return arguments.width == ViewportArguments::ValueDeviceWidth || !arguments.userZoom
         || (arguments.minZoom == arguments.maxZoom && arguments.minZoom != ViewportArguments::ValueAuto);
 }
 
 } // namespace WebKit