<!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>[171609] 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/171609">171609</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2014-07-25 12:39:25 -0700 (Fri, 25 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[New Multicolumn] RenderViews paginated as RL or LR don't handle percentage widths correctly.
REGRESSION: Images don’t scale to fit in page in vertical text books
https://bugs.webkit.org/show_bug.cgi?id=135204
Source/WebCore:
<rdar://problem/17043792>
Reviewed by Simon Fraser.
Added fast/multicol/pagination/RightToLeft-max-width.html
* rendering/RenderView.cpp:
(WebCore::RenderView::availableLogicalHeight):
Put back in the same code that used to exist for the old columns (but ported to the new
columns).
LayoutTests:
<rdar://problem/17043792>
Reviewed by Simon Fraser.
* fast/multicol/newmulticol/compare-with-old-impl/overflow-content-expected.html: Removed.
* fast/multicol/newmulticol/compare-with-old-impl/overflow-content.html: Removed.
* fast/multicol/pagination/RightToLeft-max-width.html: Added.
* platform/mac/fast/multicol/pagination/RightToLeft-max-width-expected.png: Added.
* platform/mac/fast/multicol/pagination/RightToLeft-max-width-expected.txt: 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="#trunkSourceWebCorerenderingRenderViewcpp">trunk/Source/WebCore/rendering/RenderView.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmulticolpaginationRightToLeftmaxwidthhtml">trunk/LayoutTests/fast/multicol/pagination/RightToLeft-max-width.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastmulticolpaginationRightToLeftmaxwidthexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/pagination/RightToLeft-max-width-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastmulticolpaginationRightToLeftmaxwidthexpectedtxt">trunk/LayoutTests/platform/mac/fast/multicol/pagination/RightToLeft-max-width-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (171608 => 171609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-07-25 19:08:22 UTC (rev 171608)
+++ trunk/LayoutTests/ChangeLog 2014-07-25 19:39:25 UTC (rev 171609)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-07-25 David Hyatt <hyatt@apple.com>
+
+ [New Multicolumn] RenderViews paginated as RL or LR don't handle percentage widths correctly.
+ REGRESSION: Images don’t scale to fit in page in vertical text books
+
+ https://bugs.webkit.org/show_bug.cgi?id=135204
+ <rdar://problem/17043792>
+
+ Reviewed by Simon Fraser.
+
+ * fast/multicol/newmulticol/compare-with-old-impl/overflow-content-expected.html: Removed.
+ * fast/multicol/newmulticol/compare-with-old-impl/overflow-content.html: Removed.
+ * fast/multicol/pagination/RightToLeft-max-width.html: Added.
+ * platform/mac/fast/multicol/pagination/RightToLeft-max-width-expected.png: Added.
+ * platform/mac/fast/multicol/pagination/RightToLeft-max-width-expected.txt: Added.
+
</ins><span class="cx"> 2014-07-25 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r171480.
</span></span></pre></div>
<a id="trunkLayoutTestsfastmulticolpaginationRightToLeftmaxwidthhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/pagination/RightToLeft-max-width.html (0 => 171609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/pagination/RightToLeft-max-width.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/pagination/RightToLeft-max-width.html 2014-07-25 19:39:25 UTC (rev 171609)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ body {
+ -webkit-writing-mode: vertical-rl;
+ }
+ .box {
+ height: 50px;
+ width: 50px;
+ background-color: blue;
+ }
+ .box.changed {
+ background-color: green;
+ }
+ </style>
+ <script>
+ if (window.internals)
+ internals.setPagination("RightToLeftPaginated", 20, 180);
+ </script>
+</head>
+<body>
+
+<p>1 Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. </p>
+
+<img style="display:block; max-width:100%; width:400px;height:100px;background-color:lime">
+<div class="box" onclick="this.classList.toggle('changed')"></div>
+<p>2 Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. </p>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastmulticolpaginationRightToLeftmaxwidthexpectedpng"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/platform/mac/fast/multicol/pagination/RightToLeft-max-width-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/LayoutTests/platform/mac/fast/multicol/pagination/RightToLeft-max-width-expected.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestsplatformmacfastmulticolpaginationRightToLeftmaxwidthexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/fast/multicol/pagination/RightToLeft-max-width-expected.txt (0 => 171609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/multicol/pagination/RightToLeft-max-width-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/multicol/pagination/RightToLeft-max-width-expected.txt 2014-07-25 19:39:25 UTC (rev 171609)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+ RenderMultiColumnSet at (0,0) size 800x600
+layer at (268,0) size 532x600
+ RenderMultiColumnFlowThread at (0,0) size 532x600
+layer at (268,0) size 532x600
+ RenderBlock {HTML} at (0,0) size 532x600
+ RenderBody {BODY} at (16,8) size 500x584
+ RenderBlock {P} at (0,0) size 90x584
+ RenderText {#text} at (0,0) size 90x584
+ text run at (0,0) width 580: "1 Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt"
+ text run at (18,0) width 536: "ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation"
+ text run at (36,0) width 510: "ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in"
+ text run at (54,0) width 553: "reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint"
+ text run at (72,0) width 584: "occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+ RenderImage {IMG} at (164,0) size 180x100 [bgcolor=#00FF00]
+ RenderBlock {DIV} at (344,0) size 50x50 [bgcolor=#0000FF]
+ RenderBlock {P} at (410,0) size 90x584
+ RenderText {#text} at (0,0) size 90x584
+ text run at (0,0) width 580: "2 Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt"
+ text run at (18,0) width 536: "ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation"
+ text run at (36,0) width 510: "ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in"
+ text run at (54,0) width 553: "reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint"
+ text run at (72,0) width 584: "occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171608 => 171609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-25 19:08:22 UTC (rev 171608)
+++ trunk/Source/WebCore/ChangeLog 2014-07-25 19:39:25 UTC (rev 171609)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-07-25 David Hyatt <hyatt@apple.com>
+
+ [New Multicolumn] RenderViews paginated as RL or LR don't handle percentage widths correctly.
+ REGRESSION: Images don’t scale to fit in page in vertical text books
+
+ https://bugs.webkit.org/show_bug.cgi?id=135204
+ <rdar://problem/17043792>
+
+ Reviewed by Simon Fraser.
+
+ Added fast/multicol/pagination/RightToLeft-max-width.html
+
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::availableLogicalHeight):
+ Put back in the same code that used to exist for the old columns (but ported to the new
+ columns).
+
</ins><span class="cx"> 2014-07-25 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Unneeded MobileMe workaround in ResourceHandle::receivedCredential
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.cpp (171608 => 171609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.cpp 2014-07-25 19:08:22 UTC (rev 171608)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2014-07-25 19:39:25 UTC (rev 171609)
</span><span class="lines">@@ -206,7 +206,10 @@
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderView::availableLogicalHeight(AvailableLogicalHeightType) const
</span><span class="cx"> {
</span><del>- // FIXME: Need to patch for new columns?
</del><ins>+ // Make sure block progression pagination for percentages uses the column extent and
+ // not the view's extent. See https://bugs.webkit.org/show_bug.cgi?id=135204.
+ if (multiColumnFlowThread() && multiColumnFlowThread()->firstMultiColumnSet())
+ return multiColumnFlowThread()->firstMultiColumnSet()->computedColumnHeight();
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> // Workaround for <rdar://problem/7166808>.
</span></span></pre>
</div>
</div>
</body>
</html>