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

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

Issue 2165833006: Merge CSSSVGDocumentValue with CSSURIValue (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixup FilterInterpolationFunctions Created 4 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) 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 #include "core/css/CSSImageSetValue.h" 46 #include "core/css/CSSImageSetValue.h"
47 #include "core/css/CSSImageValue.h" 47 #include "core/css/CSSImageValue.h"
48 #include "core/css/CSSInheritedValue.h" 48 #include "core/css/CSSInheritedValue.h"
49 #include "core/css/CSSInitialValue.h" 49 #include "core/css/CSSInitialValue.h"
50 #include "core/css/CSSPaintValue.h" 50 #include "core/css/CSSPaintValue.h"
51 #include "core/css/CSSPathValue.h" 51 #include "core/css/CSSPathValue.h"
52 #include "core/css/CSSPendingSubstitutionValue.h" 52 #include "core/css/CSSPendingSubstitutionValue.h"
53 #include "core/css/CSSPrimitiveValue.h" 53 #include "core/css/CSSPrimitiveValue.h"
54 #include "core/css/CSSQuadValue.h" 54 #include "core/css/CSSQuadValue.h"
55 #include "core/css/CSSReflectValue.h" 55 #include "core/css/CSSReflectValue.h"
56 #include "core/css/CSSSVGDocumentValue.h"
57 #include "core/css/CSSShadowValue.h" 56 #include "core/css/CSSShadowValue.h"
58 #include "core/css/CSSStringValue.h" 57 #include "core/css/CSSStringValue.h"
59 #include "core/css/CSSTimingFunctionValue.h" 58 #include "core/css/CSSTimingFunctionValue.h"
60 #include "core/css/CSSURIValue.h" 59 #include "core/css/CSSURIValue.h"
61 #include "core/css/CSSUnicodeRangeValue.h" 60 #include "core/css/CSSUnicodeRangeValue.h"
62 #include "core/css/CSSUnsetValue.h" 61 #include "core/css/CSSUnsetValue.h"
63 #include "core/css/CSSValueList.h" 62 #include "core/css/CSSValueList.h"
64 #include "core/css/CSSValuePair.h" 63 #include "core/css/CSSValuePair.h"
65 #include "core/css/CSSVariableReferenceValue.h" 64 #include "core/css/CSSVariableReferenceValue.h"
66 65
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 case UnicodeRangeClass: 169 case UnicodeRangeClass:
171 return compareCSSValues<CSSUnicodeRangeValue>(*this, other); 170 return compareCSSValues<CSSUnicodeRangeValue>(*this, other);
172 case URIClass: 171 case URIClass:
173 return compareCSSValues<CSSURIValue>(*this, other); 172 return compareCSSValues<CSSURIValue>(*this, other);
174 case ValueListClass: 173 case ValueListClass:
175 return compareCSSValues<CSSValueList>(*this, other); 174 return compareCSSValues<CSSValueList>(*this, other);
176 case ValuePairClass: 175 case ValuePairClass:
177 return compareCSSValues<CSSValuePair>(*this, other); 176 return compareCSSValues<CSSValuePair>(*this, other);
178 case ImageSetClass: 177 case ImageSetClass:
179 return compareCSSValues<CSSImageSetValue>(*this, other); 178 return compareCSSValues<CSSImageSetValue>(*this, other);
180 case CSSSVGDocumentClass:
181 return compareCSSValues<CSSSVGDocumentValue>(*this, other);
182 case CSSContentDistributionClass: 179 case CSSContentDistributionClass:
183 return compareCSSValues<CSSContentDistributionValue>(*this, other); 180 return compareCSSValues<CSSContentDistributionValue>(*this, other);
184 case CustomPropertyDeclarationClass: 181 case CustomPropertyDeclarationClass:
185 return compareCSSValues<CSSCustomPropertyDeclaration>(*this, other); 182 return compareCSSValues<CSSCustomPropertyDeclaration>(*this, other);
186 case VariableReferenceClass: 183 case VariableReferenceClass:
187 return compareCSSValues<CSSVariableReferenceValue>(*this, other); 184 return compareCSSValues<CSSVariableReferenceValue>(*this, other);
188 case PendingSubstitutionValueClass: 185 case PendingSubstitutionValueClass:
189 return compareCSSValues<CSSPendingSubstitutionValue>(*this, other); 186 return compareCSSValues<CSSPendingSubstitutionValue>(*this, other);
190 } 187 }
191 ASSERT_NOT_REACHED(); 188 ASSERT_NOT_REACHED();
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 case UnicodeRangeClass: 261 case UnicodeRangeClass:
265 return toCSSUnicodeRangeValue(this)->customCSSText(); 262 return toCSSUnicodeRangeValue(this)->customCSSText();
266 case URIClass: 263 case URIClass:
267 return toCSSURIValue(this)->customCSSText(); 264 return toCSSURIValue(this)->customCSSText();
268 case ValuePairClass: 265 case ValuePairClass:
269 return toCSSValuePair(this)->customCSSText(); 266 return toCSSValuePair(this)->customCSSText();
270 case ValueListClass: 267 case ValueListClass:
271 return toCSSValueList(this)->customCSSText(); 268 return toCSSValueList(this)->customCSSText();
272 case ImageSetClass: 269 case ImageSetClass:
273 return toCSSImageSetValue(this)->customCSSText(); 270 return toCSSImageSetValue(this)->customCSSText();
274 case CSSSVGDocumentClass:
275 return toCSSSVGDocumentValue(this)->customCSSText();
276 case CSSContentDistributionClass: 271 case CSSContentDistributionClass:
277 return toCSSContentDistributionValue(this)->customCSSText(); 272 return toCSSContentDistributionValue(this)->customCSSText();
278 case VariableReferenceClass: 273 case VariableReferenceClass:
279 return toCSSVariableReferenceValue(this)->customCSSText(); 274 return toCSSVariableReferenceValue(this)->customCSSText();
280 case CustomPropertyDeclarationClass: 275 case CustomPropertyDeclarationClass:
281 return toCSSCustomPropertyDeclaration(this)->customCSSText(); 276 return toCSSCustomPropertyDeclaration(this)->customCSSText();
282 case PendingSubstitutionValueClass: 277 case PendingSubstitutionValueClass:
283 return toCSSPendingSubstitutionValue(this)->customCSSText(); 278 return toCSSPendingSubstitutionValue(this)->customCSSText();
284 } 279 }
285 ASSERT_NOT_REACHED(); 280 ASSERT_NOT_REACHED();
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 return; 388 return;
394 case ValuePairClass: 389 case ValuePairClass:
395 delete toCSSValuePair(this); 390 delete toCSSValuePair(this);
396 return; 391 return;
397 case ValueListClass: 392 case ValueListClass:
398 delete toCSSValueList(this); 393 delete toCSSValueList(this);
399 return; 394 return;
400 case ImageSetClass: 395 case ImageSetClass:
401 delete toCSSImageSetValue(this); 396 delete toCSSImageSetValue(this);
402 return; 397 return;
403 case CSSSVGDocumentClass:
404 delete toCSSSVGDocumentValue(this);
405 return;
406 case CSSContentDistributionClass: 398 case CSSContentDistributionClass:
407 delete toCSSContentDistributionValue(this); 399 delete toCSSContentDistributionValue(this);
408 return; 400 return;
409 case VariableReferenceClass: 401 case VariableReferenceClass:
410 delete toCSSVariableReferenceValue(this); 402 delete toCSSVariableReferenceValue(this);
411 return; 403 return;
412 case CustomPropertyDeclarationClass: 404 case CustomPropertyDeclarationClass:
413 delete toCSSCustomPropertyDeclaration(this); 405 delete toCSSCustomPropertyDeclaration(this);
414 return; 406 return;
415 case PendingSubstitutionValueClass: 407 case PendingSubstitutionValueClass:
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 return; 518 return;
527 case ValueListClass: 519 case ValueListClass:
528 toCSSValueList(this)->~CSSValueList(); 520 toCSSValueList(this)->~CSSValueList();
529 return; 521 return;
530 case ValuePairClass: 522 case ValuePairClass:
531 toCSSValuePair(this)->~CSSValuePair(); 523 toCSSValuePair(this)->~CSSValuePair();
532 return; 524 return;
533 case ImageSetClass: 525 case ImageSetClass:
534 toCSSImageSetValue(this)->~CSSImageSetValue(); 526 toCSSImageSetValue(this)->~CSSImageSetValue();
535 return; 527 return;
536 case CSSSVGDocumentClass:
537 toCSSSVGDocumentValue(this)->~CSSSVGDocumentValue();
538 return;
539 case CSSContentDistributionClass: 528 case CSSContentDistributionClass:
540 toCSSContentDistributionValue(this)->~CSSContentDistributionValue(); 529 toCSSContentDistributionValue(this)->~CSSContentDistributionValue();
541 return; 530 return;
542 case VariableReferenceClass: 531 case VariableReferenceClass:
543 toCSSVariableReferenceValue(this)->~CSSVariableReferenceValue(); 532 toCSSVariableReferenceValue(this)->~CSSVariableReferenceValue();
544 return; 533 return;
545 case CustomPropertyDeclarationClass: 534 case CustomPropertyDeclarationClass:
546 toCSSCustomPropertyDeclaration(this)->~CSSCustomPropertyDeclaration(); 535 toCSSCustomPropertyDeclaration(this)->~CSSCustomPropertyDeclaration();
547 return; 536 return;
548 case PendingSubstitutionValueClass: 537 case PendingSubstitutionValueClass:
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
659 return; 648 return;
660 case ValueListClass: 649 case ValueListClass:
661 toCSSValueList(this)->traceAfterDispatch(visitor); 650 toCSSValueList(this)->traceAfterDispatch(visitor);
662 return; 651 return;
663 case ValuePairClass: 652 case ValuePairClass:
664 toCSSValuePair(this)->traceAfterDispatch(visitor); 653 toCSSValuePair(this)->traceAfterDispatch(visitor);
665 return; 654 return;
666 case ImageSetClass: 655 case ImageSetClass:
667 toCSSImageSetValue(this)->traceAfterDispatch(visitor); 656 toCSSImageSetValue(this)->traceAfterDispatch(visitor);
668 return; 657 return;
669 case CSSSVGDocumentClass:
670 toCSSSVGDocumentValue(this)->traceAfterDispatch(visitor);
671 return;
672 case CSSContentDistributionClass: 658 case CSSContentDistributionClass:
673 toCSSContentDistributionValue(this)->traceAfterDispatch(visitor); 659 toCSSContentDistributionValue(this)->traceAfterDispatch(visitor);
674 return; 660 return;
675 case VariableReferenceClass: 661 case VariableReferenceClass:
676 toCSSVariableReferenceValue(this)->traceAfterDispatch(visitor); 662 toCSSVariableReferenceValue(this)->traceAfterDispatch(visitor);
677 return; 663 return;
678 case CustomPropertyDeclarationClass: 664 case CustomPropertyDeclarationClass:
679 toCSSCustomPropertyDeclaration(this)->traceAfterDispatch(visitor); 665 toCSSCustomPropertyDeclaration(this)->traceAfterDispatch(visitor);
680 return; 666 return;
681 case PendingSubstitutionValueClass: 667 case PendingSubstitutionValueClass:
682 toCSSPendingSubstitutionValue(this)->traceAfterDispatch(visitor); 668 toCSSPendingSubstitutionValue(this)->traceAfterDispatch(visitor);
683 return; 669 return;
684 } 670 }
685 ASSERT_NOT_REACHED(); 671 ASSERT_NOT_REACHED();
686 } 672 }
687 673
688 } // namespace blink 674 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSValue.h ('k') | third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698