[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [98740] branches/chromium/912
From: inferno () chromium ! org
Date: 2011-10-28 18:25:24
Message-ID: 20111028182524.72A3D4415FED () lists ! macosforge ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!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>[98740] branches/chromium/912</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/98740">98740</a></dd> \
<dt>Author</dt> <dd>inferno@chromium.org</dd> <dt>Date</dt> <dd>2011-10-28 11:25:24 \
-0700 (Fri, 28 Oct 2011)</dd> </dl>
<h3>Log Message</h3>
<pre>Merge 98372 - Crash in WebCore::RenderTableSection::addChild due to assert \
failure BUG=101540
Review URL: http://codereview.chromium.org/8417039</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#brancheschromium912SourceWebCorerenderingRenderTablecpp">branches/chromium/912/Source/WebCore/rendering/RenderTable.cpp</a></li>
<li><a href="#brancheschromium912SourceWebCorerenderingRenderTableRowcpp">branches/chromium/912/Source/WebCore/rendering/RenderTableRow.cpp</a></li>
<li><a href="#brancheschromium912SourceWebCorerenderingRenderTableSectioncpp">branches/chromium/912/Source/WebCore/rendering/RenderTableSection.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#brancheschromium912LayoutTestsfasttabletableanonymouscellbugexpectedtxt" \
>branches/chromium/912/LayoutTests/fast/table/table-anonymous-cell-bug-expected.txt</a></li>
>
<li><a href="#brancheschromium912LayoutTestsfasttabletableanonymouscellbughtml">branches/chromium/912/LayoutTests/fast/table/table-anonymous-cell-bug.html</a></li>
<li><a href="#brancheschromium912LayoutTestsfasttabletableanonymousrowbugexpectedtxt" \
>branches/chromium/912/LayoutTests/fast/table/table-anonymous-row-bug-expected.txt</a></li>
>
<li><a href="#brancheschromium912LayoutTestsfasttabletableanonymousrowbughtml">branches/chromium/912/LayoutTests/fast/table/table-anonymous-row-bug.html</a></li>
<li><a href="#brancheschromium912LayoutTestsfasttabletableanonymoussectionbugexpected \
txt">branches/chromium/912/LayoutTests/fast/table/table-anonymous-section-bug-expected.txt</a></li>
<li><a href="#brancheschromium912LayoutTestsfasttabletableanonymoussectionbughtml">br \
anches/chromium/912/LayoutTests/fast/table/table-anonymous-section-bug.html</a></li> \
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="brancheschromium912LayoutTestsfasttabletableanonymouscellbugexpectedtxtfromrev98372trunkLayoutTestsfasttabletableanonymouscellbugexpectedtxt"></a>
<div class="copfile"><h4>Copied: \
branches/chromium/912/LayoutTests/fast/table/table-anonymous-cell-bug-expected.txt \
(from rev 98372, trunk/LayoutTests/fast/table/table-anonymous-cell-bug-expected.txt) \
(0 => 98740)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/chromium/912/LayoutTests/fast/table/table-anonymous-cell-bug-expected.txt \
(rev 0)
+++ branches/chromium/912/LayoutTests/fast/table/table-anonymous-cell-bug-expected.txt 2011-10-28 \
18:25:24 UTC (rev 98740) </span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x66
+ RenderBlock {HTML} at (0,0) size 800x66
+ RenderBody {BODY} at (8,8) size 784x50
+ RenderTable {DIV} at (0,0) size 260x50
+ RenderTableSection {DIV} at (0,0) size 260x50
+ RenderTableRow {DIV} at (0,0) size 260x50
+ RenderTableCell {DIV} at (0,0) size 50x0 [bgcolor=#0000FF] [r=0 c=0 rs=1 \
cs=1] + RenderTableCell (anonymous) at (50,0) size 160x16 [r=0 c=1 rs=1 \
cs=1] + RenderInline {SPAN} at (0,0) size 160x16
+ RenderText {#text} at (0,0) size 160x16
+ text run at (0,0) width 160: "Some text."
+ RenderTableCell {DIV} at (210,0) size 50x0 [bgcolor=#0000FF] [r=0 c=2 \
rs=1 cs=1] </ins></span></pre></div>
<a id="brancheschromium912LayoutTestsfasttabletableanonymouscellbughtmlfromrev98372trunkLayoutTestsfasttabletableanonymouscellbughtml"></a>
<div class="copfile"><h4>Copied: \
branches/chromium/912/LayoutTests/fast/table/table-anonymous-cell-bug.html (from rev \
98372, trunk/LayoutTests/fast/table/table-anonymous-cell-bug.html) (0 => 98740)</h4> \
<pre class="diff"><span> <span class="info">--- \
branches/chromium/912/LayoutTests/fast/table/table-anonymous-cell-bug.html \
(rev 0)
+++ branches/chromium/912/LayoutTests/fast/table/table-anonymous-cell-bug.html 2011-10-28 \
18:25:24 UTC (rev 98740) </span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body style="font-family: ahem; -webkit-font-smoothing: none;">
+<style>
+ div.table { display: table; }
+ div.section { display: table-row-group; }
+ div.cell { display: table-cell; width: 50px; height: 50px; background-color: \
blue; } + div.row { display: table-row; }
+</style>
+
+<div class="table" id="table-1">
+ <div class="section" id="tbody-1">
+ <div class="row" id="row-1">
+ <div class="cell" id="cell-1"></div>
+ <div class="cell" id="cell-2"></div>
+ </div>
+ </div>
+</div>
+
+<script>
+ function createSpan()
+ {
+ var spanElement = document.createElement("span");
+ spanElement.appendChild(document.createTextNode("Some text."));
+ return spanElement;
+ }
+
+ function insertSpan(tableID, beforeID)
+ {
+ var tableRow = document.getElementById(tableID);
+ var before = document.getElementById(beforeID);
+ tableRow.insertBefore(createSpan(), before);
+ }
+
+ document.body.offsetTop;
+
+ insertSpan("row-1", "cell-2");
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="brancheschromium912LayoutTestsfasttabletableanonymousrowbugexpectedtxtfromrev98372trunkLayoutTestsfasttabletableanonymousrowbugexpectedtxt"></a>
<div class="copfile"><h4>Copied: \
branches/chromium/912/LayoutTests/fast/table/table-anonymous-row-bug-expected.txt \
(from rev 98372, trunk/LayoutTests/fast/table/table-anonymous-row-bug-expected.txt) \
(0 => 98740)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/chromium/912/LayoutTests/fast/table/table-anonymous-row-bug-expected.txt \
(rev 0)
+++ branches/chromium/912/LayoutTests/fast/table/table-anonymous-row-bug-expected.txt 2011-10-28 \
18:25:24 UTC (rev 98740) </span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x132
+ RenderBlock {HTML} at (0,0) size 800x132
+ RenderBody {BODY} at (8,8) size 784x116
+ RenderTable {DIV} at (0,0) size 160x116
+ RenderTableSection (anonymous) at (0,0) size 160x116
+ RenderTableRow {DIV} at (0,0) size 160x50
+ RenderTableCell {DIV} at (0,0) size 160x16 [bgcolor=#0000FF] [r=0 c=0 \
rs=1 cs=1] + RenderText {#text} at (0,0) size 96x16
+ text run at (0,0) width 96: "Cell 1"
+ RenderTableRow (anonymous) at (0,50) size 160x16
+ RenderTableCell (anonymous) at (0,50) size 160x16 [r=1 c=0 rs=1 cs=1]
+ RenderInline {SPAN} at (0,0) size 160x16
+ RenderText {#text} at (0,0) size 160x16
+ text run at (0,0) width 160: "Some text."
+ RenderTableRow {DIV} at (0,66) size 160x50
+ RenderTableCell {DIV} at (0,66) size 160x16 [bgcolor=#0000FF] [r=2 c=0 \
rs=1 cs=1] + RenderText {#text} at (0,0) size 96x16
+ text run at (0,0) width 96: "Cell 2"
</ins></span></pre></div>
<a id="brancheschromium912LayoutTestsfasttabletableanonymousrowbughtmlfromrev98372trunkLayoutTestsfasttabletableanonymousrowbughtml"></a>
<div class="copfile"><h4>Copied: \
branches/chromium/912/LayoutTests/fast/table/table-anonymous-row-bug.html (from rev \
98372, trunk/LayoutTests/fast/table/table-anonymous-row-bug.html) (0 => 98740)</h4> \
<pre class="diff"><span> <span class="info">--- \
branches/chromium/912/LayoutTests/fast/table/table-anonymous-row-bug.html \
(rev 0)
+++ branches/chromium/912/LayoutTests/fast/table/table-anonymous-row-bug.html 2011-10-28 \
18:25:24 UTC (rev 98740) </span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body style="font-family: ahem; -webkit-font-smoothing: none;">
+<style>
+ div.table { display: table; }
+ div.cell { display: table-cell; width: 50px; height: 50px; background-color: \
blue; } + div.row { display: table-row; }
+</style>
+
+<div class="table" id="table-1">
+ <div class="row" id="row-1">
+ <div class="cell">Cell 1</div>
+ </div>
+ <div class="row" id="row-2">
+ <div class="cell">Cell 2</div>
+ </div>
+</div>
+
+<script>
+ function createSpan()
+ {
+ var spanElement = document.createElement("span");
+ spanElement.appendChild(document.createTextNode("Some text."));
+ return spanElement;
+ }
+
+ function insertSpan(tableID, beforeID)
+ {
+ var table = document.getElementById(tableID);
+ var before = document.getElementById(beforeID);
+ table.insertBefore(createSpan(), before);
+ }
+
+ document.body.offsetTop;
+
+ insertSpan("table-1", "row-2");
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="brancheschromium912LayoutTestsfasttabletableanonymoussectionbugexpectedtxtfromrev98372trunkLayoutTestsfasttabletableanonymoussectionbugexpectedtxt"></a>
<div class="copfile"><h4>Copied: \
branches/chromium/912/LayoutTests/fast/table/table-anonymous-section-bug-expected.txt \
(from rev 98372, trunk/LayoutTests/fast/table/table-anonymous-section-bug-expected.txt) \
(0 => 98740)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/chromium/912/LayoutTests/fast/table/table-anonymous-section-bug-expected.txt \
(rev 0)
+++ branches/chromium/912/LayoutTests/fast/table/table-anonymous-section-bug-expected.txt 2011-10-28 \
18:25:24 UTC (rev 98740) </span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x32
+ RenderBlock {HTML} at (0,0) size 800x32
+ RenderBody {BODY} at (8,8) size 784x16
+ RenderTable {DIV} at (0,0) size 160x16
+ RenderTableSection {DIV} at (0,0) size 160x0
+ RenderTableSection (anonymous) at (0,0) size 160x16
+ RenderTableRow (anonymous) at (0,0) size 160x16
+ RenderTableCell (anonymous) at (0,0) size 160x16 [r=0 c=0 rs=1 cs=1]
+ RenderInline {SPAN} at (0,0) size 160x16
+ RenderText {#text} at (0,0) size 160x16
+ text run at (0,0) width 160: "Some text."
+ RenderTableSection {DIV} at (0,16) size 160x0
</ins></span></pre></div>
<a id="brancheschromium912LayoutTestsfasttabletableanonymoussectionbughtmlfromrev98372trunkLayoutTestsfasttabletableanonymoussectionbughtml"></a>
<div class="copfile"><h4>Copied: \
branches/chromium/912/LayoutTests/fast/table/table-anonymous-section-bug.html (from \
rev 98372, trunk/LayoutTests/fast/table/table-anonymous-section-bug.html) (0 => \
98740)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/chromium/912/LayoutTests/fast/table/table-anonymous-section-bug.html \
(rev 0)
+++ branches/chromium/912/LayoutTests/fast/table/table-anonymous-section-bug.html 2011-10-28 \
18:25:24 UTC (rev 98740) </span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body style="font-family: ahem; -webkit-font-smoothing: none;">
+<style>
+ div.table { display: table; }
+ div.section { display: table-row-group; }
+</style>
+
+<div class="table" id="table-1">
+ <div class="section" id="tbody-1">
+ </div>
+ <div class="section" id="tbody-2">
+ </div>
+</div>
+
+<script>
+ function createSpan()
+ {
+ var spanElement = document.createElement("span");
+ spanElement.appendChild(document.createTextNode("Some text."));
+ return spanElement;
+ }
+
+ function insertSpan(tableID, beforeID)
+ {
+ var table = document.getElementById(tableID);
+ var before = document.getElementById(beforeID);
+ table.insertBefore(createSpan(), before);
+ }
+
+ document.body.offsetTop;
+
+ insertSpan("table-1", "tbody-2");
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="brancheschromium912SourceWebCorerenderingRenderTablecpp"></a>
<div class="modfile"><h4>Modified: \
branches/chromium/912/Source/WebCore/rendering/RenderTable.cpp (98739 => 98740)</h4> \
<pre class="diff"><span> <span class="info">--- \
branches/chromium/912/Source/WebCore/rendering/RenderTable.cpp 2011-10-28 18:23:05 \
UTC (rev 98739)
+++ branches/chromium/912/Source/WebCore/rendering/RenderTable.cpp 2011-10-28 \
18:25:24 UTC (rev 98740) </span><span class="lines">@@ -186,8 +186,7 @@
</span><span class="cx">
</span><span class="cx"> if (beforeChild && \
!beforeChild->isAnonymous() && beforeChild->parent() == this) { \
</span><span class="cx"> RenderObject* section = \
beforeChild->previousSibling(); </span><del>- if (section && \
section->isTableSection()) {
- ASSERT(section->isAnonymous());
</del><ins>+ if (section && section->isTableSection() && \
section->isAnonymous()) { </ins><span class="cx"> \
section->addChild(child); </span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="brancheschromium912SourceWebCorerenderingRenderTableRowcpp"></a>
<div class="modfile"><h4>Modified: \
branches/chromium/912/Source/WebCore/rendering/RenderTableRow.cpp (98739 => \
98740)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/chromium/912/Source/WebCore/rendering/RenderTableRow.cpp 2011-10-28 18:23:05 \
UTC (rev 98739)
+++ branches/chromium/912/Source/WebCore/rendering/RenderTableRow.cpp 2011-10-28 \
18:25:24 UTC (rev 98740) </span><span class="lines">@@ -106,8 +106,7 @@
</span><span class="cx">
</span><span class="cx"> if (beforeChild && \
!beforeChild->isAnonymous() && beforeChild->parent() == this) { \
</span><span class="cx"> RenderObject* cell = \
beforeChild->previousSibling(); </span><del>- if (cell && \
cell->isTableCell()) {
- ASSERT(cell->isAnonymous());
</del><ins>+ if (cell && cell->isTableCell() && \
cell->isAnonymous()) { </ins><span class="cx"> \
cell->addChild(child); </span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="brancheschromium912SourceWebCorerenderingRenderTableSectioncpp"></a>
<div class="modfile"><h4>Modified: \
branches/chromium/912/Source/WebCore/rendering/RenderTableSection.cpp (98739 => \
98740)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/chromium/912/Source/WebCore/rendering/RenderTableSection.cpp 2011-10-28 \
18:23:05 UTC (rev 98739)
+++ branches/chromium/912/Source/WebCore/rendering/RenderTableSection.cpp 2011-10-28 \
18:25:24 UTC (rev 98740) </span><span class="lines">@@ -119,8 +119,7 @@
</span><span class="cx">
</span><span class="cx"> if (beforeChild && \
!beforeChild->isAnonymous() && beforeChild->parent() == this) { \
</span><span class="cx"> RenderObject* row = \
beforeChild->previousSibling(); </span><del>- if (row && \
row->isTableRow()) {
- ASSERT(row->isAnonymous());
</del><ins>+ if (row && row->isTableRow() && \
row->isAnonymous()) { </ins><span class="cx"> \
row->addChild(child); </span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic