Chromium Code Reviews| Index: Source/core/rendering/style/NinePieceImage.h |
| diff --git a/Source/core/rendering/style/NinePieceImage.h b/Source/core/rendering/style/NinePieceImage.h |
| index 3bf40c17408d06ddc4a73ae394bc46cb984a2154..31f270d38acaa9f239ab79d2e87807b4cde0bd70 100644 |
| --- a/Source/core/rendering/style/NinePieceImage.h |
| +++ b/Source/core/rendering/style/NinePieceImage.h |
| @@ -26,6 +26,7 @@ |
| #include "core/rendering/style/DataRef.h" |
| #include "core/rendering/style/StyleImage.h" |
| +#include "platform/BorderImageLengthBox.h" |
| #include "platform/LayoutUnit.h" |
| #include "platform/LengthBox.h" |
| @@ -48,8 +49,8 @@ public: |
| unsigned verticalRule : 2; // ENinePieceImageRule |
| RefPtr<StyleImage> image; |
| LengthBox imageSlices; |
| - LengthBox borderSlices; |
| - LengthBox outset; |
| + BorderImageLengthBox borderSlices; |
| + BorderImageLengthBox outset; |
| private: |
| NinePieceImageData(); |
| @@ -59,7 +60,7 @@ private: |
| class NinePieceImage { |
| public: |
| NinePieceImage(); |
| - NinePieceImage(PassRefPtr<StyleImage>, LengthBox imageSlices, bool fill, LengthBox borderSlices, LengthBox outset, ENinePieceImageRule horizontalRule, ENinePieceImageRule verticalRule); |
| + NinePieceImage(PassRefPtr<StyleImage>, LengthBox imageSlices, bool fill, BorderImageLengthBox borderSlices, BorderImageLengthBox outset, ENinePieceImageRule horizontalRule, ENinePieceImageRule verticalRule); |
|
Julien - ping for review
2013/11/04 16:31:40
Nit: const BorderImageLengthBox& ?
|
| bool operator==(const NinePieceImage& other) const { return m_data == other.m_data; } |
| bool operator!=(const NinePieceImage& other) const { return m_data != other.m_data; } |
| @@ -74,11 +75,11 @@ public: |
| bool fill() const { return m_data->fill; } |
| void setFill(bool fill) { m_data.access()->fill = fill; } |
| - const LengthBox& borderSlices() const { return m_data->borderSlices; } |
| - void setBorderSlices(const LengthBox& slices) { m_data.access()->borderSlices = slices; } |
| + const BorderImageLengthBox& borderSlices() const { return m_data->borderSlices; } |
| + void setBorderSlices(const BorderImageLengthBox& slices) { m_data.access()->borderSlices = slices; } |
| - const LengthBox& outset() const { return m_data->outset; } |
| - void setOutset(const LengthBox& outset) { m_data.access()->outset = outset; } |
| + const BorderImageLengthBox& outset() const { return m_data->outset; } |
| + void setOutset(const BorderImageLengthBox& outset) { m_data.access()->outset = outset; } |
| ENinePieceImageRule horizontalRule() const { return static_cast<ENinePieceImageRule>(m_data->horizontalRule); } |
| void setHorizontalRule(ENinePieceImageRule rule) { m_data.access()->horizontalRule = rule; } |
| @@ -112,14 +113,14 @@ public: |
| { |
| m_data.access()->imageSlices = LengthBox(0); |
| m_data.access()->fill = true; |
| - m_data.access()->borderSlices = LengthBox(); |
| + m_data.access()->borderSlices = BorderImageLengthBox(); |
| } |
| - static LayoutUnit computeOutset(Length outsetSide, LayoutUnit borderSide) |
| + static LayoutUnit computeOutset(const BorderImageLength& outsetSide, LayoutUnit borderSide) |
| { |
| - if (outsetSide.isRelative()) |
| - return outsetSide.value() * borderSide; |
| - return outsetSide.value(); |
| + if (outsetSide.isNumber()) |
| + return outsetSide.number() * borderSide; |
| + return outsetSide.length().value(); |
| } |
| private: |