Changeset 136146 in webkit

Timestamp:

Nov 29, 2012, 12:11:06 PM (14 years ago)

Author:

hyatt@apple.com

Message:

[New Multicolumn] Add minimum column height tracking and forced break tracking to column sets.
​https://bugs.webkit.org/show_bug.cgi?id=103657

Reviewed by Simon Fraser.

• rendering/RenderMultiColumnSet.cpp:

(WebCore::RenderMultiColumnSet::RenderMultiColumnSet):

• rendering/RenderMultiColumnSet.h:

(WebCore::RenderMultiColumnSet::updateMinimumColumnHeight):
(WebCore::RenderMultiColumnSet::minimumColumnHeight):
(RenderMultiColumnSet):
(WebCore::RenderMultiColumnSet::forcedBreaksCount):
(WebCore::RenderMultiColumnSet::forcedBreakOffset):
(WebCore::RenderMultiColumnSet::maximumDistanceBetweenForcedBreaks):
(WebCore::RenderMultiColumnSet::clearForcedBreaks):
(WebCore::RenderMultiColumnSet::addForcedBreak):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderMultiColumnSet.cpp (modified) (1 diff)
• rendering/RenderMultiColumnSet.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-29  David Hyatt  <hyatt@apple.com>
+
+        [New Multicolumn] Add minimum column height tracking and forced break tracking to column sets.
+        https://bugs.webkit.org/show_bug.cgi?id=103657
+
+        Reviewed by Simon Fraser.
+
+        * rendering/RenderMultiColumnSet.cpp:
+        (WebCore::RenderMultiColumnSet::RenderMultiColumnSet):
+        * rendering/RenderMultiColumnSet.h:
+        (WebCore::RenderMultiColumnSet::updateMinimumColumnHeight):
+        (WebCore::RenderMultiColumnSet::minimumColumnHeight):
+        (RenderMultiColumnSet):
+        (WebCore::RenderMultiColumnSet::forcedBreaksCount):
+        (WebCore::RenderMultiColumnSet::forcedBreakOffset):
+        (WebCore::RenderMultiColumnSet::maximumDistanceBetweenForcedBreaks):
+        (WebCore::RenderMultiColumnSet::clearForcedBreaks):
+        (WebCore::RenderMultiColumnSet::addForcedBreak):
+
 2012-11-29  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp

@@ -42 +42 @@
     , m_computedColumnWidth(0)
     , m_computedColumnHeight(0)
+    , m_minimumColumnHeight(0)
+    , m_forcedBreaksCount(0)
+    , m_maximumDistanceBetweenForcedBreaks(0)
+    , m_forcedBreakOffset(0)
 {
 }

trunk/Source/WebCore/rendering/RenderMultiColumnSet.h

@@ -62 +62 @@
     }
 
+    void updateMinimumColumnHeight(LayoutUnit height) { m_minimumColumnHeight = std::max(height, m_minimumColumnHeight); }
+    LayoutUnit minimumColumnHeight() const { return m_minimumColumnHeight; }
+
+    unsigned forcedBreaksCount() const { return m_forcedBreaksCount; }
+    LayoutUnit forcedBreakOffset() const { return m_forcedBreakOffset; }
+    LayoutUnit maximumDistanceBetweenForcedBreaks() const { return m_maximumDistanceBetweenForcedBreaks; }
+    void clearForcedBreaks()
+    { 
+        m_forcedBreaksCount = 0;
+        m_maximumDistanceBetweenForcedBreaks = 0;
+        m_forcedBreakOffset = 0;
+    }
+    void addForcedBreak(LayoutUnit offsetFromFirstPage)
+    { 
+        ASSERT(!computedColumnHeight());
+        LayoutUnit distanceFromLastBreak = offsetFromFirstPage - m_forcedBreakOffset;
+        if (!distanceFromLastBreak)
+            return;
+        m_forcedBreaksCount++;
+        m_maximumDistanceBetweenForcedBreaks = std::max(m_maximumDistanceBetweenForcedBreaks, distanceFromLastBreak);
+        m_forcedBreakOffset = offsetFromFirstPage;
+    }
+
 private:
     virtual void updateLogicalWidth() OVERRIDE;
@@ -97 +120 @@
     LayoutUnit m_computedColumnWidth;
     LayoutUnit m_computedColumnHeight;
+    
+    // The following variables are used when balancing the column set.
+    LayoutUnit m_minimumColumnHeight;
+    unsigned m_forcedBreaksCount; // FIXME: We will ultimately need to cache more information to balance around forced breaks properly.
+    LayoutUnit m_maximumDistanceBetweenForcedBreaks;
+    LayoutUnit m_forcedBreakOffset;
 };