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

Side by Side Diff: Source/core/rendering/style/SVGRenderStyle.h

Issue 234453002: Remove SVG1.1 kerning property (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: More TestExpectations updates Created 6 years, 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> 2 Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
3 2004, 2005 Rob Buis <buis@kde.org> 3 2004, 2005 Rob Buis <buis@kde.org>
4 Copyright (C) 2005, 2006 Apple Computer, Inc. 4 Copyright (C) 2005, 2006 Apple Computer, Inc.
5 Copyright (C) Research In Motion Limited 2010. All rights reserved. 5 Copyright (C) Research In Motion Limited 2010. All rights reserved.
6 6
7 This library is free software; you can redistribute it and/or 7 This library is free software; you can redistribute it and/or
8 modify it under the terms of the GNU Library General Public 8 modify it under the terms of the GNU Library General Public
9 License as published by the Free Software Foundation; either 9 License as published by the Free Software Foundation; either
10 version 2 of the License, or (at your option) any later version. 10 version 2 of the License, or (at your option) any later version.
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 static EMaskType initialMaskType() { return MT_LUMINANCE; } 95 static EMaskType initialMaskType() { return MT_LUMINANCE; }
96 static EPaintOrder initialPaintOrder() { return PO_NORMAL; } 96 static EPaintOrder initialPaintOrder() { return PO_NORMAL; }
97 97
98 static PassRefPtr<SVGLength> initialBaselineShiftValue() 98 static PassRefPtr<SVGLength> initialBaselineShiftValue()
99 { 99 {
100 RefPtr<SVGLength> length = SVGLength::create(); 100 RefPtr<SVGLength> length = SVGLength::create();
101 length->newValueSpecifiedUnits(LengthTypeNumber, 0); 101 length->newValueSpecifiedUnits(LengthTypeNumber, 0);
102 return length.release(); 102 return length.release();
103 } 103 }
104 104
105 static PassRefPtr<SVGLength> initialKerning()
106 {
107 RefPtr<SVGLength> length = SVGLength::create();
108 length->newValueSpecifiedUnits(LengthTypeNumber, 0);
109 return length.release();
110 }
111
112 static PassRefPtr<SVGLength> initialStrokeDashOffset() 105 static PassRefPtr<SVGLength> initialStrokeDashOffset()
113 { 106 {
114 RefPtr<SVGLength> length = SVGLength::create(); 107 RefPtr<SVGLength> length = SVGLength::create();
115 length->newValueSpecifiedUnits(LengthTypeNumber, 0); 108 length->newValueSpecifiedUnits(LengthTypeNumber, 0);
116 return length.release(); 109 return length.release();
117 } 110 }
118 111
119 static PassRefPtr<SVGLength> initialStrokeWidth() 112 static PassRefPtr<SVGLength> initialStrokeWidth()
120 { 113 {
121 RefPtr<SVGLength> length = SVGLength::create(); 114 RefPtr<SVGLength> length = SVGLength::create();
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 if (!(stroke->width == obj)) 206 if (!(stroke->width == obj))
214 stroke.access()->width = obj; 207 stroke.access()->width = obj;
215 } 208 }
216 209
217 void setStrokeDashOffset(PassRefPtr<SVGLength> obj) 210 void setStrokeDashOffset(PassRefPtr<SVGLength> obj)
218 { 211 {
219 if (!(stroke->dashOffset == obj)) 212 if (!(stroke->dashOffset == obj))
220 stroke.access()->dashOffset = obj; 213 stroke.access()->dashOffset = obj;
221 } 214 }
222 215
223 void setKerning(PassRefPtr<SVGLength> obj)
224 {
225 if (!(text->kerning == obj))
226 text.access()->kerning = obj;
227 }
228
229 void setStopOpacity(float obj) 216 void setStopOpacity(float obj)
230 { 217 {
231 if (!(stops->opacity == obj)) 218 if (!(stops->opacity == obj))
232 stops.access()->opacity = obj; 219 stops.access()->opacity = obj;
233 } 220 }
234 221
235 void setStopColor(const Color& obj) 222 void setStopColor(const Color& obj)
236 { 223 {
237 if (!(stops->color == obj)) 224 if (!(stops->color == obj))
238 stops.access()->color = obj; 225 stops.access()->color = obj;
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 const Color& fillPaintColor() const { return fill->paintColor; } 310 const Color& fillPaintColor() const { return fill->paintColor; }
324 const String& fillPaintUri() const { return fill->paintUri; } 311 const String& fillPaintUri() const { return fill->paintUri; }
325 float strokeOpacity() const { return stroke->opacity; } 312 float strokeOpacity() const { return stroke->opacity; }
326 const SVGPaint::SVGPaintType& strokePaintType() const { return stroke->paint Type; } 313 const SVGPaint::SVGPaintType& strokePaintType() const { return stroke->paint Type; }
327 const Color& strokePaintColor() const { return stroke->paintColor; } 314 const Color& strokePaintColor() const { return stroke->paintColor; }
328 const String& strokePaintUri() const { return stroke->paintUri; } 315 const String& strokePaintUri() const { return stroke->paintUri; }
329 PassRefPtr<SVGLengthList> strokeDashArray() const { return stroke->dashArray ; } 316 PassRefPtr<SVGLengthList> strokeDashArray() const { return stroke->dashArray ; }
330 float strokeMiterLimit() const { return stroke->miterLimit; } 317 float strokeMiterLimit() const { return stroke->miterLimit; }
331 PassRefPtr<SVGLength> strokeWidth() const { return stroke->width; } 318 PassRefPtr<SVGLength> strokeWidth() const { return stroke->width; }
332 PassRefPtr<SVGLength> strokeDashOffset() const { return stroke->dashOffset; } 319 PassRefPtr<SVGLength> strokeDashOffset() const { return stroke->dashOffset; }
333 PassRefPtr<SVGLength> kerning() const { return text->kerning; }
334 float stopOpacity() const { return stops->opacity; } 320 float stopOpacity() const { return stops->opacity; }
335 const Color& stopColor() const { return stops->color; } 321 const Color& stopColor() const { return stops->color; }
336 float floodOpacity() const { return misc->floodOpacity; } 322 float floodOpacity() const { return misc->floodOpacity; }
337 const Color& floodColor() const { return misc->floodColor; } 323 const Color& floodColor() const { return misc->floodColor; }
338 const Color& lightingColor() const { return misc->lightingColor; } 324 const Color& lightingColor() const { return misc->lightingColor; }
339 PassRefPtr<SVGLength> baselineShiftValue() const { return misc->baselineShif tValue; } 325 PassRefPtr<SVGLength> baselineShiftValue() const { return misc->baselineShif tValue; }
340 const AtomicString& clipperResource() const { return resources->clipper; } 326 const AtomicString& clipperResource() const { return resources->clipper; }
341 const AtomicString& filterResource() const { return resources->filter; } 327 const AtomicString& filterResource() const { return resources->filter; }
342 const AtomicString& maskerResource() const { return resources->masker; } 328 const AtomicString& maskerResource() const { return resources->masker; }
343 const AtomicString& markerStartResource() const { return inheritedResources- >markerStart; } 329 const AtomicString& markerStartResource() const { return inheritedResources- >markerStart; }
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 unsigned maskType: 1; // EMaskType 406 unsigned maskType: 1; // EMaskType
421 // 18 bits unused 407 // 18 bits unused
422 } f; 408 } f;
423 uint32_t _niflags; 409 uint32_t _niflags;
424 }; 410 };
425 } svg_noninherited_flags; 411 } svg_noninherited_flags;
426 412
427 // inherited attributes 413 // inherited attributes
428 DataRef<StyleFillData> fill; 414 DataRef<StyleFillData> fill;
429 DataRef<StyleStrokeData> stroke; 415 DataRef<StyleStrokeData> stroke;
430 DataRef<StyleTextData> text;
431 DataRef<StyleInheritedResourceData> inheritedResources; 416 DataRef<StyleInheritedResourceData> inheritedResources;
432 417
433 // non-inherited attributes 418 // non-inherited attributes
434 DataRef<StyleStopData> stops; 419 DataRef<StyleStopData> stops;
435 DataRef<StyleMiscData> misc; 420 DataRef<StyleMiscData> misc;
436 DataRef<StyleResourceData> resources; 421 DataRef<StyleResourceData> resources;
437 422
438 private: 423 private:
439 enum CreateDefaultType { CreateDefault }; 424 enum CreateDefaultType { CreateDefault };
440 425
(...skipping 23 matching lines...) Expand all
464 svg_noninherited_flags.f._baselineShift = initialBaselineShift(); 449 svg_noninherited_flags.f._baselineShift = initialBaselineShift();
465 svg_noninherited_flags.f._vectorEffect = initialVectorEffect(); 450 svg_noninherited_flags.f._vectorEffect = initialVectorEffect();
466 svg_noninherited_flags.f.bufferedRendering = initialBufferedRendering(); 451 svg_noninherited_flags.f.bufferedRendering = initialBufferedRendering();
467 svg_noninherited_flags.f.maskType = initialMaskType(); 452 svg_noninherited_flags.f.maskType = initialMaskType();
468 } 453 }
469 }; 454 };
470 455
471 } // namespace WebCore 456 } // namespace WebCore
472 457
473 #endif // SVGRenderStyle_h 458 #endif // SVGRenderStyle_h
OLDNEW
« no previous file with comments | « Source/core/rendering/style/RenderStyle.h ('k') | Source/core/rendering/style/SVGRenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698