Diff
Modified: trunk/LayoutTests/ChangeLog (94754 => 94755)
--- trunk/LayoutTests/ChangeLog 2011-09-08 12:15:53 UTC (rev 94754)
+++ trunk/LayoutTests/ChangeLog 2011-09-08 12:58:17 UTC (rev 94755)
@@ -1,3 +1,19 @@
+2011-09-08 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r94695.
+ http://trac.webkit.org/changeset/94695
+ https://bugs.webkit.org/show_bug.cgi?id=67776
+
+ Hitting an assertion on Snow Leopard, Qt, GTK (Requested by
+ Zoltan on #webkit).
+
+ * fast/block/positioning/absolute-layout-after-image-load-expected.txt: Removed.
+ * fast/block/positioning/absolute-layout-after-image-load.html: Removed.
+ * fast/block/positioning/positioned-float-layout-after-image-load-expected.txt: Removed.
+ * fast/block/positioning/positioned-float-layout-after-image-load.html: Removed.
+ * fast/block/positioning/resources/absolute-layout-after-image-load-2.html: Removed.
+ * fast/block/positioning/resources/positioned-float-layout-after-image-load-2.html: Removed.
+
2011-09-08 Csaba Osztrogonác <[email protected]>
[Qt] Couple of tests have different results on 64 bit and/or in debug mode compared to 32 bit and/or release mode
Deleted: trunk/LayoutTests/fast/block/positioning/absolute-layout-after-image-load-expected.txt (94754 => 94755)
--- trunk/LayoutTests/fast/block/positioning/absolute-layout-after-image-load-expected.txt 2011-09-08 12:15:53 UTC (rev 94754)
+++ trunk/LayoutTests/fast/block/positioning/absolute-layout-after-image-load-expected.txt 2011-09-08 12:58:17 UTC (rev 94755)
@@ -1,3 +0,0 @@
-
-[1]
-SUCCESS
Deleted: trunk/LayoutTests/fast/block/positioning/absolute-layout-after-image-load.html (94754 => 94755)
--- trunk/LayoutTests/fast/block/positioning/absolute-layout-after-image-load.html 2011-09-08 12:15:53 UTC (rev 94754)
+++ trunk/LayoutTests/fast/block/positioning/absolute-layout-after-image-load.html 2011-09-08 12:58:17 UTC (rev 94755)
@@ -1,21 +0,0 @@
-<html>
-<head>
-<script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
- }
-
- // https://bugs.webkit.org/show_bug.cgi?id=54611
- // When navigating to absolute-layout-after-image-load-2.html#anchor1 directly, the anchor should be positioned below
- // the image on first load. The test is sensitive to caching of the image, so you should reload
- // absolute-layout-after-image-load-2.html#anchor1 if testing manually.
-
- function test(){
- setTimeout(location.assign("resources/absolute-layout-after-image-load-2.html#anchor1"),0);
- }
-</script>
-</head>
-<body _onload_="test();">
-</body></html>
-
Deleted: trunk/LayoutTests/fast/block/positioning/positioned-float-layout-after-image-load-expected.txt (94754 => 94755)
--- trunk/LayoutTests/fast/block/positioning/positioned-float-layout-after-image-load-expected.txt 2011-09-08 12:15:53 UTC (rev 94754)
+++ trunk/LayoutTests/fast/block/positioning/positioned-float-layout-after-image-load-expected.txt 2011-09-08 12:58:17 UTC (rev 94755)
@@ -1,3 +0,0 @@
-
-[1]
-SUCCESS
Deleted: trunk/LayoutTests/fast/block/positioning/positioned-float-layout-after-image-load.html (94754 => 94755)
--- trunk/LayoutTests/fast/block/positioning/positioned-float-layout-after-image-load.html 2011-09-08 12:15:53 UTC (rev 94754)
+++ trunk/LayoutTests/fast/block/positioning/positioned-float-layout-after-image-load.html 2011-09-08 12:58:17 UTC (rev 94755)
@@ -1,21 +0,0 @@
-<html>
-<head>
-<script>
- if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
- }
-
- // https://bugs.webkit.org/show_bug.cgi?id=54611
- // When navigating to positioned-float-layout-after-image-load-2.html#anchor1 directly, the anchor should be positioned below
- // the image on first load. The test is sensitive to caching of the image, so you should reload
- // positioned-float-layout-after-image-load-2.html#anchor1 if testing manually.
-
- function test(){
- setTimeout(location.assign("resources/positioned-float-layout-after-image-load-2.html#anchor1"),0);
- }
-</script>
-</head>
-<body _onload_="test();">
-</body></html>
-
Deleted: trunk/LayoutTests/fast/block/positioning/resources/absolute-layout-after-image-load-2.html (94754 => 94755)
--- trunk/LayoutTests/fast/block/positioning/resources/absolute-layout-after-image-load-2.html 2011-09-08 12:15:53 UTC (rev 94754)
+++ trunk/LayoutTests/fast/block/positioning/resources/absolute-layout-after-image-load-2.html 2011-09-08 12:58:17 UTC (rev 94755)
@@ -1,37 +0,0 @@
-<html>
-<head>
-<style type="text/css">
- body { margin-left: 10%; margin-right: 10%;}
- h1,h2,h3,h4,h5,h6 { text-align: center; clear: both;}
- h1 span { display: block; padding-bottom: 0.5em; }
- .figcenter { margin: auto; text-align: center;}
- .footnotes {border: dashed 1px;}
- .footnote {margin-left: 10%; margin-right: 10%; font-size: 0.9em;}
- .footnote .label {position: absolute; right: 84%; text-align: right;}
-</style>
-
-<script>
- // https://bugs.webkit.org/show_bug.cgi?id=54611
- // When navigating to the anchor directly, the anchor should be positioned below
- // the image on first load.
-
- function test(){
- var bottomOfImage = document.getElementById("image").offsetTop + document.getElementById("image").offsetHeight;
- var footnotePosition = document.getElementById("spantext").offsetTop;
- if (footnotePosition >= bottomOfImage)
- document.getElementById("console").innerHTML = "SUCCESS";
- layoutTestController.notifyDone();
- }
-</script>
-
-</head>
-<body _onload_="test();">
-<div class="figcenter">
- <img id="image" src="" alt="Book cover." title="">
-</div>
-
-<div class="footnote"><a id="anchor1"></a><a href="" id="spantext" class="label">[1]</span></a></div>
-
-<div id="console">FAILURE</div>
-</body></html>
-
Deleted: trunk/LayoutTests/fast/block/positioning/resources/positioned-float-layout-after-image-load-2.html (94754 => 94755)
--- trunk/LayoutTests/fast/block/positioning/resources/positioned-float-layout-after-image-load-2.html 2011-09-08 12:15:53 UTC (rev 94754)
+++ trunk/LayoutTests/fast/block/positioning/resources/positioned-float-layout-after-image-load-2.html 2011-09-08 12:58:17 UTC (rev 94755)
@@ -1,36 +0,0 @@
-<html>
-<head>
-<style type="text/css">
- body { margin-left: 10%; margin-right: 10%;}
- h1,h2,h3,h4,h5,h6 { text-align: center; clear: both;}
- h1 span { display: block; padding-bottom: 0.5em; }
- .figcenter { margin: auto; text-align: center;}
- .footnote {margin-left: 10%; margin-right: 10%; font-size: 0.9em;}
- .footnote .label {position: absolute; float: -webkit-positioned; right: 84%; text-align: right; width: 200px}
-</style>
-
-<script>
- // https://bugs.webkit.org/show_bug.cgi?id=54611
- // When navigating to the anchor directly, the anchor should be positioned below
- // the image on first load.
-
- function test(){
- var bottomOfImage = document.getElementById("image").offsetTop + document.getElementById("image").offsetHeight;
- var footnotePosition = document.getElementById("spantext").offsetTop;
- if (footnotePosition >= bottomOfImage)
- document.getElementById("console").innerHTML = "SUCCESS";
- layoutTestController.notifyDone();
- }
-</script>
-
-</head>
-<body _onload_="test();">
-<div class="figcenter">
- <img id="image" src="" alt="Book cover." title="">
-</div>
-
-<div class="footnote"><a id="anchor1"></a><a href="" id="spantext" class="label">[1]</span></a></div>
-
-<div id="console">FAILURE</div>
-</body></html>
-
Modified: trunk/Source/WebCore/ChangeLog (94754 => 94755)
--- trunk/Source/WebCore/ChangeLog 2011-09-08 12:15:53 UTC (rev 94754)
+++ trunk/Source/WebCore/ChangeLog 2011-09-08 12:58:17 UTC (rev 94755)
@@ -1,3 +1,16 @@
+2011-09-08 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r94695.
+ http://trac.webkit.org/changeset/94695
+ https://bugs.webkit.org/show_bug.cgi?id=67776
+
+ Hitting an assertion on Snow Leopard, Qt, GTK (Requested by
+ Zoltan on #webkit).
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::positionedFloatsNeedRelayout):
+ (WebCore::RenderBlock::layoutPositionedObjects):
+
2011-09-08 Alexander Pavlov <[email protected]>
Unreviewed, strip trailing whitespace in the Web Inspector frontend (*.js and *.css).
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (94754 => 94755)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2011-09-08 12:15:53 UTC (rev 94754)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2011-09-08 12:58:17 UTC (rev 94755)
@@ -2216,7 +2216,7 @@
if (positionedObject->needsLayout())
return true;
- if (positionedObject->style()->hasStaticBlockPosition(isHorizontalWritingMode()) && positionedObject->parent() != this)
+ if (positionedObject->style()->hasStaticBlockPosition(isHorizontalWritingMode()) && positionedObject->parent() != this && positionedObject->parent()->isBlockFlow())
return true;
if (view()->layoutState()->pageLogicalHeightChanged() || (view()->layoutState()->pageLogicalHeight() && view()->layoutState()->pageLogicalOffset(logicalTop()) != pageLogicalOffset()))
@@ -2244,7 +2244,7 @@
// non-positioned block. Rather than trying to detect all of these movement cases, we just always lay out positioned
// objects that are positioned implicitly like this. Such objects are rare, and so in typical DHTML menu usage (where everything is
// positioned explicitly) this should not incur a performance penalty.
- if (relayoutChildren || (r->style()->hasStaticBlockPosition(isHorizontalWritingMode()) && r->parent() != this))
+ if (relayoutChildren || (r->style()->hasStaticBlockPosition(isHorizontalWritingMode()) && r->parent() != this && r->parent()->isBlockFlow()))
r->setChildNeedsLayout(true, false);
// If relayoutChildren is set and the child has percentage padding or an embedded content box, we also need to invalidate the childs pref widths.
