Changeset 167483 in webkit

Timestamp:

Apr 17, 2014, 10:10:38 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r167478.
​https://bugs.webkit.org/show_bug.cgi?id=131840

Broke multicol tests (Requested by ap on #webkit).

Reverted changeset:

"[New Multicolumn] Pagination mode messed up with non-inline
axis and reversed direction."
​https://bugs.webkit.org/show_bug.cgi?id=131811
​http://trac.webkit.org/changeset/167478

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/multicol/newmulticol/compare-with-old-impl/BottomToTop-tb-expected.html (deleted)
• LayoutTests/fast/multicol/newmulticol/compare-with-old-impl/BottomToTop-tb.html (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderMultiColumnSet.cpp (modified) (4 diffs)
• Source/WebCore/rendering/RenderMultiColumnSet.h (modified) (1 diff)
• Source/WebCore/rendering/RenderView.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-04-17  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r167478.
+        https://bugs.webkit.org/show_bug.cgi?id=131840
+
+        Broke multicol tests (Requested by ap on #webkit).
+
+        Reverted changeset:
+
+        "[New Multicolumn] Pagination mode messed up with non-inline
+        axis and reversed direction."
+        https://bugs.webkit.org/show_bug.cgi?id=131811
+        http://trac.webkit.org/changeset/167478
+
 2014-04-17  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-17  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r167478.
+        https://bugs.webkit.org/show_bug.cgi?id=131840
+
+        Broke multicol tests (Requested by ap on #webkit).
+
+        Reverted changeset:
+
+        "[New Multicolumn] Pagination mode messed up with non-inline
+        axis and reversed direction."
+        https://bugs.webkit.org/show_bug.cgi?id=131811
+        http://trac.webkit.org/changeset/167478
+
 2014-04-17  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp

@@ -27 +27 @@
 #include "RenderMultiColumnSet.h"
 
-#include "FrameView.h"
 #include "PaintInfo.h"
 #include "RenderLayer.h"
 #include "RenderMultiColumnFlowThread.h"
 #include "RenderMultiColumnSpannerPlaceholder.h"
-#include "RenderView.h"
 
 namespace WebCore {
@@ -41 +39 @@
     , m_computedColumnWidth(0)
     , m_computedColumnHeight(0)
-    , m_availableColumnHeight(0)
     , m_maxColumnHeight(RenderFlowThread::maxLogicalHeight())
     , m_minSpaceShortage(RenderFlowThread::maxLogicalHeight())
@@ -155 +152 @@
     if (m_computedColumnHeight > m_maxColumnHeight)
         m_computedColumnHeight = m_maxColumnHeight;
-    
-    // FIXME: The available column height is not the same as the constrained height specified
-    // by the pagination API. The column set in this case is allowed to be bigger than the
-    // height of a single column. We cache available column height in order to use it
-    // in computeLogicalHeight later. This is pretty gross, and maybe there's a better way
-    // to formalize the idea of clamped column heights without having a view dependency
-    // here.
-    m_availableColumnHeight = m_computedColumnHeight;
-    if (multiColumnFlowThread() && !multiColumnFlowThread()->progressionIsInline() && parent()->isRenderView()) {
-        int pageLength = view().frameView().pagination().pageLength;
-        if (pageLength)
-            m_computedColumnHeight = pageLength;
-    }
     // FIXME: the height may also be affected by the enclosing pagination context, if any.
 }
@@ -413 +397 @@
 void RenderMultiColumnSet::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
 {
-    computedValues.m_extent = m_availableColumnHeight;
+    computedValues.m_extent = m_computedColumnHeight;
     computedValues.m_position = logicalTop;
 }

trunk/Source/WebCore/rendering/RenderMultiColumnSet.h

@@ -179 +179 @@
     LayoutUnit m_computedColumnWidth; // Used column width (the resulting 'W' from the pseudo-algorithm in the multicol spec)
     LayoutUnit m_computedColumnHeight;
-    LayoutUnit m_availableColumnHeight;
     
     // The following variables are used when balancing the column set.

trunk/Source/WebCore/rendering/RenderView.cpp

@@ -296 +296 @@
         return pageLogicalHeight();
     
-    if ((hasColumns() || multiColumnFlowThread()) && !style().hasInlineColumnAxis()) {
+    if (hasColumns() && !style().hasInlineColumnAxis()) {
         if (int pageLength = frameView().pagination().pageLength)
             return pageLength;