Changeset 107009 in webkit

Timestamp:

Feb 7, 2012 4:52:39 PM (12 years ago)

Author:

leviw@chromium.org

Message:

Update LayoutUnit usage in ColumnInfo and RenderFrameSet
​https://bugs.webkit.org/show_bug.cgi?id=77914

Reviewed by Eric Seidel.

Updating ColumnInfo and RenderFrameSet to use LayoutUnits
instead of directly referencing integers for locations and
distances.

No new tests. No changed behavior.

• rendering/ColumnInfo.h:

(WebCore::ColumnInfo::forcedBreakOffset):
(WebCore::ColumnInfo::maximumDistanceBetweenForcedBreaks):
(ColumnInfo):

• rendering/RenderFrameSet.cpp:

(WebCore::RenderFrameSet::paintColumnBorder):
(WebCore::RenderFrameSet::paintRowBorder):

• rendering/RenderFrameSet.h:

(RenderFrameSet):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-07  Levi Weintraub  <leviw@chromium.org>
+
+        Update LayoutUnit usage in ColumnInfo and RenderFrameSet
+        https://bugs.webkit.org/show_bug.cgi?id=77914
+
+        Reviewed by Eric Seidel.
+
+        Updating ColumnInfo and RenderFrameSet to use LayoutUnits
+        instead of directly referencing integers for locations and
+        distances.
+
+        No new tests. No changed behavior.
+
+        * rendering/ColumnInfo.h:
+        (WebCore::ColumnInfo::forcedBreakOffset):
+        (WebCore::ColumnInfo::maximumDistanceBetweenForcedBreaks):
+        (ColumnInfo):
+        * rendering/RenderFrameSet.cpp:
+        (WebCore::RenderFrameSet::paintColumnBorder):
+        (WebCore::RenderFrameSet::paintRowBorder):
+        * rendering/RenderFrameSet.h:
+        (RenderFrameSet):
+
 2012-02-07  Adam Klein  <adamk@chromium.org>
 

trunk/Source/WebCore/rendering/ColumnInfo.h

@@ -76 +76 @@
 
     int forcedBreaks() const { return m_forcedBreaks; }
-    int forcedBreakOffset() const { return m_forcedBreakOffset; }
-    int maximumDistanceBetweenForcedBreaks() const { return m_maximumDistanceBetweenForcedBreaks; }
+    LayoutUnit forcedBreakOffset() const { return m_forcedBreakOffset; }
+    LayoutUnit maximumDistanceBetweenForcedBreaks() const { return m_maximumDistanceBetweenForcedBreaks; }
     void clearForcedBreaks()
     { 
@@ -108 +108 @@
     LayoutUnit m_minimumColumnHeight;
     int m_forcedBreaks; // FIXME: We will ultimately need to cache more information to balance around forced breaks properly.
-    int m_maximumDistanceBetweenForcedBreaks;
-    int m_forcedBreakOffset;
+    LayoutUnit m_maximumDistanceBetweenForcedBreaks;
+    LayoutUnit m_forcedBreakOffset;
     PaginationUnit m_paginationUnit;
 };

trunk/Source/WebCore/rendering/RenderFrameSet.cpp

@@ -81 +81 @@
 }
 
-void RenderFrameSet::paintColumnBorder(const PaintInfo& paintInfo, const IntRect& borderRect)
+void RenderFrameSet::paintColumnBorder(const PaintInfo& paintInfo, const LayoutRect& borderRect)
 {
     if (!paintInfo.rect.intersects(borderRect))
@@ -101 +101 @@
 }
 
-void RenderFrameSet::paintRowBorder(const PaintInfo& paintInfo, const IntRect& borderRect)
+void RenderFrameSet::paintRowBorder(const PaintInfo& paintInfo, const LayoutRect& borderRect)
 {
     if (!paintInfo.rect.intersects(borderRect))

trunk/Source/WebCore/rendering/RenderFrameSet.h

@@ -120 +120 @@
     void continueResizing(GridAxis&, int position);
 
-    void paintRowBorder(const PaintInfo&, const IntRect&);
-    void paintColumnBorder(const PaintInfo&, const IntRect&);
+    void paintRowBorder(const PaintInfo&, const LayoutRect&);
+    void paintColumnBorder(const PaintInfo&, const LayoutRect&);
 
     RenderObjectChildList m_children;