diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-25 15:09:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-25 15:09:11 +0200 |
| commit | a89b2ebb8e192c5e8cea21079bda2ee2c0c7dddd (patch) | |
| tree | b7abd9f49ae1d4d2e426a5883bfccd42b8e2ee12 /Source/WebCore/rendering/RenderBoxModelObject.h | |
| parent | 8d473cf9743f1d30a16a27114e93bd5af5648d23 (diff) | |
| download | qtwebkit-a89b2ebb8e192c5e8cea21079bda2ee2c0c7dddd.tar.gz | |
Imported WebKit commit eb5c1b8fe4d4b1b90b5137433fc58a91da0e6878 (http://svn.webkit.org/repository/webkit/trunk@118516)
Diffstat (limited to 'Source/WebCore/rendering/RenderBoxModelObject.h')
| -rw-r--r-- | Source/WebCore/rendering/RenderBoxModelObject.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/rendering/RenderBoxModelObject.h b/Source/WebCore/rendering/RenderBoxModelObject.h index d0883a5ee..b145e6f71 100644 --- a/Source/WebCore/rendering/RenderBoxModelObject.h +++ b/Source/WebCore/rendering/RenderBoxModelObject.h @@ -130,10 +130,10 @@ public: 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; + virtual LayoutUnit marginBefore(const RenderStyle* otherStyle = 0) const = 0; + virtual LayoutUnit marginAfter(const RenderStyle* otherStyle = 0) const = 0; + virtual LayoutUnit marginStart(const RenderStyle* otherStyle = 0) const = 0; + virtual LayoutUnit marginEnd(const RenderStyle* otherStyle = 0) const = 0; LayoutUnit marginHeight() const { return marginTop() + marginBottom(); } LayoutUnit marginWidth() const { return marginLeft() + marginRight(); } |