Modified: trunk/LayoutTests/ChangeLog (171608 => 171609)
--- trunk/LayoutTests/ChangeLog 2014-07-25 19:08:22 UTC (rev 171608)
+++ trunk/LayoutTests/ChangeLog 2014-07-25 19:39:25 UTC (rev 171609)
@@ -1,3 +1,19 @@
+2014-07-25 David Hyatt <[email protected]>
+
+ [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.
+
2014-07-25 Commit Queue <[email protected]>
Unreviewed, rolling out r171480.
Added: trunk/LayoutTests/fast/multicol/pagination/RightToLeft-max-width.html (0 => 171609)
--- 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)
@@ -0,0 +1,32 @@
+<!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>
Added: trunk/LayoutTests/platform/mac/fast/multicol/pagination/RightToLeft-max-width-expected.txt (0 => 171609)
--- 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)
@@ -0,0 +1,24 @@
+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."
Modified: trunk/Source/WebCore/ChangeLog (171608 => 171609)
--- 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)
@@ -1,3 +1,20 @@
+2014-07-25 David Hyatt <[email protected]>
+
+ [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).
+
2014-07-25 Dan Bernstein <[email protected]>
[Mac] Unneeded MobileMe workaround in ResourceHandle::receivedCredential
Modified: trunk/Source/WebCore/rendering/RenderView.cpp (171608 => 171609)
--- 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)
@@ -206,7 +206,10 @@
LayoutUnit RenderView::availableLogicalHeight(AvailableLogicalHeightType) const
{
- // FIXME: Need to patch for new columns?
+ // 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();
#if PLATFORM(IOS)
// Workaround for <rdar://problem/7166808>.
