<!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>[197452] trunk/Source/WebKit2</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/197452">197452</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-02 09:59:34 -0800 (Wed, 02 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/197409">r197409</a>): [GTK] Web process always crashes on WebPage construction after <a href="http://trac.webkit.org/projects/webkit/changeset/197409">r197409</a>
https://bugs.webkit.org/show_bug.cgi?id=154918
Reviewed by Žan Doberšek.
We have an incorrect check in DrawingAreaImpl constructor that has
never actually worked because it uses the page settings before
they were initialized. But that has been fixed in <a href="http://trac.webkit.org/projects/webkit/changeset/197409">r197409</a> and now
we are always forcing accelerated compositing mode incorrectly,
because m_alwaysUseCompositing is set in the constructor and never
changed again.
* WebProcess/WebPage/DrawingAreaImpl.cpp:
(WebKit::DrawingAreaImpl::DrawingAreaImpl): Remove code to set
settings and m_alwaysUseCompositing, since that should be done in
updatePreferences().
(WebKit::DrawingAreaImpl::updatePreferences): Update the settings
accordingly and always update m_alwaysUseCompositing when AC is
enabled and forced in the settings.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage): WebPage::updatePreferences() calls
DrawingArea::updatePreferences(), but since <a href="http://trac.webkit.org/projects/webkit/changeset/197409">r197409</a> it happens
before the drawing area has been created. So, call
DrawingArea::updatePreferences() in the constructor right after
the main frame has been created, since
DrawingArea::updatePreferences() uses the main frame.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageDrawingAreaImplcpp">trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (197451 => 197452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-03-02 17:32:28 UTC (rev 197451)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-02 17:59:34 UTC (rev 197452)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2016-03-02 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ REGRESSION(r197409): [GTK] Web process always crashes on WebPage construction after r197409
+ https://bugs.webkit.org/show_bug.cgi?id=154918
+
+ Reviewed by Žan Doberšek.
+
+ We have an incorrect check in DrawingAreaImpl constructor that has
+ never actually worked because it uses the page settings before
+ they were initialized. But that has been fixed in r197409 and now
+ we are always forcing accelerated compositing mode incorrectly,
+ because m_alwaysUseCompositing is set in the constructor and never
+ changed again.
+
+ * WebProcess/WebPage/DrawingAreaImpl.cpp:
+ (WebKit::DrawingAreaImpl::DrawingAreaImpl): Remove code to set
+ settings and m_alwaysUseCompositing, since that should be done in
+ updatePreferences().
+ (WebKit::DrawingAreaImpl::updatePreferences): Update the settings
+ accordingly and always update m_alwaysUseCompositing when AC is
+ enabled and forced in the settings.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage): WebPage::updatePreferences() calls
+ DrawingArea::updatePreferences(), but since r197409 it happens
+ before the drawing area has been created. So, call
+ DrawingArea::updatePreferences() in the constructor right after
+ the main frame has been created, since
+ DrawingArea::updatePreferences() uses the main frame.
+
</ins><span class="cx"> 2016-02-29 Ada Chan <adachan@apple.com>
</span><span class="cx">
</span><span class="cx"> Adopt the new version of AVOutputDeviceMenuController's showMenuForRect method.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageDrawingAreaImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp (197451 => 197452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2016-03-02 17:32:28 UTC (rev 197451)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2016-03-02 17:59:34 UTC (rev 197452)
</span><span class="lines">@@ -68,16 +68,6 @@
</span><span class="cx"> , m_displayTimer(RunLoop::main(), this, &DrawingAreaImpl::displayTimerFired)
</span><span class="cx"> , m_exitCompositingTimer(RunLoop::main(), this, &DrawingAreaImpl::exitAcceleratedCompositingMode)
</span><span class="cx"> {
</span><del>-
-#if USE(COORDINATED_GRAPHICS_THREADED)
- webPage.corePage()->settings().setForceCompositingMode(true);
-#endif
-
- if (webPage.corePage()->settings().acceleratedDrawingEnabled() || webPage.corePage()->settings().forceCompositingMode())
- m_alwaysUseCompositing = true;
-
- if (m_alwaysUseCompositing)
- enterAcceleratedCompositingMode(0);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DrawingAreaImpl::setNeedsDisplay()
</span><span class="lines">@@ -257,6 +247,10 @@
</span><span class="cx"> settings.setAcceleratedCompositingForFixedPositionEnabled(true);
</span><span class="cx"> settings.setFixedPositionCreatesStackingContext(true);
</span><span class="cx"> #endif
</span><ins>+
+ m_alwaysUseCompositing = settings.acceleratedDrawingEnabled() && settings.forceCompositingMode();
+ if (m_alwaysUseCompositing && !m_layerTreeHost)
+ enterAcceleratedCompositingMode(nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DrawingAreaImpl::layerHostDidFlushLayers()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (197451 => 197452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-03-02 17:32:28 UTC (rev 197451)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-03-02 17:59:34 UTC (rev 197452)
</span><span class="lines">@@ -418,6 +418,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_mainFrame = WebFrame::createWithCoreMainFrame(this, &m_page->mainFrame());
</span><ins>+ m_drawingArea->updatePreferences(parameters.store);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(BATTERY_STATUS)
</span><span class="cx"> WebCore::provideBatteryTo(m_page.get(), new WebBatteryClient(this));
</span></span></pre>
</div>
</div>
</body>
</html>