Switch ColumnInfo::addForcedBreak to LayoutUnits

https://bugs.webkit.org/show_bug.cgi?id=82210

Reviewed by Eric Seidel.

Forced breaks are added by local offsets, which should be in LayoutUnits.

No new tests. No change in behavior.

* rendering/ColumnInfo.h:
(WebCore::ColumnInfo::addForcedBreak):

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 80cd963..4df4b90 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,5 +1,19 @@
 2012-03-26  Levi Weintraub  <leviw@chromium.org>
 
+        Switch ColumnInfo::addForcedBreak to LayoutUnits
+        https://bugs.webkit.org/show_bug.cgi?id=82210
+
+        Reviewed by Eric Seidel.
+
+        Forced breaks are added by local offsets, which should be in LayoutUnits.
+
+        No new tests. No change in behavior.
+
+        * rendering/ColumnInfo.h:
+        (WebCore::ColumnInfo::addForcedBreak):
+
+2012-03-26  Levi Weintraub  <leviw@chromium.org>
+
         Update LayoutUnit usage in ContainerNode, Element, and ElementRareData
         https://bugs.webkit.org/show_bug.cgi?id=82219
 

diff --git a/Source/WebCore/rendering/ColumnInfo.h b/Source/WebCore/rendering/ColumnInfo.h
index c8191cf..e462a84 100644 (file)
--- a/Source/WebCore/rendering/ColumnInfo.h
+++ b/Source/WebCore/rendering/ColumnInfo.h
@@ -83,10 +83,10 @@ public:
         m_maximumDistanceBetweenForcedBreaks = 0;
         m_forcedBreakOffset = 0;
     }
-    void addForcedBreak(int offsetFromFirstPage)
+    void addForcedBreak(LayoutUnit offsetFromFirstPage)
     { 
         ASSERT(!m_columnHeight);
-        int distanceFromLastBreak = offsetFromFirstPage - m_forcedBreakOffset;
+        LayoutUnit distanceFromLastBreak = offsetFromFirstPage - m_forcedBreakOffset;
         if (!distanceFromLastBreak)
             return;
         m_forcedBreaks++;