Title: [147939] trunk
- Revision
- 147939
- Author
- [email protected]
- Date
- 2013-04-08 11:38:26 -0700 (Mon, 08 Apr 2013)
Log Message
Unreviewed, rolling out r147850.
http://trac.webkit.org/changeset/147850
https://bugs.webkit.org/show_bug.cgi?id=113706
Changeset crossed paths with 147505, which is the same fix.
Source/WebCore:
* rendering/RenderBlockLineLayout.cpp:
(WebCore::inlineLogicalWidth):
LayoutTests:
* fast/inline/inline-with-empty-inline-children-expected.txt:
* fast/inline/inline-with-empty-inline-children.html:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (147938 => 147939)
--- trunk/LayoutTests/ChangeLog 2013-04-08 18:17:19 UTC (rev 147938)
+++ trunk/LayoutTests/ChangeLog 2013-04-08 18:38:26 UTC (rev 147939)
@@ -1,3 +1,14 @@
+2013-04-08 Robert Hogan <[email protected]>
+
+ Unreviewed, rolling out r147850.
+ http://trac.webkit.org/changeset/147850
+ https://bugs.webkit.org/show_bug.cgi?id=113706
+
+ Changeset crossed paths with 147505, which is the same fix.
+
+ * fast/inline/inline-with-empty-inline-children-expected.txt:
+ * fast/inline/inline-with-empty-inline-children.html:
+
2013-04-08 Max Vujovic <[email protected]>
REGRESSION (r147502): Animations of CA filters broken
Modified: trunk/LayoutTests/fast/inline/inline-with-empty-inline-children-expected.txt (147938 => 147939)
--- trunk/LayoutTests/fast/inline/inline-with-empty-inline-children-expected.txt 2013-04-08 18:17:19 UTC (rev 147938)
+++ trunk/LayoutTests/fast/inline/inline-with-empty-inline-children-expected.txt 2013-04-08 18:38:26 UTC (rev 147939)
@@ -1,4 +1,4 @@
-https://bugs.webkit.org/show_bug.cgi?id=95772: There should be seven green bars below with a PASS in each.
+https://bugs.webkit.org/show_bug.cgi?id=95772: There should be six green bars below with a PASS in each.
PASS
PASS
@@ -6,6 +6,4 @@
PASS
PASS
PASS
-Words
-PASS
Modified: trunk/LayoutTests/fast/inline/inline-with-empty-inline-children.html (147938 => 147939)
--- trunk/LayoutTests/fast/inline/inline-with-empty-inline-children.html 2013-04-08 18:17:19 UTC (rev 147938)
+++ trunk/LayoutTests/fast/inline/inline-with-empty-inline-children.html 2013-04-08 18:38:26 UTC (rev 147939)
@@ -4,39 +4,34 @@
<style>
.block { display: block; background: green; }
.inline { display: inline; margin-left: 40px; font: 30px/1 Ahem;}
- .white-span { width: 50%; background: white; }
+ span { width: 50%; background: white; }
.absolute { position: absolute; }
.float { float: left; }
- .inline-span { display: inline-block; }
</style>
<script src=""
</head>
<body>
- <p> https://bugs.webkit.org/show_bug.cgi?id=95772: There should be seven green bars below with a PASS in each. </p>
+ <p> https://bugs.webkit.org/show_bug.cgi?id=95772: There should be six green bars below with a PASS in each. </p>
<div class="block">
- <div class="inline" data-expected-height="30"> <span class="absolute white-span"></span> <span class="absolute white-span"></span> </div>
+ <div class="inline" data-expected-height="30"> <span class="absolute"></span> <span class="absolute"></span> </div>
</div>
<div class="block">
- <div class="inline" data-expected-height="30"><span class="absolute white-span"></span><span class="absolute"></span></div>
+ <div class="inline" data-expected-height="30"><span class="absolute"></span><span class="absolute"></span></div>
</div>
<div class="block">
- <div class="inline" data-expected-height="30"><span class="float white-span"></span><span class="float white-span"></span></div>
+ <div class="inline" data-expected-height="30"><span class="float"></span><span class="float"></span></div>
</div>
<div class="block">
- <div class="inline" data-expected-height="30"> <span class="float white-span"></span> <span class="float white-span"></span></div>
+ <div class="inline" data-expected-height="30"> <span class="float"></span> <span class="float"></span></div>
</div>
<div class="block">
- <div class="inline" data-expected-height="30"><span class="white-span"></span><span class="white-span"></span></div>
+ <div class="inline" data-expected-height="30"><span></span><span></span></div>
</div>
<div class="block">
- <div class="inline" data-expected-height="30"> <span class="white-span"></span> <span class="white-span"></span></div>
+ <div class="inline" data-expected-height="30"> <span></span> <span></span></div>
</div>
- <div class="block">
- <span class="inline-span" data-expected-height="30"><div class="inline"> <div class="float"> Words </div></div></span>
- </div>
<script>
checkLayout('body > div > div')
- checkLayout('body > div > span')
</script>
</body>
</html>
Modified: trunk/Source/WebCore/ChangeLog (147938 => 147939)
--- trunk/Source/WebCore/ChangeLog 2013-04-08 18:17:19 UTC (rev 147938)
+++ trunk/Source/WebCore/ChangeLog 2013-04-08 18:38:26 UTC (rev 147939)
@@ -1,3 +1,14 @@
+2013-04-08 Robert Hogan <[email protected]>
+
+ Unreviewed, rolling out r147850.
+ http://trac.webkit.org/changeset/147850
+ https://bugs.webkit.org/show_bug.cgi?id=113706
+
+ Changeset crossed paths with 147505, which is the same fix.
+
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebCore::inlineLogicalWidth):
+
2013-04-08 Alexey Proskuryakov <[email protected]>
<rdar://problem/12834449> Crashes in WebSocketChannel::processFrame when processing a ping
Modified: trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp (147938 => 147939)
--- trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2013-04-08 18:17:19 UTC (rev 147938)
+++ trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2013-04-08 18:38:26 UTC (rev 147939)
@@ -332,8 +332,7 @@
unsigned lineDepth = 1;
LayoutUnit extraWidth = 0;
RenderObject* parent = child->parent();
- // Empty inline parents have added their inline border, padding and margin to the line already.
- while (parent->isRenderInline() && !isEmptyInline(parent) && lineDepth++ < cMaxLineDepth) {
+ while (parent->isRenderInline() && lineDepth++ < cMaxLineDepth) {
RenderInline* parentAsRenderInline = toRenderInline(parent);
if (!isEmptyInline(parentAsRenderInline)) {
if (start && shouldAddBorderPaddingMargin(child->previousSibling(), start))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
