Title: [200830] releases/WebKitGTK/webkit-2.12
- Revision
- 200830
- Author
- [email protected]
- Date
- 2016-05-13 03:25:18 -0700 (Fri, 13 May 2016)
Log Message
Merge r199895 - REGRESSION (r189567): The top of Facebook's messenger.com looks visually broken
https://bugs.webkit.org/show_bug.cgi?id=156869
<rdar://problem/23204668>
Reviewed by Zalan Bujtas.
Source/WebCore:
Added fast/block/min-content-with-box-sizing.html
* rendering/RenderBox.cpp:
(WebCore::RenderBox::computeIntrinsicLogicalContentHeightUsing):
LayoutTests:
* fast/block/min-content-box-sizing-expected.html: Added.
* fast/block/min-content-box-sizing.html: Added.
Modified Paths
Added Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (200829 => 200830)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-05-13 10:22:21 UTC (rev 200829)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-05-13 10:25:18 UTC (rev 200830)
@@ -1,3 +1,14 @@
+2016-04-22 Dave Hyatt <[email protected]>
+
+ REGRESSION (r189567): The top of Facebook's messenger.com looks visually broken
+ https://bugs.webkit.org/show_bug.cgi?id=156869
+ <rdar://problem/23204668>
+
+ Reviewed by Zalan Bujtas.
+
+ * fast/block/min-content-box-sizing-expected.html: Added.
+ * fast/block/min-content-box-sizing.html: Added.
+
2016-04-22 Antti Koivisto <[email protected]>
REGRESSION (r194898): Multi download of external SVG defs file by <use> xlinks:href (caching)
Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/block/min-content-box-sizing-expected.html (0 => 200830)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/block/min-content-box-sizing-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/block/min-content-box-sizing-expected.html 2016-05-13 10:25:18 UTC (rev 200830)
@@ -0,0 +1,3 @@
+<div style="float:left; border:2px solid black; padding:10px; box-sizing:border-box;">
+<div style="width:100px;height:100px;background-color:green"></div>
+</div>
Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/block/min-content-box-sizing.html (0 => 200830)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/block/min-content-box-sizing.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/block/min-content-box-sizing.html 2016-05-13 10:25:18 UTC (rev 200830)
@@ -0,0 +1,3 @@
+<div style="float:left; border:2px solid black; padding:10px; box-sizing:border-box; height:500px; height:-webkit-min-content; height:-moz-min-content; height:min-content; width:500px; width:-webkit-min-content; width:-moz-min-content; width:min-content">
+<div style="width:100px;height:100px;background-color:green"></div>
+</div>
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (200829 => 200830)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-05-13 10:22:21 UTC (rev 200829)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-05-13 10:25:18 UTC (rev 200830)
@@ -1,3 +1,16 @@
+2016-04-22 Dave Hyatt <[email protected]>
+
+ REGRESSION (r189567): The top of Facebook's messenger.com looks visually broken
+ https://bugs.webkit.org/show_bug.cgi?id=156869
+ <rdar://problem/23204668>
+
+ Reviewed by Zalan Bujtas.
+
+ Added fast/block/min-content-with-box-sizing.html
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::computeIntrinsicLogicalContentHeightUsing):
+
2016-04-22 Antti Koivisto <[email protected]>
REGRESSION (r194898): Multi download of external SVG defs file by <use> xlinks:href (caching)
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderBox.cpp (200829 => 200830)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderBox.cpp 2016-05-13 10:22:21 UTC (rev 200829)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderBox.cpp 2016-05-13 10:25:18 UTC (rev 200830)
@@ -2893,8 +2893,13 @@
{
// FIXME: The CSS sizing spec is considering changing what min-content/max-content should resolve to.
// If that happens, this code will have to change.
- if (logicalHeightLength.isMinContent() || logicalHeightLength.isMaxContent() || logicalHeightLength.isFitContent())
+ if (logicalHeightLength.isMinContent() || logicalHeightLength.isMaxContent() || logicalHeightLength.isFitContent()) {
+ if (!intrinsicContentHeight)
+ return intrinsicContentHeight;
+ if (style().boxSizing() == BORDER_BOX)
+ return intrinsicContentHeight.value() + borderAndPaddingLogicalHeight();
return intrinsicContentHeight;
+ }
if (logicalHeightLength.isFillAvailable())
return containingBlock()->availableLogicalHeight(ExcludeMarginBorderPadding) - borderAndPadding;
ASSERT_NOT_REACHED();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
