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

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

Issue 361543002: Remove SVGPaint (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Patch for landing Created 6 years, 5 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
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) Research In Motion Limited 2010. All rights reserved. 4 Copyright (C) Research In Motion Limited 2010. All rights reserved.
5 5
6 Based on khtml code by: 6 Based on khtml code by:
7 Copyright (C) 2000-2003 Lars Knoll (knoll@kde.org) 7 Copyright (C) 2000-2003 Lars Knoll (knoll@kde.org)
8 (C) 2000 Antti Koivisto (koivisto@kde.org) 8 (C) 2000 Antti Koivisto (koivisto@kde.org)
9 (C) 2000-2003 Dirk Mueller (mueller@kde.org) 9 (C) 2000-2003 Dirk Mueller (mueller@kde.org)
10 (C) 2002-2003 Apple Computer, Inc. 10 (C) 2002-2003 Apple Computer, Inc.
(...skipping 12 matching lines...) Expand all
23 along with this library; see the file COPYING.LIB. If not, write to 23 along with this library; see the file COPYING.LIB. If not, write to
24 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 24 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
25 Boston, MA 02110-1301, USA. 25 Boston, MA 02110-1301, USA.
26 */ 26 */
27 27
28 #ifndef SVGRenderStyleDefs_h 28 #ifndef SVGRenderStyleDefs_h
29 #define SVGRenderStyleDefs_h 29 #define SVGRenderStyleDefs_h
30 30
31 #include "core/svg/SVGLength.h" 31 #include "core/svg/SVGLength.h"
32 #include "core/svg/SVGLengthList.h" 32 #include "core/svg/SVGLengthList.h"
33 #include "core/svg/SVGPaint.h"
34 #include "wtf/OwnPtr.h" 33 #include "wtf/OwnPtr.h"
35 #include "wtf/PassOwnPtr.h" 34 #include "wtf/PassOwnPtr.h"
36 #include "wtf/RefCounted.h" 35 #include "wtf/RefCounted.h"
37 #include "wtf/RefPtr.h" 36 #include "wtf/RefPtr.h"
38 37
39 namespace WebCore { 38 namespace WebCore {
40 39
40 enum SVGPaintType {
41 SVG_PAINTTYPE_UNKNOWN,
42 SVG_PAINTTYPE_RGBCOLOR,
43 SVG_PAINTTYPE_RGBCOLOR_ICCCOLOR,
44 SVG_PAINTTYPE_NONE,
45 SVG_PAINTTYPE_CURRENTCOLOR,
46 SVG_PAINTTYPE_URI_NONE,
47 SVG_PAINTTYPE_URI_CURRENTCOLOR,
48 SVG_PAINTTYPE_URI_RGBCOLOR,
49 SVG_PAINTTYPE_URI_RGBCOLOR_ICCCOLOR,
50 SVG_PAINTTYPE_URI
51 };
52
41 enum EBaselineShift { 53 enum EBaselineShift {
42 BS_BASELINE, BS_SUB, BS_SUPER, BS_LENGTH 54 BS_BASELINE, BS_SUB, BS_SUPER, BS_LENGTH
43 }; 55 };
44 56
45 enum ETextAnchor { 57 enum ETextAnchor {
46 TA_START, TA_MIDDLE, TA_END 58 TA_START, TA_MIDDLE, TA_END
47 }; 59 };
48 60
49 enum EColorInterpolation { 61 enum EColorInterpolation {
50 CI_AUTO, CI_SRGB, CI_LINEARRGB 62 CI_AUTO, CI_SRGB, CI_LINEARRGB
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 static PassRefPtr<StyleFillData> create() { return adoptRef(new StyleFil lData); } 122 static PassRefPtr<StyleFillData> create() { return adoptRef(new StyleFil lData); }
111 PassRefPtr<StyleFillData> copy() const { return adoptRef(new StyleFillDa ta(*this)); } 123 PassRefPtr<StyleFillData> copy() const { return adoptRef(new StyleFillDa ta(*this)); }
112 124
113 bool operator==(const StyleFillData&) const; 125 bool operator==(const StyleFillData&) const;
114 bool operator!=(const StyleFillData& other) const 126 bool operator!=(const StyleFillData& other) const
115 { 127 {
116 return !(*this == other); 128 return !(*this == other);
117 } 129 }
118 130
119 float opacity; 131 float opacity;
120 SVGPaint::SVGPaintType paintType; 132 SVGPaintType paintType;
121 Color paintColor; 133 Color paintColor;
122 String paintUri; 134 String paintUri;
123 SVGPaint::SVGPaintType visitedLinkPaintType; 135 SVGPaintType visitedLinkPaintType;
124 Color visitedLinkPaintColor; 136 Color visitedLinkPaintColor;
125 String visitedLinkPaintUri; 137 String visitedLinkPaintUri;
126 138
127 private: 139 private:
128 StyleFillData(); 140 StyleFillData();
129 StyleFillData(const StyleFillData&); 141 StyleFillData(const StyleFillData&);
130 }; 142 };
131 143
132 class StyleStrokeData : public RefCounted<StyleStrokeData> { 144 class StyleStrokeData : public RefCounted<StyleStrokeData> {
133 public: 145 public:
134 static PassRefPtr<StyleStrokeData> create() { return adoptRef(new StyleS trokeData); } 146 static PassRefPtr<StyleStrokeData> create() { return adoptRef(new StyleS trokeData); }
135 PassRefPtr<StyleStrokeData> copy() const { return adoptRef(new StyleStro keData(*this)); } 147 PassRefPtr<StyleStrokeData> copy() const { return adoptRef(new StyleStro keData(*this)); }
136 148
137 bool operator==(const StyleStrokeData&) const; 149 bool operator==(const StyleStrokeData&) const;
138 bool operator!=(const StyleStrokeData& other) const 150 bool operator!=(const StyleStrokeData& other) const
139 { 151 {
140 return !(*this == other); 152 return !(*this == other);
141 } 153 }
142 154
143 float opacity; 155 float opacity;
144 float miterLimit; 156 float miterLimit;
145 157
146 RefPtr<SVGLength> width; 158 RefPtr<SVGLength> width;
147 RefPtr<SVGLength> dashOffset; 159 RefPtr<SVGLength> dashOffset;
148 RefPtr<SVGLengthList> dashArray; 160 RefPtr<SVGLengthList> dashArray;
149 161
150 SVGPaint::SVGPaintType paintType; 162 SVGPaintType paintType;
151 Color paintColor; 163 Color paintColor;
152 String paintUri; 164 String paintUri;
153 SVGPaint::SVGPaintType visitedLinkPaintType; 165 SVGPaintType visitedLinkPaintType;
154 Color visitedLinkPaintColor; 166 Color visitedLinkPaintColor;
155 String visitedLinkPaintUri; 167 String visitedLinkPaintUri;
156 168
157 private: 169 private:
158 StyleStrokeData(); 170 StyleStrokeData();
159 StyleStrokeData(const StyleStrokeData&); 171 StyleStrokeData(const StyleStrokeData&);
160 }; 172 };
161 173
162 class StyleStopData : public RefCounted<StyleStopData> { 174 class StyleStopData : public RefCounted<StyleStopData> {
163 public: 175 public:
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 AtomicString markerEnd; 251 AtomicString markerEnd;
240 252
241 private: 253 private:
242 StyleInheritedResourceData(); 254 StyleInheritedResourceData();
243 StyleInheritedResourceData(const StyleInheritedResourceData&); 255 StyleInheritedResourceData(const StyleInheritedResourceData&);
244 }; 256 };
245 257
246 } // namespace WebCore 258 } // namespace WebCore
247 259
248 #endif // SVGRenderStyleDefs_h 260 #endif // SVGRenderStyleDefs_h
OLDNEW
« no previous file with comments | « Source/core/rendering/style/SVGRenderStyle.h ('k') | Source/core/rendering/svg/RenderSVGResource.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698