Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1607)

Unified Diff: Source/core/style/SVGComputedStyle.h

Issue 1241163002: dominant-baseline property should be inherited (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/CSSProperties.in ('k') | Source/core/style/SVGComputedStyle.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/style/SVGComputedStyle.h
diff --git a/Source/core/style/SVGComputedStyle.h b/Source/core/style/SVGComputedStyle.h
index 0e9b88e77b339c036da902e298203b1e5d1ba372..ac9f4322f4826558cc9c6191415b471a85422d03 100644
--- a/Source/core/style/SVGComputedStyle.h
+++ b/Source/core/style/SVGComputedStyle.h
@@ -103,7 +103,7 @@ public:
// SVG CSS Property setters
void setAlignmentBaseline(EAlignmentBaseline val) { svg_noninherited_flags.f._alignmentBaseline = val; }
- void setDominantBaseline(EDominantBaseline val) { svg_noninherited_flags.f._dominantBaseline = val; }
+ void setDominantBaseline(EDominantBaseline val) { svg_inherited_flags.dominantBaseline = val; }
void setBaselineShift(EBaselineShift val) { svg_noninherited_flags.f._baselineShift = val; }
void setVectorEffect(EVectorEffect val) { svg_noninherited_flags.f._vectorEffect = val; }
void setBufferedRendering(EBufferedRendering val) { svg_noninherited_flags.f.bufferedRendering = val; }
@@ -308,7 +308,7 @@ public:
// Read accessors for all the properties
EAlignmentBaseline alignmentBaseline() const { return (EAlignmentBaseline) svg_noninherited_flags.f._alignmentBaseline; }
- EDominantBaseline dominantBaseline() const { return (EDominantBaseline) svg_noninherited_flags.f._dominantBaseline; }
+ EDominantBaseline dominantBaseline() const { return (EDominantBaseline) svg_inherited_flags.dominantBaseline; }
EBaselineShift baselineShift() const { return (EBaselineShift) svg_noninherited_flags.f._baselineShift; }
EVectorEffect vectorEffect() const { return (EVectorEffect) svg_noninherited_flags.f._vectorEffect; }
EBufferedRendering bufferedRendering() const { return (EBufferedRendering) svg_noninherited_flags.f.bufferedRendering; }
@@ -395,7 +395,8 @@ protected:
&& (_writingMode == other._writingMode)
&& (_glyphOrientationHorizontal == other._glyphOrientationHorizontal)
&& (_glyphOrientationVertical == other._glyphOrientationVertical)
- && (paintOrder == other.paintOrder);
+ && (paintOrder == other.paintOrder)
+ && (dominantBaseline == other.dominantBaseline);
}
bool operator!=(const InheritedFlags& other) const
@@ -416,6 +417,7 @@ protected:
unsigned _glyphOrientationHorizontal : 3; // EGlyphOrientation
unsigned _glyphOrientationVertical : 3; // EGlyphOrientation
unsigned paintOrder : 3; // EPaintOrder
+ unsigned dominantBaseline : 4; // EDominantBaseline
} svg_inherited_flags;
// don't inherit
@@ -427,7 +429,6 @@ protected:
union {
struct {
unsigned _alignmentBaseline : 4; // EAlignmentBaseline
- unsigned _dominantBaseline : 4; // EDominantBaseline
unsigned _baselineShift : 2; // EBaselineShift
unsigned _vectorEffect: 1; // EVectorEffect
unsigned bufferedRendering: 2; // EBufferedRendering
@@ -474,10 +475,10 @@ private:
svg_inherited_flags._glyphOrientationHorizontal = initialGlyphOrientationHorizontal();
svg_inherited_flags._glyphOrientationVertical = initialGlyphOrientationVertical();
svg_inherited_flags.paintOrder = initialPaintOrder();
+ svg_inherited_flags.dominantBaseline = initialDominantBaseline();
svg_noninherited_flags._niflags = 0;
svg_noninherited_flags.f._alignmentBaseline = initialAlignmentBaseline();
- svg_noninherited_flags.f._dominantBaseline = initialDominantBaseline();
svg_noninherited_flags.f._baselineShift = initialBaselineShift();
svg_noninherited_flags.f._vectorEffect = initialVectorEffect();
svg_noninherited_flags.f.bufferedRendering = initialBufferedRendering();
« no previous file with comments | « Source/core/css/CSSProperties.in ('k') | Source/core/style/SVGComputedStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698