Tried to fix an unused parameter warning after r112154.

* rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::layoutBlock): Changed to not pass relayoutChildren to
layoutFlexItems.
(WebCore::RenderFlexibleBox::layoutFlexItems): Removed the unused relayoutChildren parameter.
* rendering/RenderFlexibleBox.h:

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index c3aabe1..754a8f2 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2012-03-26  Dan Bernstein  <mitz@apple.com>
+
+        Tried to fix an unused parameter warning after r112154.
+
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::layoutBlock): Changed to not pass relayoutChildren to
+        layoutFlexItems.
+        (WebCore::RenderFlexibleBox::layoutFlexItems): Removed the unused relayoutChildren parameter.
+        * rendering/RenderFlexibleBox.h:
+
 2012-03-26  Rob Arnold  <robarnold@fb.com>
 
         SyntheticStyleCalc on an element should not force recalculation on its children

diff --git a/Source/WebCore/rendering/RenderFlexibleBox.cpp b/Source/WebCore/rendering/RenderFlexibleBox.cpp
index 46b9550..41fa08a 100644 (file)
--- a/Source/WebCore/rendering/RenderFlexibleBox.cpp
+++ b/Source/WebCore/rendering/RenderFlexibleBox.cpp
@@ -266,7 +266,7 @@ void RenderFlexibleBox::layoutBlock(bool relayoutChildren, int, BlockLayoutPass)
     FlexOrderHashSet flexOrderValues;
     computeMainAxisPreferredSizes(relayoutChildren, flexOrderValues);
     FlexOrderIterator flexIterator(this, flexOrderValues);
-    layoutFlexItems(relayoutChildren, flexIterator, lineContexts);
+    layoutFlexItems(flexIterator, lineContexts);
 
     LayoutUnit oldClientAfterEdge = clientLogicalBottom();
     computeLogicalHeight();
@@ -610,7 +610,7 @@ LayoutUnit RenderFlexibleBox::computeAvailableFreeSpace(LayoutUnit preferredMain
     return heightResult - preferredMainAxisExtent;
 }
 
-void RenderFlexibleBox::layoutFlexItems(bool relayoutChildren, FlexOrderIterator& iterator, WTF::Vector<LineContext>& lineContexts)
+void RenderFlexibleBox::layoutFlexItems(FlexOrderIterator& iterator, WTF::Vector<LineContext>& lineContexts)
 {
     OrderedFlexItemList orderedChildren;
     LayoutUnit preferredMainAxisExtent;

diff --git a/Source/WebCore/rendering/RenderFlexibleBox.h b/Source/WebCore/rendering/RenderFlexibleBox.h
index ec83fbe..f8fa48d 100644 (file)
--- a/Source/WebCore/rendering/RenderFlexibleBox.h
+++ b/Source/WebCore/rendering/RenderFlexibleBox.h
@@ -100,7 +100,7 @@ private:
     LayoutUnit mainAxisScrollbarExtentForChild(RenderBox* child) const;
     LayoutUnit preferredMainAxisContentExtentForChild(RenderBox* child) const;
 
-    void layoutFlexItems(bool relayoutChildren, FlexOrderIterator&, WTF::Vector<LineContext>&);
+    void layoutFlexItems(FlexOrderIterator&, WTF::Vector<LineContext>&);
     void repositionLogicalHeightDependentFlexItems(FlexOrderIterator&, WTF::Vector<LineContext>&, LayoutUnit& oldClientAfterEdge);
 
     float positiveFlexForChild(RenderBox* child) const;