Index: Source/core/style/SVGComputedStyle.h |
diff --git a/Source/core/style/SVGComputedStyle.h b/Source/core/style/SVGComputedStyle.h |
index d022bf08363d9f45b7455ba63089dc57d267bea8..0e9b88e77b339c036da902e298203b1e5d1ba372 100644 |
--- a/Source/core/style/SVGComputedStyle.h |
+++ b/Source/core/style/SVGComputedStyle.h |
@@ -92,7 +92,7 @@ public: |
static const AtomicString& initialMarkerMidResource() { return nullAtom; } |
static const AtomicString& initialMarkerEndResource() { return nullAtom; } |
static EMaskType initialMaskType() { return MT_LUMINANCE; } |
- static EPaintOrder initialPaintOrder() { return PO_NORMAL; } |
+ static EPaintOrder initialPaintOrder() { return PaintOrderNormal; } |
static Length initialCx() { return Length(Fixed); } |
static Length initialCy() { return Length(Fixed); } |
static Length initialX() { return Length(Fixed); } |
@@ -120,7 +120,7 @@ public: |
void setGlyphOrientationHorizontal(EGlyphOrientation val) { svg_inherited_flags._glyphOrientationHorizontal = val; } |
void setGlyphOrientationVertical(EGlyphOrientation val) { svg_inherited_flags._glyphOrientationVertical = val; } |
void setMaskType(EMaskType val) { svg_noninherited_flags.f.maskType = val; } |
- void setPaintOrder(EPaintOrder val) { svg_inherited_flags._paintOrder = (int)val; } |
+ void setPaintOrder(EPaintOrder val) { svg_inherited_flags.paintOrder = (int)val; } |
void setCx(const Length& obj) |
{ |
if (!(layout->cx == obj)) |
@@ -356,7 +356,7 @@ public: |
const AtomicString& markerMidResource() const { return inheritedResources->markerMid; } |
const AtomicString& markerEndResource() const { return inheritedResources->markerEnd; } |
EMaskType maskType() const { return (EMaskType) svg_noninherited_flags.f.maskType; } |
- EPaintOrder paintOrder() const { return (EPaintOrder) svg_inherited_flags._paintOrder; } |
+ EPaintOrder paintOrder() const { return (EPaintOrder) svg_inherited_flags.paintOrder; } |
EPaintOrderType paintOrderType(unsigned index) const; |
const SVGPaintType& visitedLinkFillPaintType() const { return fill->visitedLinkPaintType; } |
@@ -395,7 +395,7 @@ protected: |
&& (_writingMode == other._writingMode) |
&& (_glyphOrientationHorizontal == other._glyphOrientationHorizontal) |
&& (_glyphOrientationVertical == other._glyphOrientationVertical) |
- && (_paintOrder == other._paintOrder); |
+ && (paintOrder == other.paintOrder); |
} |
bool operator!=(const InheritedFlags& other) const |
@@ -415,7 +415,7 @@ protected: |
unsigned _writingMode : 3; // SVGWritingMode |
unsigned _glyphOrientationHorizontal : 3; // EGlyphOrientation |
unsigned _glyphOrientationVertical : 3; // EGlyphOrientation |
- unsigned _paintOrder : 6; // EPaintOrder |
+ unsigned paintOrder : 3; // EPaintOrder |
} svg_inherited_flags; |
// don't inherit |
@@ -473,7 +473,7 @@ private: |
svg_inherited_flags._writingMode = initialWritingMode(); |
svg_inherited_flags._glyphOrientationHorizontal = initialGlyphOrientationHorizontal(); |
svg_inherited_flags._glyphOrientationVertical = initialGlyphOrientationVertical(); |
- svg_inherited_flags._paintOrder = initialPaintOrder(); |
+ svg_inherited_flags.paintOrder = initialPaintOrder(); |
svg_noninherited_flags._niflags = 0; |
svg_noninherited_flags.f._alignmentBaseline = initialAlignmentBaseline(); |