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):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@107009 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 602eb78..ae1c8b9 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,26 @@
+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>
 
         Add JSC support for delivering mutations when the outermost script context exits

diff --git a/Source/WebCore/rendering/ColumnInfo.h b/Source/WebCore/rendering/ColumnInfo.h
index 94b130d..c8191cf 100644 (file)
--- a/Source/WebCore/rendering/ColumnInfo.h
+++ b/Source/WebCore/rendering/ColumnInfo.h
@@ -75,8 +75,8 @@ public:
     LayoutUnit minimumColumnHeight() const { return m_minimumColumnHeight; }
 
     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()
     { 
         m_forcedBreaks = 0;
@@ -107,8 +107,8 @@ private:
     LayoutUnit m_columnHeight;
     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;
 };
 

diff --git a/Source/WebCore/rendering/RenderFrameSet.cpp b/Source/WebCore/rendering/RenderFrameSet.cpp
index 6b6d239..fc2c97f 100644 (file)
--- a/Source/WebCore/rendering/RenderFrameSet.cpp
+++ b/Source/WebCore/rendering/RenderFrameSet.cpp
@@ -80,7 +80,7 @@ static Color borderFillColor()
     return Color(208, 208, 208);
 }
 
-void RenderFrameSet::paintColumnBorder(const PaintInfo& paintInfo, const IntRect& borderRect)
+void RenderFrameSet::paintColumnBorder(const PaintInfo& paintInfo, const LayoutRect& borderRect)
 {
     if (!paintInfo.rect.intersects(borderRect))
         return;
@@ -100,7 +100,7 @@ void RenderFrameSet::paintColumnBorder(const PaintInfo& paintInfo, const IntRect
     }
 }
 
-void RenderFrameSet::paintRowBorder(const PaintInfo& paintInfo, const IntRect& borderRect)
+void RenderFrameSet::paintRowBorder(const PaintInfo& paintInfo, const LayoutRect& borderRect)
 {
     if (!paintInfo.rect.intersects(borderRect))
         return;

diff --git a/Source/WebCore/rendering/RenderFrameSet.h b/Source/WebCore/rendering/RenderFrameSet.h
index 63ae2a8..373d0d0 100644 (file)
--- a/Source/WebCore/rendering/RenderFrameSet.h
+++ b/Source/WebCore/rendering/RenderFrameSet.h
@@ -119,8 +119,8 @@ private:
     void startResizing(GridAxis&, int position);
     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;