<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[211785] releases/WebKitGTK/webkit-2.14/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/211785">211785</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-07 01:32:41 -0800 (Tue, 07 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/211141">r211141</a> - [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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCorepagePageOverlayControllercpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/page/PageOverlayController.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCorepagePageOverlayControllerh">releases/WebKitGTK/webkit-2.14/Source/WebCore/page/PageOverlayController.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCorerenderingRenderLayerCompositorcpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2WebProcessWebCoreSupportWebInspectorClientcpp">releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (211784 => 211785)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2017-02-07 09:32:31 UTC (rev 211784)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2017-02-07 09:32:41 UTC (rev 211785)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+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):
+
</ins><span class="cx"> 2017-01-24 Miguel Gomez <magomez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Do not paint non composited content into the window when using the threaded compositor
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCorepagePageOverlayControllercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/page/PageOverlayController.cpp (211784 => 211785)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/page/PageOverlayController.cpp 2017-02-07 09:32:31 UTC (rev 211784)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/page/PageOverlayController.cpp 2017-02-07 09:32:41 UTC (rev 211785)
</span><span class="lines">@@ -209,6 +209,13 @@
</span><span class="cx"> updateOverlayGeometry(*overlayAndLayer.key, *overlayAndLayer.value);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PageOverlayController::willDetachRootLayer()
+{
+ m_documentOverlayRootLayer = nullptr;
+ m_viewOverlayRootLayer = nullptr;
+ m_initialized = false;
+}
+
</ins><span class="cx"> void PageOverlayController::didChangeViewSize()
</span><span class="cx"> {
</span><span class="cx"> for (auto& overlayAndLayer : m_overlayGraphicsLayers) {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCorepagePageOverlayControllerh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/page/PageOverlayController.h (211784 => 211785)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/page/PageOverlayController.h 2017-02-07 09:32:31 UTC (rev 211784)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/page/PageOverlayController.h 2017-02-07 09:32:41 UTC (rev 211785)
</span><span class="lines">@@ -60,6 +60,7 @@
</span><span class="cx"> GraphicsLayer& layerForOverlay(PageOverlay&) const;
</span><span class="cx">
</span><span class="cx"> void willAttachRootLayer();
</span><ins>+ void willDetachRootLayer();
</ins><span class="cx">
</span><span class="cx"> void didChangeViewSize();
</span><span class="cx"> void didChangeDocumentSize();
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderLayerCompositor.cpp (211784 => 211785)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderLayerCompositor.cpp 2017-02-07 09:32:31 UTC (rev 211784)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderLayerCompositor.cpp 2017-02-07 09:32:41 UTC (rev 211785)
</span><span class="lines">@@ -798,7 +798,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderLayerCompositor::appendDocumentOverlayLayers(Vector<GraphicsLayer*>& childList)
</span><span class="cx"> {
</span><del>- if (!isMainFrameCompositor())
</del><ins>+ if (!isMainFrameCompositor() || !m_compositing)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> Frame& frame = m_renderView.frameView().frame();
</span><span class="lines">@@ -3588,8 +3588,10 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> page->chrome().client().attachRootGraphicsLayer(&frame, 0);
</span><del>- if (frame.isMainFrame())
</del><ins>+ if (frame.isMainFrame()) {
</ins><span class="cx"> page->chrome().client().attachViewOverlayGraphicsLayer(&frame, 0);
</span><ins>+ frame.mainFrame().pageOverlayController().willDetachRootLayer();
+ }
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case RootLayerUnattached:
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog (211784 => 211785)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2017-02-07 09:32:31 UTC (rev 211784)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2017-02-07 09:32:41 UTC (rev 211785)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+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):
+
</ins><span class="cx"> 2017-01-19 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [Threaded Compositor] Initialize the threaded compositor with the current size
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2WebProcessWebCoreSupportWebInspectorClientcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp (211784 => 211785)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp 2017-02-07 09:32:31 UTC (rev 211784)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp 2017-02-07 09:32:41 UTC (rev 211785)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include <WebCore/MainFrame.h>
</span><span class="cx"> #include <WebCore/Page.h>
</span><span class="cx"> #include <WebCore/PageOverlayController.h>
</span><ins>+#include <WebCore/Settings.h>
</ins><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -105,6 +106,9 @@
</span><span class="cx">
</span><span class="cx"> void WebInspectorClient::highlight()
</span><span class="cx"> {
</span><ins>+ if (!m_page->corePage()->settings().acceleratedCompositingEnabled())
+ return;
+
</ins><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> if (!m_highlightOverlay) {
</span><span class="cx"> auto highlightOverlay = PageOverlay::create(*this);
</span><span class="lines">@@ -134,6 +138,9 @@
</span><span class="cx">
</span><span class="cx"> void WebInspectorClient::showPaintRect(const FloatRect& rect)
</span><span class="cx"> {
</span><ins>+ if (!m_page->corePage()->settings().acceleratedCompositingEnabled())
+ return;
+
</ins><span class="cx"> if (!m_paintRectOverlay) {
</span><span class="cx"> m_paintRectOverlay = PageOverlay::create(*this, PageOverlay::OverlayType::Document);
</span><span class="cx"> m_page->mainFrame()->pageOverlayController().installPageOverlay(m_paintRectOverlay, PageOverlay::FadeMode::DoNotFade);
</span></span></pre>
</div>
</div>
</body>
</html>