| Index: third_party/WebKit/Source/core/style/SVGComputedStyle.h
|
| diff --git a/third_party/WebKit/Source/core/style/SVGComputedStyle.h b/third_party/WebKit/Source/core/style/SVGComputedStyle.h
|
| index 9145dc9c52e1ed82cd2de691c07166c56600d6c7..38ce12fdebe66e23ddb0f13b07bc69e8855e6e77 100644
|
| --- a/third_party/WebKit/Source/core/style/SVGComputedStyle.h
|
| +++ b/third_party/WebKit/Source/core/style/SVGComputedStyle.h
|
| @@ -65,8 +65,6 @@ public:
|
| static LineJoin initialJoinStyle() { return MiterJoin; }
|
| static EShapeRendering initialShapeRendering() { return SR_AUTO; }
|
| static ETextAnchor initialTextAnchor() { return TA_START; }
|
| - static EGlyphOrientation initialGlyphOrientationHorizontal() { return GO_0DEG; }
|
| - static EGlyphOrientation initialGlyphOrientationVertical() { return GO_AUTO; }
|
| static float initialFillOpacity() { return 1; }
|
| static SVGPaintType initialFillPaintType() { return SVG_PAINTTYPE_RGBCOLOR; }
|
| static Color initialFillPaintColor() { return Color::black; }
|
| @@ -115,8 +113,6 @@ public:
|
| void setJoinStyle(LineJoin val) { svg_inherited_flags._joinStyle = val; }
|
| void setShapeRendering(EShapeRendering val) { svg_inherited_flags._shapeRendering = val; }
|
| void setTextAnchor(ETextAnchor val) { svg_inherited_flags._textAnchor = val; }
|
| - 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 setCx(const Length& obj)
|
| @@ -319,8 +315,6 @@ public:
|
| LineJoin joinStyle() const { return (LineJoin) svg_inherited_flags._joinStyle; }
|
| EShapeRendering shapeRendering() const { return (EShapeRendering) svg_inherited_flags._shapeRendering; }
|
| ETextAnchor textAnchor() const { return (ETextAnchor) svg_inherited_flags._textAnchor; }
|
| - EGlyphOrientation glyphOrientationHorizontal() const { return (EGlyphOrientation) svg_inherited_flags._glyphOrientationHorizontal; }
|
| - EGlyphOrientation glyphOrientationVertical() const { return (EGlyphOrientation) svg_inherited_flags._glyphOrientationVertical; }
|
| float fillOpacity() const { return fill->opacity; }
|
| const SVGPaintType& fillPaintType() const { return fill->paintType; }
|
| const Color& fillPaintColor() const { return fill->paintColor; }
|
| @@ -388,8 +382,6 @@ protected:
|
| && (_textAnchor == other._textAnchor)
|
| && (_colorInterpolation == other._colorInterpolation)
|
| && (_colorInterpolationFilters == other._colorInterpolationFilters)
|
| - && (_glyphOrientationHorizontal == other._glyphOrientationHorizontal)
|
| - && (_glyphOrientationVertical == other._glyphOrientationVertical)
|
| && (paintOrder == other.paintOrder)
|
| && (dominantBaseline == other.dominantBaseline);
|
| }
|
| @@ -408,8 +400,6 @@ protected:
|
| unsigned _textAnchor : 2; // ETextAnchor
|
| unsigned _colorInterpolation : 2; // EColorInterpolation
|
| unsigned _colorInterpolationFilters : 2; // EColorInterpolation
|
| - unsigned _glyphOrientationHorizontal : 3; // EGlyphOrientation
|
| - unsigned _glyphOrientationVertical : 3; // EGlyphOrientation
|
| unsigned paintOrder : 3; // EPaintOrder
|
| unsigned dominantBaseline : 4; // EDominantBaseline
|
| } svg_inherited_flags;
|
| @@ -465,8 +455,6 @@ private:
|
| svg_inherited_flags._joinStyle = initialJoinStyle();
|
| svg_inherited_flags._colorInterpolation = initialColorInterpolation();
|
| svg_inherited_flags._colorInterpolationFilters = initialColorInterpolationFilters();
|
| - svg_inherited_flags._glyphOrientationHorizontal = initialGlyphOrientationHorizontal();
|
| - svg_inherited_flags._glyphOrientationVertical = initialGlyphOrientationVertical();
|
| svg_inherited_flags.paintOrder = initialPaintOrder();
|
| svg_inherited_flags.dominantBaseline = initialDominantBaseline();
|
|
|
|
|