Changeset 206679 in webkit for trunk/Source/WebCore/css/CSSValue.cpp

Timestamp:

Sep 30, 2016, 2:59:15 PM (9 years ago)

Author:

[email protected]

Message:

Parse font-variation-settings
​https://bugs.webkit.org/show_bug.cgi?id=162781

Reviewed by Simon Fraser.

Source/WebCore:

CSS Fonts level 4 [1] details the font-variation-settings property which allows variations
to be applied to fonts which accept it. The property accepts a list of key/value
pairs where the keys are four-character Ascii codes and the values are floating
point values. The implementation uses font-feature-settings as a model, but with one
big difference: font-variation-settings can be animated. The set of variation points
are animated individually.

This font variations work is being done behind a run-time switch, which is settable from
the Safari Develop menu.

Now that FontDescription is growing, I'd like to do an investigation into the possibility of
moving some of the rare pieces of it into their own class to reduce memory. However, upon
advice, this investigation will be fairly involved and should be done in its own bug.

Test: fast/text/variations/getComputedStyle.html

• CMakeLists.txt:
• WebCore.xcodeproj/project.pbxproj:
• css/CSSAllInOne.cpp:
• css/CSSComputedStyleDeclaration.cpp:

(WebCore::ComputedStyleExtractor::propertyValue):

• css/CSSFontVariationValue.cpp: Copied from Source/WebCore/platform/graphics/FontTaggedSettings.cpp.

(WebCore::CSSFontVariationValue::CSSFontVariationValue):
(WebCore::CSSFontVariationValue::customCSSText):
(WebCore::CSSFontVariationValue::equals):

• css/CSSFontVariationValue.h: Copied from Source/WebCore/platform/graphics/FontTaggedSettings.cpp.
• css/CSSPropertyNames.in:
• css/CSSValue.cpp:

(WebCore::CSSValue::equals):
(WebCore::CSSValue::cssText):
(WebCore::CSSValue::destroy):

• css/CSSValue.h:

(WebCore::CSSValue::isFontVariationValue):
(WebCore::CSSValue::isFontFeatureValue): Deleted.

• css/StyleBuilderConverter.h:

(WebCore::StyleBuilderConverter::convertFontVariationSettings):

• css/StyleBuilderCustom.h:

(WebCore::StyleBuilderCustom::applyInitialFontVariationSettings):
(WebCore::StyleBuilderCustom::applyInheritFontVariationSettings):
(WebCore::StyleBuilderCustom::applyInheritFontFeatureSettings): Deleted.

• css/parser/CSSParser.cpp:

(WebCore::CSSParserContext::CSSParserContext):
(WebCore::operator==):
(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseFontFeatureSettings):
(WebCore::CSSParser::parseFontVariationTag):
(WebCore::CSSParser::parseFontVariationSettings):

• css/parser/CSSParser.h:
• css/parser/CSSParserMode.h:
• platform/graphics/FontCache.h:

(WebCore::FontDescriptionKey::FontDescriptionKey):
(WebCore::FontDescriptionKey::operator==):
(WebCore::FontDescriptionKey::computeHash):

• platform/graphics/FontDescription.cpp:
• platform/graphics/FontDescription.h:

(WebCore::FontDescription::variationSettings):
(WebCore::FontDescription::setVariationSettings):
(WebCore::FontDescription::operator==):
(WebCore::FontDescription::featureSettings): Deleted.
(WebCore::FontDescription::setFeatureSettings): Deleted.

• platform/graphics/FontTaggedSettings.cpp:

(WebCore::FontVariationSettings::hash):
(WebCore::operator<<):

• platform/graphics/FontTaggedSettings.h:

LayoutTests:

• fast/text/variations/getComputedStyle-expected.txt: Added.
• fast/text/variations/getComputedStyle.html: Added.

File:

• trunk/Source/WebCore/css/CSSValue.cpp (modified) (4 diffs)

trunk/Source/WebCore/css/CSSValue.cpp

@@ -44 +44 @@
 #include "CSSFontFeatureValue.h"
 #include "CSSFontValue.h"
+#include "CSSFontVariationValue.h"
 #include "CSSFunctionValue.h"
 #include "CSSGradientValue.h"
@@ -177 +178 @@
         case FontFeatureClass:
             return compareCSSValues<CSSFontFeatureValue>(*this, other);
+        case FontVariationClass:
+            return compareCSSValues<CSSFontVariationValue>(*this, other);
         case FunctionClass:
             return compareCSSValues<CSSFunctionValue>(*this, other);
@@ -283 +286 @@
     case FontFeatureClass:
         return downcast<CSSFontFeatureValue>(*this).customCSSText();
+    case FontVariationClass:
+        return downcast<CSSFontVariationValue>(*this).customCSSText();
     case FunctionClass:
         return downcast<CSSFunctionValue>(*this).customCSSText();
@@ -397 +402 @@
         delete downcast<CSSFontFeatureValue>(this);
         return;
+    case FontVariationClass:
+        delete downcast<CSSFontVariationValue>(this);
+        return;
     case FunctionClass:
         delete downcast<CSSFunctionValue>(this);