Chromium Code Reviews| Index: Source/core/rendering/style/FillLayer.cpp |
| diff --git a/Source/core/rendering/style/FillLayer.cpp b/Source/core/rendering/style/FillLayer.cpp |
| index fc784c84092c30e7e77a810e09b3de9dfc540e28..fff865374be2d78bcc6492bab02b937f0dfe6956 100644 |
| --- a/Source/core/rendering/style/FillLayer.cpp |
| +++ b/Source/core/rendering/style/FillLayer.cpp |
| @@ -40,7 +40,7 @@ struct SameSizeAsFillLayer { |
| COMPILE_ASSERT(sizeof(FillLayer) == sizeof(SameSizeAsFillLayer), FillLayer_should_stay_small); |
| -FillLayer::FillLayer(EFillLayerType type) |
| +FillLayer::FillLayer(EFillLayerType type, bool isInitiallySet) |
|
Steve Block
2013/11/03 10:16:48
Would something like useInitialSize be a better na
alancutter (OOO until 2018)
2013/11/04 00:45:24
Renamed to useInitialValues.
|
| : m_next(0) |
| , m_image(FillLayer::initialFillImage(type)) |
| , m_xPosition(FillLayer::initialFillXPosition(type)) |
| @@ -52,24 +52,24 @@ FillLayer::FillLayer(EFillLayerType type) |
| , m_repeatX(FillLayer::initialFillRepeatX(type)) |
| , m_repeatY(FillLayer::initialFillRepeatY(type)) |
| , m_composite(FillLayer::initialFillComposite(type)) |
| - , m_sizeType(SizeNone) // SizeNone indicates size is unset. |
| + , m_sizeType(isInitiallySet ? FillLayer::initialFillSizeType(type) : SizeNone) |
| , m_blendMode(FillLayer::initialFillBlendMode(type)) |
| , m_maskSourceType(FillLayer::initialFillMaskSourceType(type)) |
| , m_backgroundXOrigin(LeftEdge) |
| , m_backgroundYOrigin(TopEdge) |
| - , m_imageSet(false) |
| - , m_attachmentSet(false) |
| - , m_clipSet(false) |
| - , m_originSet(false) |
| - , m_repeatXSet(false) |
| - , m_repeatYSet(false) |
| - , m_xPosSet(false) |
| - , m_yPosSet(false) |
| - , m_backgroundXOriginSet(false) |
| - , m_backgroundYOriginSet(false) |
| - , m_compositeSet(type == MaskFillLayer) |
| - , m_blendModeSet(false) |
| - , m_maskSourceTypeSet(false) |
| + , m_imageSet(isInitiallySet) |
| + , m_attachmentSet(isInitiallySet) |
| + , m_clipSet(isInitiallySet) |
| + , m_originSet(isInitiallySet) |
| + , m_repeatXSet(isInitiallySet) |
| + , m_repeatYSet(isInitiallySet) |
| + , m_xPosSet(isInitiallySet) |
| + , m_yPosSet(isInitiallySet) |
| + , m_backgroundXOriginSet(isInitiallySet) |
| + , m_backgroundYOriginSet(isInitiallySet) |
| + , m_compositeSet(isInitiallySet || type == MaskFillLayer) |
| + , m_blendModeSet(isInitiallySet) |
| + , m_maskSourceTypeSet(isInitiallySet) |
| , m_type(type) |
| { |
| } |