| Index: Source/core/rendering/style/FillLayer.h
|
| diff --git a/Source/core/rendering/style/FillLayer.h b/Source/core/rendering/style/FillLayer.h
|
| index 461fd6f4ec95ddfb38e7b1d19b206462553da659..381d0ec96243bc97f256cded99cf57e57964f6c7 100644
|
| --- a/Source/core/rendering/style/FillLayer.h
|
| +++ b/Source/core/rendering/style/FillLayer.h
|
| @@ -76,7 +76,7 @@ public:
|
| EFillRepeat repeatX() const { return static_cast<EFillRepeat>(m_repeatX); }
|
| EFillRepeat repeatY() const { return static_cast<EFillRepeat>(m_repeatY); }
|
| CompositeOperator composite() const { return static_cast<CompositeOperator>(m_composite); }
|
| - blink::WebBlendMode blendMode() const { return static_cast<blink::WebBlendMode>(m_blendMode); }
|
| + WebBlendMode blendMode() const { return static_cast<WebBlendMode>(m_blendMode); }
|
| const LengthSize& sizeLength() const { return m_sizeLength; }
|
| EFillSizeType sizeType() const { return static_cast<EFillSizeType>(m_sizeType); }
|
| FillSize size() const { return FillSize(static_cast<EFillSizeType>(m_sizeType), m_sizeLength); }
|
| @@ -117,7 +117,7 @@ public:
|
| void setRepeatX(EFillRepeat r) { m_repeatX = r; m_repeatXSet = true; }
|
| void setRepeatY(EFillRepeat r) { m_repeatY = r; m_repeatYSet = true; }
|
| void setComposite(CompositeOperator c) { m_composite = c; m_compositeSet = true; }
|
| - void setBlendMode(blink::WebBlendMode b) { m_blendMode = b; m_blendModeSet = true; }
|
| + void setBlendMode(WebBlendMode b) { m_blendMode = b; m_blendModeSet = true; }
|
| void setSizeType(EFillSizeType b) { m_sizeType = b; }
|
| void setSizeLength(const LengthSize& l) { m_sizeLength = l; }
|
| void setSize(FillSize f) { m_sizeType = f.type; m_sizeLength = f.size; }
|
| @@ -186,7 +186,7 @@ public:
|
| static EFillRepeat initialFillRepeatX(EFillLayerType) { return RepeatFill; }
|
| static EFillRepeat initialFillRepeatY(EFillLayerType) { return RepeatFill; }
|
| static CompositeOperator initialFillComposite(EFillLayerType) { return CompositeSourceOver; }
|
| - static blink::WebBlendMode initialFillBlendMode(EFillLayerType) { return blink::WebBlendModeNormal; }
|
| + static WebBlendMode initialFillBlendMode(EFillLayerType) { return WebBlendModeNormal; }
|
| static EFillSizeType initialFillSizeType(EFillLayerType) { return SizeLength; }
|
| static LengthSize initialFillSizeLength(EFillLayerType) { return LengthSize(); }
|
| static FillSize initialFillSize(EFillLayerType type) { return FillSize(initialFillSizeType(type), initialFillSizeLength(type)); }
|
| @@ -218,7 +218,7 @@ private:
|
| unsigned m_repeatY : 3; // EFillRepeat
|
| unsigned m_composite : 4; // CompositeOperator
|
| unsigned m_sizeType : 2; // EFillSizeType
|
| - unsigned m_blendMode : 5; // blink::WebBlendMode
|
| + unsigned m_blendMode : 5; // WebBlendMode
|
| unsigned m_maskSourceType : 1; // EMaskSourceType
|
| unsigned m_backgroundXOrigin : 2; // BackgroundEdgeOrigin
|
| unsigned m_backgroundYOrigin : 2; // BackgroundEdgeOrigin
|
|
|