<!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>[186454] releases/WebKitGTK/webkit-2.8/Source/WebCore</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/186454">186454</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-07-07 05:28:13 -0700 (Tue, 07 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/186366">r186366</a> - Crash: LayoutState root's container is nullptr when the layout root is detached.
https://bugs.webkit.org/show_bug.cgi?id=146646
rdar://problem/21371544
Reviewed by Simon Fraser.
This is a speculative fix to ensure that when the root of the LayoutState is detached
we don't try to access its container (nullptr).
This is related to trac.webkit.org/<a href="http://trac.webkit.org/projects/webkit/changeset/185484">r185484</a>.
Not reproducible.
* rendering/LayoutState.cpp:
(WebCore::LayoutState::LayoutState):
* rendering/LayoutState.h:
(WebCore::LayoutState::LayoutState): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorerenderingLayoutStatecpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/LayoutState.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorerenderingLayoutStateh">releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/LayoutState.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (186453 => 186454)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-07-07 12:25:05 UTC (rev 186453)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-07-07 12:28:13 UTC (rev 186454)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-07-06 Zalan Bujtas <zalan@apple.com>
+
+ Crash: LayoutState root's container is nullptr when the layout root is detached.
+ https://bugs.webkit.org/show_bug.cgi?id=146646
+ rdar://problem/21371544
+
+ Reviewed by Simon Fraser.
+
+ This is a speculative fix to ensure that when the root of the LayoutState is detached
+ we don't try to access its container (nullptr).
+ This is related to trac.webkit.org/r185484.
+
+ Not reproducible.
+
+ * rendering/LayoutState.cpp:
+ (WebCore::LayoutState::LayoutState):
+ * rendering/LayoutState.h:
+ (WebCore::LayoutState::LayoutState): Deleted.
+
</ins><span class="cx"> 2015-07-05 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2] WebBackForwardListItems' pageState is not kept up-to-date
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorerenderingLayoutStatecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/LayoutState.cpp (186453 => 186454)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/LayoutState.cpp 2015-07-07 12:25:05 UTC (rev 186453)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/LayoutState.cpp 2015-07-07 12:28:13 UTC (rev 186454)
</span><span class="lines">@@ -35,8 +35,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> LayoutState::LayoutState(std::unique_ptr<LayoutState> next, RenderBox* renderer, const LayoutSize& offset, LayoutUnit pageLogicalHeight, bool pageLogicalHeightChanged)
</span><del>- : m_lineGrid(0)
- , m_next(WTF::move(next))
</del><ins>+ : m_next(WTF::move(next))
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> , m_renderer(renderer)
</span><span class="cx"> #endif
</span><span class="lines">@@ -130,23 +129,23 @@
</span><span class="cx"> , m_layoutDeltaXSaturated(false)
</span><span class="cx"> , m_layoutDeltaYSaturated(false)
</span><span class="cx"> #endif
</span><del>- , m_lineGrid(0)
- , m_pageLogicalHeight(0)
</del><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> , m_renderer(&root)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><del>- RenderElement* container = root.container();
- FloatPoint absContentPoint = container->localToAbsolute(FloatPoint(), UseTransforms);
- m_paintOffset = LayoutSize(absContentPoint.x(), absContentPoint.y());
</del><ins>+ if (RenderElement* container = root.container()) {
+ FloatPoint absContentPoint = container->localToAbsolute(FloatPoint(), UseTransforms);
+ m_paintOffset = LayoutSize(absContentPoint.x(), absContentPoint.y());
</ins><span class="cx">
</span><del>- if (container->hasOverflowClip()) {
- m_clipped = true;
- auto& containerBox = downcast<RenderBox>(*container);
- m_clipRect = LayoutRect(toLayoutPoint(m_paintOffset), containerBox.cachedSizeForOverflowClip());
- m_paintOffset -= containerBox.scrolledContentOffset();
</del><ins>+ if (container->hasOverflowClip()) {
+ m_clipped = true;
+ auto& containerBox = downcast<RenderBox>(*container);
+ m_clipRect = LayoutRect(toLayoutPoint(m_paintOffset), containerBox.cachedSizeForOverflowClip());
+ m_paintOffset -= containerBox.scrolledContentOffset();
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> void LayoutState::clearPaginationInformation()
</span><span class="cx"> {
</span><span class="cx"> m_pageLogicalHeight = m_next->m_pageLogicalHeight;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorerenderingLayoutStateh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/LayoutState.h (186453 => 186454)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/LayoutState.h 2015-07-07 12:25:05 UTC (rev 186453)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/LayoutState.h 2015-07-07 12:28:13 UTC (rev 186454)
</span><span class="lines">@@ -52,11 +52,6 @@
</span><span class="cx"> , m_layoutDeltaXSaturated(false)
</span><span class="cx"> , m_layoutDeltaYSaturated(false)
</span><span class="cx"> #endif
</span><del>- , m_lineGrid(nullptr)
- , m_pageLogicalHeight(0)
-#ifndef NDEBUG
- , m_renderer(nullptr)
-#endif
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -103,7 +98,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // The current line grid that we're snapping to and the offset of the start of the grid.
</span><del>- RenderBlockFlow* m_lineGrid;
</del><ins>+ RenderBlockFlow* m_lineGrid { nullptr };
</ins><span class="cx"> std::unique_ptr<LayoutState> m_next;
</span><span class="cx">
</span><span class="cx"> // FIXME: Distinguish between the layout clip rect and the paint clip rect which may be larger,
</span><span class="lines">@@ -129,7 +124,7 @@
</span><span class="cx"> RenderFlowThread* m_currentRenderFlowThread { nullptr };
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><del>- RenderObject* m_renderer;
</del><ins>+ RenderObject* m_renderer { nullptr };
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>