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

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

Issue 2558053002: Add CSS support for font-variation-settings (Closed)
Patch Set: DCHECK corrected, newline removed. Created 4 years 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 20 matching lines...) Expand all
31 #include "core/css/CSSColorValue.h" 31 #include "core/css/CSSColorValue.h"
32 #include "core/css/CSSContentDistributionValue.h" 32 #include "core/css/CSSContentDistributionValue.h"
33 #include "core/css/CSSCounterValue.h" 33 #include "core/css/CSSCounterValue.h"
34 #include "core/css/CSSCrossfadeValue.h" 34 #include "core/css/CSSCrossfadeValue.h"
35 #include "core/css/CSSCursorImageValue.h" 35 #include "core/css/CSSCursorImageValue.h"
36 #include "core/css/CSSCustomIdentValue.h" 36 #include "core/css/CSSCustomIdentValue.h"
37 #include "core/css/CSSCustomPropertyDeclaration.h" 37 #include "core/css/CSSCustomPropertyDeclaration.h"
38 #include "core/css/CSSFontFaceSrcValue.h" 38 #include "core/css/CSSFontFaceSrcValue.h"
39 #include "core/css/CSSFontFamilyValue.h" 39 #include "core/css/CSSFontFamilyValue.h"
40 #include "core/css/CSSFontFeatureValue.h" 40 #include "core/css/CSSFontFeatureValue.h"
41 #include "core/css/CSSFontVariationValue.h"
41 #include "core/css/CSSFunctionValue.h" 42 #include "core/css/CSSFunctionValue.h"
42 #include "core/css/CSSGradientValue.h" 43 #include "core/css/CSSGradientValue.h"
43 #include "core/css/CSSGridAutoRepeatValue.h" 44 #include "core/css/CSSGridAutoRepeatValue.h"
44 #include "core/css/CSSGridLineNamesValue.h" 45 #include "core/css/CSSGridLineNamesValue.h"
45 #include "core/css/CSSGridTemplateAreasValue.h" 46 #include "core/css/CSSGridTemplateAreasValue.h"
46 #include "core/css/CSSIdentifierValue.h" 47 #include "core/css/CSSIdentifierValue.h"
47 #include "core/css/CSSImageSetValue.h" 48 #include "core/css/CSSImageSetValue.h"
48 #include "core/css/CSSImageValue.h" 49 #include "core/css/CSSImageValue.h"
49 #include "core/css/CSSInheritedValue.h" 50 #include "core/css/CSSInheritedValue.h"
50 #include "core/css/CSSInitialValue.h" 51 #include "core/css/CSSInitialValue.h"
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 case CounterClass: 141 case CounterClass:
141 return compareCSSValues<CSSCounterValue>(*this, other); 142 return compareCSSValues<CSSCounterValue>(*this, other);
142 case CursorImageClass: 143 case CursorImageClass:
143 return compareCSSValues<CSSCursorImageValue>(*this, other); 144 return compareCSSValues<CSSCursorImageValue>(*this, other);
144 case FontFaceSrcClass: 145 case FontFaceSrcClass:
145 return compareCSSValues<CSSFontFaceSrcValue>(*this, other); 146 return compareCSSValues<CSSFontFaceSrcValue>(*this, other);
146 case FontFamilyClass: 147 case FontFamilyClass:
147 return compareCSSValues<CSSFontFamilyValue>(*this, other); 148 return compareCSSValues<CSSFontFamilyValue>(*this, other);
148 case FontFeatureClass: 149 case FontFeatureClass:
149 return compareCSSValues<CSSFontFeatureValue>(*this, other); 150 return compareCSSValues<CSSFontFeatureValue>(*this, other);
151 case FontVariationClass:
152 return compareCSSValues<CSSFontVariationValue>(*this, other);
150 case FunctionClass: 153 case FunctionClass:
151 return compareCSSValues<CSSFunctionValue>(*this, other); 154 return compareCSSValues<CSSFunctionValue>(*this, other);
152 case LinearGradientClass: 155 case LinearGradientClass:
153 return compareCSSValues<CSSLinearGradientValue>(*this, other); 156 return compareCSSValues<CSSLinearGradientValue>(*this, other);
154 case RadialGradientClass: 157 case RadialGradientClass:
155 return compareCSSValues<CSSRadialGradientValue>(*this, other); 158 return compareCSSValues<CSSRadialGradientValue>(*this, other);
156 case CrossfadeClass: 159 case CrossfadeClass:
157 return compareCSSValues<CSSCrossfadeValue>(*this, other); 160 return compareCSSValues<CSSCrossfadeValue>(*this, other);
158 case PaintClass: 161 case PaintClass:
159 return compareCSSValues<CSSPaintValue>(*this, other); 162 return compareCSSValues<CSSPaintValue>(*this, other);
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 case CounterClass: 237 case CounterClass:
235 return toCSSCounterValue(this)->customCSSText(); 238 return toCSSCounterValue(this)->customCSSText();
236 case CursorImageClass: 239 case CursorImageClass:
237 return toCSSCursorImageValue(this)->customCSSText(); 240 return toCSSCursorImageValue(this)->customCSSText();
238 case FontFaceSrcClass: 241 case FontFaceSrcClass:
239 return toCSSFontFaceSrcValue(this)->customCSSText(); 242 return toCSSFontFaceSrcValue(this)->customCSSText();
240 case FontFamilyClass: 243 case FontFamilyClass:
241 return toCSSFontFamilyValue(this)->customCSSText(); 244 return toCSSFontFamilyValue(this)->customCSSText();
242 case FontFeatureClass: 245 case FontFeatureClass:
243 return toCSSFontFeatureValue(this)->customCSSText(); 246 return toCSSFontFeatureValue(this)->customCSSText();
247 case FontVariationClass:
248 return toCSSFontVariationValue(this)->customCSSText();
244 case FunctionClass: 249 case FunctionClass:
245 return toCSSFunctionValue(this)->customCSSText(); 250 return toCSSFunctionValue(this)->customCSSText();
246 case LinearGradientClass: 251 case LinearGradientClass:
247 return toCSSLinearGradientValue(this)->customCSSText(); 252 return toCSSLinearGradientValue(this)->customCSSText();
248 case RadialGradientClass: 253 case RadialGradientClass:
249 return toCSSRadialGradientValue(this)->customCSSText(); 254 return toCSSRadialGradientValue(this)->customCSSText();
250 case CrossfadeClass: 255 case CrossfadeClass:
251 return toCSSCrossfadeValue(this)->customCSSText(); 256 return toCSSCrossfadeValue(this)->customCSSText();
252 case PaintClass: 257 case PaintClass:
253 return toCSSPaintValue(this)->customCSSText(); 258 return toCSSPaintValue(this)->customCSSText();
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 return; 341 return;
337 case FontFaceSrcClass: 342 case FontFaceSrcClass:
338 toCSSFontFaceSrcValue(this)->~CSSFontFaceSrcValue(); 343 toCSSFontFaceSrcValue(this)->~CSSFontFaceSrcValue();
339 return; 344 return;
340 case FontFamilyClass: 345 case FontFamilyClass:
341 toCSSFontFamilyValue(this)->~CSSFontFamilyValue(); 346 toCSSFontFamilyValue(this)->~CSSFontFamilyValue();
342 return; 347 return;
343 case FontFeatureClass: 348 case FontFeatureClass:
344 toCSSFontFeatureValue(this)->~CSSFontFeatureValue(); 349 toCSSFontFeatureValue(this)->~CSSFontFeatureValue();
345 return; 350 return;
351 case FontVariationClass:
352 toCSSFontVariationValue(this)->~CSSFontVariationValue();
353 return;
346 case FunctionClass: 354 case FunctionClass:
347 toCSSFunctionValue(this)->~CSSFunctionValue(); 355 toCSSFunctionValue(this)->~CSSFunctionValue();
348 return; 356 return;
349 case LinearGradientClass: 357 case LinearGradientClass:
350 toCSSLinearGradientValue(this)->~CSSLinearGradientValue(); 358 toCSSLinearGradientValue(this)->~CSSLinearGradientValue();
351 return; 359 return;
352 case RadialGradientClass: 360 case RadialGradientClass:
353 toCSSRadialGradientValue(this)->~CSSRadialGradientValue(); 361 toCSSRadialGradientValue(this)->~CSSRadialGradientValue();
354 return; 362 return;
355 case CrossfadeClass: 363 case CrossfadeClass:
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
469 return; 477 return;
470 case FontFaceSrcClass: 478 case FontFaceSrcClass:
471 toCSSFontFaceSrcValue(this)->traceAfterDispatch(visitor); 479 toCSSFontFaceSrcValue(this)->traceAfterDispatch(visitor);
472 return; 480 return;
473 case FontFamilyClass: 481 case FontFamilyClass:
474 toCSSFontFamilyValue(this)->traceAfterDispatch(visitor); 482 toCSSFontFamilyValue(this)->traceAfterDispatch(visitor);
475 return; 483 return;
476 case FontFeatureClass: 484 case FontFeatureClass:
477 toCSSFontFeatureValue(this)->traceAfterDispatch(visitor); 485 toCSSFontFeatureValue(this)->traceAfterDispatch(visitor);
478 return; 486 return;
487 case FontVariationClass:
488 toCSSFontVariationValue(this)->traceAfterDispatch(visitor);
489 return;
479 case FunctionClass: 490 case FunctionClass:
480 toCSSFunctionValue(this)->traceAfterDispatch(visitor); 491 toCSSFunctionValue(this)->traceAfterDispatch(visitor);
481 return; 492 return;
482 case LinearGradientClass: 493 case LinearGradientClass:
483 toCSSLinearGradientValue(this)->traceAfterDispatch(visitor); 494 toCSSLinearGradientValue(this)->traceAfterDispatch(visitor);
484 return; 495 return;
485 case RadialGradientClass: 496 case RadialGradientClass:
486 toCSSRadialGradientValue(this)->traceAfterDispatch(visitor); 497 toCSSRadialGradientValue(this)->traceAfterDispatch(visitor);
487 return; 498 return;
488 case CrossfadeClass: 499 case CrossfadeClass:
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 toCSSCustomPropertyDeclaration(this)->traceAfterDispatch(visitor); 578 toCSSCustomPropertyDeclaration(this)->traceAfterDispatch(visitor);
568 return; 579 return;
569 case PendingSubstitutionValueClass: 580 case PendingSubstitutionValueClass:
570 toCSSPendingSubstitutionValue(this)->traceAfterDispatch(visitor); 581 toCSSPendingSubstitutionValue(this)->traceAfterDispatch(visitor);
571 return; 582 return;
572 } 583 }
573 ASSERT_NOT_REACHED(); 584 ASSERT_NOT_REACHED();
574 } 585 }
575 586
576 } // namespace blink 587 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSValue.h ('k') | third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698