Title: [112316] trunk/Source/WebCore
- Revision
- 112316
- Author
- le...@chromium.org
- Date
- 2012-03-27 14:34:21 -0700 (Tue, 27 Mar 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (112315 => 112316)
--- trunk/Source/WebCore/ChangeLog 2012-03-27 21:29:41 UTC (rev 112315)
+++ trunk/Source/WebCore/ChangeLog 2012-03-27 21:34:21 UTC (rev 112316)
@@ -1,3 +1,20 @@
+2012-03-27 Levi Weintraub <le...@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 <timo...@apple.com>
Make WebKit properly load a staged framework when soft linking.
Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (112315 => 112316)
--- trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2012-03-27 21:29:41 UTC (rev 112315)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2012-03-27 21:34:21 UTC (rev 112316)
@@ -230,7 +230,7 @@
setPreferredLogicalWidthsDirty(false);
}
-void RenderFlexibleBox::layoutBlock(bool relayoutChildren, int, BlockLayoutPass)
+void RenderFlexibleBox::layoutBlock(bool relayoutChildren, LayoutUnit, BlockLayoutPass)
{
ASSERT(needsLayout());
@@ -247,7 +247,7 @@
}
computeInitialRegionRangeForBlock();
- IntSize previousSize = size();
+ LayoutSize previousSize = size();
setLogicalHeight(0);
computeLogicalWidth();
Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.h (112315 => 112316)
--- trunk/Source/WebCore/rendering/RenderFlexibleBox.h 2012-03-27 21:29:41 UTC (rev 112315)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.h 2012-03-27 21:34:21 UTC (rev 112316)
@@ -44,7 +44,7 @@
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;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
