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

Side by Side Diff: third_party/WebKit/Source/core/css/CSSValue.cpp

Issue 1376573004: Split out Color from CSSPrimitiveValue (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@split_property
Patch Set: Rebase and review feedback Created 5 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) 2011 Andreas Kling (kling@webkit.org) 2 * Copyright (C) 2011 Andreas Kling (kling@webkit.org)
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
(...skipping 12 matching lines...) Expand all
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 26
27 #include "config.h" 27 #include "config.h"
28 #include "core/css/CSSValue.h" 28 #include "core/css/CSSValue.h"
29 29
30 #include "core/css/CSSBasicShapeValues.h" 30 #include "core/css/CSSBasicShapeValues.h"
31 #include "core/css/CSSBorderImageSliceValue.h" 31 #include "core/css/CSSBorderImageSliceValue.h"
32 #include "core/css/CSSCanvasValue.h" 32 #include "core/css/CSSCanvasValue.h"
33 #include "core/css/CSSColorValue.h"
33 #include "core/css/CSSContentDistributionValue.h" 34 #include "core/css/CSSContentDistributionValue.h"
34 #include "core/css/CSSCounterValue.h" 35 #include "core/css/CSSCounterValue.h"
35 #include "core/css/CSSCrossfadeValue.h" 36 #include "core/css/CSSCrossfadeValue.h"
36 #include "core/css/CSSCursorImageValue.h" 37 #include "core/css/CSSCursorImageValue.h"
37 #include "core/css/CSSCustomIdentValue.h" 38 #include "core/css/CSSCustomIdentValue.h"
38 #include "core/css/CSSFontFaceSrcValue.h" 39 #include "core/css/CSSFontFaceSrcValue.h"
39 #include "core/css/CSSFontFeatureValue.h" 40 #include "core/css/CSSFontFeatureValue.h"
40 #include "core/css/CSSFunctionValue.h" 41 #include "core/css/CSSFunctionValue.h"
41 #include "core/css/CSSGradientValue.h" 42 #include "core/css/CSSGradientValue.h"
42 #include "core/css/CSSGridLineNamesValue.h" 43 #include "core/css/CSSGridLineNamesValue.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 case BasicShapeEllipseClass: 104 case BasicShapeEllipseClass:
104 return compareCSSValues<CSSBasicShapeEllipseValue>(*this, other); 105 return compareCSSValues<CSSBasicShapeEllipseValue>(*this, other);
105 case BasicShapePolygonClass: 106 case BasicShapePolygonClass:
106 return compareCSSValues<CSSBasicShapePolygonValue>(*this, other); 107 return compareCSSValues<CSSBasicShapePolygonValue>(*this, other);
107 case BasicShapeInsetClass: 108 case BasicShapeInsetClass:
108 return compareCSSValues<CSSBasicShapeInsetValue>(*this, other); 109 return compareCSSValues<CSSBasicShapeInsetValue>(*this, other);
109 case BorderImageSliceClass: 110 case BorderImageSliceClass:
110 return compareCSSValues<CSSBorderImageSliceValue>(*this, other); 111 return compareCSSValues<CSSBorderImageSliceValue>(*this, other);
111 case CanvasClass: 112 case CanvasClass:
112 return compareCSSValues<CSSCanvasValue>(*this, other); 113 return compareCSSValues<CSSCanvasValue>(*this, other);
114 case ColorClass:
115 return compareCSSValues<CSSColorValue>(*this, other);
113 case CounterClass: 116 case CounterClass:
114 return compareCSSValues<CSSCounterValue>(*this, other); 117 return compareCSSValues<CSSCounterValue>(*this, other);
115 case CursorImageClass: 118 case CursorImageClass:
116 return compareCSSValues<CSSCursorImageValue>(*this, other); 119 return compareCSSValues<CSSCursorImageValue>(*this, other);
117 case FontFaceSrcClass: 120 case FontFaceSrcClass:
118 return compareCSSValues<CSSFontFaceSrcValue>(*this, other); 121 return compareCSSValues<CSSFontFaceSrcValue>(*this, other);
119 case FontFeatureClass: 122 case FontFeatureClass:
120 return compareCSSValues<CSSFontFeatureValue>(*this, other); 123 return compareCSSValues<CSSFontFeatureValue>(*this, other);
121 case FunctionClass: 124 case FunctionClass:
122 return compareCSSValues<CSSFunctionValue>(*this, other); 125 return compareCSSValues<CSSFunctionValue>(*this, other);
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 case BasicShapeEllipseClass: 188 case BasicShapeEllipseClass:
186 return toCSSBasicShapeEllipseValue(this)->customCSSText(); 189 return toCSSBasicShapeEllipseValue(this)->customCSSText();
187 case BasicShapePolygonClass: 190 case BasicShapePolygonClass:
188 return toCSSBasicShapePolygonValue(this)->customCSSText(); 191 return toCSSBasicShapePolygonValue(this)->customCSSText();
189 case BasicShapeInsetClass: 192 case BasicShapeInsetClass:
190 return toCSSBasicShapeInsetValue(this)->customCSSText(); 193 return toCSSBasicShapeInsetValue(this)->customCSSText();
191 case BorderImageSliceClass: 194 case BorderImageSliceClass:
192 return toCSSBorderImageSliceValue(this)->customCSSText(); 195 return toCSSBorderImageSliceValue(this)->customCSSText();
193 case CanvasClass: 196 case CanvasClass:
194 return toCSSCanvasValue(this)->customCSSText(); 197 return toCSSCanvasValue(this)->customCSSText();
198 case ColorClass:
199 return toCSSColorValue(this)->customCSSText();
195 case CounterClass: 200 case CounterClass:
196 return toCSSCounterValue(this)->customCSSText(); 201 return toCSSCounterValue(this)->customCSSText();
197 case CursorImageClass: 202 case CursorImageClass:
198 return toCSSCursorImageValue(this)->customCSSText(); 203 return toCSSCursorImageValue(this)->customCSSText();
199 case FontFaceSrcClass: 204 case FontFaceSrcClass:
200 return toCSSFontFaceSrcValue(this)->customCSSText(); 205 return toCSSFontFaceSrcValue(this)->customCSSText();
201 case FontFeatureClass: 206 case FontFeatureClass:
202 return toCSSFontFeatureValue(this)->customCSSText(); 207 return toCSSFontFeatureValue(this)->customCSSText();
203 case FunctionClass: 208 case FunctionClass:
204 return toCSSFunctionValue(this)->customCSSText(); 209 return toCSSFunctionValue(this)->customCSSText();
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 return; 276 return;
272 case BasicShapeInsetClass: 277 case BasicShapeInsetClass:
273 delete toCSSBasicShapeInsetValue(this); 278 delete toCSSBasicShapeInsetValue(this);
274 return; 279 return;
275 case BorderImageSliceClass: 280 case BorderImageSliceClass:
276 delete toCSSBorderImageSliceValue(this); 281 delete toCSSBorderImageSliceValue(this);
277 return; 282 return;
278 case CanvasClass: 283 case CanvasClass:
279 delete toCSSCanvasValue(this); 284 delete toCSSCanvasValue(this);
280 return; 285 return;
286 case ColorClass:
287 delete toCSSColorValue(this);
288 return;
281 case CounterClass: 289 case CounterClass:
282 delete toCSSCounterValue(this); 290 delete toCSSCounterValue(this);
283 return; 291 return;
284 case CursorImageClass: 292 case CursorImageClass:
285 delete toCSSCursorImageValue(this); 293 delete toCSSCursorImageValue(this);
286 return; 294 return;
287 case FontFaceSrcClass: 295 case FontFaceSrcClass:
288 delete toCSSFontFaceSrcValue(this); 296 delete toCSSFontFaceSrcValue(this);
289 return; 297 return;
290 case FontFeatureClass: 298 case FontFeatureClass:
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 return; 394 return;
387 case BasicShapeInsetClass: 395 case BasicShapeInsetClass:
388 toCSSBasicShapeInsetValue(this)->~CSSBasicShapeInsetValue(); 396 toCSSBasicShapeInsetValue(this)->~CSSBasicShapeInsetValue();
389 return; 397 return;
390 case BorderImageSliceClass: 398 case BorderImageSliceClass:
391 toCSSBorderImageSliceValue(this)->~CSSBorderImageSliceValue(); 399 toCSSBorderImageSliceValue(this)->~CSSBorderImageSliceValue();
392 return; 400 return;
393 case CanvasClass: 401 case CanvasClass:
394 toCSSCanvasValue(this)->~CSSCanvasValue(); 402 toCSSCanvasValue(this)->~CSSCanvasValue();
395 return; 403 return;
404 case ColorClass:
405 toCSSColorValue(this)->~CSSColorValue();
406 return;
396 case CounterClass: 407 case CounterClass:
397 toCSSCounterValue(this)->~CSSCounterValue(); 408 toCSSCounterValue(this)->~CSSCounterValue();
398 return; 409 return;
399 case CursorImageClass: 410 case CursorImageClass:
400 toCSSCursorImageValue(this)->~CSSCursorImageValue(); 411 toCSSCursorImageValue(this)->~CSSCursorImageValue();
401 return; 412 return;
402 case FontFaceSrcClass: 413 case FontFaceSrcClass:
403 toCSSFontFaceSrcValue(this)->~CSSFontFaceSrcValue(); 414 toCSSFontFaceSrcValue(this)->~CSSFontFaceSrcValue();
404 return; 415 return;
405 case FontFeatureClass: 416 case FontFeatureClass:
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 return; 512 return;
502 case BasicShapeInsetClass: 513 case BasicShapeInsetClass:
503 toCSSBasicShapeInsetValue(this)->traceAfterDispatch(visitor); 514 toCSSBasicShapeInsetValue(this)->traceAfterDispatch(visitor);
504 return; 515 return;
505 case BorderImageSliceClass: 516 case BorderImageSliceClass:
506 toCSSBorderImageSliceValue(this)->traceAfterDispatch(visitor); 517 toCSSBorderImageSliceValue(this)->traceAfterDispatch(visitor);
507 return; 518 return;
508 case CanvasClass: 519 case CanvasClass:
509 toCSSCanvasValue(this)->traceAfterDispatch(visitor); 520 toCSSCanvasValue(this)->traceAfterDispatch(visitor);
510 return; 521 return;
522 case ColorClass:
523 toCSSColorValue(this)->traceAfterDispatch(visitor);
524 return;
511 case CounterClass: 525 case CounterClass:
512 toCSSCounterValue(this)->traceAfterDispatch(visitor); 526 toCSSCounterValue(this)->traceAfterDispatch(visitor);
513 return; 527 return;
514 case CursorImageClass: 528 case CursorImageClass:
515 toCSSCursorImageValue(this)->traceAfterDispatch(visitor); 529 toCSSCursorImageValue(this)->traceAfterDispatch(visitor);
516 return; 530 return;
517 case FontFaceSrcClass: 531 case FontFaceSrcClass:
518 toCSSFontFaceSrcValue(this)->traceAfterDispatch(visitor); 532 toCSSFontFaceSrcValue(this)->traceAfterDispatch(visitor);
519 return; 533 return;
520 case FontFeatureClass: 534 case FontFeatureClass:
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
596 toCSSSVGDocumentValue(this)->traceAfterDispatch(visitor); 610 toCSSSVGDocumentValue(this)->traceAfterDispatch(visitor);
597 return; 611 return;
598 case CSSContentDistributionClass: 612 case CSSContentDistributionClass:
599 toCSSContentDistributionValue(this)->traceAfterDispatch(visitor); 613 toCSSContentDistributionValue(this)->traceAfterDispatch(visitor);
600 return; 614 return;
601 } 615 }
602 ASSERT_NOT_REACHED(); 616 ASSERT_NOT_REACHED();
603 } 617 }
604 618
605 } 619 }
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSValue.h ('k') | third_party/WebKit/Source/core/css/CSSValuePool.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698