Diff
Modified: trunk/Source/WebCore/ChangeLog (90048 => 90049)
--- trunk/Source/WebCore/ChangeLog 2011-06-29 21:33:11 UTC (rev 90048)
+++ trunk/Source/WebCore/ChangeLog 2011-06-29 21:41:41 UTC (rev 90049)
@@ -1,3 +1,24 @@
+2011-06-29 Emil A Eklund <[email protected]>
+
+ Reviewed by Eric Seidel.
+
+ Switch RenderBoxModelObject::margin* and setMargin* to to new layout types
+ https://bugs.webkit.org/show_bug.cgi?id=63652
+
+ Switch margin methods for render tree over to the new layout unit abstraction.
+
+ No new tests, no functionality changes.
+
+ * rendering/InlineFlowBox.h:
+ * rendering/RenderBlock.cpp:
+ * rendering/RenderBlock.h:
+ * rendering/RenderBox.cpp:
+ * rendering/RenderBox.h:
+ * rendering/RenderBoxModelObject.h:
+ * rendering/RenderInline.cpp:
+ * rendering/RenderInline.h:
+ * rendering/RenderText.h:
+
2011-06-29 Levi Weintraub <[email protected]>
Reviewed by Eric Seidel.
Modified: trunk/Source/WebCore/rendering/InlineFlowBox.h (90048 => 90049)
--- trunk/Source/WebCore/rendering/InlineFlowBox.h 2011-06-29 21:33:11 UTC (rev 90048)
+++ trunk/Source/WebCore/rendering/InlineFlowBox.h 2011-06-29 21:41:41 UTC (rev 90049)
@@ -116,13 +116,13 @@
// logicalLeft = left in a horizontal line and top in a vertical line.
int marginBorderPaddingLogicalLeft() const { return marginLogicalLeft() + borderLogicalLeft() + paddingLogicalLeft(); }
int marginBorderPaddingLogicalRight() const { return marginLogicalRight() + borderLogicalRight() + paddingLogicalRight(); }
- int marginLogicalLeft() const
+ LayoutUnit marginLogicalLeft() const
{
if (!includeLogicalLeftEdge())
return 0;
return isHorizontal() ? boxModelObject()->marginLeft() : boxModelObject()->marginTop();
}
- int marginLogicalRight() const
+ LayoutUnit marginLogicalRight() const
{
if (!includeLogicalRightEdge())
return 0;
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (90048 => 90049)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2011-06-29 21:33:11 UTC (rev 90048)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2011-06-29 21:41:41 UTC (rev 90049)
@@ -6121,7 +6121,7 @@
return marginAfterForChild(child);
}
-int RenderBlock::marginBeforeForChild(RenderBoxModelObject* child) const
+LayoutUnit RenderBlock::marginBeforeForChild(RenderBoxModelObject* child) const
{
switch (style()->writingMode()) {
case TopToBottomWritingMode:
@@ -6137,7 +6137,7 @@
return child->marginTop();
}
-int RenderBlock::marginAfterForChild(RenderBoxModelObject* child) const
+LayoutUnit RenderBlock::marginAfterForChild(RenderBoxModelObject* child) const
{
switch (style()->writingMode()) {
case TopToBottomWritingMode:
@@ -6153,21 +6153,21 @@
return child->marginBottom();
}
-int RenderBlock::marginStartForChild(RenderBoxModelObject* child) const
+LayoutUnit RenderBlock::marginStartForChild(RenderBoxModelObject* child) const
{
if (isHorizontalWritingMode())
return style()->isLeftToRightDirection() ? child->marginLeft() : child->marginRight();
return style()->isLeftToRightDirection() ? child->marginTop() : child->marginBottom();
}
-int RenderBlock::marginEndForChild(RenderBoxModelObject* child) const
+LayoutUnit RenderBlock::marginEndForChild(RenderBoxModelObject* child) const
{
if (isHorizontalWritingMode())
return style()->isLeftToRightDirection() ? child->marginRight() : child->marginLeft();
return style()->isLeftToRightDirection() ? child->marginBottom() : child->marginTop();
}
-void RenderBlock::setMarginStartForChild(RenderBox* child, int margin)
+void RenderBlock::setMarginStartForChild(RenderBox* child, LayoutUnit margin)
{
if (isHorizontalWritingMode()) {
if (style()->isLeftToRightDirection())
@@ -6182,7 +6182,7 @@
}
}
-void RenderBlock::setMarginEndForChild(RenderBox* child, int margin)
+void RenderBlock::setMarginEndForChild(RenderBox* child, LayoutUnit margin)
{
if (isHorizontalWritingMode()) {
if (style()->isLeftToRightDirection())
@@ -6197,7 +6197,7 @@
}
}
-void RenderBlock::setMarginBeforeForChild(RenderBox* child, int margin)
+void RenderBlock::setMarginBeforeForChild(RenderBox* child, LayoutUnit margin)
{
switch (style()->writingMode()) {
case TopToBottomWritingMode:
@@ -6215,7 +6215,7 @@
}
}
-void RenderBlock::setMarginAfterForChild(RenderBox* child, int margin)
+void RenderBlock::setMarginAfterForChild(RenderBox* child, LayoutUnit margin)
{
switch (style()->writingMode()) {
case TopToBottomWritingMode:
Modified: trunk/Source/WebCore/rendering/RenderBlock.h (90048 => 90049)
--- trunk/Source/WebCore/rendering/RenderBlock.h 2011-06-29 21:33:11 UTC (rev 90048)
+++ trunk/Source/WebCore/rendering/RenderBlock.h 2011-06-29 21:41:41 UTC (rev 90049)
@@ -198,14 +198,14 @@
int logicalTopForChild(RenderBox* child) { return isHorizontalWritingMode() ? child->y() : child->x(); }
void setLogicalLeftForChild(RenderBox* child, int logicalLeft, ApplyLayoutDeltaMode = DoNotApplyLayoutDelta);
void setLogicalTopForChild(RenderBox* child, int logicalTop, ApplyLayoutDeltaMode = DoNotApplyLayoutDelta);
- int marginBeforeForChild(RenderBoxModelObject* child) const;
- int marginAfterForChild(RenderBoxModelObject* child) const;
- int marginStartForChild(RenderBoxModelObject* child) const;
- int marginEndForChild(RenderBoxModelObject* child) const;
- void setMarginStartForChild(RenderBox* child, int);
- void setMarginEndForChild(RenderBox* child, int);
- void setMarginBeforeForChild(RenderBox* child, int);
- void setMarginAfterForChild(RenderBox* child, int);
+ LayoutUnit marginBeforeForChild(RenderBoxModelObject* child) const;
+ LayoutUnit marginAfterForChild(RenderBoxModelObject* child) const;
+ LayoutUnit marginStartForChild(RenderBoxModelObject* child) const;
+ LayoutUnit marginEndForChild(RenderBoxModelObject* child) const;
+ void setMarginStartForChild(RenderBox* child, LayoutUnit);
+ void setMarginEndForChild(RenderBox* child, LayoutUnit);
+ void setMarginBeforeForChild(RenderBox* child, LayoutUnit);
+ void setMarginAfterForChild(RenderBox* child, LayoutUnit);
int collapsedMarginBeforeForChild(RenderBox* child) const;
int collapsedMarginAfterForChild(RenderBox* child) const;
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (90048 => 90049)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2011-06-29 21:33:11 UTC (rev 90048)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2011-06-29 21:41:41 UTC (rev 90049)
@@ -81,7 +81,7 @@
{
}
-int RenderBox::marginBefore() const
+LayoutUnit RenderBox::marginBefore() const
{
switch (style()->writingMode()) {
case TopToBottomWritingMode:
@@ -97,7 +97,7 @@
return m_marginTop;
}
-int RenderBox::marginAfter() const
+LayoutUnit RenderBox::marginAfter() const
{
switch (style()->writingMode()) {
case TopToBottomWritingMode:
@@ -113,21 +113,21 @@
return m_marginBottom;
}
-int RenderBox::marginStart() const
+LayoutUnit RenderBox::marginStart() const
{
if (isHorizontalWritingMode())
return style()->isLeftToRightDirection() ? m_marginLeft : m_marginRight;
return style()->isLeftToRightDirection() ? m_marginTop : m_marginBottom;
}
-int RenderBox::marginEnd() const
+LayoutUnit RenderBox::marginEnd() const
{
if (isHorizontalWritingMode())
return style()->isLeftToRightDirection() ? m_marginRight : m_marginLeft;
return style()->isLeftToRightDirection() ? m_marginBottom : m_marginTop;
}
-void RenderBox::setMarginStart(int margin)
+void RenderBox::setMarginStart(LayoutUnit margin)
{
if (isHorizontalWritingMode()) {
if (style()->isLeftToRightDirection())
@@ -142,7 +142,7 @@
}
}
-void RenderBox::setMarginEnd(int margin)
+void RenderBox::setMarginEnd(LayoutUnit margin)
{
if (isHorizontalWritingMode()) {
if (style()->isLeftToRightDirection())
@@ -157,7 +157,7 @@
}
}
-void RenderBox::setMarginBefore(int margin)
+void RenderBox::setMarginBefore(LayoutUnit margin)
{
switch (style()->writingMode()) {
case TopToBottomWritingMode:
@@ -175,7 +175,7 @@
}
}
-void RenderBox::setMarginAfter(int margin)
+void RenderBox::setMarginAfter(LayoutUnit margin)
{
switch (style()->writingMode()) {
case TopToBottomWritingMode:
Modified: trunk/Source/WebCore/rendering/RenderBox.h (90048 => 90049)
--- trunk/Source/WebCore/rendering/RenderBox.h 2011-06-29 21:33:11 UTC (rev 90048)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2011-06-29 21:41:41 UTC (rev 90049)
@@ -202,22 +202,22 @@
virtual void setScrollLeft(int);
virtual void setScrollTop(int);
- virtual int marginTop() const { return m_marginTop; }
- virtual int marginBottom() const { return m_marginBottom; }
- virtual int marginLeft() const { return m_marginLeft; }
- virtual int marginRight() const { return m_marginRight; }
- void setMarginTop(int margin) { m_marginTop = margin; }
- void setMarginBottom(int margin) { m_marginBottom = margin; }
- void setMarginLeft(int margin) { m_marginLeft = margin; }
- void setMarginRight(int margin) { m_marginRight = margin; }
- virtual int marginBefore() const;
- virtual int marginAfter() const;
- virtual int marginStart() const;
- virtual int marginEnd() const;
- void setMarginStart(int);
- void setMarginEnd(int);
- void setMarginBefore(int);
- void setMarginAfter(int);
+ virtual LayoutUnit marginTop() const { return m_marginTop; }
+ virtual LayoutUnit marginBottom() const { return m_marginBottom; }
+ virtual LayoutUnit marginLeft() const { return m_marginLeft; }
+ virtual LayoutUnit marginRight() const { return m_marginRight; }
+ void setMarginTop(LayoutUnit margin) { m_marginTop = margin; }
+ void setMarginBottom(LayoutUnit margin) { m_marginBottom = margin; }
+ void setMarginLeft(LayoutUnit margin) { m_marginLeft = margin; }
+ void setMarginRight(LayoutUnit margin) { m_marginRight = margin; }
+ virtual LayoutUnit marginBefore() const;
+ virtual LayoutUnit marginAfter() const;
+ virtual LayoutUnit marginStart() const;
+ virtual LayoutUnit marginEnd() const;
+ void setMarginStart(LayoutUnit);
+ void setMarginEnd(LayoutUnit);
+ void setMarginBefore(LayoutUnit);
+ void setMarginAfter(LayoutUnit);
// The following five functions are used to implement collapsing margins.
// All objects know their maximal positive and negative margins. The
@@ -470,10 +470,10 @@
LayoutRect m_frameRect;
protected:
- int m_marginLeft;
- int m_marginRight;
- int m_marginTop;
- int m_marginBottom;
+ LayoutUnit m_marginLeft;
+ LayoutUnit m_marginRight;
+ LayoutUnit m_marginTop;
+ LayoutUnit m_marginBottom;
// The preferred logical width of the element if it were to break its lines at every possible opportunity.
int m_minPreferredLogicalWidth;
Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.h (90048 => 90049)
--- trunk/Source/WebCore/rendering/RenderBoxModelObject.h 2011-06-29 21:33:11 UTC (rev 90048)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.h 2011-06-29 21:41:41 UTC (rev 90049)
@@ -102,14 +102,14 @@
int borderLogicalLeft() const { return style()->isHorizontalWritingMode() ? borderLeft() : borderTop(); }
int borderLogicalRight() const { return style()->isHorizontalWritingMode() ? borderRight() : borderBottom(); }
- virtual int marginTop() const = 0;
- virtual int marginBottom() const = 0;
- virtual int marginLeft() const = 0;
- virtual int marginRight() const = 0;
- virtual int marginBefore() const = 0;
- virtual int marginAfter() const = 0;
- virtual int marginStart() const = 0;
- virtual int marginEnd() const = 0;
+ virtual LayoutUnit marginTop() const = 0;
+ virtual LayoutUnit marginBottom() const = 0;
+ virtual LayoutUnit marginLeft() const = 0;
+ virtual LayoutUnit marginRight() const = 0;
+ virtual LayoutUnit marginBefore() const = 0;
+ virtual LayoutUnit marginAfter() const = 0;
+ virtual LayoutUnit marginStart() const = 0;
+ virtual LayoutUnit marginEnd() const = 0;
bool hasInlineDirectionBordersPaddingOrMargin() const { return hasInlineDirectionBordersOrPadding() || marginStart()|| marginEnd(); }
bool hasInlineDirectionBordersOrPadding() const { return borderStart() || borderEnd() || paddingStart()|| paddingEnd(); }
Modified: trunk/Source/WebCore/rendering/RenderInline.cpp (90048 => 90049)
--- trunk/Source/WebCore/rendering/RenderInline.cpp 2011-06-29 21:33:11 UTC (rev 90048)
+++ trunk/Source/WebCore/rendering/RenderInline.cpp 2011-06-29 21:41:41 UTC (rev 90049)
@@ -647,7 +647,7 @@
return y;
}
-static int computeMargin(const RenderInline* renderer, const Length& margin)
+static LayoutUnit computeMargin(const RenderInline* renderer, const Length& margin)
{
if (margin.isAuto())
return 0;
@@ -658,42 +658,42 @@
return 0;
}
-int RenderInline::marginLeft() const
+LayoutUnit RenderInline::marginLeft() const
{
return computeMargin(this, style()->marginLeft());
}
-int RenderInline::marginRight() const
+LayoutUnit RenderInline::marginRight() const
{
return computeMargin(this, style()->marginRight());
}
-int RenderInline::marginTop() const
+LayoutUnit RenderInline::marginTop() const
{
return computeMargin(this, style()->marginTop());
}
-int RenderInline::marginBottom() const
+LayoutUnit RenderInline::marginBottom() const
{
return computeMargin(this, style()->marginBottom());
}
-int RenderInline::marginStart() const
+LayoutUnit RenderInline::marginStart() const
{
return computeMargin(this, style()->marginStart());
}
-int RenderInline::marginEnd() const
+LayoutUnit RenderInline::marginEnd() const
{
return computeMargin(this, style()->marginEnd());
}
-int RenderInline::marginBefore() const
+LayoutUnit RenderInline::marginBefore() const
{
return computeMargin(this, style()->marginBefore());
}
-int RenderInline::marginAfter() const
+LayoutUnit RenderInline::marginAfter() const
{
return computeMargin(this, style()->marginAfter());
}
Modified: trunk/Source/WebCore/rendering/RenderInline.h (90048 => 90049)
--- trunk/Source/WebCore/rendering/RenderInline.h 2011-06-29 21:33:11 UTC (rev 90048)
+++ trunk/Source/WebCore/rendering/RenderInline.h 2011-06-29 21:41:41 UTC (rev 90049)
@@ -39,14 +39,14 @@
virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0);
- virtual int marginLeft() const;
- virtual int marginRight() const;
- virtual int marginTop() const;
- virtual int marginBottom() const;
- virtual int marginBefore() const;
- virtual int marginAfter() const;
- virtual int marginStart() const;
- virtual int marginEnd() const;
+ virtual LayoutUnit marginLeft() const;
+ virtual LayoutUnit marginRight() const;
+ virtual LayoutUnit marginTop() const;
+ virtual LayoutUnit marginBottom() const;
+ virtual LayoutUnit marginBefore() const;
+ virtual LayoutUnit marginAfter() const;
+ virtual LayoutUnit marginStart() const;
+ virtual LayoutUnit marginEnd() const;
virtual void absoluteRects(Vector<IntRect>&, const IntPoint& accumulatedOffset);
virtual void absoluteQuads(Vector<FloatQuad>&);
Modified: trunk/Source/WebCore/rendering/RenderText.h (90048 => 90049)
--- trunk/Source/WebCore/rendering/RenderText.h 2011-06-29 21:33:11 UTC (rev 90048)
+++ trunk/Source/WebCore/rendering/RenderText.h 2011-06-29 21:41:41 UTC (rev 90049)
@@ -99,8 +99,8 @@
virtual IntRect selectionRectForRepaint(RenderBoxModelObject* repaintContainer, bool clipToVisibleContent = true);
virtual IntRect localCaretRect(InlineBox*, int caretOffset, int* extraWidthToEndOfLine = 0);
- virtual int marginLeft() const { return style()->marginLeft().calcMinValue(0); }
- virtual int marginRight() const { return style()->marginRight().calcMinValue(0); }
+ virtual LayoutUnit marginLeft() const { return style()->marginLeft().calcMinValue(0); }
+ virtual LayoutUnit marginRight() const { return style()->marginRight().calcMinValue(0); }
virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer);
