Title: [118549] trunk
- Revision
- 118549
- Author
- [email protected]
- Date
- 2012-05-25 12:21:37 -0700 (Fri, 25 May 2012)
Log Message
Unreviewed, rolling out r118395.
http://trac.webkit.org/changeset/118395
https://bugs.webkit.org/show_bug.cgi?id=87526
Breaking sites including GMail and Yahoo mail (Requested by
jsbell on #webkit).
Patch by Sheriff Bot <[email protected]> on 2012-05-25
Source/WebCore:
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::collapseMargins):
LayoutTests:
* fast/css/clear-float-sibling-expected.html: Removed.
* fast/css/clear-float-sibling.html: Removed.
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (118548 => 118549)
--- trunk/LayoutTests/ChangeLog 2012-05-25 19:06:17 UTC (rev 118548)
+++ trunk/LayoutTests/ChangeLog 2012-05-25 19:21:37 UTC (rev 118549)
@@ -1,3 +1,15 @@
+2012-05-25 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r118395.
+ http://trac.webkit.org/changeset/118395
+ https://bugs.webkit.org/show_bug.cgi?id=87526
+
+ Breaking sites including GMail and Yahoo mail (Requested by
+ jsbell on #webkit).
+
+ * fast/css/clear-float-sibling-expected.html: Removed.
+ * fast/css/clear-float-sibling.html: Removed.
+
2012-05-25 Jessie Berlin <[email protected]>
Skip the Network Information tests on Windows.
Deleted: trunk/LayoutTests/fast/css/clear-float-sibling-expected.html (118548 => 118549)
--- trunk/LayoutTests/fast/css/clear-float-sibling-expected.html 2012-05-25 19:06:17 UTC (rev 118548)
+++ trunk/LayoutTests/fast/css/clear-float-sibling-expected.html 2012-05-25 19:21:37 UTC (rev 118549)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
- <head>
- <title>CSS Test: Clear set to 'right' and negative margin with earlier right floated boxes</title>
- <link rel="author" title="WebKit" href=""
- <link rel="help" href=""
- <meta name="flags" content="">
- <meta name="assert" content="Boxes with 'clear: both' and collapsing margins need to clear earlier right floated boxes.">
- <style type="text/css">
- div
- {
- width: 2in;
- }
- div
- {
- height: 1in;
- width: 1in;
- }
- #div1
- {
- float: right;
- background-color: orange;
- }
- #div2
- {
- background: blue;
- clear: both;
- }
- </style>
- </head>
- <body>
- <p>Test passes if the blue box is directly below the orange box.</p>
- <div>
- <div id="div1"></div>
- </div>
- <div id="div2"></div>
- </body>
-</html>
\ No newline at end of file
Deleted: trunk/LayoutTests/fast/css/clear-float-sibling.html (118548 => 118549)
--- trunk/LayoutTests/fast/css/clear-float-sibling.html 2012-05-25 19:06:17 UTC (rev 118548)
+++ trunk/LayoutTests/fast/css/clear-float-sibling.html 2012-05-25 19:21:37 UTC (rev 118549)
@@ -1,39 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
- <head>
- <title>CSS Test: Clear set to 'right' and negative margin with earlier right floated boxes</title>
- <link rel="author" title="WebKit" href=""
- <link rel="help" href=""
- <meta name="flags" content="">
- <meta name="assert" content="Boxes with 'clear: both' and collapsing margins need to clear earlier right floated boxes.">
- <style type="text/css">
- div
- {
- width: 2in;
- }
- div
- {
- height: 1in;
- width: 1in;
- }
- #div1
- {
- float: right;
- background-color: orange;
- }
- #div2
- {
- margin-top: -0.5in;
- background: blue;
- clear: both;
- }
- </style>
- </head>
- <body>
- <p>Test passes if the blue box is directly below the orange box.</p>
- <div>
- <div id="div1"></div>
- </div>
- <div id="div2"></div>
- </body>
-</html>
\ No newline at end of file
Modified: trunk/Source/WebCore/ChangeLog (118548 => 118549)
--- trunk/Source/WebCore/ChangeLog 2012-05-25 19:06:17 UTC (rev 118548)
+++ trunk/Source/WebCore/ChangeLog 2012-05-25 19:21:37 UTC (rev 118549)
@@ -1,3 +1,15 @@
+2012-05-25 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r118395.
+ http://trac.webkit.org/changeset/118395
+ https://bugs.webkit.org/show_bug.cgi?id=87526
+
+ Breaking sites including GMail and Yahoo mail (Requested by
+ jsbell on #webkit).
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::collapseMargins):
+
2012-05-25 Ken Buchanan <[email protected]>
Layout root not getting cleared for anonymous renderers geting destroyed
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (118548 => 118549)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2012-05-25 19:06:17 UTC (rev 118548)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2012-05-25 19:21:37 UTC (rev 118549)
@@ -2015,16 +2015,6 @@
logicalTop = min(logicalTop, nextPageLogicalTop(beforeCollapseLogicalTop));
setLogicalHeight(logicalHeight() + (logicalTop - oldLogicalTop));
}
-
- // If we have collapsed into a previous sibling and so reduced the height of the parent, ensure any floats that now
- // overhang from the previous sibling are added to our parent
- RenderObject* prev = child->previousSibling();
- if (prev && prev->isRenderBlock()) {
- RenderBlock* block = toRenderBlock(prev);
- if (block->m_floatingObjects && block->lowestFloatLogicalBottom() > logicalTop)
- addOverhangingFloats(block, false);
- }
-
return logicalTop;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
