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 1888 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());
+        ContinuousPainter::setNeedsDisplayRecursive(m_rootGraphicsLayer, m_pageOverlay->graphicsLayer());
         m_client->scheduleAnimation();
     }
 }
 
 void WebViewImpl::setNeedsLayoutAndFullPaintInvalidation()
 {
     if (!mainFrameImpl() || !mainFrameImpl()->frame() || !mainFrameImpl()->frame()->view())
         return;
 
     FrameView* view = mainFrameImpl()->frame()->view();
@@ skipping 15 matching lines @@
         m_linkHighlights[i]->updateGeometry();
 }
 
 void WebViewImpl::paint(WebCanvas* canvas, const WebRect& rect)
 {
     // This should only be used when compositing is not being used for this
     // WebView, and it is painting into the recording of its parent.
     ASSERT(!isAcceleratedCompositingActive());
 
     double paintStart = currentTime();
-    PageWidgetDelegate::paint(*m_page, pageOverlays(), canvas, rect, *m_page->deprecatedLocalMainFrame());
+    PageWidgetDelegate::paint(*m_page, m_pageOverlay.get(), canvas, rect, *m_page->deprecatedLocalMainFrame());
     double paintEnd = currentTime();
     double pixelsPerSec = (rect.width * rect.height) / (paintEnd - paintStart);
     Platform::current()->histogramCustomCounts("Renderer4.SoftwarePaintDurationMS", (paintEnd - paintStart) * 1000, 0, 120, 30);
     Platform::current()->histogramCustomCounts("Renderer4.SoftwarePaintMegapixPerSecond", pixelsPerSec / 1000000, 10, 210, 30);
 }
 
 #if OS(ANDROID)
 void WebViewImpl::paintCompositedDeprecated(WebCanvas* canvas, const WebRect& rect)
 {
     // Note: This method exists on OS(ANDROID) and will hopefully be
@@ skipping 1691 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();
+    if (m_pageOverlay)
+        m_pageOverlay->update();
     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)
+void WebViewImpl::addPageOverlay(WebPageOverlay* overlay)

[dgozman, 2015/07/28 16:16:57]

Should we pass PageOverlay here and make client create it? This way WebViewImpl
would not care about WebPageOverlay/PageOverlayDelegate.

[sergeyv, 2015/07/29 18:12:36]

Done.

 {
-    if (!m_pageOverlays)
-        m_pageOverlays = PageOverlayList::create(this);
+    if (m_pageOverlay && m_pageOverlay->overlay() != overlay)
+        return;
 
-    m_pageOverlays->add(overlay, zOrder);
+    if (!m_pageOverlay)
+        m_pageOverlay = PageOverlay::create(this, overlay);
+
+    m_pageOverlay->update();
 }
 
 void WebViewImpl::setPageOverlayColor(WebColor color)
 {
     if (m_pageColorOverlay) {
         removePageOverlay(m_pageColorOverlay.get());
         m_pageColorOverlay.clear();
     }
 
     if (color == Color::transparent)
         return;
 
     m_pageColorOverlay = adoptPtr(new ColorOverlay(color));
-    addPageOverlay(m_pageColorOverlay.get(), 0);
+    addPageOverlay(m_pageColorOverlay.get());
 }
 
 void WebViewImpl::removePageOverlay(WebPageOverlay* overlay)
 {
-    if (m_pageOverlays && m_pageOverlays->remove(overlay) && m_pageOverlays->empty())
-        m_pageOverlays = nullptr;
+    if (!m_pageOverlay || m_pageOverlay->overlay() != overlay)
+        return;
+
+    m_pageOverlay->clear();
+    m_pageOverlay.clear();
 }
 
 void WebViewImpl::setOverlayLayer(GraphicsLayer* layer)
 {
     if (!m_rootGraphicsLayer)
         return;
 
     if (!m_page->mainFrame()->isLocalFrame())
         return;
 
@@ skipping 77 matching lines @@
     pinchViewport.attachToLayerTree(layer, graphicsLayerFactory());
     if (layer) {
         m_rootGraphicsLayer = pinchViewport.rootGraphicsLayer();
         m_rootLayer = pinchViewport.rootGraphicsLayer()->platformLayer();
         m_rootTransformLayer = pinchViewport.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().pinchViewport().registerLayersWithTreeView(m_layerTreeView);
-        if (m_pageOverlays)
-            m_pageOverlays->update();
+        if (m_pageOverlay)
+            m_pageOverlay->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;
         m_layerTreeView->setVisible(visible);
     } else {
         m_rootGraphicsLayer = nullptr;
         m_rootLayer = nullptr;
@@ skipping 298 matching lines @@
 {
     WebGLRenderingContext::forceNextWebGLContextCreationToFail();
 }
 
 void WebViewImpl::forceNextDrawingBufferCreationToFail()
 {
     DrawingBuffer::forceNextDrawingBufferCreationToFail();
 }
 
 } // namespace blink