Index: Source/core/rendering/RenderBoxModelObject.h |
diff --git a/Source/core/rendering/RenderBoxModelObject.h b/Source/core/rendering/RenderBoxModelObject.h |
index 8f0c0b5c7b85178c2c1d3bb1f4df44a4bc9ddffd..d36da60b62b7f1c8427b5908c962b6764b6cfa1a 100644 |
--- a/Source/core/rendering/RenderBoxModelObject.h |
+++ b/Source/core/rendering/RenderBoxModelObject.h |
@@ -81,12 +81,12 @@ public: |
virtual IntRect borderBoundingBox() const = 0; |
// These return the CSS computed padding values. |
- LayoutUnit computedCSSPaddingTop() const { return computedCSSPadding(style()->paddingTop()); } |
- LayoutUnit computedCSSPaddingBottom() const { return computedCSSPadding(style()->paddingBottom()); } |
+ LayoutUnit computedCSSPaddingTop() const { return computedCSSPadding(style()->paddingTop(), true); } |
tony
2014/07/10 17:10:06
This should be an enum, not a bool.
harpreet.sk
2014/07/14 08:38:07
Done.
|
+ LayoutUnit computedCSSPaddingBottom() const { return computedCSSPadding(style()->paddingBottom(), true); } |
LayoutUnit computedCSSPaddingLeft() const { return computedCSSPadding(style()->paddingLeft()); } |
LayoutUnit computedCSSPaddingRight() const { return computedCSSPadding(style()->paddingRight()); } |
- LayoutUnit computedCSSPaddingBefore() const { return computedCSSPadding(style()->paddingBefore()); } |
- LayoutUnit computedCSSPaddingAfter() const { return computedCSSPadding(style()->paddingAfter()); } |
+ LayoutUnit computedCSSPaddingBefore() const { return computedCSSPadding(style()->paddingBefore(), true); } |
+ LayoutUnit computedCSSPaddingAfter() const { return computedCSSPadding(style()->paddingAfter(), true); } |
LayoutUnit computedCSSPaddingStart() const { return computedCSSPadding(style()->paddingStart()); } |
LayoutUnit computedCSSPaddingEnd() const { return computedCSSPadding(style()->paddingEnd()); } |
@@ -151,6 +151,7 @@ public: |
bool hasInlineDirectionBordersOrPadding() const { return borderStart() || borderEnd() || paddingStart()|| paddingEnd(); } |
virtual LayoutUnit containingBlockLogicalWidthForContent() const; |
+ virtual LayoutUnit containingBlockLogicalHeightForContent() const; |
virtual void childBecameNonInline(RenderObject* /*child*/) { } |
@@ -297,7 +298,7 @@ public: |
IntSize calculateImageIntrinsicDimensions(StyleImage*, const IntSize& scaledPositioningAreaSize, ScaleByEffectiveZoomOrNot) const; |
private: |
- LayoutUnit computedCSSPadding(const Length&) const; |
+ LayoutUnit computedCSSPadding(const Length&, bool isTopOrBottomOrAfterOrBeforePadding = false) const; |
virtual bool isBoxModelObject() const OVERRIDE FINAL { return true; } |
IntSize calculateFillTileSize(const FillLayer*, const IntSize& scaledPositioningAreaSize) const; |