Title: [140482] trunk
Revision
140482
Author
[email protected]
Date
2013-01-22 15:44:27 -0800 (Tue, 22 Jan 2013)

Log Message

Unreviewed, rolling out r140171.
http://trac.webkit.org/changeset/140171
https://bugs.webkit.org/show_bug.cgi?id=107193

Regressed scrollable region size in other cases.

Source/WebCore:

* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::simplifiedLayout):

LayoutTests:

* fast/overflow/height-during-simplified-layout-expected.txt: Removed.
* fast/overflow/height-during-simplified-layout.html: Removed.

Modified Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (140481 => 140482)


--- trunk/LayoutTests/ChangeLog	2013-01-22 23:36:58 UTC (rev 140481)
+++ trunk/LayoutTests/ChangeLog	2013-01-22 23:44:27 UTC (rev 140482)
@@ -1,3 +1,14 @@
+2013-01-22  Tony Chang  <[email protected]>
+
+        Unreviewed, rolling out r140171.
+        http://trac.webkit.org/changeset/140171
+        https://bugs.webkit.org/show_bug.cgi?id=107193
+
+        Regressed scrollable region size in other cases.
+
+        * fast/overflow/height-during-simplified-layout-expected.txt: Removed.
+        * fast/overflow/height-during-simplified-layout.html: Removed.
+
 2013-01-22  Julien Chaffraix  <[email protected]>
 
         [CSS Grid Layout] Add grid.css to hold the common grid testing code

Deleted: trunk/LayoutTests/fast/overflow/height-during-simplified-layout-expected.txt (140481 => 140482)


--- trunk/LayoutTests/fast/overflow/height-during-simplified-layout-expected.txt	2013-01-22 23:36:58 UTC (rev 140481)
+++ trunk/LayoutTests/fast/overflow/height-during-simplified-layout-expected.txt	2013-01-22 23:44:27 UTC (rev 140482)
@@ -1,5 +0,0 @@
-PASS document.getElementById('scrollable').scrollTop is 400
-PASS document.getElementById('scrollable').scrollHeight is 600
-This test passes if you see a green box below.
-
-

Deleted: trunk/LayoutTests/fast/overflow/height-during-simplified-layout.html (140481 => 140482)


--- trunk/LayoutTests/fast/overflow/height-during-simplified-layout.html	2013-01-22 23:36:58 UTC (rev 140481)
+++ trunk/LayoutTests/fast/overflow/height-during-simplified-layout.html	2013-01-22 23:44:27 UTC (rev 140482)
@@ -1,21 +0,0 @@
-<html>
-<body>
-
-<p>This test passes if you see a green box below.</p>
-
-<div id="scrollable" style="height: 0; overflow-y: auto; padding-bottom: 200px; background-color: green">
-  <div style="position: relative; height: 400px; background-color: red">
-    <div id="node-to-hide" style="position: absolute;">hello</div>
-  </div>
-</div>
-<script src=""
-<script>
-document.body.offsetLeft;
-document.getElementById("node-to-hide").style.display = "none";
-document.getElementById("scrollable").scrollTop = "400";
-shouldBe("document.getElementById('scrollable').scrollTop", "400");
-shouldBe("document.getElementById('scrollable').scrollHeight", "600");
-</script>
-</body>
-</html>
-

Modified: trunk/Source/WebCore/ChangeLog (140481 => 140482)


--- trunk/Source/WebCore/ChangeLog	2013-01-22 23:36:58 UTC (rev 140481)
+++ trunk/Source/WebCore/ChangeLog	2013-01-22 23:44:27 UTC (rev 140482)
@@ -1,3 +1,14 @@
+2013-01-22  Tony Chang  <[email protected]>
+
+        Unreviewed, rolling out r140171.
+        http://trac.webkit.org/changeset/140171
+        https://bugs.webkit.org/show_bug.cgi?id=107193
+
+        Regressed scrollable region size in other cases.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::simplifiedLayout):
+
 2013-01-22  Alexey Proskuryakov  <[email protected]>
 
         [WK2] WebProcessService is not terminated when page is closed

Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (140481 => 140482)


--- trunk/Source/WebCore/rendering/RenderBlock.cpp	2013-01-22 23:36:58 UTC (rev 140481)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp	2013-01-22 23:44:27 UTC (rev 140482)
@@ -2607,8 +2607,7 @@
     // For now just always recompute overflow.  This is no worse performance-wise than the old code that called rightmostPosition and
     // lowestPosition on every relayout so it's not a regression.
     m_overflow.clear();
-    LayoutUnit logicalScrollHeight = style()->isHorizontalWritingMode() ? scrollHeight() : scrollWidth();
-    computeOverflow(borderBefore() + logicalScrollHeight, true);
+    computeOverflow(clientLogicalBottom(), true);
 
     statePusher.pop();
     
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to