Changeset 112316 in webkit

Timestamp:

Mar 27, 2012 2:34:21 PM (12 years ago)

Author:

leviw@chromium.org

Message:

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

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -231 +231 @@
 }
 
-void RenderFlexibleBox::layoutBlock(bool relayoutChildren, int, BlockLayoutPass)
+void RenderFlexibleBox::layoutBlock(bool relayoutChildren, LayoutUnit, BlockLayoutPass)
 {
     ASSERT(needsLayout());
@@ -248 +248 @@
     computeInitialRegionRangeForBlock();
 
-    IntSize previousSize = size();
+    LayoutSize previousSize = size();
 
     setLogicalHeight(0);

trunk/Source/WebCore/rendering/RenderFlexibleBox.h

@@ -45 +45 @@
     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;