Title: [112156] trunk/Source/WebCore
- Revision
- 112156
- Author
- [email protected]
- Date
- 2012-03-26 15:39:18 -0700 (Mon, 26 Mar 2012)
Log Message
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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (112155 => 112156)
--- trunk/Source/WebCore/ChangeLog 2012-03-26 22:32:47 UTC (rev 112155)
+++ trunk/Source/WebCore/ChangeLog 2012-03-26 22:39:18 UTC (rev 112156)
@@ -1,3 +1,13 @@
+2012-03-26 Dan Bernstein <[email protected]>
+
+ 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 <[email protected]>
SyntheticStyleCalc on an element should not force recalculation on its children
Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (112155 => 112156)
--- trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2012-03-26 22:32:47 UTC (rev 112155)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2012-03-26 22:39:18 UTC (rev 112156)
@@ -266,7 +266,7 @@
FlexOrderHashSet flexOrderValues;
computeMainAxisPreferredSizes(relayoutChildren, flexOrderValues);
FlexOrderIterator flexIterator(this, flexOrderValues);
- layoutFlexItems(relayoutChildren, flexIterator, lineContexts);
+ layoutFlexItems(flexIterator, lineContexts);
LayoutUnit oldClientAfterEdge = clientLogicalBottom();
computeLogicalHeight();
@@ -610,7 +610,7 @@
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;
Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.h (112155 => 112156)
--- trunk/Source/WebCore/rendering/RenderFlexibleBox.h 2012-03-26 22:32:47 UTC (rev 112155)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.h 2012-03-26 22:39:18 UTC (rev 112156)
@@ -100,7 +100,7 @@
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;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
