Changeset 191968 in webkit for trunk/Source/WebCore/css/CSSFontFaceSource.cpp

Timestamp:

Nov 3, 2015, 12:31:33 PM (10 years ago)

Author:

[email protected]

Message:

font-variant-* properties in @font-face declarations should be honored
​https://bugs.webkit.org/show_bug.cgi?id=149771

Reviewed by Simon Fraser.

Source/WebCore:

According to the CSS Fonts Level 3 spec, web authors are allowed to put
font-feature-settings / font-variant-* inside @font-face blocks. These
properties are supposed to be applied at a specific time during the
font selection algorithm.

This patch gives a FontFeatureSettings object and a FontVariantSettings
object to CSSFontFace, and moves common parsing logic from
StyleBuilderCustom to a shared location. Then, once the two properties
are parsed from the @font-face block, the relevant data structures are
passed down into the font selection algorithm. This algorithm then
consults with these values at the correct time (inside
preparePlatformFont()).

Tests: css3/font-feature-settings-font-face-rendering.html

css3/font-variant-font-face-all.html
css3/font-variant-font-face-override.html

• WebCore.xcodeproj/project.pbxproj: Add a header for the common

location of parsing font-variant-ligatures, font-variant-numeric,
and font-variant-east-asian.

• css/CSSFontFace.cpp:

(WebCore::CSSFontFace::font): Pass the relevant data structures
into the font selection algorithm.

• css/CSSFontFace.h: Add FontFeatureSettings and FontVariantSettings

member variables.
(WebCore::CSSFontFace::insertFeature):
(WebCore::CSSFontFace::setVariantCommonLigatures):
(WebCore::CSSFontFace::setVariantDiscretionaryLigatures):
(WebCore::CSSFontFace::setVariantHistoricalLigatures):
(WebCore::CSSFontFace::setVariantContextualAlternates):
(WebCore::CSSFontFace::setVariantPosition):
(WebCore::CSSFontFace::setVariantCaps):
(WebCore::CSSFontFace::setVariantNumericFigure):
(WebCore::CSSFontFace::setVariantNumericSpacing):
(WebCore::CSSFontFace::setVariantNumericFraction):
(WebCore::CSSFontFace::setVariantNumericOrdinal):
(WebCore::CSSFontFace::setVariantNumericSlashedZero):
(WebCore::CSSFontFace::setVariantAlternates):
(WebCore::CSSFontFace::setVariantEastAsianVariant):
(WebCore::CSSFontFace::setVariantEastAsianWidth):
(WebCore::CSSFontFace::setVariantEastAsianRuby):

• css/CSSFontFaceSource.cpp:

(WebCore::CSSFontFaceSource::font): Pass the relevant data
structures into the font selection algorithm.

• css/CSSFontFaceSource.h: Ditto.
• css/CSSFontSelector.cpp:

(WebCore::CSSFontSelector::addFontFaceRule): Call the shared
parsing logic to populate the FontFeatureSettings and
FontVariantSettings members.

• css/FontVariantBuilder.h: Added. Destination for shared parsing

logic.
(WebCore::applyValueFontVariantLigatures):
(WebCore::applyValueFontVariantNumeric):
(WebCore::applyValueFontVariantEastAsian):

• css/StyleBuilderCustom.h: Source for shared parsing logic.

(WebCore::StyleBuilderCustom::applyValueFontVariantLigatures):
(WebCore::StyleBuilderCustom::applyValueFontVariantNumeric):
(WebCore::StyleBuilderCustom::applyValueFontVariantEastAsian):

• loader/cache/CachedFont.cpp: Pass the relevant data structures

into the font selection algorithm.
(WebCore::CachedFont::createFont):
(WebCore::CachedFont::platformDataFromCustomData):

• loader/cache/CachedFont.h: Ditto.
• loader/cache/CachedSVGFont.cpp: Ditto.

(WebCore::CachedSVGFont::createFont):
(WebCore::CachedSVGFont::platformDataFromCustomData):

• loader/cache/CachedSVGFont.h: Ditto.
• platform/graphics/FontCache.h: Ditto.
• platform/graphics/FontCascade.cpp:

(WebCore::FontCascade::codePath): Adjust comment.

• platform/graphics/cocoa/FontCacheCoreText.cpp:

(WebCore::preparePlatformFont): Consult with the newly parsed values.
(WebCore::fontWithFamily): Pass the relevant data structures into the
font selection algorithm.
(WebCore::FontCache::systemFallbackForCharacters): Ditto.

• platform/graphics/mac/FontCustomPlatformData.cpp:

(WebCore::FontCustomPlatformData::fontPlatformData): Ditto.

• platform/graphics/mac/FontCustomPlatformData.h: Ditto.

LayoutTests:

• css3/font-variant-font-face-override-expected.html: Added
• css3/font-variant-font-face-override.html: Added
• css3/font-feature-settings-font-face-rendering-expected.html: Added.
• css3/font-feature-settings-font-face-rendering.html: Added.
• css3/font-variant-font-face-all-expected.html: Added.
• css3/font-variant-font-face-all.html: Added.

File:

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

trunk/Source/WebCore/css/CSSFontFaceSource.cpp

@@ -102 +102 @@
 }
 
-RefPtr<Font> CSSFontFaceSource::font(const FontDescription& fontDescription, bool syntheticBold, bool syntheticItalic, CSSFontSelector* fontSelector)
+RefPtr<Font> CSSFontFaceSource::font(const FontDescription& fontDescription, bool syntheticBold, bool syntheticItalic, CSSFontSelector* fontSelector, const FontFeatureSettings& fontFaceFeatures, const FontVariantSettings& fontFaceVariantSettings)
 {
     // If the font hasn't loaded or an error occurred, then we've got nothing.
@@ -125 +125 @@
         return font.release();
 
-    // If we are still loading, then we let the system pick a font.
     if (isLoaded()) {
         if (m_font) {
-            // Create new FontPlatformData from our CGFontRef, point size and ATSFontRef.
             bool hasExternalSVGFont = false;
 #if ENABLE(SVG_FONTS)
@@ -136 +134 @@
                 return nullptr;
 
-            font = m_font->createFont(fontDescription, m_string, syntheticBold, syntheticItalic, hasExternalSVGFont);
+            font = m_font->createFont(fontDescription, m_string, syntheticBold, syntheticItalic, hasExternalSVGFont, fontFaceFeatures, fontFaceVariantSettings);
         } else {
 #if ENABLE(SVG_FONTS)
@@ -154 +152 @@
                 if (!customPlatformData)
                     return nullptr;
-                font = Font::create(customPlatformData->fontPlatformData(fontDescription, syntheticBold, syntheticItalic), true, false);
+                font = Font::create(customPlatformData->fontPlatformData(fontDescription, syntheticBold, syntheticItalic, fontFaceFeatures, fontFaceVariantSettings), true, false);
 #else
                 font = Font::create(std::make_unique<SVGFontData>(m_svgFontFaceElement.get()), fontDescription.computedPixelSize(), syntheticBold, syntheticItalic);