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

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

Issue 1317523002: Changed Pair to be a CSSValue (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@add_const_to_primvalue
Patch Set: Rebase Created 5 years, 3 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
« no previous file with comments | « Source/core/css/CSSValue.h ('k') | Source/core/css/CSSValuePair.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 #include "core/css/CSSPathValue.h" 47 #include "core/css/CSSPathValue.h"
48 #include "core/css/CSSPrimitiveValue.h" 48 #include "core/css/CSSPrimitiveValue.h"
49 #include "core/css/CSSQuadValue.h" 49 #include "core/css/CSSQuadValue.h"
50 #include "core/css/CSSReflectValue.h" 50 #include "core/css/CSSReflectValue.h"
51 #include "core/css/CSSSVGDocumentValue.h" 51 #include "core/css/CSSSVGDocumentValue.h"
52 #include "core/css/CSSShadowValue.h" 52 #include "core/css/CSSShadowValue.h"
53 #include "core/css/CSSTimingFunctionValue.h" 53 #include "core/css/CSSTimingFunctionValue.h"
54 #include "core/css/CSSUnicodeRangeValue.h" 54 #include "core/css/CSSUnicodeRangeValue.h"
55 #include "core/css/CSSUnsetValue.h" 55 #include "core/css/CSSUnsetValue.h"
56 #include "core/css/CSSValueList.h" 56 #include "core/css/CSSValueList.h"
57 #include "core/css/CSSValuePair.h"
57 58
58 namespace blink { 59 namespace blink {
59 60
60 struct SameSizeAsCSSValue : public RefCountedWillBeGarbageCollectedFinalized<Sam eSizeAsCSSValue> { 61 struct SameSizeAsCSSValue : public RefCountedWillBeGarbageCollectedFinalized<Sam eSizeAsCSSValue> {
61 uint32_t bitfields; 62 uint32_t bitfields;
62 }; 63 };
63 64
64 static_assert(sizeof(CSSValue) <= sizeof(SameSizeAsCSSValue), "CSSValue should s tay small"); 65 static_assert(sizeof(CSSValue) <= sizeof(SameSizeAsCSSValue), "CSSValue should s tay small");
65 66
66 bool CSSValue::isImplicitInitialValue() const 67 bool CSSValue::isImplicitInitialValue() const
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 case ShadowClass: 138 case ShadowClass:
138 return compareCSSValues<CSSShadowValue>(*this, other); 139 return compareCSSValues<CSSShadowValue>(*this, other);
139 case CubicBezierTimingFunctionClass: 140 case CubicBezierTimingFunctionClass:
140 return compareCSSValues<CSSCubicBezierTimingFunctionValue>(*this, ot her); 141 return compareCSSValues<CSSCubicBezierTimingFunctionValue>(*this, ot her);
141 case StepsTimingFunctionClass: 142 case StepsTimingFunctionClass:
142 return compareCSSValues<CSSStepsTimingFunctionValue>(*this, other); 143 return compareCSSValues<CSSStepsTimingFunctionValue>(*this, other);
143 case UnicodeRangeClass: 144 case UnicodeRangeClass:
144 return compareCSSValues<CSSUnicodeRangeValue>(*this, other); 145 return compareCSSValues<CSSUnicodeRangeValue>(*this, other);
145 case ValueListClass: 146 case ValueListClass:
146 return compareCSSValues<CSSValueList>(*this, other); 147 return compareCSSValues<CSSValueList>(*this, other);
148 case ValuePairClass:
149 return compareCSSValues<CSSValuePair>(*this, other);
147 case LineBoxContainClass: 150 case LineBoxContainClass:
148 return compareCSSValues<CSSLineBoxContainValue>(*this, other); 151 return compareCSSValues<CSSLineBoxContainValue>(*this, other);
149 case ImageSetClass: 152 case ImageSetClass:
150 return compareCSSValues<CSSImageSetValue>(*this, other); 153 return compareCSSValues<CSSImageSetValue>(*this, other);
151 case CSSSVGDocumentClass: 154 case CSSSVGDocumentClass:
152 return compareCSSValues<CSSSVGDocumentValue>(*this, other); 155 return compareCSSValues<CSSSVGDocumentValue>(*this, other);
153 case CSSContentDistributionClass: 156 case CSSContentDistributionClass:
154 return compareCSSValues<CSSContentDistributionValue>(*this, other); 157 return compareCSSValues<CSSContentDistributionValue>(*this, other);
155 } 158 }
156 ASSERT_NOT_REACHED(); 159 ASSERT_NOT_REACHED();
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 case ReflectClass: 206 case ReflectClass:
204 return toCSSReflectValue(this)->customCSSText(); 207 return toCSSReflectValue(this)->customCSSText();
205 case ShadowClass: 208 case ShadowClass:
206 return toCSSShadowValue(this)->customCSSText(); 209 return toCSSShadowValue(this)->customCSSText();
207 case CubicBezierTimingFunctionClass: 210 case CubicBezierTimingFunctionClass:
208 return toCSSCubicBezierTimingFunctionValue(this)->customCSSText(); 211 return toCSSCubicBezierTimingFunctionValue(this)->customCSSText();
209 case StepsTimingFunctionClass: 212 case StepsTimingFunctionClass:
210 return toCSSStepsTimingFunctionValue(this)->customCSSText(); 213 return toCSSStepsTimingFunctionValue(this)->customCSSText();
211 case UnicodeRangeClass: 214 case UnicodeRangeClass:
212 return toCSSUnicodeRangeValue(this)->customCSSText(); 215 return toCSSUnicodeRangeValue(this)->customCSSText();
216 case ValuePairClass:
217 return toCSSValuePair(this)->customCSSText();
213 case ValueListClass: 218 case ValueListClass:
214 return toCSSValueList(this)->customCSSText(); 219 return toCSSValueList(this)->customCSSText();
215 case LineBoxContainClass: 220 case LineBoxContainClass:
216 return toCSSLineBoxContainValue(this)->customCSSText(); 221 return toCSSLineBoxContainValue(this)->customCSSText();
217 case ImageSetClass: 222 case ImageSetClass:
218 return toCSSImageSetValue(this)->customCSSText(); 223 return toCSSImageSetValue(this)->customCSSText();
219 case CSSSVGDocumentClass: 224 case CSSSVGDocumentClass:
220 return toCSSSVGDocumentValue(this)->customCSSText(); 225 return toCSSSVGDocumentValue(this)->customCSSText();
221 case CSSContentDistributionClass: 226 case CSSContentDistributionClass:
222 return toCSSContentDistributionValue(this)->customCSSText(); 227 return toCSSContentDistributionValue(this)->customCSSText();
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 return; 298 return;
294 case CubicBezierTimingFunctionClass: 299 case CubicBezierTimingFunctionClass:
295 delete toCSSCubicBezierTimingFunctionValue(this); 300 delete toCSSCubicBezierTimingFunctionValue(this);
296 return; 301 return;
297 case StepsTimingFunctionClass: 302 case StepsTimingFunctionClass:
298 delete toCSSStepsTimingFunctionValue(this); 303 delete toCSSStepsTimingFunctionValue(this);
299 return; 304 return;
300 case UnicodeRangeClass: 305 case UnicodeRangeClass:
301 delete toCSSUnicodeRangeValue(this); 306 delete toCSSUnicodeRangeValue(this);
302 return; 307 return;
308 case ValuePairClass:
309 delete toCSSValuePair(this);
310 return;
303 case ValueListClass: 311 case ValueListClass:
304 delete toCSSValueList(this); 312 delete toCSSValueList(this);
305 return; 313 return;
306 case LineBoxContainClass: 314 case LineBoxContainClass:
307 delete toCSSLineBoxContainValue(this); 315 delete toCSSLineBoxContainValue(this);
308 return; 316 return;
309 case ImageSetClass: 317 case ImageSetClass:
310 delete toCSSImageSetValue(this); 318 delete toCSSImageSetValue(this);
311 return; 319 return;
312 case CSSSVGDocumentClass: 320 case CSSSVGDocumentClass:
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 return; 398 return;
391 case StepsTimingFunctionClass: 399 case StepsTimingFunctionClass:
392 toCSSStepsTimingFunctionValue(this)->~CSSStepsTimingFunctionValue(); 400 toCSSStepsTimingFunctionValue(this)->~CSSStepsTimingFunctionValue();
393 return; 401 return;
394 case UnicodeRangeClass: 402 case UnicodeRangeClass:
395 toCSSUnicodeRangeValue(this)->~CSSUnicodeRangeValue(); 403 toCSSUnicodeRangeValue(this)->~CSSUnicodeRangeValue();
396 return; 404 return;
397 case ValueListClass: 405 case ValueListClass:
398 toCSSValueList(this)->~CSSValueList(); 406 toCSSValueList(this)->~CSSValueList();
399 return; 407 return;
408 case ValuePairClass:
409 toCSSValuePair(this)->~CSSValuePair();
410 return;
400 case LineBoxContainClass: 411 case LineBoxContainClass:
401 toCSSLineBoxContainValue(this)->~CSSLineBoxContainValue(); 412 toCSSLineBoxContainValue(this)->~CSSLineBoxContainValue();
402 return; 413 return;
403 case ImageSetClass: 414 case ImageSetClass:
404 toCSSImageSetValue(this)->~CSSImageSetValue(); 415 toCSSImageSetValue(this)->~CSSImageSetValue();
405 return; 416 return;
406 case CSSSVGDocumentClass: 417 case CSSSVGDocumentClass:
407 toCSSSVGDocumentValue(this)->~CSSSVGDocumentValue(); 418 toCSSSVGDocumentValue(this)->~CSSSVGDocumentValue();
408 return; 419 return;
409 case CSSContentDistributionClass: 420 case CSSContentDistributionClass:
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 return; 495 return;
485 case StepsTimingFunctionClass: 496 case StepsTimingFunctionClass:
486 toCSSStepsTimingFunctionValue(this)->traceAfterDispatch(visitor); 497 toCSSStepsTimingFunctionValue(this)->traceAfterDispatch(visitor);
487 return; 498 return;
488 case UnicodeRangeClass: 499 case UnicodeRangeClass:
489 toCSSUnicodeRangeValue(this)->traceAfterDispatch(visitor); 500 toCSSUnicodeRangeValue(this)->traceAfterDispatch(visitor);
490 return; 501 return;
491 case ValueListClass: 502 case ValueListClass:
492 toCSSValueList(this)->traceAfterDispatch(visitor); 503 toCSSValueList(this)->traceAfterDispatch(visitor);
493 return; 504 return;
505 case ValuePairClass:
506 toCSSValuePair(this)->traceAfterDispatch(visitor);
507 return;
494 case LineBoxContainClass: 508 case LineBoxContainClass:
495 toCSSLineBoxContainValue(this)->traceAfterDispatch(visitor); 509 toCSSLineBoxContainValue(this)->traceAfterDispatch(visitor);
496 return; 510 return;
497 case ImageSetClass: 511 case ImageSetClass:
498 toCSSImageSetValue(this)->traceAfterDispatch(visitor); 512 toCSSImageSetValue(this)->traceAfterDispatch(visitor);
499 return; 513 return;
500 case CSSSVGDocumentClass: 514 case CSSSVGDocumentClass:
501 toCSSSVGDocumentValue(this)->traceAfterDispatch(visitor); 515 toCSSSVGDocumentValue(this)->traceAfterDispatch(visitor);
502 return; 516 return;
503 case CSSContentDistributionClass: 517 case CSSContentDistributionClass:
504 toCSSContentDistributionValue(this)->traceAfterDispatch(visitor); 518 toCSSContentDistributionValue(this)->traceAfterDispatch(visitor);
505 return; 519 return;
506 } 520 }
507 ASSERT_NOT_REACHED(); 521 ASSERT_NOT_REACHED();
508 } 522 }
509 523
510 } 524 }
OLDNEW
« no previous file with comments | « Source/core/css/CSSValue.h ('k') | Source/core/css/CSSValuePair.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698