<!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>[201218] 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/201218">201218</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2016-05-20 11:48:53 -0700 (Fri, 20 May 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Scrolling broken in iTunes connect pages
https://bugs.webkit.org/show_bug.cgi?id=157678

Reviewed by Zalan Bujtas.

Source/WebCore:

Added fast/flexbox/nested-columns-min-intrinsic-disabled.html

Turn off minimum intrinsic size adjustment for flexboxes. This violates the spec,
but until we can produce good results that is what we need to do. Blink has also
turned off nested columns intrinsic sizing as well, so we match them with this
change.

* rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::adjustChildSizeForMinAndMax):

LayoutTests:

* fast/flexbox/nested-column-intrinsic-min-disabled-expected.html: Added.
* fast/flexbox/nested-column-intrinsic-min-disabled.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlexibleBoxcpp">trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastflexboxnestedcolumnintrinsicmindisabledexpectedhtml">trunk/LayoutTests/fast/flexbox/nested-column-intrinsic-min-disabled-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastflexboxnestedcolumnintrinsicmindisabledhtml">trunk/LayoutTests/fast/flexbox/nested-column-intrinsic-min-disabled.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (201217 => 201218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-05-20 18:44:26 UTC (rev 201217)
+++ trunk/LayoutTests/ChangeLog        2016-05-20 18:48:53 UTC (rev 201218)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-05-20  Dave Hyatt  &lt;hyatt@apple.com&gt;
+
+        Scrolling broken in iTunes connect pages
+        https://bugs.webkit.org/show_bug.cgi?id=157678
+
+        Reviewed by Zalan Bujtas.
+
+        * fast/flexbox/nested-column-intrinsic-min-disabled-expected.html: Added.
+        * fast/flexbox/nested-column-intrinsic-min-disabled.html: Added.
+
</ins><span class="cx"> 2016-05-20  Joanmarie Diggs  &lt;jdiggs@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         AX: Layout tests related to text alternative computation need to be done differently
</span></span></pre></div>
<a id="trunkLayoutTestsfastflexboxnestedcolumnintrinsicmindisabledexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/flexbox/nested-column-intrinsic-min-disabled-expected.html (0 => 201218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/flexbox/nested-column-intrinsic-min-disabled-expected.html                                (rev 0)
+++ trunk/LayoutTests/fast/flexbox/nested-column-intrinsic-min-disabled-expected.html        2016-05-20 18:48:53 UTC (rev 201218)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+&lt;html&gt;
+&lt;body&gt;
+&lt;div&gt;This height should be 0. We are violating the spec (section 4.5) for now until we can implement nested column intrinsic sizing properly.&lt;/div&gt;
+&lt;/body&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsfastflexboxnestedcolumnintrinsicmindisabledhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/flexbox/nested-column-intrinsic-min-disabled.html (0 => 201218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/flexbox/nested-column-intrinsic-min-disabled.html                                (rev 0)
+++ trunk/LayoutTests/fast/flexbox/nested-column-intrinsic-min-disabled.html        2016-05-20 18:48:53 UTC (rev 201218)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+&lt;html&gt;
+&lt;head&gt;
+&lt;style&gt;
+
+.flexbox {
+    display: -webkit-flex;
+}
+
+.column {
+    -webkit-flex-direction: column;
+}
+&lt;/style&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;div class=&quot;flexbox column&quot; style=&quot;height:0px&quot;&gt;
+&lt;div style=&quot;display:flex;background-color:red&quot;&gt;This height should be 0. We are violating the spec (section 4.5) for now until we can implement nested column intrinsic sizing properly.&lt;/div&gt;
+&lt;/div&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201217 => 201218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-05-20 18:44:26 UTC (rev 201217)
+++ trunk/Source/WebCore/ChangeLog        2016-05-20 18:48:53 UTC (rev 201218)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-05-20  Dave Hyatt  &lt;hyatt@apple.com&gt;
+
+        Scrolling broken in iTunes connect pages
+        https://bugs.webkit.org/show_bug.cgi?id=157678
+
+        Reviewed by Zalan Bujtas.
+
+        Added fast/flexbox/nested-columns-min-intrinsic-disabled.html
+
+        Turn off minimum intrinsic size adjustment for flexboxes. This violates the spec,
+        but until we can produce good results that is what we need to do. Blink has also
+        turned off nested columns intrinsic sizing as well, so we match them with this
+        change.
+
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::adjustChildSizeForMinAndMax):
+
</ins><span class="cx"> 2016-05-20  Rawinder Singh  &lt;rawinder.singh-webkit@cisra.canon.com.au&gt;
</span><span class="cx"> 
</span><span class="cx">         Implement operator== for WeakPtr
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlexibleBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (201217 => 201218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp        2016-05-20 18:44:26 UTC (rev 201217)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp        2016-05-20 18:48:53 UTC (rev 201218)
</span><span class="lines">@@ -868,10 +868,12 @@
</span><span class="cx">     if (min.isSpecifiedOrIntrinsic())
</span><span class="cx">         return std::max(childSize, computeMainAxisExtentForChild(child, MinSize, min).valueOr(childSize));
</span><span class="cx"> 
</span><del>-    if (!isFlexibleBoxImpl() &amp;&amp; min.isAuto() &amp;&amp; mainAxisOverflowForChild(child) == OVISIBLE) {
</del><ins>+    if (!isFlexibleBoxImpl() &amp;&amp; min.isAuto() &amp;&amp; mainAxisOverflowForChild(child) == OVISIBLE &amp;&amp; !(isColumnFlow() &amp;&amp; is&lt;RenderFlexibleBox&gt;(child))) {
</ins><span class="cx">         // This is the implementation of CSS flexbox section 4.5 which defines the minimum size of &quot;pure&quot; flex
</span><span class="cx">         // items. For any other item the value should be 0, this also includes RenderFlexibleBox's derived clases
</span><span class="cx">         // (RenderButton, RenderFullScreen...) because that's just an implementation detail.
</span><ins>+        // FIXME: For now we don't handle nested column flexboxes. Need to implement better intrinsic
+        // size handling from the flex box spec first (4.5).
</ins><span class="cx">         LayoutUnit contentSize = computeMainAxisExtentForChild(child, MinSize, Length(MinContent)).value();
</span><span class="cx">         ASSERT(contentSize &gt;= 0);
</span><span class="cx">         contentSize = std::min(contentSize, maxExtent.valueOr(contentSize));
</span></span></pre>
</div>
</div>

</body>
</html>