Index: Source/core/rendering/RenderFlexibleBox.cpp |
diff --git a/Source/core/rendering/RenderFlexibleBox.cpp b/Source/core/rendering/RenderFlexibleBox.cpp |
index 65c82221b62186787391f1900db78e5043ad82c7..cb014c275319b1c5924fd66743f11bb706a5a885 100644 |
--- a/Source/core/rendering/RenderFlexibleBox.cpp |
+++ b/Source/core/rendering/RenderFlexibleBox.cpp |
@@ -814,17 +814,16 @@ LayoutUnit RenderFlexibleBox::marginBoxAscentForChild(RenderBox* child) |
return ascent + flowAwareMarginBeforeForChild(child); |
} |
-LayoutUnit RenderFlexibleBox::computeChildMarginValue(Length margin, RenderView* view) |
+LayoutUnit RenderFlexibleBox::computeChildMarginValue(Length margin) |
{ |
// When resolving the margins, we use the content size for resolving percent and calc (for percents in calc expressions) margins. |
// Fortunately, percent margins are always computed with respect to the block's width, even for margin-top and margin-bottom. |
LayoutUnit availableSize = contentLogicalWidth(); |
- return minimumValueForLength(margin, availableSize, view); |
+ return minimumValueForLength(margin, availableSize); |
} |
void RenderFlexibleBox::prepareOrderIteratorAndMargins() |
{ |
- RenderView* renderView = view(); |
OrderIteratorPopulator populator(m_orderIterator); |
for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox()) { |
@@ -836,11 +835,11 @@ void RenderFlexibleBox::prepareOrderIteratorAndMargins() |
// Before running the flex algorithm, 'auto' has a margin of 0. |
// Also, if we're not auto sizing, we don't do a layout that computes the start/end margins. |
if (isHorizontalFlow()) { |
- child->setMarginLeft(computeChildMarginValue(child->style()->marginLeft(), renderView)); |
- child->setMarginRight(computeChildMarginValue(child->style()->marginRight(), renderView)); |
+ child->setMarginLeft(computeChildMarginValue(child->style()->marginLeft())); |
+ child->setMarginRight(computeChildMarginValue(child->style()->marginRight())); |
} else { |
- child->setMarginTop(computeChildMarginValue(child->style()->marginTop(), renderView)); |
- child->setMarginBottom(computeChildMarginValue(child->style()->marginBottom(), renderView)); |
+ child->setMarginTop(computeChildMarginValue(child->style()->marginTop())); |
+ child->setMarginBottom(computeChildMarginValue(child->style()->marginBottom())); |
} |
} |
} |