Title: [118318] trunk
- Revision
- 118318
- Author
- [email protected]
- Date
- 2012-05-23 20:48:39 -0700 (Wed, 23 May 2012)
Log Message
Unreviewed, rolling out r118297.
http://trac.webkit.org/changeset/118297
https://bugs.webkit.org/show_bug.cgi?id=87338
It caused several layout failures on Mac (Requested by
sundiamonde on #webkit).
Patch by Sheriff Bot <[email protected]> on 2012-05-23
Source/WebCore:
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::computeInlinePreferredLogicalWidths):
LayoutTests:
* fast/block/float/floats-with-margin-should-not-wrap-expected.html: Removed.
* fast/block/float/floats-with-margin-should-not-wrap.html: Removed.
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (118317 => 118318)
--- trunk/LayoutTests/ChangeLog 2012-05-24 03:45:18 UTC (rev 118317)
+++ trunk/LayoutTests/ChangeLog 2012-05-24 03:48:39 UTC (rev 118318)
@@ -1,3 +1,15 @@
+2012-05-23 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r118297.
+ http://trac.webkit.org/changeset/118297
+ https://bugs.webkit.org/show_bug.cgi?id=87338
+
+ It caused several layout failures on Mac (Requested by
+ sundiamonde on #webkit).
+
+ * fast/block/float/floats-with-margin-should-not-wrap-expected.html: Removed.
+ * fast/block/float/floats-with-margin-should-not-wrap.html: Removed.
+
2012-05-23 Shinya Kawanaka <[email protected]>
Document.caretRangeFromPoint exposes inner elemnet of Shadow DOM.
Deleted: trunk/LayoutTests/fast/block/float/floats-with-margin-should-not-wrap-expected.html (118317 => 118318)
--- trunk/LayoutTests/fast/block/float/floats-with-margin-should-not-wrap-expected.html 2012-05-24 03:45:18 UTC (rev 118317)
+++ trunk/LayoutTests/fast/block/float/floats-with-margin-should-not-wrap-expected.html 2012-05-24 03:48:39 UTC (rev 118318)
@@ -1,22 +0,0 @@
-<!DOCTYPE>
-<html>
-<head>
-<style>
- body { zoom: 150%; }
- .container { float: left; position: relative; left: -1px; }
- .container > div { float: left; width: 19px; background: orange; }
- .bottom { clear: both; }
-</style>
-</head>
-<body>
-
-<div class="container">
- <div>1</div>
- <div>2</div>
- <div style="width: 20px;">3</div>
-</div>
-
-<div class="bottom">The three blocks above should all be on the same line.</div>
-
-</body>
-</html>
Deleted: trunk/LayoutTests/fast/block/float/floats-with-margin-should-not-wrap.html (118317 => 118318)
--- trunk/LayoutTests/fast/block/float/floats-with-margin-should-not-wrap.html 2012-05-24 03:45:18 UTC (rev 118317)
+++ trunk/LayoutTests/fast/block/float/floats-with-margin-should-not-wrap.html 2012-05-24 03:48:39 UTC (rev 118318)
@@ -1,22 +0,0 @@
-<!DOCTYPE>
-<html>
-<head>
-<style>
- body { zoom: 150%; }
- .container { float: left; }
- .container > div { float: left; width: 20px; margin-left: -1px; background: orange; }
- .bottom { clear: both; }
-</style>
-</head>
-<body>
-
-<div class="container">
- <div>1</div>
- <div>2</div>
- <div>3</div>
-</div>
-
-<div class="bottom">The three blocks above should all be on the same line.</div>
-
-</body>
-</html>
Modified: trunk/Source/WebCore/ChangeLog (118317 => 118318)
--- trunk/Source/WebCore/ChangeLog 2012-05-24 03:45:18 UTC (rev 118317)
+++ trunk/Source/WebCore/ChangeLog 2012-05-24 03:48:39 UTC (rev 118318)
@@ -1,3 +1,15 @@
+2012-05-23 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r118297.
+ http://trac.webkit.org/changeset/118297
+ https://bugs.webkit.org/show_bug.cgi?id=87338
+
+ It caused several layout failures on Mac (Requested by
+ sundiamonde on #webkit).
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::computeInlinePreferredLogicalWidths):
+
2012-05-23 Shinya Kawanaka <[email protected]>
Document.caretRangeFromPoint exposes inner elemnet of Shadow DOM.
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (118317 => 118318)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2012-05-24 03:45:18 UTC (rev 118317)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2012-05-24 03:48:39 UTC (rev 118318)
@@ -5523,7 +5523,7 @@
child->setPreferredLogicalWidthsDirty(false);
} else {
// Inline replaced elts add in their margins to their min/max values.
- LayoutUnit margins = 0;
+ float margins = 0;
Length startMargin = childStyle->marginStart();
Length endMargin = childStyle->marginEnd();
if (startMargin.isFixed())
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
