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

Side by Side Diff: third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.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) 2004 Zack Rusin <zack@kde.org> 2 * Copyright (C) 2004 Zack Rusin <zack@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
4 * All rights reserved. 4 * All rights reserved.
5 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 5 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 6 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
7 * Copyright (C) 2011 Sencha, Inc. All rights reserved. 7 * Copyright (C) 2011 Sencha, Inc. All rights reserved.
8 * Copyright (C) 2015 Google Inc. All rights reserved. 8 * Copyright (C) 2015 Google Inc. All rights reserved.
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 21 matching lines...) Expand all
32 #include "core/css/CSSBasicShapeValues.h" 32 #include "core/css/CSSBasicShapeValues.h"
33 #include "core/css/CSSBorderImage.h" 33 #include "core/css/CSSBorderImage.h"
34 #include "core/css/CSSBorderImageSliceValue.h" 34 #include "core/css/CSSBorderImageSliceValue.h"
35 #include "core/css/CSSColorValue.h" 35 #include "core/css/CSSColorValue.h"
36 #include "core/css/CSSCounterValue.h" 36 #include "core/css/CSSCounterValue.h"
37 #include "core/css/CSSCursorImageValue.h" 37 #include "core/css/CSSCursorImageValue.h"
38 #include "core/css/CSSCustomIdentValue.h" 38 #include "core/css/CSSCustomIdentValue.h"
39 #include "core/css/CSSCustomPropertyDeclaration.h" 39 #include "core/css/CSSCustomPropertyDeclaration.h"
40 #include "core/css/CSSFontFamilyValue.h" 40 #include "core/css/CSSFontFamilyValue.h"
41 #include "core/css/CSSFontFeatureValue.h" 41 #include "core/css/CSSFontFeatureValue.h"
42 #include "core/css/CSSFontVariationValue.h"
42 #include "core/css/CSSFunctionValue.h" 43 #include "core/css/CSSFunctionValue.h"
43 #include "core/css/CSSGridLineNamesValue.h" 44 #include "core/css/CSSGridLineNamesValue.h"
44 #include "core/css/CSSGridTemplateAreasValue.h" 45 #include "core/css/CSSGridTemplateAreasValue.h"
45 #include "core/css/CSSIdentifierValue.h" 46 #include "core/css/CSSIdentifierValue.h"
46 #include "core/css/CSSInitialValue.h" 47 #include "core/css/CSSInitialValue.h"
47 #include "core/css/CSSPathValue.h" 48 #include "core/css/CSSPathValue.h"
48 #include "core/css/CSSPrimitiveValue.h" 49 #include "core/css/CSSPrimitiveValue.h"
49 #include "core/css/CSSPrimitiveValueMappings.h" 50 #include "core/css/CSSPrimitiveValueMappings.h"
50 #include "core/css/CSSQuadValue.h" 51 #include "core/css/CSSQuadValue.h"
51 #include "core/css/CSSReflectValue.h" 52 #include "core/css/CSSReflectValue.h"
(...skipping 2304 matching lines...) Expand 10 before | Expand all | Expand 10 after
2356 return CSSIdentifierValue::create(CSSValueNormal); 2357 return CSSIdentifierValue::create(CSSValueNormal);
2357 CSSValueList* list = CSSValueList::createCommaSeparated(); 2358 CSSValueList* list = CSSValueList::createCommaSeparated();
2358 for (unsigned i = 0; i < featureSettings->size(); ++i) { 2359 for (unsigned i = 0; i < featureSettings->size(); ++i) {
2359 const FontFeature& feature = featureSettings->at(i); 2360 const FontFeature& feature = featureSettings->at(i);
2360 CSSFontFeatureValue* featureValue = 2361 CSSFontFeatureValue* featureValue =
2361 CSSFontFeatureValue::create(feature.tag(), feature.value()); 2362 CSSFontFeatureValue::create(feature.tag(), feature.value());
2362 list->append(*featureValue); 2363 list->append(*featureValue);
2363 } 2364 }
2364 return list; 2365 return list;
2365 } 2366 }
2367 case CSSPropertyFontVariationSettings: {
2368 DCHECK(RuntimeEnabledFeatures::cssVariableFontsEnabled());
2369 const FontVariationSettings* variationSettings =
2370 style.getFontDescription().variationSettings();
2371 if (!variationSettings || !variationSettings->size())
2372 return CSSIdentifierValue::create(CSSValueNormal);
2373 CSSValueList* list = CSSValueList::createCommaSeparated();
2374 for (unsigned i = 0; i < variationSettings->size(); ++i) {
2375 const FontVariationAxis& variationAxis = variationSettings->at(i);
2376 CSSFontVariationValue* variationValue = CSSFontVariationValue::create(
2377 variationAxis.tag(), variationAxis.value());
2378 list->append(*variationValue);
2379 }
2380 return list;
2381 }
2366 case CSSPropertyGridAutoFlow: { 2382 case CSSPropertyGridAutoFlow: {
2367 CSSValueList* list = CSSValueList::createSpaceSeparated(); 2383 CSSValueList* list = CSSValueList::createSpaceSeparated();
2368 switch (style.getGridAutoFlow()) { 2384 switch (style.getGridAutoFlow()) {
2369 case AutoFlowRow: 2385 case AutoFlowRow:
2370 case AutoFlowRowDense: 2386 case AutoFlowRowDense:
2371 list->append(*CSSIdentifierValue::create(CSSValueRow)); 2387 list->append(*CSSIdentifierValue::create(CSSValueRow));
2372 break; 2388 break;
2373 case AutoFlowColumn: 2389 case AutoFlowColumn:
2374 case AutoFlowColumnDense: 2390 case AutoFlowColumnDense:
2375 list->append(*CSSIdentifierValue::create(CSSValueColumn)); 2391 list->append(*CSSIdentifierValue::create(CSSValueColumn));
(...skipping 1252 matching lines...) Expand 10 before | Expand all | Expand 10 after
3628 case CSSPropertyAll: 3644 case CSSPropertyAll:
3629 return nullptr; 3645 return nullptr;
3630 default: 3646 default:
3631 break; 3647 break;
3632 } 3648 }
3633 ASSERT_NOT_REACHED(); 3649 ASSERT_NOT_REACHED();
3634 return nullptr; 3650 return nullptr;
3635 } 3651 }
3636 3652
3637 } // namespace blink 3653 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSValue.cpp ('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