Title: [101530] trunk/Source/WebCore
- Revision
- 101530
- Author
- [email protected]
- Date
- 2011-11-30 10:44:43 -0800 (Wed, 30 Nov 2011)
Log Message
Remove dead flexible box code
https://bugs.webkit.org/show_bug.cgi?id=73377
Reviewed by Darin Adler.
We used to use these with an earlier version of the spec where margins
set to auto were treated as flex(1).
No new tests, just removing some uncalled methods.
* rendering/RenderFlexibleBox.cpp:
* rendering/RenderFlexibleBox.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (101529 => 101530)
--- trunk/Source/WebCore/ChangeLog 2011-11-30 18:26:27 UTC (rev 101529)
+++ trunk/Source/WebCore/ChangeLog 2011-11-30 18:44:43 UTC (rev 101530)
@@ -1,3 +1,18 @@
+2011-11-30 Tony Chang <[email protected]>
+
+ Remove dead flexible box code
+ https://bugs.webkit.org/show_bug.cgi?id=73377
+
+ Reviewed by Darin Adler.
+
+ We used to use these with an earlier version of the spec where margins
+ set to auto were treated as flex(1).
+
+ No new tests, just removing some uncalled methods.
+
+ * rendering/RenderFlexibleBox.cpp:
+ * rendering/RenderFlexibleBox.h:
+
2011-11-30 Antti Koivisto <[email protected]>
Reuse cached style fully if the parent inherited styles are equal
Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (101529 => 101530)
--- trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2011-11-30 18:26:27 UTC (rev 101529)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2011-11-30 18:44:43 UTC (rev 101530)
@@ -425,36 +425,6 @@
return isHorizontalFlow() ? child->location() : child->location().transposedPoint();
}
-void RenderFlexibleBox::setFlowAwareMarginStartForChild(RenderBox* child, LayoutUnit margin)
-{
- if (isHorizontalFlow()) {
- if (isLeftToRightFlow())
- child->setMarginLeft(margin);
- else
- child->setMarginRight(margin);
- } else {
- if (isLeftToRightFlow())
- child->setMarginTop(margin);
- else
- child->setMarginBottom(margin);
- }
-}
-
-void RenderFlexibleBox::setFlowAwareMarginEndForChild(RenderBox* child, LayoutUnit margin)
-{
- if (isHorizontalFlow()) {
- if (isLeftToRightFlow())
- child->setMarginRight(margin);
- else
- child->setMarginLeft(margin);
- } else {
- if (isLeftToRightFlow())
- child->setMarginBottom(margin);
- else
- child->setMarginTop(margin);
- }
-}
-
void RenderFlexibleBox::setFlowAwareLocationForChild(RenderBox* child, const LayoutPoint& location)
{
if (isHorizontalFlow())
@@ -473,20 +443,6 @@
return isHorizontalFlow() ? child->verticalScrollbarWidth() : child->horizontalScrollbarHeight();
}
-Length RenderFlexibleBox::marginStartStyleForChild(RenderBox* child) const
-{
- if (isHorizontalFlow())
- return isLeftToRightFlow() ? child->style()->marginLeft() : child->style()->marginRight();
- return isLeftToRightFlow() ? child->style()->marginTop() : child->style()->marginBottom();
-}
-
-Length RenderFlexibleBox::marginEndStyleForChild(RenderBox* child) const
-{
- if (isHorizontalFlow())
- return isLeftToRightFlow() ? child->style()->marginRight() : child->style()->marginLeft();
- return isLeftToRightFlow() ? child->style()->marginBottom() : child->style()->marginTop();
-}
-
LayoutUnit RenderFlexibleBox::preferredMainAxisContentExtentForFlexItem(RenderBox* child) const
{
Length mainAxisLength = mainAxisLengthForChild(child);
Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.h (101529 => 101530)
--- trunk/Source/WebCore/rendering/RenderFlexibleBox.h 2011-11-30 18:26:27 UTC (rev 101529)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.h 2011-11-30 18:44:43 UTC (rev 101530)
@@ -78,15 +78,11 @@
LayoutUnit flowAwareMarginAfterForChild(RenderBox* child) const;
LayoutUnit crossAxisMarginExtentForChild(RenderBox* child) const;
LayoutPoint flowAwareLocationForChild(RenderBox* child) const;
- void setFlowAwareMarginStartForChild(RenderBox* child, LayoutUnit);
- void setFlowAwareMarginEndForChild(RenderBox* child, LayoutUnit);
// FIXME: Supporting layout deltas.
void setFlowAwareLocationForChild(RenderBox* child, const LayoutPoint&);
void adjustAlignmentForChild(RenderBox* child, LayoutUnit);
LayoutUnit mainAxisBorderAndPaddingExtentForChild(RenderBox* child) const;
LayoutUnit mainAxisScrollbarExtentForChild(RenderBox* child) const;
- Length marginStartStyleForChild(RenderBox* child) const;
- Length marginEndStyleForChild(RenderBox* child) const;
LayoutUnit preferredMainAxisContentExtentForFlexItem(RenderBox* child) const;
void layoutFlexItems(bool relayoutChildren);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
