PageOverlays: Remove PageOverlayList

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 135 matching lines @@
 #include "public/web/WebViewClient.h"
 #include "public/web/WebWindowFeatures.h"
 #include "web/CompositionUnderlineVectorBuilder.h"
 #include "web/ContextFeaturesClientImpl.h"
 #include "web/DatabaseClientImpl.h"
 #include "web/DevToolsEmulator.h"
 #include "web/FullscreenController.h"
 #include "web/GraphicsLayerFactoryChromium.h"
 #include "web/InspectorOverlayImpl.h"
 #include "web/LinkHighlightImpl.h"
+#include "web/PageOverlay.h"
 #include "web/PrerendererClientImpl.h"
 #include "web/ResizeViewportAnchor.h"
 #include "web/RotationViewportAnchor.h"
 #include "web/SpeechRecognitionClientProxy.h"
 #include "web/StorageQuotaClientImpl.h"
 #include "web/ValidationMessageClientImpl.h"
 #include "web/ViewportAnchor.h"
 #include "web/WebDevToolsAgentImpl.h"
 #include "web/WebInputEventConversion.h"
 #include "web/WebLocalFrameImpl.h"
@@ skipping 121 matching lines @@
     EmptyEventListener()
         : EventListener(CPPEventListenerType)
     {
     }
 
     void handleEvent(ExecutionContext* executionContext, Event*) override
     {
     }
 };
 
-class ColorOverlay : public WebPageOverlay {
+class ColorOverlay : public PageOverlay::Delegate {
 public:
     ColorOverlay(WebColor color)
         : m_color(color)
     {
     }
 
     virtual ~ColorOverlay()
     {
     }
 
@@ skipping 1585 matching lines @@
     }
 
     if (!m_page)
         return;
 
     // FIXME: This should probably be using the local root?
     if (m_page->mainFrame()->isLocalFrame())
         PageWidgetDelegate::animate(*m_page, validFrameTime.lastFrameTimeMonotonic, *m_page->deprecatedLocalMainFrame());
 
     if (m_continuousPaintingEnabled) {
-        ContinuousPainter::setNeedsDisplayRecursive(m_rootGraphicsLayer, m_pageOverlays.get());
+        GraphicsLayer* inspectorOverlayLayer = nullptr;
+        if (m_inspectorOverlay) {
+            PageOverlay* inspectorPageOverlay = m_inspectorOverlay->pageOverlay();
+            if (inspectorPageOverlay)
+                inspectorOverlayLayer = inspectorPageOverlay->graphicsLayer();
+        }
+        ContinuousPainter::setNeedsDisplayRecursive(m_rootGraphicsLayer, inspectorOverlayLayer);
         m_client->scheduleAnimation();
     }
 }
 
 void WebViewImpl::setNeedsLayoutAndFullPaintInvalidation()
 {
     if (!mainFrameImpl() || !mainFrameImpl()->frame() || !mainFrameImpl()->frame()->view())
         return;
 
     FrameView* view = mainFrameImpl()->frame()->view();
@@ skipping 1738 matching lines @@
     }
 
     if (m_client) {
         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();
+    updatePageOverlays();
     m_devToolsEmulator->viewportChanged();
 }
 
 void WebViewImpl::configureAutoResizeMode()
 {
     if (!mainFrameImpl() || !mainFrameImpl()->frame() || !mainFrameImpl()->frame()->view())
         return;
 
     if (m_shouldAutoResize)
         mainFrameImpl()->frame()->view()->enableAutoSizeMode(m_minAutoSize, m_maxAutoSize);
@@ skipping 314 matching lines @@
     m_backgroundColorOverride = color;
     updateLayerTreeBackgroundColor();
 }
 
 void WebViewImpl::setZoomFactorOverride(float zoomFactor)
 {
     m_zoomFactorOverride = zoomFactor;
     setZoomLevel(zoomLevel());
 }
 
-void WebViewImpl::addPageOverlay(WebPageOverlay* overlay, int zOrder)
-{
-    if (!m_pageOverlays)
-        m_pageOverlays = PageOverlayList::create(this);
-
-    m_pageOverlays->add(overlay, zOrder);
-}
-
 void WebViewImpl::setPageOverlayColor(WebColor color)
 {
-    if (m_pageColorOverlay) {
-        removePageOverlay(m_pageColorOverlay.get());
+    if (m_pageColorOverlay)
         m_pageColorOverlay.clear();
-    }
 
     if (color == Color::transparent)
         return;
 
-    m_pageColorOverlay = adoptPtr(new ColorOverlay(color));
-    addPageOverlay(m_pageColorOverlay.get(), 0);
-}
-
-void WebViewImpl::removePageOverlay(WebPageOverlay* overlay)
-{
-    if (m_pageOverlays && m_pageOverlays->remove(overlay) && m_pageOverlays->empty())
-        m_pageOverlays = nullptr;
+    m_pageColorOverlay = PageOverlay::create(this, adoptPtr(new ColorOverlay(color)));
+    m_pageColorOverlay->update();
 }
 
 void WebViewImpl::setOverlayLayer(GraphicsLayer* layer)
 {
     if (!m_rootGraphicsLayer)
         return;
 
     if (!m_page->mainFrame()->isLocalFrame())
         return;
 
@@ skipping 77 matching lines @@
     visualViewport.attachToLayerTree(layer, graphicsLayerFactory());
     if (layer) {
         m_rootGraphicsLayer = visualViewport.rootGraphicsLayer();
         m_rootLayer = visualViewport.rootGraphicsLayer()->platformLayer();
         m_rootTransformLayer = visualViewport.rootGraphicsLayer();
         updateRootLayerTransform();
         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().visualViewport().registerLayersWithTreeView(m_layerTreeView);
-        if (m_pageOverlays)
-            m_pageOverlays->update();
-
+        updatePageOverlays();
         // 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;
         m_layerTreeView->setVisible(visible);
     } else {
         m_rootGraphicsLayer = nullptr;
         m_rootLayer = nullptr;
         m_rootTransformLayer = nullptr;
@@ skipping 296 matching lines @@
 void WebViewImpl::forceNextWebGLContextCreationToFail()
 {
     WebGLRenderingContext::forceNextWebGLContextCreationToFail();
 }
 
 void WebViewImpl::forceNextDrawingBufferCreationToFail()
 {
     DrawingBuffer::forceNextDrawingBufferCreationToFail();
 }
 
+void WebViewImpl::updatePageOverlays()
+{
+    if (m_pageColorOverlay)
+        m_pageColorOverlay->update();
+    if (m_inspectorOverlay) {
+        PageOverlay* inspectorPageOverlay = m_inspectorOverlay->pageOverlay();
+        if (inspectorPageOverlay)
+            inspectorPageOverlay->update();
+    }
+}
+
 } // namespace blink