Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1345)

Unified Diff: Source/core/rendering/style/RenderStyle.h

Issue 55813002: Convert animation and renderer code to know about BorderImageLength (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@length-relative-die-step-1-4
Patch Set: Rebased on top of patch set #2 of https://codereview.chromium.org/55783002/ Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/rendering/style/RenderStyle.h
diff --git a/Source/core/rendering/style/RenderStyle.h b/Source/core/rendering/style/RenderStyle.h
index 25210ca9b4a0a5c9fd9b4b30fe1631530ede31ec..351f619b5952ce642a7a7b168c0a49a385c8ec64 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().deprecatedLengthBox(); }
- LengthBox borderImageOutset() const { return surround->border.image().outset().deprecatedLengthBox(); }
+ const BorderImageLengthBox& borderImageWidth() const { return surround->border.image().borderSlices(); }
+ const BorderImageLengthBox& borderImageOutset() const { return surround->border.image().outset(); }
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().deprecatedLengthBox(); }
- LengthBox maskBoxImageOutset() const { return rareNonInheritedData->m_maskBoxImage.outset().deprecatedLengthBox(); }
+ const BorderImageLengthBox& maskBoxImageWidth() const { return rareNonInheritedData->m_maskBoxImage.borderSlices(); }
+ const BorderImageLengthBox& 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(const BorderImageLengthBox&);
+ void setBorderImageOutset(const BorderImageLengthBox&);
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(const BorderImageLengthBox& slices)
{
- rareNonInheritedData.access()->m_maskBoxImage.setBorderSlices(BorderImageLengthBox(slices));
+ rareNonInheritedData.access()->m_maskBoxImage.setBorderSlices(slices);
}
- void setMaskBoxImageOutset(LengthBox outset)
+ void setMaskBoxImageOutset(const BorderImageLengthBox& outset)
{
- rareNonInheritedData.access()->m_maskBoxImage.setOutset(BorderImageLengthBox(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); }

Powered by Google App Engine
This is Rietveld 408576698