Modified: trunk/Source/WebCore/ChangeLog (101423 => 101424)
--- trunk/Source/WebCore/ChangeLog 2011-11-29 22:22:00 UTC (rev 101423)
+++ trunk/Source/WebCore/ChangeLog 2011-11-29 22:42:16 UTC (rev 101424)
@@ -1,3 +1,22 @@
+2011-11-29 Tony Chang <t...@chromium.org>
+
+ Rename some flexbox functions to be less confusing
+ https://bugs.webkit.org/show_bug.cgi?id=73363
+
+ Reviewed by Ojan Vafai.
+
+ These methods no longer have anything to do with block/inline direction.
+
+ No new tests, just renaming some functions.
+
+ * rendering/RenderFlexibleBox.cpp:
+ (WebCore::RenderFlexibleBox::layoutBlock):
+ (WebCore::RenderFlexibleBox::layoutFlexItems):
+ (WebCore::RenderFlexibleBox::runFreeSpaceAllocationAlgorithm):
+ (WebCore::RenderFlexibleBox::layoutAndPlaceChildren):
+ (WebCore::RenderFlexibleBox::alignChildren):
+ * rendering/RenderFlexibleBox.h:
+
2011-11-29 Erik Arvidsson <a...@chromium.org>
Add support for [ClassMethod] to CodeGeneratorJS.pm
Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (101423 => 101424)
--- trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2011-11-29 22:22:00 UTC (rev 101423)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2011-11-29 22:42:16 UTC (rev 101424)
@@ -168,14 +168,13 @@
IntSize previousSize = size();
setLogicalHeight(0);
- // We need to call both of these because we grab both crossAxisExtent and mainAxisExtent in layoutInlineDirection.
+ // We need to call both of these because we grab both crossAxisExtent and mainAxisExtent in layoutFlexItems.
computeLogicalWidth();
computeLogicalHeight();
m_overflow.clear();
- // FIXME: This is no longer named correctly. This should just be layoutFlexItems.
- layoutInlineDirection(relayoutChildren);
+ layoutFlexItems(relayoutChildren);
LayoutUnit oldClientAfterEdge = clientLogicalBottom();
computeLogicalHeight();
@@ -498,7 +497,7 @@
return mainAxisLength.calcMinValue(mainAxisContentExtent());
}
-void RenderFlexibleBox::layoutInlineDirection(bool relayoutChildren)
+void RenderFlexibleBox::layoutFlexItems(bool relayoutChildren)
{
LayoutUnit preferredMainAxisExtent;
float totalPositiveFlexibility;
@@ -511,12 +510,12 @@
FlexOrderIterator flexIterator(this, treeIterator.flexOrderValues());
InflexibleFlexItemSize inflexibleItems;
WTF::Vector<LayoutUnit> childSizes;
- while (!runFreeSpaceAllocationAlgorithmInlineDirection(flexIterator, availableFreeSpace, totalPositiveFlexibility, totalNegativeFlexibility, inflexibleItems, childSizes)) {
+ while (!runFreeSpaceAllocationAlgorithm(flexIterator, availableFreeSpace, totalPositiveFlexibility, totalNegativeFlexibility, inflexibleItems, childSizes)) {
ASSERT(totalPositiveFlexibility >= 0 && totalNegativeFlexibility >= 0);
ASSERT(inflexibleItems.size() > 0);
}
- layoutAndPlaceChildrenInlineDirection(flexIterator, childSizes, availableFreeSpace, totalPositiveFlexibility);
+ layoutAndPlaceChildren(flexIterator, childSizes, availableFreeSpace, totalPositiveFlexibility);
}
float RenderFlexibleBox::positiveFlexForChild(RenderBox* child) const
@@ -580,7 +579,7 @@
}
// Returns true if we successfully ran the algorithm and sized the flex items.
-bool RenderFlexibleBox::runFreeSpaceAllocationAlgorithmInlineDirection(FlexOrderIterator& iterator, LayoutUnit& availableFreeSpace, float& totalPositiveFlexibility, float& totalNegativeFlexibility, InflexibleFlexItemSize& inflexibleItems, WTF::Vector<LayoutUnit>& childSizes)
+bool RenderFlexibleBox::runFreeSpaceAllocationAlgorithm(FlexOrderIterator& iterator, LayoutUnit& availableFreeSpace, float& totalPositiveFlexibility, float& totalNegativeFlexibility, InflexibleFlexItemSize& inflexibleItems, WTF::Vector<LayoutUnit>& childSizes)
{
childSizes.clear();
@@ -636,7 +635,7 @@
child->setOverrideWidth(childPreferredSize);
}
-void RenderFlexibleBox::layoutAndPlaceChildrenInlineDirection(FlexOrderIterator& iterator, const WTF::Vector<LayoutUnit>& childSizes, LayoutUnit availableFreeSpace, float totalPositiveFlexibility)
+void RenderFlexibleBox::layoutAndPlaceChildren(FlexOrderIterator& iterator, const WTF::Vector<LayoutUnit>& childSizes, LayoutUnit availableFreeSpace, float totalPositiveFlexibility)
{
LayoutUnit startEdge = flowAwareBorderStart() + flowAwarePaddingStart();
@@ -686,7 +685,7 @@
if (isColumnFlow())
setLogicalHeight(startEdge);
}
- alignChildrenBlockDirection(iterator, maxAscent);
+ alignChildren(iterator, maxAscent);
}
void RenderFlexibleBox::adjustAlignmentForChild(RenderBox* child, LayoutUnit delta)
@@ -702,7 +701,7 @@
child->repaintDuringLayoutIfMoved(oldRect);
}
-void RenderFlexibleBox::alignChildrenBlockDirection(FlexOrderIterator& iterator, LayoutUnit maxAscent)
+void RenderFlexibleBox::alignChildren(FlexOrderIterator& iterator, LayoutUnit maxAscent)
{
LayoutUnit crossExtent = crossAxisExtent();
Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.h (101423 => 101424)
--- trunk/Source/WebCore/rendering/RenderFlexibleBox.h 2011-11-29 22:22:00 UTC (rev 101423)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.h 2011-11-29 22:42:16 UTC (rev 101424)
@@ -89,7 +89,7 @@
Length marginEndStyleForChild(RenderBox* child) const;
LayoutUnit preferredMainAxisContentExtentForFlexItem(RenderBox* child) const;
- void layoutInlineDirection(bool relayoutChildren);
+ void layoutFlexItems(bool relayoutChildren);
float positiveFlexForChild(RenderBox* child) const;
float negativeFlexForChild(RenderBox* child) const;
@@ -98,10 +98,10 @@
LayoutUnit marginBoxAscent(RenderBox*);
void computePreferredMainAxisExtent(bool relayoutChildren, TreeOrderIterator&, LayoutUnit&, float& totalPositiveFlexibility, float& totalNegativeFlexibility);
- bool runFreeSpaceAllocationAlgorithmInlineDirection(FlexOrderIterator&, LayoutUnit& availableFreeSpace, float& totalPositiveFlexibility, float& totalNegativeFlexibility, InflexibleFlexItemSize&, WTF::Vector<LayoutUnit>& childSizes);
+ bool runFreeSpaceAllocationAlgorithm(FlexOrderIterator&, LayoutUnit& availableFreeSpace, float& totalPositiveFlexibility, float& totalNegativeFlexibility, InflexibleFlexItemSize&, WTF::Vector<LayoutUnit>& childSizes);
void setLogicalOverrideSize(RenderBox* child, LayoutUnit childPreferredSize);
- void layoutAndPlaceChildrenInlineDirection(FlexOrderIterator&, const WTF::Vector<LayoutUnit>& childSizes, LayoutUnit availableFreeSpace, float totalPositiveFlexibility);
- void alignChildrenBlockDirection(FlexOrderIterator&, LayoutUnit maxAscent);
+ void layoutAndPlaceChildren(FlexOrderIterator&, const WTF::Vector<LayoutUnit>& childSizes, LayoutUnit availableFreeSpace, float totalPositiveFlexibility);
+ void alignChildren(FlexOrderIterator&, LayoutUnit maxAscent);
};
} // namespace WebCore
