Title: [199883] trunk
Revision
199883
Author
ryanhad...@apple.com
Date
2016-04-22 11:17:32 -0700 (Fri, 22 Apr 2016)

Log Message

Unreviewed, rolling out r199877.
https://bugs.webkit.org/show_bug.cgi?id=156918

The LayoutTest added with this change is failing on all
platforms. (Requested by ryanhaddad on #webkit).

Reverted changeset:

"REGRESSION (r189567): The top of Facebook's messenger.com
looks visually broken"
https://bugs.webkit.org/show_bug.cgi?id=156869
http://trac.webkit.org/changeset/199877

Patch by Commit Queue <commit-qu...@webkit.org> on 2016-04-22

Modified Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (199882 => 199883)


--- trunk/LayoutTests/ChangeLog	2016-04-22 18:06:04 UTC (rev 199882)
+++ trunk/LayoutTests/ChangeLog	2016-04-22 18:17:32 UTC (rev 199883)
@@ -1,3 +1,18 @@
+2016-04-22  Commit Queue  <commit-qu...@webkit.org>
+
+        Unreviewed, rolling out r199877.
+        https://bugs.webkit.org/show_bug.cgi?id=156918
+
+        The LayoutTest added with this change is failing on all
+        platforms. (Requested by ryanhaddad on #webkit).
+
+        Reverted changeset:
+
+        "REGRESSION (r189567): The top of Facebook's messenger.com
+        looks visually broken"
+        https://bugs.webkit.org/show_bug.cgi?id=156869
+        http://trac.webkit.org/changeset/199877
+
 2016-04-22  Antti Koivisto  <an...@apple.com>
 
         REGRESSION (r194898): Multi download of external SVG defs file by <use> xlinks:href (caching)

Deleted: trunk/LayoutTests/fast/block/min-content-with-box-sizing-expected.html (199882 => 199883)


--- trunk/LayoutTests/fast/block/min-content-with-box-sizing-expected.html	2016-04-22 18:06:04 UTC (rev 199882)
+++ trunk/LayoutTests/fast/block/min-content-with-box-sizing-expected.html	2016-04-22 18:17:32 UTC (rev 199883)
@@ -1,3 +0,0 @@
-<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>

Deleted: trunk/LayoutTests/fast/block/min-content-with-box-sizing.html (199882 => 199883)


--- trunk/LayoutTests/fast/block/min-content-with-box-sizing.html	2016-04-22 18:06:04 UTC (rev 199882)
+++ trunk/LayoutTests/fast/block/min-content-with-box-sizing.html	2016-04-22 18:17:32 UTC (rev 199883)
@@ -1,3 +0,0 @@
-<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 (199882 => 199883)


--- trunk/Source/WebCore/ChangeLog	2016-04-22 18:06:04 UTC (rev 199882)
+++ trunk/Source/WebCore/ChangeLog	2016-04-22 18:17:32 UTC (rev 199883)
@@ -1,3 +1,18 @@
+2016-04-22  Commit Queue  <commit-qu...@webkit.org>
+
+        Unreviewed, rolling out r199877.
+        https://bugs.webkit.org/show_bug.cgi?id=156918
+
+        The LayoutTest added with this change is failing on all
+        platforms. (Requested by ryanhaddad on #webkit).
+
+        Reverted changeset:
+
+        "REGRESSION (r189567): The top of Facebook's messenger.com
+        looks visually broken"
+        https://bugs.webkit.org/show_bug.cgi?id=156869
+        http://trac.webkit.org/changeset/199877
+
 2016-04-22  Brady Eidson  <beid...@apple.com>
 
         Modern IDB: Rework the ownership/RefCounting model of IDBConnectionToServer and IDBConnectionProxy.

Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (199882 => 199883)


--- trunk/Source/WebCore/rendering/RenderBox.cpp	2016-04-22 18:06:04 UTC (rev 199882)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp	2016-04-22 18:17:32 UTC (rev 199883)
@@ -2889,11 +2889,8 @@
 
 Optional<LayoutUnit> RenderBox::computeContentLogicalHeight(SizeType heightType, const Length& height, Optional<LayoutUnit> intrinsicContentHeight) const
 {
-    if (Optional<LayoutUnit> heightIncludingScrollbar = computeContentAndScrollbarLogicalHeightUsing(heightType, height, intrinsicContentHeight)) {
-        if (height.isIntrinsic())
-            return std::max<LayoutUnit>(0, heightIncludingScrollbar.value() - scrollbarLogicalHeight());
+    if (Optional<LayoutUnit> heightIncludingScrollbar = computeContentAndScrollbarLogicalHeightUsing(heightType, height, intrinsicContentHeight))
         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

Reply via email to