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

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

Issue 112003003: [SVG] SVGLength{,List} migration to new SVG property impl. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebaselined Created 7 years 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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 1357 matching lines...) Expand 10 before | Expand all | Expand 10 after
1368 Color fillPaintColor() const { return svgStyle()->fillPaintColor(); } 1368 Color fillPaintColor() const { return svgStyle()->fillPaintColor(); }
1369 void setFillPaintColor(const Color& c) { accessSVGStyle()->setFillPaint(SVGP aint::SVG_PAINTTYPE_RGBCOLOR, c, ""); } 1369 void setFillPaintColor(const Color& c) { accessSVGStyle()->setFillPaint(SVGP aint::SVG_PAINTTYPE_RGBCOLOR, c, ""); }
1370 float fillOpacity() const { return svgStyle()->fillOpacity(); } 1370 float fillOpacity() const { return svgStyle()->fillOpacity(); }
1371 void setFillOpacity(float f) { accessSVGStyle()->setFillOpacity(f); } 1371 void setFillOpacity(float f) { accessSVGStyle()->setFillOpacity(f); }
1372 1372
1373 const SVGPaint::SVGPaintType& strokePaintType() const { return svgStyle()->s trokePaintType(); } 1373 const SVGPaint::SVGPaintType& strokePaintType() const { return svgStyle()->s trokePaintType(); }
1374 Color strokePaintColor() const { return svgStyle()->strokePaintColor(); } 1374 Color strokePaintColor() const { return svgStyle()->strokePaintColor(); }
1375 void setStrokePaintColor(const Color& c) { accessSVGStyle()->setStrokePaint( SVGPaint::SVG_PAINTTYPE_RGBCOLOR, c, ""); } 1375 void setStrokePaintColor(const Color& c) { accessSVGStyle()->setStrokePaint( SVGPaint::SVG_PAINTTYPE_RGBCOLOR, c, ""); }
1376 float strokeOpacity() const { return svgStyle()->strokeOpacity(); } 1376 float strokeOpacity() const { return svgStyle()->strokeOpacity(); }
1377 void setStrokeOpacity(float f) { accessSVGStyle()->setStrokeOpacity(f); } 1377 void setStrokeOpacity(float f) { accessSVGStyle()->setStrokeOpacity(f); }
1378 SVGLength strokeWidth() const { return svgStyle()->strokeWidth(); } 1378 SVGLength* strokeWidth() const { return svgStyle()->strokeWidth(); }
pdr. 2014/01/07 06:42:53 Could this be introducing UAFs if the existing cod
kouhei (in TOK) 2014/01/08 08:12:07 Changed to PassRefPtr<> for safety. I'm a bit worr
1379 void setStrokeWidth(SVGLength w) { accessSVGStyle()->setStrokeWidth(w); } 1379 void setStrokeWidth(PassRefPtr<SVGLength> w) { accessSVGStyle()->setStrokeWi dth(w); }
1380 Vector<SVGLength> strokeDashArray() const { return svgStyle()->strokeDashArr ay(); } 1380 SVGLengthList* strokeDashArray() const { return svgStyle()->strokeDashArray( ); }
1381 void setStrokeDashArray(Vector<SVGLength> array) { accessSVGStyle()->setStro keDashArray(array); } 1381 void setStrokeDashArray(PassRefPtr<SVGLengthList> array) { accessSVGStyle()- >setStrokeDashArray(array); }
1382 SVGLength strokeDashOffset() const { return svgStyle()->strokeDashOffset(); } 1382 SVGLength* strokeDashOffset() const { return svgStyle()->strokeDashOffset(); }
1383 void setStrokeDashOffset(SVGLength d) { accessSVGStyle()->setStrokeDashOffse t(d); } 1383 void setStrokeDashOffset(PassRefPtr<SVGLength> d) { accessSVGStyle()->setStr okeDashOffset(d); }
1384 float strokeMiterLimit() const { return svgStyle()->strokeMiterLimit(); } 1384 float strokeMiterLimit() const { return svgStyle()->strokeMiterLimit(); }
1385 void setStrokeMiterLimit(float f) { accessSVGStyle()->setStrokeMiterLimit(f) ; } 1385 void setStrokeMiterLimit(float f) { accessSVGStyle()->setStrokeMiterLimit(f) ; }
1386 1386
1387 float floodOpacity() const { return svgStyle()->floodOpacity(); } 1387 float floodOpacity() const { return svgStyle()->floodOpacity(); }
1388 void setFloodOpacity(float f) { accessSVGStyle()->setFloodOpacity(f); } 1388 void setFloodOpacity(float f) { accessSVGStyle()->setFloodOpacity(f); }
1389 1389
1390 float stopOpacity() const { return svgStyle()->stopOpacity(); } 1390 float stopOpacity() const { return svgStyle()->stopOpacity(); }
1391 void setStopOpacity(float f) { accessSVGStyle()->setStopOpacity(f); } 1391 void setStopOpacity(float f) { accessSVGStyle()->setStopOpacity(f); }
1392 1392
1393 void setStopColor(const Color& c) { accessSVGStyle()->setStopColor(c); } 1393 void setStopColor(const Color& c) { accessSVGStyle()->setStopColor(c); }
1394 void setFloodColor(const Color& c) { accessSVGStyle()->setFloodColor(c); } 1394 void setFloodColor(const Color& c) { accessSVGStyle()->setFloodColor(c); }
1395 void setLightingColor(const Color& c) { accessSVGStyle()->setLightingColor(c ); } 1395 void setLightingColor(const Color& c) { accessSVGStyle()->setLightingColor(c ); }
1396 1396
1397 SVGLength baselineShiftValue() const { return svgStyle()->baselineShiftValue (); } 1397 SVGLength* baselineShiftValue() const { return svgStyle()->baselineShiftValu e(); }
1398 void setBaselineShiftValue(SVGLength s) { accessSVGStyle()->setBaselineShift Value(s); } 1398 void setBaselineShiftValue(PassRefPtr<SVGLength> s) { accessSVGStyle()->setB aselineShiftValue(s); }
1399 SVGLength kerning() const { return svgStyle()->kerning(); } 1399 SVGLength* kerning() const { return svgStyle()->kerning(); }
1400 void setKerning(SVGLength k) { accessSVGStyle()->setKerning(k); } 1400 void setKerning(PassRefPtr<SVGLength> k) { accessSVGStyle()->setKerning(k); }
1401 1401
1402 void setShapeInside(PassRefPtr<ShapeValue> value) 1402 void setShapeInside(PassRefPtr<ShapeValue> value)
1403 { 1403 {
1404 if (rareNonInheritedData->m_shapeInside == value) 1404 if (rareNonInheritedData->m_shapeInside == value)
1405 return; 1405 return;
1406 rareNonInheritedData.access()->m_shapeInside = value; 1406 rareNonInheritedData.access()->m_shapeInside = value;
1407 } 1407 }
1408 ShapeValue* shapeInside() const { return rareNonInheritedData->m_shapeInside .get(); } 1408 ShapeValue* shapeInside() const { return rareNonInheritedData->m_shapeInside .get(); }
1409 ShapeValue* resolvedShapeInside() const 1409 ShapeValue* resolvedShapeInside() const
1410 { 1410 {
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
1859 inline void RenderStyle::setHasPseudoStyle(PseudoId pseudo) 1859 inline void RenderStyle::setHasPseudoStyle(PseudoId pseudo)
1860 { 1860 {
1861 ASSERT(pseudo > NOPSEUDO); 1861 ASSERT(pseudo > NOPSEUDO);
1862 ASSERT(pseudo < FIRST_INTERNAL_PSEUDOID); 1862 ASSERT(pseudo < FIRST_INTERNAL_PSEUDOID);
1863 noninherited_flags._pseudoBits |= 1 << (pseudo - 1); 1863 noninherited_flags._pseudoBits |= 1 << (pseudo - 1);
1864 } 1864 }
1865 1865
1866 } // namespace WebCore 1866 } // namespace WebCore
1867 1867
1868 #endif // RenderStyle_h 1868 #endif // RenderStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698