Title: [199877] trunk
- Revision
- 199877
- Author
- hy...@apple.com
- Date
- 2016-04-22 08:58:02 -0700 (Fri, 22 Apr 2016)
Log Message
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::computeContentLogicalHeight):
LayoutTests:
* fast/block/min-content-with-box-sizing-expected.html: Added.
* fast/block/min-content-with-box-sizing.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (199876 => 199877)
--- trunk/LayoutTests/ChangeLog 2016-04-22 12:49:03 UTC (rev 199876)
+++ trunk/LayoutTests/ChangeLog 2016-04-22 15:58:02 UTC (rev 199877)
@@ -1,3 +1,14 @@
+2016-04-22 Dave Hyatt <hy...@apple.com>
+
+ 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-with-box-sizing-expected.html: Added.
+ * fast/block/min-content-with-box-sizing.html: Added.
+
2016-04-22 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] Enable the download attribute support
Added: trunk/LayoutTests/fast/block/min-content-with-box-sizing-expected.html (0 => 199877)
--- trunk/LayoutTests/fast/block/min-content-with-box-sizing-expected.html (rev 0)
+++ trunk/LayoutTests/fast/block/min-content-with-box-sizing-expected.html 2016-04-22 15:58:02 UTC (rev 199877)
@@ -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: trunk/LayoutTests/fast/block/min-content-with-box-sizing.html (0 => 199877)
--- trunk/LayoutTests/fast/block/min-content-with-box-sizing.html (rev 0)
+++ trunk/LayoutTests/fast/block/min-content-with-box-sizing.html 2016-04-22 15:58:02 UTC (rev 199877)
@@ -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: trunk/Source/WebCore/ChangeLog (199876 => 199877)
--- trunk/Source/WebCore/ChangeLog 2016-04-22 12:49:03 UTC (rev 199876)
+++ trunk/Source/WebCore/ChangeLog 2016-04-22 15:58:02 UTC (rev 199877)
@@ -1,3 +1,16 @@
+2016-04-22 Dave Hyatt <hy...@apple.com>
+
+ 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::computeContentLogicalHeight):
+
2016-04-22 Manuel Rego Casasnovas <r...@igalia.com>
[css-grid] Fix bug with positioned items in vertical writing mode
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (199876 => 199877)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2016-04-22 12:49:03 UTC (rev 199876)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2016-04-22 15:58:02 UTC (rev 199877)
@@ -2889,8 +2889,11 @@
Optional<LayoutUnit> RenderBox::computeContentLogicalHeight(SizeType heightType, const Length& height, Optional<LayoutUnit> intrinsicContentHeight) const
{
- if (Optional<LayoutUnit> heightIncludingScrollbar = computeContentAndScrollbarLogicalHeightUsing(heightType, height, intrinsicContentHeight))
+ if (Optional<LayoutUnit> heightIncludingScrollbar = computeContentAndScrollbarLogicalHeightUsing(heightType, height, intrinsicContentHeight)) {
+ if (height.isIntrinsic())
+ return std::max<LayoutUnit>(0, heightIncludingScrollbar.value() - scrollbarLogicalHeight());
return std::max<LayoutUnit>(0, adjustContentBoxLogicalHeightForBoxSizing(heightIncludingScrollbar) - scrollbarLogicalHeight());
+ }
return Nullopt;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
