Remove WebGraphicsContext/WebGraphicsContextImpl

third_party/WebKit/Source/web/InspectorOverlay.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 33 matching lines @@
 #include "core/inspector/LayoutEditor.h"
 #include "core/layout/LayoutView.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 "platform/graphics/paint/CullRect.h"
+#include "platform/graphics/paint/DisplayItemCacheSkipper.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 blink {
 
 namespace {
 
 Node* hoveredNodeForPoint(LocalFrame* frame, const IntPoint& pointInRootFrame, bool ignorePointerEventsNone)
@@ skipping 34 matching lines @@
     explicit InspectorPageOverlayDelegate(InspectorOverlay& overlay)
         : m_overlay(&overlay)
     { }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         visitor->trace(m_overlay);
         PageOverlay::Delegate::trace(visitor);
     }
 
-    void paintPageOverlay(WebGraphicsContext* context, const WebSize& webViewSize) const override
+    void paintPageOverlay(const PageOverlay&, GraphicsContext& graphicsContext, const WebSize& webViewSize) const override
     {
         if (m_overlay->isEmpty())
             return;
 
-        GraphicsContext& graphicsContext = toWebGraphicsContextImpl(context)->graphicsContext();
+        // Skip cache because the following paint may conflict with the view's real painting.
+        DisplayItemCacheSkipper cacheSkipper(graphicsContext);

[chrishtr, 2016/05/05 16:10:43]

I'm encountering this again in the context of investigation into issue 592915.
This is the only
place other than BoxPainter (for painting theme content) that this is used, so
I'm looking into
getting rid of both.

Why is this necessary again? Why would the PaintController for this overlay be
shared with the
main page?

[Xianzhu, 2016/05/05 16:27:52]

The comment seems a bit misleading. The real reason of cache skipper here is
that we never invalidate display items in this paint controller when the display
items are invalidated, so we must assume that all display items are invalid.
Another choice (which seems more correct) is to clear the paint controller
before painting in PageOverlay::paintContents().

[chrishtr, 2016/05/05 16:30:07]

But where does this PaintController come from? Isn't it new'ed up on every paint
in these cases?

[Xianzhu, 2016/05/05 16:47:33]

Read more code and I found I misunderstood InspectorOverlay. I thought it
painted the inspected frame in some way, but actually it paints
InspectorOverlayPage.html, so this won't conflict with the inspected frame, and
the cache skipper should not be needed.

[chrishtr, 2016/05/05 16:53:04]

Ok I'll put up a patch to remove this then.

         FrameView* view = m_overlay->overlayMainFrame()->view();
         ASSERT(!view->needsLayout());
         view->paint(&graphicsContext, CullRect(IntRect(0, 0, view->width(), view->height())));
     }
 
 private:
     RawPtrWillBeMember<InspectorOverlay> m_overlay;
 };
 
 
@@ skipping 627 matching lines @@
 
 void InspectorOverlay::initializeLayoutEditorIfNeeded(Node* node)
 {
     if (node && node->isElementNode() && m_inspectMode == InspectorDOMAgent::ShowLayoutEditor && !m_layoutEditor) {
         m_layoutEditor = LayoutEditor::create(toElement(node), m_cssAgent, m_domAgent, &overlayMainFrame()->script());
         toChromeClientImpl(m_webViewImpl->page()->chromeClient()).setCursorOverridden(true);
     }
 }
 
 } // namespace blink