Changeset 90049 in webkit

Timestamp:

Jun 29, 2011 2:41:41 PM (13 years ago)

Author:

eae@chromium.org

Message:

2011-06-29 Emil A Eklund <​eae@chromium.org>

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/InlineFlowBox.h (modified) (2 diffs)
• rendering/RenderBlock.cpp (modified) (8 diffs)
• rendering/RenderBlock.h (modified) (1 diff)
• rendering/RenderBox.cpp (modified) (8 diffs)
• rendering/RenderBox.h (modified) (2 diffs)
• rendering/RenderBoxModelObject.h (modified) (1 diff)
• rendering/RenderInline.cpp (modified) (2 diffs)
• rendering/RenderInline.h (modified) (1 diff)
• rendering/RenderText.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-29  Emil A Eklund  <eae@chromium.org>
+
+        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  <leviw@chromium.org>
 

trunk/Source/WebCore/rendering/InlineFlowBox.h

@@ -117 +117 @@
     int marginBorderPaddingLogicalLeft() const { return marginLogicalLeft() + borderLogicalLeft() + paddingLogicalLeft(); }
     int marginBorderPaddingLogicalRight() const { return marginLogicalRight() + borderLogicalRight() + paddingLogicalRight(); }
-    int marginLogicalLeft() const
+    LayoutUnit marginLogicalLeft() const
     {
         if (!includeLogicalLeftEdge())
@@ -123 +123 @@
         return isHorizontal() ? boxModelObject()->marginLeft() : boxModelObject()->marginTop();
     }
-    int marginLogicalRight() const
+    LayoutUnit marginLogicalRight() const
     {
         if (!includeLogicalRightEdge())

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -6122 +6122 @@
 }
 
-int RenderBlock::marginBeforeForChild(RenderBoxModelObject* child) const
+LayoutUnit RenderBlock::marginBeforeForChild(RenderBoxModelObject* child) const
 {
     switch (style()->writingMode()) {
@@ -6138 +6138 @@
 }
 
-int RenderBlock::marginAfterForChild(RenderBoxModelObject* child) const
+LayoutUnit RenderBlock::marginAfterForChild(RenderBoxModelObject* child) const
 {
     switch (style()->writingMode()) {
@@ -6154 +6154 @@
 }
     
-int RenderBlock::marginStartForChild(RenderBoxModelObject* child) const
+LayoutUnit RenderBlock::marginStartForChild(RenderBoxModelObject* child) const
 {
     if (isHorizontalWritingMode())
@@ -6161 +6161 @@
 }
 
-int RenderBlock::marginEndForChild(RenderBoxModelObject* child) const
+LayoutUnit RenderBlock::marginEndForChild(RenderBoxModelObject* child) const
 {
     if (isHorizontalWritingMode())
@@ -6168 +6168 @@
 }
 
-void RenderBlock::setMarginStartForChild(RenderBox* child, int margin)
+void RenderBlock::setMarginStartForChild(RenderBox* child, LayoutUnit margin)
 {
     if (isHorizontalWritingMode()) {
@@ -6183 +6183 @@
 }
 
-void RenderBlock::setMarginEndForChild(RenderBox* child, int margin)
+void RenderBlock::setMarginEndForChild(RenderBox* child, LayoutUnit margin)
 {
     if (isHorizontalWritingMode()) {
@@ -6198 +6198 @@
 }
 
-void RenderBlock::setMarginBeforeForChild(RenderBox* child, int margin)
+void RenderBlock::setMarginBeforeForChild(RenderBox* child, LayoutUnit margin)
 {
     switch (style()->writingMode()) {
@@ -6216 +6216 @@
 }
 
-void RenderBlock::setMarginAfterForChild(RenderBox* child, int margin)
+void RenderBlock::setMarginAfterForChild(RenderBox* child, LayoutUnit margin)
 {
     switch (style()->writingMode()) {

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -199 +199 @@
     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;

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -82 +82 @@
 }
 
-int RenderBox::marginBefore() const
+LayoutUnit RenderBox::marginBefore() const
 {
     switch (style()->writingMode()) {
@@ -98 +98 @@
 }
 
-int RenderBox::marginAfter() const
+LayoutUnit RenderBox::marginAfter() const
 {
     switch (style()->writingMode()) {
@@ -114 +114 @@
 }
 
-int RenderBox::marginStart() const
+LayoutUnit RenderBox::marginStart() const
 {
     if (isHorizontalWritingMode())
@@ -121 +121 @@
 }
 
-int RenderBox::marginEnd() const
+LayoutUnit RenderBox::marginEnd() const
 {
     if (isHorizontalWritingMode())
@@ -128 +128 @@
 }
 
-void RenderBox::setMarginStart(int margin)
+void RenderBox::setMarginStart(LayoutUnit margin)
 {
     if (isHorizontalWritingMode()) {
@@ -143 +143 @@
 }
 
-void RenderBox::setMarginEnd(int margin)
+void RenderBox::setMarginEnd(LayoutUnit margin)
 {
     if (isHorizontalWritingMode()) {
@@ -158 +158 @@
 }
 
-void RenderBox::setMarginBefore(int margin)
+void RenderBox::setMarginBefore(LayoutUnit margin)
 {
     switch (style()->writingMode()) {
@@ -176 +176 @@
 }
 
-void RenderBox::setMarginAfter(int margin)
+void RenderBox::setMarginAfter(LayoutUnit margin)
 {
     switch (style()->writingMode()) {

trunk/Source/WebCore/rendering/RenderBox.h

@@ -203 +203 @@
     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.
@@ -471 +471 @@
 
 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.

trunk/Source/WebCore/rendering/RenderBoxModelObject.h

@@ -103 +103 @@
     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(); }

trunk/Source/WebCore/rendering/RenderInline.cpp

@@ -648 +648 @@
 }
 
-static int computeMargin(const RenderInline* renderer, const Length& margin)
+static LayoutUnit computeMargin(const RenderInline* renderer, const Length& margin)
 {
     if (margin.isAuto())
@@ -659 +659 @@
 }
 
-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());

trunk/Source/WebCore/rendering/RenderInline.h

@@ -40 +40 @@
     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);

trunk/Source/WebCore/rendering/RenderText.h

@@ -100 +100 @@
     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);