PageOverlays: Remove PageOverlayList

Source/web/InspectorOverlayImpl.cpp

 /*
  * Copyright (C) 2011 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 30 matching lines @@
 #include "core/inspector/LayoutEditor.h"
 #include "core/loader/EmptyClients.h"
 #include "core/loader/FrameLoadRequest.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/Page.h"
 #include "platform/JSONValues.h"
 #include "platform/ScriptForbiddenScope.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebData.h"
+#include "web/PageOverlay.h"
 #include "web/WebGraphicsContextImpl.h"
 #include "web/WebInputEventConversion.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebViewImpl.h"
 #include <v8.h>
 
-namespace OverlayZOrders {
-// Use 99 as a big z-order number so that highlight is above other overlays.
-static const int highlight = 99;
-}
-
 namespace blink {
 
 namespace {
 
 class InspectorOverlayStub : public NoBaseWillBeGarbageCollectedFinalized<InspectorOverlayStub>, public InspectorOverlay {
     WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(InspectorOverlayStub);
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(InspectorOverlayStub);
 public:
     InspectorOverlayStub() { }
     DECLARE_TRACE();
@@ skipping 13 matching lines @@
     void setLayoutEditor(PassOwnPtrWillBeRawPtr<LayoutEditor>) override { }
 };
 
 DEFINE_TRACE(InspectorOverlayStub)
 {
     InspectorOverlay::trace(visitor);
 }
 
 } // anonymous namespace
 
+class InspectorOverlayImpl::InspectorPageOverlayDelegate : public PageOverlay::Delegate {
+public:
+    InspectorPageOverlayDelegate(InspectorOverlayImpl& overlay)
+        : m_overlay(overlay)
+    { }
+
+    void paintPageOverlay(WebGraphicsContext* context, const WebSize& webViewSize)
+    {
+        if (m_overlay.isEmpty())
+            return;
+
+        GraphicsContext& graphicsContext = toWebGraphicsContextImpl(context)->graphicsContext();
+        FrameView* view = m_overlay.overlayMainFrame()->view();
+        ASSERT(!view->needsLayout());
+        view->paint(&graphicsContext, IntRect(0, 0, view->width(), view->height()));
+    }
+
+private:
+    InspectorOverlayImpl& m_overlay;
+};
+
+
 class InspectorOverlayImpl::InspectorOverlayChromeClient final: public EmptyChromeClient {
 public:
     InspectorOverlayChromeClient(ChromeClient& client, InspectorOverlayImpl& overlay)
         : m_client(client)
         , m_overlay(overlay)
     { }
 
     void setCursor(const Cursor& cursor) override
     {
         m_client.setCursor(cursor);
@@ skipping 53 matching lines @@
 {
     visitor->trace(m_highlightNode);
     visitor->trace(m_eventTargetNode);
     visitor->trace(m_overlayPage);
     visitor->trace(m_overlayHost);
     visitor->trace(m_listener);
     visitor->trace(m_layoutEditor);
     InspectorOverlay::trace(visitor);
 }
 
-void InspectorOverlayImpl::paintPageOverlay(WebGraphicsContext* context, const WebSize& webViewSize)
-{
-    if (isEmpty())
-        return;
-
-    GraphicsContext& graphicsContext = toWebGraphicsContextImpl(context)->graphicsContext();
-    FrameView* view = overlayMainFrame()->view();
-    ASSERT(!view->needsLayout());
-    view->paint(&graphicsContext, IntRect(0, 0, view->width(), view->height()));
-}
-
 void InspectorOverlayImpl::invalidate()
 {
-    m_webViewImpl->addPageOverlay(this, OverlayZOrders::highlight);
+    if (!m_pageOverlay)
+        m_pageOverlay = PageOverlay::create(m_webViewImpl, adoptPtr(new InspectorPageOverlayDelegate(*this)));
+
+    m_pageOverlay->update();
 }
 
 void InspectorOverlayImpl::layout()
 {
     if (isEmpty())
         return;
 
     TemporaryChange<bool> scoped(m_inLayout, true);
     if (m_needsUpdate) {
         m_needsUpdate = false;
@@ skipping 89 matching lines @@
     if (m_suspendCount)
         return true;
     bool hasAlwaysVisibleElements = m_highlightNode || m_eventTargetNode || m_highlightQuad  || m_drawViewSize;
     bool hasInvisibleInInspectModeElements = !m_pausedInDebuggerMessage.isNull();
     return !(hasAlwaysVisibleElements || (hasInvisibleInInspectModeElements && !m_inspectModeEnabled));
 }
 
 void InspectorOverlayImpl::update()
 {
     if (isEmpty()) {
-        m_webViewImpl->removePageOverlay(this);
+        if (m_pageOverlay)
+            m_pageOverlay.clear();
         return;
     }
     m_needsUpdate = true;
     m_webViewImpl->page()->chromeClient().scheduleAnimation();
 }
 
 void InspectorOverlayImpl::rebuildOverlayPage()
 {
     FrameView* view = m_webViewImpl->mainFrameImpl()->frameView();
     if (!view)
@@ skipping 200 matching lines @@
 {
     --m_suspendCount;
 }
 
 void InspectorOverlayImpl::setLayoutEditor(PassOwnPtrWillBeRawPtr<LayoutEditor> layoutEditor)
 {
     m_layoutEditor = layoutEditor;
     m_overlayHost->setLayoutEditorListener(m_layoutEditor.get());
 }
 
+GraphicsLayer* InspectorOverlayImpl::graphicsLayer()
+{
+    if (!m_pageOverlay)
+        return nullptr;
+
+    return m_pageOverlay->graphicsLayer();
+}
+
+void InspectorOverlayImpl::updatePageOverlay()

[dgozman, 2015/07/30 10:17:31]

updateGraphicsLayer? Or even better replace two methods with |PageOverlay*
pageOverlay()|.

[sergeyv, 2015/07/30 11:42:37]

Done.

+{
+    if (m_pageOverlay)
+        m_pageOverlay->update();
+}
 
 } // namespace blink