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

Side by Side Diff: third_party/WebKit/Source/core/css/CSSGradientValue.h

Issue 2346193002: Split CSSPrimitiveValue into CSSPrimitiveValue and CSSIdentifierValue (Closed)
Patch Set: Rebase please work Created 4 years, 2 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) 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2008 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef CSSGradientValue_h 26 #ifndef CSSGradientValue_h
27 #define CSSGradientValue_h 27 #define CSSGradientValue_h
28 28
29 #include "core/css/CSSIdentifierValue.h"
29 #include "core/css/CSSImageGeneratorValue.h" 30 #include "core/css/CSSImageGeneratorValue.h"
30 #include "core/css/CSSPrimitiveValue.h" 31 #include "core/css/CSSPrimitiveValue.h"
31 #include "wtf/RefPtr.h" 32 #include "wtf/RefPtr.h"
32 #include "wtf/Vector.h" 33 #include "wtf/Vector.h"
33 34
34 namespace blink { 35 namespace blink {
35 36
36 class Color; 37 class Color;
37 class FloatPoint; 38 class FloatPoint;
38 class Gradient; 39 class Gradient;
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 static CSSRadialGradientValue* create(CSSGradientRepeat repeat, CSSGradientT ype gradientType = CSSRadialGradient) 184 static CSSRadialGradientValue* create(CSSGradientRepeat repeat, CSSGradientT ype gradientType = CSSRadialGradient)
184 { 185 {
185 return new CSSRadialGradientValue(repeat, gradientType); 186 return new CSSRadialGradientValue(repeat, gradientType);
186 } 187 }
187 188
188 String customCSSText() const; 189 String customCSSText() const;
189 190
190 void setFirstRadius(CSSPrimitiveValue* val) { m_firstRadius = val; } 191 void setFirstRadius(CSSPrimitiveValue* val) { m_firstRadius = val; }
191 void setSecondRadius(CSSPrimitiveValue* val) { m_secondRadius = val; } 192 void setSecondRadius(CSSPrimitiveValue* val) { m_secondRadius = val; }
192 193
193 void setShape(CSSPrimitiveValue* val) { m_shape = val; } 194 void setShape(CSSIdentifierValue* val) { m_shape = val; }
194 void setSizingBehavior(CSSPrimitiveValue* val) { m_sizingBehavior = val; } 195 void setSizingBehavior(CSSIdentifierValue* val) { m_sizingBehavior = val; }
195 196
196 void setEndHorizontalSize(CSSPrimitiveValue* val) { m_endHorizontalSize = va l; } 197 void setEndHorizontalSize(CSSPrimitiveValue* val) { m_endHorizontalSize = va l; }
197 void setEndVerticalSize(CSSPrimitiveValue* val) { m_endVerticalSize = val; } 198 void setEndVerticalSize(CSSPrimitiveValue* val) { m_endVerticalSize = val; }
198 199
199 // Create the gradient for a given size. 200 // Create the gradient for a given size.
200 PassRefPtr<Gradient> createGradient(const CSSToLengthConversionData&, const IntSize&, const LayoutObject&); 201 PassRefPtr<Gradient> createGradient(const CSSToLengthConversionData&, const IntSize&, const LayoutObject&);
201 202
202 bool equals(const CSSRadialGradientValue&) const; 203 bool equals(const CSSRadialGradientValue&) const;
203 204
204 DECLARE_TRACE_AFTER_DISPATCH(); 205 DECLARE_TRACE_AFTER_DISPATCH();
205 206
206 private: 207 private:
207 CSSRadialGradientValue(CSSGradientRepeat repeat, CSSGradientType gradientTyp e = CSSRadialGradient) 208 CSSRadialGradientValue(CSSGradientRepeat repeat, CSSGradientType gradientTyp e = CSSRadialGradient)
208 : CSSGradientValue(RadialGradientClass, repeat, gradientType) 209 : CSSGradientValue(RadialGradientClass, repeat, gradientType)
209 { 210 {
210 } 211 }
211 212
212 // Resolve points/radii to front end values. 213 // Resolve points/radii to front end values.
213 float resolveRadius(CSSPrimitiveValue*, const CSSToLengthConversionData&, fl oat* widthOrHeight = 0); 214 float resolveRadius(CSSPrimitiveValue*, const CSSToLengthConversionData&, fl oat* widthOrHeight = 0);
214 215
215 // These may be null for non-deprecated gradients. 216 // These may be null for non-deprecated gradients.
216 Member<CSSPrimitiveValue> m_firstRadius; 217 Member<CSSPrimitiveValue> m_firstRadius;
217 Member<CSSPrimitiveValue> m_secondRadius; 218 Member<CSSPrimitiveValue> m_secondRadius;
218 219
219 // The below are only used for non-deprecated gradients. Any of them may be null. 220 // The below are only used for non-deprecated gradients. Any of them may be null.
220 Member<CSSPrimitiveValue> m_shape; 221 Member<CSSIdentifierValue> m_shape;
221 Member<CSSPrimitiveValue> m_sizingBehavior; 222 Member<CSSIdentifierValue> m_sizingBehavior;
222 223
223 Member<CSSPrimitiveValue> m_endHorizontalSize; 224 Member<CSSPrimitiveValue> m_endHorizontalSize;
224 Member<CSSPrimitiveValue> m_endVerticalSize; 225 Member<CSSPrimitiveValue> m_endVerticalSize;
225 }; 226 };
226 227
227 DEFINE_CSS_VALUE_TYPE_CASTS(CSSRadialGradientValue, isRadialGradientValue()); 228 DEFINE_CSS_VALUE_TYPE_CASTS(CSSRadialGradientValue, isRadialGradientValue());
228 229
229 } // namespace blink 230 } // namespace blink
230 231
231 #endif // CSSGradientValue_h 232 #endif // CSSGradientValue_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSCounterValue.h ('k') | third_party/WebKit/Source/core/css/CSSGradientValue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698