Changeset 19992 in webkit
- Timestamp:
- Mar 6, 2007 4:27:46 PM (17 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r19991 r19992 1 2007-03-07 Nikolas Zimmermann <zimmermann@kde.org> 2 3 Reviewed by Rob & Oliver. 4 5 Preparations for the new SVG text engine. 6 7 Handle baseline-shift / kerning css values correctly. 8 Recognize missing svg presentation attribute "font-size-adjust". 9 Add all missing svg<->css property mappings in mapToEntry(). 10 11 Doesn't affect any layout test (as these properties are not used w/o my text patch). 12 While I'm at it, unify the macro names (RS_ -> SVG_RS_) & cleanup style a bit. 13 14 * ksvg2/css/CSSPropertyNames.in: 15 * ksvg2/css/SVGCSSParser.cpp: 16 (WebCore::CSSParser::parseSVGValue): 17 * ksvg2/css/SVGCSSStyleSelector.cpp: 18 (WebCore::CSSStyleSelector::applySVGProperty): 19 * ksvg2/css/SVGRenderStyle.cpp: 20 (WebCore::SVGRenderStyle::SVGRenderStyle): 21 (WebCore::SVGRenderStyle::operator==): 22 (WebCore::SVGRenderStyle::inheritedNotEqual): 23 (WebCore::SVGRenderStyle::inheritFrom): 24 * ksvg2/css/SVGRenderStyle.h: 25 (WebCore::SVGRenderStyle::NonInheritedFlags::): 26 (WebCore::SVGRenderStyle::setBitDefaults): 27 * ksvg2/css/SVGRenderStyleDefs.cpp: 28 (StyleTextData::StyleTextData): 29 (StyleTextData::operator==): 30 (StyleMiscData::StyleMiscData): 31 (StyleMiscData::operator==): 32 * ksvg2/css/SVGRenderStyleDefs.h: 33 (WebCore::): 34 (WebCore::StyleTextData::operator!=): 35 * ksvg2/svg/SVGStyledElement.cpp: 36 (WebCore::SVGStyledElement::cssPropertyIdForSVGAttributeName): 37 1 38 2007-03-06 Justin Garcia <justin.garcia@apple.com> 2 39 -
trunk/WebCore/ksvg2/css/CSSPropertyNames.in
r13393 r19992 23 23 fill-opacity 24 24 fill-rule 25 font-size-adjust 25 26 image-rendering 26 27 marker -
trunk/WebCore/ksvg2/css/SVGCSSParser.cpp
r19855 r19992 273 273 274 274 case SVGCSS_PROP_KERNING: // auto | normal | <length> | inherit 275 if (id == CSS_VAL_AUTO )275 if (id == CSS_VAL_AUTO || id == CSS_VAL_NORMAL) 276 276 valid_primitive = true; 277 277 else -
trunk/WebCore/ksvg2/css/SVGCSSStyleSelector.cpp
r19855 r19992 1 1 /* 2 2 Copyright (C) 2005 Apple Computer, Inc. 3 Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>3 Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> 4 4 2004, 2005 Rob Buis <buis@kde.org> 5 5 … … 61 61 if (id == propID) \ 62 62 {\ 63 svgstyle->set##Prop(parentStyle-> prop());\63 svgstyle->set##Prop(parentStyle->svgStyle()->prop());\ 64 64 return;\ 65 65 } … … 72 72 } 73 73 74 #define HANDLE_INITIAL_COND_WITH_VALUE(propID, Prop, Value) \ 75 if (id == propID) { \ 76 svgstyle->set##Prop(SVGRenderStyle::initial##Value()); \ 77 return; \ 78 } 79 74 80 namespace WebCore { 75 81 … … 80 86 primitiveValue = static_cast<CSSPrimitiveValue*>(value); 81 87 82 Length l;83 88 SVGRenderStyle* svgstyle = style->accessSVGStyle(); 84 85 89 unsigned short valueType = value->cssValueType(); 86 90 … … 145 149 break; 146 150 } 151 case SVGCSS_PROP_BASELINE_SHIFT: 152 { 153 HANDLE_INHERIT_AND_INITIAL(baselineShift, BaselineShift); 154 if (!primitiveValue) 155 break; 156 157 if (primitiveValue->getIdent()) { 158 switch (primitiveValue->getIdent()) { 159 case CSS_VAL_BASELINE: 160 svgstyle->setBaselineShift(BS_BASELINE); 161 break; 162 case CSS_VAL_SUB: 163 svgstyle->setBaselineShift(BS_SUB); 164 break; 165 case CSS_VAL_SUPER: 166 svgstyle->setBaselineShift(BS_SUPER); 167 break; 168 default: 169 break; 170 } 171 } else { 172 svgstyle->setBaselineShift(BS_LENGTH); 173 svgstyle->setBaselineShiftValue(primitiveValue); 174 } 175 176 break; 177 } 178 case SVGCSS_PROP_KERNING: 179 { 180 if (isInherit) { 181 HANDLE_INHERIT_COND(SVGCSS_PROP_KERNING, kerning, Kerning) 182 return; 183 } 184 else if (isInitial) { 185 HANDLE_INITIAL_COND_WITH_VALUE(SVGCSS_PROP_KERNING, Kerning, Kerning) 186 return; 187 } 188 189 svgstyle->setKerning(primitiveValue); 190 break; 191 } 147 192 case SVGCSS_PROP_POINTER_EVENTS: 148 193 { -
trunk/WebCore/ksvg2/css/SVGRenderStyle.cpp
r19855 r19992 1 1 /* 2 Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>2 Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> 3 3 2004, 2005 Rob Buis <buis@kde.org> 4 4 … … 37 37 SVGRenderStyle::SVGRenderStyle() 38 38 { 39 if (!s_defaultStyle)39 if (!s_defaultStyle) 40 40 s_defaultStyle = new SVGRenderStyle(true); 41 41 42 42 fill = s_defaultStyle->fill; 43 43 stroke = s_defaultStyle->stroke; 44 text = s_defaultStyle->text; 44 45 stops = s_defaultStyle->stops; 45 46 clip = s_defaultStyle->clip; … … 57 58 fill.init(); 58 59 stroke.init(); 60 text.init(); 59 61 stops.init(); 60 62 clip.init(); … … 68 70 fill = other.fill; 69 71 stroke = other.stroke; 72 text = other.text; 70 73 stops = other.stops; 71 74 clip = other.clip; … … 84 87 bool SVGRenderStyle::operator==(const SVGRenderStyle& o) const 85 88 { 86 return (fill == o.fill && stroke == o.stroke && 89 return (fill == o.fill && stroke == o.stroke && text == o.text && 87 90 stops == o.stops && clip == o.clip && mask == o.mask && 88 91 misc == o.misc && markers == o.markers && … … 96 99 || stroke != other->stroke 97 100 || markers != other->markers 101 || text != other->text 98 102 || svg_inherited_flags != other->svg_inherited_flags); 99 103 } … … 101 105 void SVGRenderStyle::inheritFrom(const SVGRenderStyle* svgInheritParent) 102 106 { 103 if (!svgInheritParent)107 if (!svgInheritParent) 104 108 return; 105 109 … … 107 111 stroke = svgInheritParent->stroke; 108 112 markers = svgInheritParent->markers; 113 text = svgInheritParent->text; 109 114 110 115 svg_inherited_flags = svgInheritParent->svg_inherited_flags; … … 113 118 } 114 119 115 // vim:ts=4:noet116 120 #endif // ENABLE(SVG) 117 121 122 // vim:ts=4:noet -
trunk/WebCore/ksvg2/css/SVGRenderStyle.h
r19855 r19992 1 1 /* 2 Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>2 Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> 3 3 2004, 2005 Rob Buis <buis@kde.org> 4 4 Copyright (C) 2005, 2006 Apple Computer, Inc. … … 24 24 #ifndef SVGRenderStyle_h 25 25 #define SVGRenderStyle_h 26 26 27 #if ENABLE(SVG) 27 28 … … 36 37 typedef unsigned long long uint64_t; 37 38 #endif 38 39 // "Helper" macros for SVG's RenderStyle properties40 // FIXME: These are impossible to work with or debug.41 #define RS_DEFINE_ATTRIBUTE(Data, Type, Name, Initial) \42 void set##Type(Data val) { noninherited_flags.f._##Name = val; } \43 Data Name() const { return (Data) noninherited_flags.f._##Name; } \44 static Data initial##Type() { return Initial; }45 46 #define RS_DEFINE_ATTRIBUTE_INHERITED(Data, Type, Name, Initial) \47 void set##Type(Data val) { inherited_flags.f._##Name = val; } \48 Data Name() const { return (Data) inherited_flags.f._##Name; } \49 static Data initial##Type() { return Initial; }50 51 #define RS_DEFINE_ATTRIBUTE_DATAREF(Data, Group, Variable, Type, Name) \52 Data Name() const { return Group->Variable; } \53 void set##Type(Data obj) { RS_SET_VARIABLE(Group, Variable, obj) }54 55 #define RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(Data, Group, Variable, Type, Name, Initial) \56 RS_DEFINE_ATTRIBUTE_DATAREF(Data, Group, Variable, Type, Name) \57 static Data initial##Type() { return Initial; }58 59 #define RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL_REFCOUNTED(Data, Group, Variable, Type, Name, Initial) \60 Data* Name() const { return Group->Variable.get(); } \61 void set##Type(PassRefPtr<Data> obj) { \62 if(!(Group->Variable == obj)) \63 Group.access()->Variable = obj; \64 } \65 static Data* initial##Type() { return Initial; }66 67 #define RS_SET_VARIABLE(Group, Variable, Value) \68 if(!(Group->Variable == Value)) \69 Group.access()->Variable = Value;70 39 71 40 namespace WebCore { … … 87 56 SVG_RS_DEFINE_ATTRIBUTE(EAlignmentBaseline, AlignmentBaseline, alignmentBaseline, AB_AUTO) 88 57 SVG_RS_DEFINE_ATTRIBUTE(EDominantBaseline, DominantBaseline, dominantBaseline, DB_AUTO) 58 SVG_RS_DEFINE_ATTRIBUTE(EBaselineShift, BaselineShift, baselineShift, BS_BASELINE) 89 59 90 60 SVG_RS_DEFINE_ATTRIBUTE_INHERITED(LineCap, CapStyle, capStyle, ButtCap) … … 101 71 SVG_RS_DEFINE_ATTRIBUTE_INHERITED(ETextRendering, TextRendering, textRendering, TR_AUTO) 102 72 SVG_RS_DEFINE_ATTRIBUTE_INHERITED(EWritingMode, WritingMode, writingMode, WM_LRTB) 73 74 // SVG CSS Properties (using DataRef's) 75 SVG_RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(float, fill, opacity, FillOpacity, fillOpacity, 1.0) 76 SVG_RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL_REFCOUNTED(SVGPaint, fill, paint, FillPaint, fillPaint, SVGPaint::defaultFill()) 103 77 104 // SVG CSS Properties (using DataRef's) 105 RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(float, fill, opacity, FillOpacity, fillOpacity, 1.0) 106 RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL_REFCOUNTED(SVGPaint, fill, paint, FillPaint, fillPaint, SVGPaint::defaultFill()) 78 SVG_RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(float, stroke, opacity, StrokeOpacity, strokeOpacity, 1.0) 79 SVG_RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL_REFCOUNTED(SVGPaint, stroke, paint, StrokePaint, strokePaint, SVGPaint::defaultStroke()) 80 SVG_RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL_REFCOUNTED(CSSValueList, stroke, dashArray, StrokeDashArray, strokeDashArray, 0) 81 SVG_RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(float, stroke, miterLimit, StrokeMiterLimit, strokeMiterLimit, 4.0) 82 83 SVG_RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL_REFCOUNTED(CSSValue, stroke, width, StrokeWidth, strokeWidth, 0) 84 SVG_RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL_REFCOUNTED(CSSValue, stroke, dashOffset, StrokeDashOffset, strokeDashOffset, 0); 107 85 108 RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(float, stroke, opacity, StrokeOpacity, strokeOpacity, 1.0)109 RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL_REFCOUNTED(SVGPaint, stroke, paint, StrokePaint, strokePaint, SVGPaint::defaultStroke()) 110 RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL_REFCOUNTED(CSSValueList, stroke, dashArray, StrokeDashArray, strokeDashArray,0)111 RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(float, stroke, miterLimit, StrokeMiterLimit, strokeMiterLimit, 4.0)86 SVG_RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL_REFCOUNTED(CSSValue, text, kerning, Kerning, kerning, 0) 87 88 SVG_RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(float, stops, opacity, StopOpacity, stopOpacity, 1.0) 89 SVG_RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(Color, stops, color, StopColor, stopColor, Color(0, 0, 0)) 112 90 113 RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL_REFCOUNTED(CSSValue, stroke, width, StrokeWidth, strokeWidth, 0) 114 RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL_REFCOUNTED(CSSValue, stroke, dashOffset, StrokeDashOffset, strokeDashOffset, 0); 115 116 RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(float, stops, opacity, StopOpacity, stopOpacity, 1.0) 117 RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(Color, stops, color, StopColor, stopColor, Color(0, 0, 0)) 118 119 RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(String, clip, clipPath, ClipPath, clipPath, String()) 120 RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(String, mask, maskElement, MaskElement, maskElement, String()) 121 RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(String, markers, startMarker, StartMarker, startMarker, String()) 122 RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(String, markers, midMarker, MidMarker, midMarker, String()) 123 RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(String, markers, endMarker, EndMarker, endMarker, String()) 91 SVG_RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(String, clip, clipPath, ClipPath, clipPath, String()) 92 SVG_RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(String, mask, maskElement, MaskElement, maskElement, String()) 93 SVG_RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(String, markers, startMarker, StartMarker, startMarker, String()) 94 SVG_RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(String, markers, midMarker, MidMarker, midMarker, String()) 95 SVG_RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(String, markers, endMarker, EndMarker, endMarker, String()) 124 96 125 RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(String, misc, filter, Filter, filter, String()) 126 RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(float, misc, floodOpacity, FloodOpacity, floodOpacity, 1.0) 127 RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(Color, misc, floodColor, FloodColor, floodColor, Color(0, 0, 0)) 128 97 SVG_RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(String, misc, filter, Filter, filter, String()) 98 SVG_RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(float, misc, floodOpacity, FloodOpacity, floodOpacity, 1.0) 99 SVG_RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(Color, misc, floodColor, FloodColor, floodColor, Color(0, 0, 0)) 100 SVG_RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL_REFCOUNTED(CSSValue, misc, baselineShiftValue, BaselineShiftValue, baselineShiftValue, 0) 101 129 102 // convenience 130 103 bool hasStroke() const { return (strokePaint()->paintType() != SVGPaint::SVG_PAINTTYPE_NONE); } … … 169 142 unsigned _alignmentBaseline : 4; // EAlignmentBaseline 170 143 unsigned _dominantBaseline : 4; // EDominantBaseline 171 // 24 bits unused 144 unsigned _baselineShift : 2; // EBaselineShift 145 // 22 bits unused 172 146 } f; 173 147 uint32_t _niflags; … … 179 153 DataRef<StyleStrokeData> stroke; 180 154 DataRef<StyleMarkerData> markers; 155 DataRef<StyleTextData> text; 181 156 182 157 // non-inherited attributes … … 210 185 svg_noninherited_flags.f._alignmentBaseline = initialAlignmentBaseline(); 211 186 svg_noninherited_flags.f._dominantBaseline = initialDominantBaseline(); 187 svg_noninherited_flags.f._baselineShift = initialBaselineShift(); 212 188 } 213 189 }; -
trunk/WebCore/ksvg2/css/SVGRenderStyleDefs.cpp
r19855 r19992 1 1 /* 2 Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>2 Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> 3 3 2004, 2005 Rob Buis <buis@kde.org> 4 4 … … 116 116 } 117 117 118 StyleTextData::StyleTextData() : Shared<StyleTextData>() 119 { 120 kerning = SVGRenderStyle::initialKerning(); 121 } 122 123 StyleTextData::StyleTextData(const StyleTextData& other) : Shared<StyleTextData>() 124 { 125 kerning = other.kerning; 126 } 127 128 bool StyleTextData::operator==(const StyleTextData& other) const 129 { 130 return kerning == other.kerning; 131 } 132 118 133 StyleClipData::StyleClipData() : Shared<StyleClipData>() 119 134 { … … 167 182 StyleMiscData::StyleMiscData() : Shared<StyleMiscData>() 168 183 { 169 floodColor = RenderStyle::initialColor(); 170 floodOpacity = RenderStyle::initialOpacity(); 184 floodColor = SVGRenderStyle::initialFloodColor(); 185 floodOpacity = SVGRenderStyle::initialFloodOpacity(); 186 baselineShiftValue = SVGRenderStyle::initialBaselineShiftValue(); 171 187 } 172 188 … … 176 192 floodColor = other.floodColor; 177 193 floodOpacity = other.floodOpacity; 194 baselineShiftValue = other.baselineShiftValue; 178 195 } 179 196 180 197 bool StyleMiscData::operator==(const StyleMiscData &other) const 181 198 { 182 return (filter == other.filter && floodOpacity == other.floodOpacity && floodColor == other.floodColor); 183 } 199 return filter == other.filter 200 && floodOpacity == other.floodOpacity 201 && floodColor == other.floodColor 202 && baselineShiftValue == other.baselineShiftValue; 203 } 204 205 #endif // ENABLE(SVG) 184 206 185 207 // vim:ts=4:noet 186 #endif // ENABLE(SVG)187 -
trunk/WebCore/ksvg2/css/SVGRenderStyleDefs.h
r19855 r19992 1 1 /* 2 Copyright (C) 2004, 2005 Nikolas Zimmermann <wildfox@kde.org>2 Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> 3 3 2004, 2005 Rob Buis <buis@kde.org> 4 4 … … 29 29 #ifndef SVGRenderStyleDefs_h 30 30 #define SVGRenderStyleDefs_h 31 31 32 #if ENABLE(SVG) 32 33 33 #include "Color.h" 34 34 #include "Path.h" … … 48 48 static Data initial##Type() { return Initial; } 49 49 50 // "Helper" macros for SVG's RenderStyle properties 51 // FIXME: These are impossible to work with or debug. 52 #define SVG_RS_DEFINE_ATTRIBUTE_DATAREF(Data, Group, Variable, Type, Name) \ 53 Data Name() const { return Group->Variable; } \ 54 void set##Type(Data obj) { SVG_RS_SET_VARIABLE(Group, Variable, obj) } 55 56 #define SVG_RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(Data, Group, Variable, Type, Name, Initial) \ 57 SVG_RS_DEFINE_ATTRIBUTE_DATAREF(Data, Group, Variable, Type, Name) \ 58 static Data initial##Type() { return Initial; } 59 60 #define SVG_RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL_REFCOUNTED(Data, Group, Variable, Type, Name, Initial) \ 61 Data* Name() const { return Group->Variable.get(); } \ 62 void set##Type(PassRefPtr<Data> obj) { \ 63 if(!(Group->Variable == obj)) \ 64 Group.access()->Variable = obj; \ 65 } \ 66 static Data* initial##Type() { return Initial; } 67 68 #define SVG_RS_SET_VARIABLE(Group, Variable, Value) \ 69 if(!(Group->Variable == Value)) \ 70 Group.access()->Variable = Value; 71 50 72 namespace WebCore { 73 74 enum EBaselineShift { 75 BS_BASELINE, BS_SUB, BS_SUPER, BS_LENGTH 76 }; 51 77 52 78 enum ETextAnchor { … … 160 186 }; 161 187 188 class StyleTextData : public Shared<StyleTextData> { 189 public: 190 StyleTextData(); 191 StyleTextData(const StyleTextData& other); 192 193 bool operator==(const StyleTextData& other) const; 194 bool operator!=(const StyleTextData& other) const 195 { 196 return !(*this == other); 197 } 198 199 RefPtr<CSSValue> kerning; 200 201 private: 202 StyleTextData& operator=(const StyleTextData&); 203 }; 204 162 205 class StyleClipData : public Shared<StyleClipData> { 163 206 public: … … 226 269 float floodOpacity; 227 270 271 // non-inherited text stuff lives here not in StyleTextData. 272 RefPtr<CSSValue> baselineShiftValue; 273 228 274 private: 229 275 StyleMiscData &operator=(const StyleMiscData &); … … 233 279 234 280 #endif // ENABLE(SVG) 235 #endif // KSVG_SVGRenderStyleDefs_h281 #endif // SVGRenderStyleDefs_h 236 282 237 283 // vim:ts=4:noet -
trunk/WebCore/ksvg2/svg/SVGStyledElement.cpp
r19972 r19992 110 110 mapAttributeToCSSProperty(propertyNameToIdMap, clip_ruleAttr); 111 111 mapAttributeToCSSProperty(propertyNameToIdMap, colorAttr); 112 mapAttributeToCSSProperty(propertyNameToIdMap, color_interpolationAttr); 112 113 mapAttributeToCSSProperty(propertyNameToIdMap, color_interpolation_filtersAttr); 113 114 mapAttributeToCSSProperty(propertyNameToIdMap, color_profileAttr); 115 mapAttributeToCSSProperty(propertyNameToIdMap, color_renderingAttr); 114 116 mapAttributeToCSSProperty(propertyNameToIdMap, cursorAttr); 115 117 mapAttributeToCSSProperty(propertyNameToIdMap, directionAttr); … … 125 127 mapAttributeToCSSProperty(propertyNameToIdMap, font_familyAttr); 126 128 mapAttributeToCSSProperty(propertyNameToIdMap, font_sizeAttr); 129 mapAttributeToCSSProperty(propertyNameToIdMap, font_size_adjustAttr); 127 130 mapAttributeToCSSProperty(propertyNameToIdMap, font_stretchAttr); 128 131 mapAttributeToCSSProperty(propertyNameToIdMap, font_styleAttr); … … 159 162 mapAttributeToCSSProperty(propertyNameToIdMap, visibilityAttr); 160 163 mapAttributeToCSSProperty(propertyNameToIdMap, word_spacingAttr); 164 mapAttributeToCSSProperty(propertyNameToIdMap, writing_modeAttr); 161 165 } 162 166
Note: See TracChangeset
for help on using the changeset viewer.