<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[213748] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/213748">213748</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2017-03-10 19:30:05 -0800 (Fri, 10 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Percentage constrained images shrinking inside blocks inside nested flex boxes
https://bugs.webkit.org/show_bug.cgi?id=169438
Reviewed by Dean Jackson.
Source/WebCore:
Added new test in fast/hidpi.
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::computeChildPreferredLogicalWidths):
Make sure to clear out flexbox override sizes when computing preferred logical widths,
since they should not ever influence the preferred size.
LayoutTests:
* fast/hidpi/percent-height-image-nested-expected.html: Added.
* fast/hidpi/percent-height-image-nested.html: Added.
* fast/hidpi/resources/pic.jpg: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorTestExpectations">trunk/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderDeprecatedFlexibleBoxcpp">trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlexibleBoxcpp">trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasthidpipercentheightimagenestedexpectedhtml">trunk/LayoutTests/fast/hidpi/percent-height-image-nested-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasthidpipercentheightimagenestedhtml">trunk/LayoutTests/fast/hidpi/percent-height-image-nested.html</a></li>
<li><a href="#trunkLayoutTestsfasthidpiresourcesblue15002000pxpng">trunk/LayoutTests/fast/hidpi/resources/blue-1500-2000-px.png</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (213747 => 213748)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-11 03:24:30 UTC (rev 213747)
+++ trunk/LayoutTests/ChangeLog 2017-03-11 03:30:05 UTC (rev 213748)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-03-10 Dave Hyatt <hyatt@apple.com>
+
+ Percentage constrained images shrinking inside blocks inside nested flex boxes
+ https://bugs.webkit.org/show_bug.cgi?id=169438
+
+ Reviewed by Dean Jackson.
+
+ * fast/hidpi/percent-height-image-nested-expected.html: Added.
+ * fast/hidpi/percent-height-image-nested.html: Added.
+ * fast/hidpi/resources/pic.jpg: Added.
+
</ins><span class="cx"> 2017-03-10 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> Move libwebrtc backend to using tracks
</span></span></pre></div>
<a id="trunkLayoutTestsfasthidpipercentheightimagenestedexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/hidpi/percent-height-image-nested-expected.html (0 => 213748)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/hidpi/percent-height-image-nested-expected.html (rev 0)
+++ trunk/LayoutTests/fast/hidpi/percent-height-image-nested-expected.html 2017-03-11 03:30:05 UTC (rev 213748)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<!doctype html>
+<head>
+ <style>
+ .flex { display: flex }
+ img { max-width:100%; }
+ body, html { height:100% }
+ html { overflow:hidden }
+ div { width:16.6% }
+ </style>
+</head>
+<body>
+ <div>
+ <img src="resources/blue-1500-2000-px.png">
+ </div>
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasthidpipercentheightimagenestedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/hidpi/percent-height-image-nested.html (0 => 213748)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/hidpi/percent-height-image-nested.html (rev 0)
+++ trunk/LayoutTests/fast/hidpi/percent-height-image-nested.html 2017-03-11 03:30:05 UTC (rev 213748)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<!doctype html>
+<head>
+<style>
+.flex { display: flex }
+img { max-height:80%; max-width:100%; }
+body, html { height:100% }
+html { overflow:hidden }
+</style>
+</head>
+<body>
+<div class="flex">
+ <div class="flex">
+ <div>
+ <img src="resources/blue-1500-2000-px.png">
+ </div>
+ </div>
+</div>
+</div>
+<script>
+document.body.offsetWidth
+document.body.style.width = '20%'
+document.body.offsetHeight
+</script>
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasthidpiresourcesblue15002000pxpng"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/fast/hidpi/resources/blue-1500-2000-px.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Index: trunk/LayoutTests/fast/hidpi/resources/blue-1500-2000-px.png
</span><span class="cx">===================================================================
</span><del>--- trunk/LayoutTests/fast/hidpi/resources/blue-1500-2000-px.png 2017-03-11 03:24:30 UTC (rev 213747)
</del><ins>+++ trunk/LayoutTests/fast/hidpi/resources/blue-1500-2000-px.png 2017-03-11 03:30:05 UTC (rev 213748)
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/hidpi/resources/blue-1500-2000-px.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<ins>+application/octet-stream
</ins><span class="cx">\ No newline at end of property
</span><a id="trunkLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (213747 => 213748)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-03-11 03:24:30 UTC (rev 213747)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-03-11 03:30:05 UTC (rev 213748)
</span><span class="lines">@@ -2901,3 +2901,7 @@
</span><span class="cx"> # Bundle upload is not supported on iOS
</span><span class="cx"> fast/files/filereader-zip-bundle-using-open-panel.html [ Skip ]
</span><span class="cx"> http/tests/local/fileapi/upload-zip-bundle-as-blob-using-open-panel.html [ Skip ]
</span><ins>+
+# Results differ from desktop
+fast/hidpi/percent-height-image-nested.html [ Skip ]
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213747 => 213748)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-11 03:24:30 UTC (rev 213747)
+++ trunk/Source/WebCore/ChangeLog 2017-03-11 03:30:05 UTC (rev 213748)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-03-10 Dave Hyatt <hyatt@apple.com>
+
+ Percentage constrained images shrinking inside blocks inside nested flex boxes
+ https://bugs.webkit.org/show_bug.cgi?id=169438
+
+ Reviewed by Dean Jackson.
+
+ Added new test in fast/hidpi.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::computeChildPreferredLogicalWidths):
+ Make sure to clear out flexbox override sizes when computing preferred logical widths,
+ since they should not ever influence the preferred size.
+
</ins><span class="cx"> 2017-03-10 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> Move libwebrtc backend to using tracks
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (213747 => 213748)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2017-03-11 03:24:30 UTC (rev 213747)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2017-03-11 03:30:05 UTC (rev 213748)
</span><span class="lines">@@ -2878,9 +2878,34 @@
</span><span class="cx"> minPreferredLogicalWidth = maxPreferredLogicalWidth = downcast<RenderBox>(child).computeLogicalHeightWithoutLayout();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+
+ // The preferred widths of flexbox children should never depend on override sizes. They should
+ // always be computed without regard for any overrides that are present.
+ std::optional<LayoutUnit> overrideHeight;
+ std::optional<LayoutUnit> overrideWidth;
+
+ if (child.isBox()) {
+ auto& box = downcast<RenderBox>(child);
+ if (box.isFlexItem()) {
+ if (box.hasOverrideLogicalContentHeight())
+ overrideHeight = std::optional<LayoutUnit>(box.overrideLogicalContentHeight());
+ if (box.hasOverrideLogicalContentWidth())
+ overrideWidth = std::optional<LayoutUnit>(box.overrideLogicalContentWidth());
+ box.clearOverrideSize();
+ }
+ }
+
</ins><span class="cx"> minPreferredLogicalWidth = child.minPreferredLogicalWidth();
</span><span class="cx"> maxPreferredLogicalWidth = child.maxPreferredLogicalWidth();
</span><span class="cx">
</span><ins>+ if (child.isBox()) {
+ auto& box = downcast<RenderBox>(child);
+ if (overrideHeight)
+ box.setOverrideLogicalContentHeight(overrideHeight.value());
+ if (overrideWidth)
+ box.setOverrideLogicalContentWidth(overrideWidth.value());
+ }
+
</ins><span class="cx"> // For non-replaced blocks if the inline size is min|max-content or a definite
</span><span class="cx"> // size the min|max-content contribution is that size plus border, padding and
</span><span class="cx"> // margin https://drafts.csswg.org/css-sizing/#block-intrinsic
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderDeprecatedFlexibleBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp (213747 => 213748)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2017-03-11 03:24:30 UTC (rev 213747)
+++ trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2017-03-11 03:30:05 UTC (rev 213748)
</span><span class="lines">@@ -309,8 +309,6 @@
</span><span class="cx">
</span><span class="cx"> ChildFrameRects oldChildRects;
</span><span class="cx"> appendChildFrameRects(this, oldChildRects);
</span><del>-
- dirtyForLayoutFromPercentageHeightDescendants();
</del><span class="cx">
</span><span class="cx"> if (isHorizontal())
</span><span class="cx"> layoutHorizontalBox(relayoutChildren);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlexibleBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (213747 => 213748)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2017-03-11 03:24:30 UTC (rev 213747)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2017-03-11 03:30:05 UTC (rev 213748)
</span><span class="lines">@@ -263,8 +263,6 @@
</span><span class="cx">
</span><span class="cx"> beginUpdateScrollInfoAfterLayoutTransaction();
</span><span class="cx">
</span><del>- dirtyForLayoutFromPercentageHeightDescendants();
-
</del><span class="cx"> prepareOrderIteratorAndMargins();
</span><span class="cx">
</span><span class="cx"> // Fieldsets need to find their legend and position it inside the border of the object.
</span></span></pre>
</div>
</div>
</body>
</html>