<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[20672] trunk</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/20672">20672</a></dd>
<dt>Author</dt> <dd>antti</dd>
<dt>Date</dt> <dd>2007-04-02 17:22:30 -0700 (Mon, 02 Apr 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>LayoutTests:
Reviewed by Hyatt.
Test you don't crash when you have abs positioned elements inside rel inline.
* fast/block/positioning/abs-inside-inline-rel-expected.checksum: Added.
* fast/block/positioning/abs-inside-inline-rel-expected.png: Added.
* fast/block/positioning/abs-inside-inline-rel-expected.txt: Added.
* fast/block/positioning/abs-inside-inline-rel.html: Added.
WebCore:
Reviewed by Hyatt.
Fix asserts, these may also be called for rel positioned elements
* rendering/RenderBox.cpp:
(WebCore::RenderBox::setStaticX):
(WebCore::RenderBox::setStaticY):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorerenderingRenderBoxcpp">trunk/WebCore/rendering/RenderBox.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastblockpositioningabsinsideinlinerelexpectedchecksum">trunk/LayoutTests/fast/block/positioning/abs-inside-inline-rel-expected.checksum</a></li>
<li><a href="#trunkLayoutTestsfastblockpositioningabsinsideinlinerelexpectedpng">trunk/LayoutTests/fast/block/positioning/abs-inside-inline-rel-expected.png</a></li>
<li><a href="#trunkLayoutTestsfastblockpositioningabsinsideinlinerelexpectedtxt">trunk/LayoutTests/fast/block/positioning/abs-inside-inline-rel-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastblockpositioningabsinsideinlinerelhtml">trunk/LayoutTests/fast/block/positioning/abs-inside-inline-rel.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (20671 => 20672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2007-04-02 23:49:03 UTC (rev 20671)
+++ trunk/LayoutTests/ChangeLog 2007-04-03 00:22:30 UTC (rev 20672)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2007-04-03 Antti Koivisto <antti@apple.com>
+
+ Reviewed by Hyatt.
+
+ Test you don't crash when you have abs positioned elements inside rel inline.
+
+ * fast/block/positioning/abs-inside-inline-rel-expected.checksum: Added.
+ * fast/block/positioning/abs-inside-inline-rel-expected.png: Added.
+ * fast/block/positioning/abs-inside-inline-rel-expected.txt: Added.
+ * fast/block/positioning/abs-inside-inline-rel.html: Added.
+
</ins><span class="cx"> 2007-04-02 Justin Garcia <justin.garcia@apple.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by darin
</span></span></pre></div>
<a id="trunkLayoutTestsfastblockpositioningabsinsideinlinerelexpectedchecksum"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/block/positioning/abs-inside-inline-rel-expected.checksum (0 => 20672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/block/positioning/abs-inside-inline-rel-expected.checksum (rev 0)
+++ trunk/LayoutTests/fast/block/positioning/abs-inside-inline-rel-expected.checksum 2007-04-03 00:22:30 UTC (rev 20672)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+34d3e04829249d43f44c97892a499c59
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfastblockpositioningabsinsideinlinerelexpectedpng"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/fast/block/positioning/abs-inside-inline-rel-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/LayoutTests/fast/block/positioning/abs-inside-inline-rel-expected.png
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:mime-type
</span><span class="cx"> + application/octet-stream
</span><a id="trunkLayoutTestsfastblockpositioningabsinsideinlinerelexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/block/positioning/abs-inside-inline-rel-expected.txt (0 => 20672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/block/positioning/abs-inside-inline-rel-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/block/positioning/abs-inside-inline-rel-expected.txt 2007-04-03 00:22:30 UTC (rev 20672)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+layer at (8,8) size 106x72
+ RenderBlock (positioned) {SPAN} at (0,0) size 106x72
+ RenderText {#text} at (0,0) size 106x72
+ text run at (0,0) width 106: "position:absolute"
+ text run at (0,18) width 70: "span inside"
+ text run at (0,36) width 100: "position:relative"
+ text run at (0,54) width 29: "span"
</ins></span></pre></div>
<a id="trunkLayoutTestsfastblockpositioningabsinsideinlinerelhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/block/positioning/abs-inside-inline-rel.html (0 => 20672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/block/positioning/abs-inside-inline-rel.html (rev 0)
+++ trunk/LayoutTests/fast/block/positioning/abs-inside-inline-rel.html 2007-04-03 00:22:30 UTC (rev 20672)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+<span style="position: relative"><span style="position: absolute"> position:absolute span inside position:relative span </span> </span>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (20671 => 20672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog 2007-04-02 23:49:03 UTC (rev 20671)
+++ trunk/WebCore/ChangeLog 2007-04-03 00:22:30 UTC (rev 20672)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2007-04-03 Antti Koivisto <antti@apple.com>
+
+ Reviewed by Hyatt.
+
+ Fix asserts, these may also be called for rel positioned elements
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::setStaticX):
+ (WebCore::RenderBox::setStaticY):
+
</ins><span class="cx"> 2007-04-02 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> Throw in an assert to try to track down a problem where an image is being set to a smaller encoded
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderBox.cpp (20671 => 20672)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderBox.cpp 2007-04-02 23:49:03 UTC (rev 20671)
+++ trunk/WebCore/rendering/RenderBox.cpp 2007-04-03 00:22:30 UTC (rev 20672)
</span><span class="lines">@@ -1479,13 +1479,13 @@
</span><span class="cx">
</span><span class="cx"> void RenderBox::setStaticX(int staticX)
</span><span class="cx"> {
</span><del>- ASSERT(isPositioned());
</del><ins>+ ASSERT(isPositioned() || isRelPositioned());
</ins><span class="cx"> m_layer->setStaticX(staticX);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderBox::setStaticY(int staticY)
</span><span class="cx"> {
</span><del>- ASSERT(isPositioned());
</del><ins>+ ASSERT(isPositioned() || isRelPositioned());
</ins><span class="cx">
</span><span class="cx"> if (staticY == m_layer->staticY())
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>