Changeset 141775 in webkit


Ignore:
Timestamp:
Feb 4, 2013 9:45:19 AM (11 years ago)
Author:
eae@chromium.org
Message:

Remove duplicate code in RenderBoxModelObject::computedCSSPadding*
https://bugs.webkit.org/show_bug.cgi?id=108707

Reviewed by Eric Seidel.

The computedCSSPaddingTop/Bottom/... methods in
RenderBoxModelObject all do pretty much exactly the same thing
yet share no code.

Break out shared code into computedCSSPadding method and have
the top/bottom/left/right/... ones call it with the appropriate
length value.

No new tests, no change in functionality.

  • rendering/RenderBoxModelObject.cpp:

(WebCore::RenderBoxModelObject::computedCSSPadding):

  • rendering/RenderBoxModelObject.h:

(WebCore::RenderBoxModelObject::computedCSSPaddingTop):
(WebCore::RenderBoxModelObject::computedCSSPaddingBottom):
(WebCore::RenderBoxModelObject::computedCSSPaddingLeft):
(WebCore::RenderBoxModelObject::computedCSSPaddingRight):
(WebCore::RenderBoxModelObject::computedCSSPaddingBefore):
(WebCore::RenderBoxModelObject::computedCSSPaddingAfter):
(WebCore::RenderBoxModelObject::computedCSSPaddingStart):
(WebCore::RenderBoxModelObject::computedCSSPaddingEnd):
(RenderBoxModelObject):

Location:
trunk/Source/WebCore
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r141774 r141775  
     12013-02-01  Emil A Eklund  <eae@chromium.org>
     2
     3        Remove duplicate code in RenderBoxModelObject::computedCSSPadding*
     4        https://bugs.webkit.org/show_bug.cgi?id=108707
     5
     6        Reviewed by Eric Seidel.
     7       
     8        The computedCSSPaddingTop/Bottom/... methods in
     9        RenderBoxModelObject all do pretty much exactly the same thing
     10        yet share no code.
     11       
     12        Break out shared code into computedCSSPadding method and have
     13        the top/bottom/left/right/... ones call it with the appropriate
     14        length value.
     15
     16        No new tests, no change in functionality.
     17
     18        * rendering/RenderBoxModelObject.cpp:
     19        (WebCore::RenderBoxModelObject::computedCSSPadding):
     20        * rendering/RenderBoxModelObject.h:
     21        (WebCore::RenderBoxModelObject::computedCSSPaddingTop):
     22        (WebCore::RenderBoxModelObject::computedCSSPaddingBottom):
     23        (WebCore::RenderBoxModelObject::computedCSSPaddingLeft):
     24        (WebCore::RenderBoxModelObject::computedCSSPaddingRight):
     25        (WebCore::RenderBoxModelObject::computedCSSPaddingBefore):
     26        (WebCore::RenderBoxModelObject::computedCSSPaddingAfter):
     27        (WebCore::RenderBoxModelObject::computedCSSPaddingStart):
     28        (WebCore::RenderBoxModelObject::computedCSSPaddingEnd):
     29        (RenderBoxModelObject):
     30
    1312013-02-04  Andrey Lushnikov  <lushnikov@chromium.org>
    232
  • trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

    r141670 r141775  
    559559}
    560560
    561 LayoutUnit RenderBoxModelObject::computedCSSPaddingTop() const
     561LayoutUnit RenderBoxModelObject::computedCSSPadding(Length padding) const
    562562{
    563563    LayoutUnit w = 0;
    564564    RenderView* renderView = 0;
    565     Length padding = style()->paddingTop();
    566     if (padding.isPercent())
    567         w = containingBlockLogicalWidthForContent();
    568     else if (padding.isViewportPercentage())
    569         renderView = view();
    570     return minimumValueForLength(padding, w, renderView);
    571 }
    572 
    573 LayoutUnit RenderBoxModelObject::computedCSSPaddingBottom() const
    574 {
    575     LayoutUnit w = 0;
    576     RenderView* renderView = 0;
    577     Length padding = style()->paddingBottom();
    578     if (padding.isPercent())
    579         w = containingBlockLogicalWidthForContent();
    580     else if (padding.isViewportPercentage())
    581         renderView = view();
    582     return minimumValueForLength(padding, w, renderView);
    583 }
    584 
    585 LayoutUnit RenderBoxModelObject::computedCSSPaddingLeft() const
    586 {
    587     LayoutUnit w = 0;
    588     RenderView* renderView = 0;
    589     Length padding = style()->paddingLeft();
    590     if (padding.isPercent())
    591         w = containingBlockLogicalWidthForContent();
    592     else if (padding.isViewportPercentage())
    593         renderView = view();
    594     return minimumValueForLength(padding, w, renderView);
    595 }
    596 
    597 LayoutUnit RenderBoxModelObject::computedCSSPaddingRight() const
    598 {
    599     LayoutUnit w = 0;
    600     RenderView* renderView = 0;
    601     Length padding = style()->paddingRight();
    602     if (padding.isPercent())
    603         w = containingBlockLogicalWidthForContent();
    604     else if (padding.isViewportPercentage())
    605         renderView = view();
    606     return minimumValueForLength(padding, w, renderView);
    607 }
    608 
    609 LayoutUnit RenderBoxModelObject::computedCSSPaddingBefore() const
    610 {
    611     LayoutUnit w = 0;
    612     RenderView* renderView = 0;
    613     Length padding = style()->paddingBefore();
    614     if (padding.isPercent())
    615         w = containingBlockLogicalWidthForContent();
    616     else if (padding.isViewportPercentage())
    617         renderView = view();
    618     return minimumValueForLength(padding, w, renderView);
    619 }
    620 
    621 LayoutUnit RenderBoxModelObject::computedCSSPaddingAfter() const
    622 {
    623     LayoutUnit w = 0;
    624     RenderView* renderView = 0;
    625     Length padding = style()->paddingAfter();
    626     if (padding.isPercent())
    627         w = containingBlockLogicalWidthForContent();
    628     else if (padding.isViewportPercentage())
    629         renderView = view();
    630     return minimumValueForLength(padding, w, renderView);
    631 }
    632 
    633 LayoutUnit RenderBoxModelObject::computedCSSPaddingStart() const
    634 {
    635     LayoutUnit w = 0;
    636     RenderView* renderView = 0;
    637     Length padding = style()->paddingStart();
    638     if (padding.isPercent())
    639         w = containingBlockLogicalWidthForContent();
    640     else if (padding.isViewportPercentage())
    641         renderView = view();
    642     return minimumValueForLength(padding, w, renderView);
    643 }
    644 
    645 LayoutUnit RenderBoxModelObject::computedCSSPaddingEnd() const
    646 {
    647     LayoutUnit w = 0;
    648     RenderView* renderView = 0;
    649     Length padding = style()->paddingEnd();
    650565    if (padding.isPercent())
    651566        w = containingBlockLogicalWidthForContent();
  • trunk/Source/WebCore/rendering/RenderBoxModelObject.h

    r141670 r141775  
    9292
    9393    // These return the CSS computed padding values.
    94     LayoutUnit computedCSSPaddingTop() const;
    95     LayoutUnit computedCSSPaddingBottom() const;
    96     LayoutUnit computedCSSPaddingLeft() const;
    97     LayoutUnit computedCSSPaddingRight() const;
    98     LayoutUnit computedCSSPaddingBefore() const;
    99     LayoutUnit computedCSSPaddingAfter() const;
    100     LayoutUnit computedCSSPaddingStart() const;
    101     LayoutUnit computedCSSPaddingEnd() const;
     94    LayoutUnit computedCSSPaddingTop() const { return computedCSSPadding(style()->paddingTop()); }
     95    LayoutUnit computedCSSPaddingBottom() const { return computedCSSPadding(style()->paddingBottom()); }
     96    LayoutUnit computedCSSPaddingLeft() const { return computedCSSPadding(style()->paddingLeft()); }
     97    LayoutUnit computedCSSPaddingRight() const { return computedCSSPadding(style()->paddingRight()); }
     98    LayoutUnit computedCSSPaddingBefore() const { return computedCSSPadding(style()->paddingBefore()); }
     99    LayoutUnit computedCSSPaddingAfter() const { return computedCSSPadding(style()->paddingAfter()); }
     100    LayoutUnit computedCSSPaddingStart() const { return computedCSSPadding(style()->paddingStart()); }
     101    LayoutUnit computedCSSPaddingEnd() const { return computedCSSPadding(style()->paddingEnd()); }
    102102
    103103    // These functions are used during layout. Table cells and the MathML
     
    279279
    280280private:
     281    LayoutUnit computedCSSPadding(Length) const;
    281282    virtual bool isBoxModelObject() const { return true; }
    282283   
  • trunk/Source/WebCore/rendering/RenderingAllInOne.cpp

    r139014 r141775  
    123123#include "ScrollBehavior.cpp"
    124124#include "break_lines.cpp"
     125
  • trunk/Source/WebCore/rendering/svg/RenderSVGAllInOne.cpp

    r117971 r141775  
    7878#include "SVGTextMetricsBuilder.cpp"
    7979#include "SVGTextQuery.cpp"
     80
Note: See TracChangeset for help on using the changeset viewer.