Correct LayoutUnit usage in virtual function layoutBlock in RenderFlexibleBox
authorleviw@chromium.org <leviw@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 27 Mar 2012 21:34:21 +0000 (21:34 +0000)
committerleviw@chromium.org <leviw@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 27 Mar 2012 21:34:21 +0000 (21:34 +0000)
https://bugs.webkit.org/show_bug.cgi?id=82344

Reviewed by Eric Seidel.

Correcting the signature of RenderFlexibleBox::layoutBlock to use a LayoutUnit
for the page height, and avoiding assigning the renderer's size to an IntSize.

No new tests. No change in behavior.

* rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::layoutBlock):
* rendering/RenderFlexibleBox.h:
(RenderFlexibleBox):

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

Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderFlexibleBox.cpp
Source/WebCore/rendering/RenderFlexibleBox.h

index e00ce05..5368f94 100644 (file)
@@ -1,3 +1,20 @@
+2012-03-27  Levi Weintraub  <leviw@chromium.org>
+
+        Correct LayoutUnit usage in virtual function layoutBlock in RenderFlexibleBox
+        https://bugs.webkit.org/show_bug.cgi?id=82344
+
+        Reviewed by Eric Seidel.
+
+        Correcting the signature of RenderFlexibleBox::layoutBlock to use a LayoutUnit
+        for the page height, and avoiding assigning the renderer's size to an IntSize.
+
+        No new tests. No change in behavior.
+
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::layoutBlock):
+        * rendering/RenderFlexibleBox.h:
+        (RenderFlexibleBox):
+
 2012-03-27  Timothy Hatcher  <timothy@apple.com>
 
         Make WebKit properly load a staged framework when soft linking.
index 25ab5e1..cbc2a94 100644 (file)
@@ -230,7 +230,7 @@ void RenderFlexibleBox::computePreferredLogicalWidths()
     setPreferredLogicalWidthsDirty(false);
 }
 
-void RenderFlexibleBox::layoutBlock(bool relayoutChildren, int, BlockLayoutPass)
+void RenderFlexibleBox::layoutBlock(bool relayoutChildren, LayoutUnit, BlockLayoutPass)
 {
     ASSERT(needsLayout());
 
@@ -247,7 +247,7 @@ void RenderFlexibleBox::layoutBlock(bool relayoutChildren, int, BlockLayoutPass)
     }
     computeInitialRegionRangeForBlock();
 
-    IntSize previousSize = size();
+    LayoutSize previousSize = size();
 
     setLogicalHeight(0);
     computeLogicalWidth();
index f8fa48d..19ee93c 100644 (file)
@@ -44,7 +44,7 @@ public:
 
     virtual bool isFlexibleBox() const { return true; }
     virtual void computePreferredLogicalWidths();
-    virtual void layoutBlock(bool relayoutChildren, int pageLogicalHeight = 0, BlockLayoutPass = NormalLayoutPass);
+    virtual void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0, BlockLayoutPass = NormalLayoutPass);
 
     bool isHorizontalFlow() const;