Unreviewed, rolling out r94695.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 8 Sep 2011 12:58:17 +0000 (12:58 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 8 Sep 2011 12:58:17 +0000 (12:58 +0000)
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).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2011-09-08

Source/WebCore:

* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::positionedFloatsNeedRelayout):
(WebCore::RenderBlock::layoutPositionedObjects):

LayoutTests:

* 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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@94755 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/fast/block/positioning/absolute-layout-after-image-load-expected.txt [deleted file]
LayoutTests/fast/block/positioning/absolute-layout-after-image-load.html [deleted file]
LayoutTests/fast/block/positioning/positioned-float-layout-after-image-load-expected.txt [deleted file]
LayoutTests/fast/block/positioning/positioned-float-layout-after-image-load.html [deleted file]
LayoutTests/fast/block/positioning/resources/absolute-layout-after-image-load-2.html [deleted file]
LayoutTests/fast/block/positioning/resources/positioned-float-layout-after-image-load-2.html [deleted file]
Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderBlock.cpp

index 90962471da3ecf5bb568c06f3d71ad340cb7e110..7097227bacd2a4f69bccaef1d7698ebc18f7714c 100644 (file)
@@ -1,3 +1,19 @@
+2011-09-08  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        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  <ossy@webkit.org>
 
         [Qt] Couple of tests have different results on 64 bit and/or in debug mode compared to 32 bit and/or release mode
diff --git a/LayoutTests/fast/block/positioning/absolute-layout-after-image-load-expected.txt b/LayoutTests/fast/block/positioning/absolute-layout-after-image-load-expected.txt
deleted file mode 100644 (file)
index 64e2ca5..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-[1]
-SUCCESS
diff --git a/LayoutTests/fast/block/positioning/absolute-layout-after-image-load.html b/LayoutTests/fast/block/positioning/absolute-layout-after-image-load.html
deleted file mode 100644 (file)
index b6f0b95..0000000
+++ /dev/null
@@ -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>
-
diff --git a/LayoutTests/fast/block/positioning/positioned-float-layout-after-image-load-expected.txt b/LayoutTests/fast/block/positioning/positioned-float-layout-after-image-load-expected.txt
deleted file mode 100644 (file)
index 64e2ca5..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-
-[1]
-SUCCESS
diff --git a/LayoutTests/fast/block/positioning/positioned-float-layout-after-image-load.html b/LayoutTests/fast/block/positioning/positioned-float-layout-after-image-load.html
deleted file mode 100644 (file)
index 4263e18..0000000
+++ /dev/null
@@ -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>
-
diff --git a/LayoutTests/fast/block/positioning/resources/absolute-layout-after-image-load-2.html b/LayoutTests/fast/block/positioning/resources/absolute-layout-after-image-load-2.html
deleted file mode 100644 (file)
index e5d8f82..0000000
+++ /dev/null
@@ -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="icon-gold.png" alt="Book cover." title="">
-</div>
-
-<div class="footnote"><a id="anchor1"></a><a href="http://www.gutenberg.org/files/33439/33439-h/33439-h.htm#FNanchor_1"><span id="spantext" class="label">[1]</span></a></div>
-
-<div id="console">FAILURE</div>
-</body></html>
-
diff --git a/LayoutTests/fast/block/positioning/resources/positioned-float-layout-after-image-load-2.html b/LayoutTests/fast/block/positioning/resources/positioned-float-layout-after-image-load-2.html
deleted file mode 100644 (file)
index 21f150c..0000000
+++ /dev/null
@@ -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="icon-gold.png" alt="Book cover." title="">
-</div>
-
-<div class="footnote"><a id="anchor1"></a><a href="http://www.gutenberg.org/files/33439/33439-h/33439-h.htm#FNanchor_1"><span id="spantext" class="label">[1]</span></a></div>
-
-<div id="console">FAILURE</div>
-</body></html>
-
index 0e1d733dca308c4a2b51efc193ad144e3463a9c3..0f47995a8a439fbb946040b4f82787fe65b076d7 100644 (file)
@@ -1,3 +1,16 @@
+2011-09-08  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        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  <apavlov@chromium.org>
 
         Unreviewed, strip trailing whitespace in the Web Inspector frontend (*.js and *.css).
index d94cab472a4ace247026a2f348aa53aafd4e1059..04cd978c3e245f34cf4c9ba7d5f219a0bdc72a23 100644 (file)
@@ -2216,7 +2216,7 @@ bool RenderBlock::positionedFloatsNeedRelayout()
         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 @@ bool RenderBlock::layoutPositionedObjects(bool relayoutChildren)
         // 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.