Title: [103738] branches/subpixellayout/Source/WebCore/rendering
- Revision
- 103738
- Author
- [email protected]
- Date
- 2011-12-27 16:11:26 -0800 (Tue, 27 Dec 2011)
Log Message
Fixing incorrectly overloaded layoutBlock method in RenderFlexibleBox
Modified Paths
Diff
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderFlexibleBox.cpp (103737 => 103738)
--- branches/subpixellayout/Source/WebCore/rendering/RenderFlexibleBox.cpp 2011-12-28 00:03:41 UTC (rev 103737)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderFlexibleBox.cpp 2011-12-28 00:11:26 UTC (rev 103738)
@@ -155,7 +155,7 @@
return "RenderFlexibleBox";
}
-void RenderFlexibleBox::layoutBlock(bool relayoutChildren, int, BlockLayoutPass)
+void RenderFlexibleBox::layoutBlock(bool relayoutChildren, LayoutUnit, BlockLayoutPass)
{
ASSERT(needsLayout());
@@ -163,7 +163,7 @@
return;
LayoutRepainter repainter(*this, checkForRepaintDuringLayout());
- LayoutStateMaintainer statePusher(view(), this, IntSize(x(), y()), hasTransform() || hasReflection() || style()->isFlippedBlocksWritingMode());
+ LayoutStateMaintainer statePusher(view(), this, LayoutSize(x(), y()), hasTransform() || hasReflection() || style()->isFlippedBlocksWritingMode());
LayoutSize previousSize = size();
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderFlexibleBox.h (103737 => 103738)
--- branches/subpixellayout/Source/WebCore/rendering/RenderFlexibleBox.h 2011-12-28 00:03:41 UTC (rev 103737)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderFlexibleBox.h 2011-12-28 00:11:26 UTC (rev 103738)
@@ -44,7 +44,7 @@
virtual bool isFlexibleBox() const { return true; }
- virtual void layoutBlock(bool relayoutChildren, int pageLogicalHeight = 0, BlockLayoutPass = NormalLayoutPass);
+ virtual void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0, BlockLayoutPass = NormalLayoutPass);
private:
class TreeOrderIterator;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
