<!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>[180698] branches/safari-600.1.4.15-branch</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/180698">180698</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2015-02-26 14:18:10 -0800 (Thu, 26 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/180174">r180174</a>. rdar://problem/19966344</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchLayoutTestsChangeLog">branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreChangeLog">branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorerenderingRenderTableCellcpp">branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderTableCell.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorerenderingRenderTableCellh">branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderTableCell.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchLayoutTestsfasttabletablecellcrashwhendetachedstateexpectedtxt">branches/safari-600.1.4.15-branch/LayoutTests/fast/table/table-cell-crash-when-detached-state-expected.txt</a></li>
<li><a href="#branchessafari6001415branchLayoutTestsfasttabletablecellcrashwhendetachedstatehtml">branches/safari-600.1.4.15-branch/LayoutTests/fast/table/table-cell-crash-when-detached-state.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog (180697 => 180698)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog 2015-02-26 22:04:13 UTC (rev 180697)
+++ branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog 2015-02-26 22:18:10 UTC (rev 180698)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-02-26 Lucas Forschler <lforschler@apple.com>
+
+ Merge r180174
+
+ 2015-02-16 Zalan Bujtas <zalan@apple.com>
+
+ RenderTableCell can't access its parent while in detached state.
+ https://bugs.webkit.org/show_bug.cgi?id=141639
+ rdar://problem/19850760
+
+ Reviewed by Simon Fraser.
+
+ Null check against ancestor chain so that certain methods in RenderTableCell can
+ be called even if the renderer is not yet attached.
+
+ * fast/table/table-cell-crash-when-detached-state-expected.txt: Added.
+ * fast/table/table-cell-crash-when-detached-state.html: Added.
+
</ins><span class="cx"> 2015-02-25 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r180274.
</span></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfasttabletablecellcrashwhendetachedstateexpectedtxtfromrev180174trunkLayoutTestsfasttabletablecellcrashwhendetachedstateexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/table/table-cell-crash-when-detached-state-expected.txt (from rev 180174, trunk/LayoutTests/fast/table/table-cell-crash-when-detached-state-expected.txt) (0 => 180698)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/table/table-cell-crash-when-detached-state-expected.txt (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/table/table-cell-crash-when-detached-state-expected.txt 2015-02-26 22:18:10 UTC (rev 180698)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+Pass if no crash or assert in debug.
</ins></span></pre></div>
<a id="branchessafari6001415branchLayoutTestsfasttabletablecellcrashwhendetachedstatehtmlfromrev180174trunkLayoutTestsfasttabletablecellcrashwhendetachedstatehtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1.4.15-branch/LayoutTests/fast/table/table-cell-crash-when-detached-state.html (from rev 180174, trunk/LayoutTests/fast/table/table-cell-crash-when-detached-state.html) (0 => 180698)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/LayoutTests/fast/table/table-cell-crash-when-detached-state.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/fast/table/table-cell-crash-when-detached-state.html 2015-02-26 22:18:10 UTC (rev 180698)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests table cell can survive width/height related calls while it is in detached state.</title>
+<style>
+ h1 {
+ display: table-cell !important;
+ background-clip: padding-box;
+ -webkit-transform: rotateX(0deg);
+ }
+</style>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</head>
+<body>
+Pass if no crash or assert in debug.
+<h1></h1>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (180697 => 180698)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-02-26 22:04:13 UTC (rev 180697)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-02-26 22:18:10 UTC (rev 180698)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2015-02-26 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r180174
+
+ 2015-02-16 Zalan Bujtas <zalan@apple.com>
+
+ RenderTableCell can't access its parent while in detached state.
+ https://bugs.webkit.org/show_bug.cgi?id=141639
+ rdar://problem/19850760
+
+ Reviewed by Simon Fraser.
+
+ Null check against ancestor chain so that certain methods in RenderTableCell can
+ be called even if the renderer is not yet attached.
+
+ Test: fast/table/table-cell-crash-when-detached-state.html
+
+ * rendering/RenderTableCell.cpp:
+ (WebCore::RenderTableCell::borderLeft):
+ (WebCore::RenderTableCell::borderRight):
+ (WebCore::RenderTableCell::borderTop):
+ (WebCore::RenderTableCell::borderBottom):
+ (WebCore::RenderTableCell::borderStart):
+ (WebCore::RenderTableCell::borderEnd):
+ (WebCore::RenderTableCell::borderBefore):
+ (WebCore::RenderTableCell::borderAfter):
+ * rendering/RenderTableCell.h:
+
+2015-02-26 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r179480
</span><span class="cx">
</span><span class="cx"> 2015-02-02 Jeremy Jones <jeremyj@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorerenderingRenderTableCellcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderTableCell.cpp (180697 => 180698)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderTableCell.cpp 2015-02-26 22:04:13 UTC (rev 180697)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderTableCell.cpp 2015-02-26 22:18:10 UTC (rev 180698)
</span><span class="lines">@@ -932,44 +932,68 @@
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderTableCell::borderLeft() const
</span><span class="cx"> {
</span><del>- return table()->collapseBorders() ? LayoutUnit::fromPixel(borderHalfLeft(false)) : RenderBlockFlow::borderLeft();
</del><ins>+ RenderTable* table = this->table();
+ if (!table)
+ return RenderBlockFlow::borderLeft();
+ return table->collapseBorders() ? LayoutUnit::fromPixel(borderHalfLeft(false)) : RenderBlockFlow::borderLeft();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderTableCell::borderRight() const
</span><span class="cx"> {
</span><del>- return table()->collapseBorders() ? LayoutUnit::fromPixel(borderHalfRight(false)) : RenderBlockFlow::borderRight();
</del><ins>+ RenderTable* table = this->table();
+ if (!table)
+ return RenderBlockFlow::borderRight();
+ return table->collapseBorders() ? LayoutUnit::fromPixel(borderHalfRight(false)) : RenderBlockFlow::borderRight();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderTableCell::borderTop() const
</span><span class="cx"> {
</span><del>- return table()->collapseBorders() ? LayoutUnit::fromPixel(borderHalfTop(false)) : RenderBlockFlow::borderTop();
</del><ins>+ RenderTable* table = this->table();
+ if (!table)
+ return RenderBlockFlow::borderTop();
+ return table->collapseBorders() ? LayoutUnit::fromPixel(borderHalfTop(false)) : RenderBlockFlow::borderTop();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderTableCell::borderBottom() const
</span><span class="cx"> {
</span><del>- return table()->collapseBorders() ? LayoutUnit::fromPixel(borderHalfBottom(false)) : RenderBlockFlow::borderBottom();
</del><ins>+ RenderTable* table = this->table();
+ if (!table)
+ return RenderBlockFlow::borderBottom();
+ return table->collapseBorders() ? LayoutUnit::fromPixel(borderHalfBottom(false)) : RenderBlockFlow::borderBottom();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: https://bugs.webkit.org/show_bug.cgi?id=46191, make the collapsed border drawing
</span><span class="cx"> // work with different block flow values instead of being hard-coded to top-to-bottom.
</span><span class="cx"> LayoutUnit RenderTableCell::borderStart() const
</span><span class="cx"> {
</span><del>- return table()->collapseBorders() ? LayoutUnit::fromPixel(borderHalfStart(false)) : RenderBlockFlow::borderStart();
</del><ins>+ RenderTable* table = this->table();
+ if (!table)
+ return RenderBlockFlow::borderStart();
+ return table->collapseBorders() ? LayoutUnit::fromPixel(borderHalfStart(false)) : RenderBlockFlow::borderStart();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderTableCell::borderEnd() const
</span><span class="cx"> {
</span><del>- return table()->collapseBorders() ? LayoutUnit::fromPixel(borderHalfEnd(false)) : RenderBlockFlow::borderEnd();
</del><ins>+ RenderTable* table = this->table();
+ if (!table)
+ return RenderBlockFlow::borderEnd();
+ return table->collapseBorders() ? LayoutUnit::fromPixel(borderHalfEnd(false)) : RenderBlockFlow::borderEnd();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderTableCell::borderBefore() const
</span><span class="cx"> {
</span><del>- return table()->collapseBorders() ? LayoutUnit::fromPixel(borderHalfBefore(false)) : RenderBlockFlow::borderBefore();
</del><ins>+ RenderTable* table = this->table();
+ if (!table)
+ return RenderBlockFlow::borderBefore();
+ return table->collapseBorders() ? LayoutUnit::fromPixel(borderHalfBefore(false)) : RenderBlockFlow::borderBefore();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderTableCell::borderAfter() const
</span><span class="cx"> {
</span><del>- return table()->collapseBorders() ? LayoutUnit::fromPixel(borderHalfAfter(false)) : RenderBlockFlow::borderAfter();
</del><ins>+ RenderTable* table = this->table();
+ if (!table)
+ return RenderBlockFlow::borderAfter();
+ return table->collapseBorders() ? LayoutUnit::fromPixel(borderHalfAfter(false)) : RenderBlockFlow::borderAfter();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int RenderTableCell::borderHalfLeft(bool outer) const
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorerenderingRenderTableCellh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderTableCell.h (180697 => 180698)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderTableCell.h 2015-02-26 22:04:13 UTC (rev 180697)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderTableCell.h 2015-02-26 22:18:10 UTC (rev 180698)
</span><span class="lines">@@ -75,8 +75,20 @@
</span><span class="cx"> RenderTableCell* previousCell() const;
</span><span class="cx">
</span><span class="cx"> RenderTableRow* row() const { return toRenderTableRow(parent()); }
</span><del>- RenderTableSection* section() const { return toRenderTableSection(parent()->parent()); }
- RenderTable* table() const { return toRenderTable(parent()->parent()->parent()); }
</del><ins>+ RenderTableSection* section() const
+ {
+ RenderTableRow* row = this->row();
+ if (!row)
+ return nullptr;
+ return toRenderTableSection(row->parent());
+ }
+ RenderTable* table() const
+ {
+ RenderTableSection* section = this->section();
+ if (!section)
+ return nullptr;
+ return toRenderTable(section->parent());
+ }
</ins><span class="cx">
</span><span class="cx"> unsigned rowIndex() const
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>