Changeset 211141 in webkit

Timestamp:

Jan 25, 2017 5:26:01 AM (7 years ago)

Author:

magomez@igalia.com

Message:

[GTK] The inspector is broken when AC support is disabled
​https://bugs.webkit.org/show_bug.cgi?id=165237

Reviewed by Carlos Garcia Campos.

Source/WebCore:

Ensure that PageOverlayController destroys its root GraphicsLayers when leaving AC. They
will be recreated if we enter AC again, avoiding a crash because the layers don't belong to
the appropriate compositor. Also, don't append the document overlay layers if we are not
in compositing mode.

No new tests added.

• page/PageOverlayController.cpp:

(WebCore::PageOverlayController::willDetachRootLayer):

• page/PageOverlayController.h:
• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::appendDocumentOverlayLayers):
(WebCore::RenderLayerCompositor::detachRootLayer):

Source/WebKit2:

WebInspector must not use PageOverlays or GraphicsLayers when AC is not avaialable.

No new tests added.

• WebProcess/WebCoreSupport/WebInspectorClient.cpp:

(WebKit::WebInspectorClient::highlight):
(WebKit::WebInspectorClient::showPaintRect):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/PageOverlayController.cpp (modified) (1 diff)
• WebCore/page/PageOverlayController.h (modified) (1 diff)
• WebCore/rendering/RenderLayerCompositor.cpp (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-01-25  Miguel Gomez  <magomez@igalia.com>
+
+        [GTK] The inspector is broken when AC support is disabled
+        https://bugs.webkit.org/show_bug.cgi?id=165237
+
+        Reviewed by Carlos Garcia Campos.
+
+        Ensure that PageOverlayController destroys its root GraphicsLayers when leaving AC. They
+        will be recreated if we enter AC again, avoiding a crash because the layers don't belong to
+        the appropriate compositor. Also, don't append the document overlay layers if we are not
+        in compositing mode.
+
+        No new tests added.
+
+        * page/PageOverlayController.cpp:
+        (WebCore::PageOverlayController::willDetachRootLayer):
+        * page/PageOverlayController.h:
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::appendDocumentOverlayLayers):
+        (WebCore::RenderLayerCompositor::detachRootLayer):
+
 2017-01-25  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/page/PageOverlayController.cpp

@@ -208 +208 @@
 }
 
+void PageOverlayController::willDetachRootLayer()
+{
+    m_documentOverlayRootLayer = nullptr;
+    m_viewOverlayRootLayer = nullptr;
+    m_initialized = false;
+}
+
 void PageOverlayController::didChangeViewSize()
 {

trunk/Source/WebCore/page/PageOverlayController.h

@@ -59 +59 @@
 
     void willAttachRootLayer();
+    void willDetachRootLayer();
 
     void didChangeViewSize();

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -773 +773 @@
 void RenderLayerCompositor::appendDocumentOverlayLayers(Vector<GraphicsLayer*>& childList)
 {
-    if (!isMainFrameCompositor())
+    if (!isMainFrameCompositor() || !m_compositing)
         return;
 
@@ -3510 +3510 @@
         Frame& frame = m_renderView.frameView().frame();
         page().chrome().client().attachRootGraphicsLayer(frame, nullptr);
-        if (frame.isMainFrame())
+        if (frame.isMainFrame()) {
             page().chrome().client().attachViewOverlayGraphicsLayer(frame, nullptr);
+            frame.mainFrame().pageOverlayController().willDetachRootLayer();
+        }
     }
     break;

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-01-25  Miguel Gomez  <magomez@igalia.com>
+
+        [GTK] The inspector is broken when AC support is disabled
+        https://bugs.webkit.org/show_bug.cgi?id=165237
+
+        Reviewed by Carlos Garcia Campos.
+
+        WebInspector must not use PageOverlays or GraphicsLayers when AC is not avaialable.
+
+        No new tests added.
+
+        * WebProcess/WebCoreSupport/WebInspectorClient.cpp:
+        (WebKit::WebInspectorClient::highlight):
+        (WebKit::WebInspectorClient::showPaintRect):
+
 2017-01-25  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp

@@ -34 +34 @@
 #include <WebCore/Page.h>
 #include <WebCore/PageOverlayController.h>
+#include <WebCore/Settings.h>
 #include <wtf/CurrentTime.h>
 
@@ -106 +107 @@
 void WebInspectorClient::highlight()
 {
+    if (!m_page->corePage()->settings().acceleratedCompositingEnabled())
+        return;
+
 #if !PLATFORM(IOS)
     if (!m_highlightOverlay) {
@@ -135 +139 @@
 void WebInspectorClient::showPaintRect(const FloatRect& rect)
 {
+    if (!m_page->corePage()->settings().acceleratedCompositingEnabled())
+        return;
+
     if (!m_paintRectOverlay) {
         m_paintRectOverlay = PageOverlay::create(*this, PageOverlay::OverlayType::Document);