Index: Source/core/rendering/style/RenderStyle.h |
diff --git a/Source/core/rendering/style/RenderStyle.h b/Source/core/rendering/style/RenderStyle.h |
index 5e8811af391667fa5df50f7100e19f107461e8f3..1ac26bc0856901bf376258714a09716c55cd09c1 100644 |
--- a/Source/core/rendering/style/RenderStyle.h |
+++ b/Source/core/rendering/style/RenderStyle.h |
@@ -473,8 +473,8 @@ public: |
const NinePieceImage& borderImage() const { return surround->border.image(); } |
StyleImage* borderImageSource() const { return surround->border.image().image(); } |
LengthBox borderImageSlices() const { return surround->border.image().imageSlices(); } |
- LengthBox borderImageWidth() const { return surround->border.image().borderSlices().lengthBox(); } |
- LengthBox borderImageOutset() const { return surround->border.image().outset().lengthBox(); } |
+ LengthOrNumberBox borderImageWidth() const { return surround->border.image().borderSlices(); } |
+ LengthOrNumberBox borderImageOutset() const { return surround->border.image().outset(); } |
Julien - ping for review
2013/11/02 00:00:03
const LengthOrNumberBox& to avoid copies (if aware
davve
2013/11/04 15:02:28
OK.
|
LengthSize borderTopLeftRadius() const { return surround->border.topLeft(); } |
LengthSize borderTopRightRadius() const { return surround->border.topRight(); } |
@@ -650,8 +650,8 @@ public: |
StyleImage* maskBoxImageSource() const { return rareNonInheritedData->m_maskBoxImage.image(); } |
LengthBox maskBoxImageSlices() const { return rareNonInheritedData->m_maskBoxImage.imageSlices(); } |
bool maskBoxImageSlicesFill() const { return rareNonInheritedData->m_maskBoxImage.fill(); } |
- LengthBox maskBoxImageWidth() const { return rareNonInheritedData->m_maskBoxImage.borderSlices().lengthBox(); } |
- LengthBox maskBoxImageOutset() const { return rareNonInheritedData->m_maskBoxImage.outset().lengthBox(); } |
+ LengthOrNumberBox maskBoxImageWidth() const { return rareNonInheritedData->m_maskBoxImage.borderSlices(); } |
+ LengthOrNumberBox maskBoxImageOutset() const { return rareNonInheritedData->m_maskBoxImage.outset(); } |
EBorderCollapse borderCollapse() const { return static_cast<EBorderCollapse>(inherited_flags._border_collapse); } |
short horizontalBorderSpacing() const; |
@@ -988,8 +988,8 @@ public: |
void setBorderImage(const NinePieceImage& b) { SET_VAR(surround, border.m_image, b); } |
void setBorderImageSource(PassRefPtr<StyleImage>); |
void setBorderImageSlices(LengthBox); |
- void setBorderImageWidth(LengthBox); |
- void setBorderImageOutset(LengthBox); |
+ void setBorderImageWidth(LengthOrNumberBox); |
+ void setBorderImageOutset(LengthOrNumberBox); |
void setBorderTopLeftRadius(LengthSize s) { SET_VAR(surround, border.m_topLeft, s); } |
void setBorderTopRightRadius(LengthSize s) { SET_VAR(surround, border.m_topRight, s); } |
@@ -1122,13 +1122,13 @@ public: |
{ |
rareNonInheritedData.access()->m_maskBoxImage.setFill(fill); |
} |
- void setMaskBoxImageWidth(LengthBox slices) |
+ void setMaskBoxImageWidth(LengthOrNumberBox slices) |
{ |
- rareNonInheritedData.access()->m_maskBoxImage.setBorderSlices(LengthOrNumberBox(slices)); |
+ rareNonInheritedData.access()->m_maskBoxImage.setBorderSlices(slices); |
} |
- void setMaskBoxImageOutset(LengthBox outset) |
+ void setMaskBoxImageOutset(LengthOrNumberBox outset) |
{ |
- rareNonInheritedData.access()->m_maskBoxImage.setOutset(LengthOrNumberBox(outset)); |
+ rareNonInheritedData.access()->m_maskBoxImage.setOutset(outset); |
} |
void setMaskXPosition(Length length) { SET_VAR(rareNonInheritedData, m_mask.m_xPosition, length); } |
void setMaskYPosition(Length length) { SET_VAR(rareNonInheritedData, m_mask.m_yPosition, length); } |