Changeset 187626 in webkit

Timestamp:

Jul 30, 2015 5:12:38 PM (9 years ago)

Author:

mmaxfield@apple.com

Message:

Move locale information into FontDescription
​https://bugs.webkit.org/show_bug.cgi?id=147457

Reviewed by Andreas Kling.

Currently, the "lang" attribute on a node sets locale information in RenderStyle.
Font selection is sensitive to this locale information, and occurs deep within
platform/ code, far away from RenderStyle. Because every RenderStyle owns a
FontDescription, and font selection can consult with FontDescriptions, it makes
sense to move the variable from RenderStyle to FontDescription, and provide
convenience methods on RenderStyle which inspect its FontDescription for locale
information.

This patch is in preparation for correctly obeying locale information when
performing font fallback.

No new tests because there is no behavior change.

• css/CSSPropertyNames.in:
• css/StyleBuilderCustom.h:

(WebCore::StyleBuilderCustom::applyValueWebkitLocale):

• platform/graphics/FontCache.h:

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

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

(WebCore::FontDescription::FontDescription):
(WebCore::FontDescription::setLocale):

• platform/graphics/FontDescription.h:

(WebCore::FontDescription::locale):
(WebCore::FontDescription::initialLocale):
(WebCore::FontDescription::operator==):
(WebCore::FontDescription::FontDescription): Deleted.
(WebCore::FontDescription::setScript): Deleted.

• platform/text/LocaleToScriptMappingDefault.cpp:

(WebCore::localeToScriptCodeForFontSelection):

• rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::changeRequiresLayout): Deleted.

• rendering/style/RenderStyle.h:
• rendering/style/StyleRareInheritedData.cpp:

(WebCore::StyleRareInheritedData::StyleRareInheritedData): Deleted.
(WebCore::StyleRareInheritedData::operator==): Deleted.

• rendering/style/StyleRareInheritedData.h:
• style/StyleResolveForDocument.cpp:

(WebCore::Style::resolveForDocument):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSPropertyNames.in (modified) (1 diff)
• css/StyleBuilderCustom.h (modified) (2 diffs)
• platform/graphics/FontCache.h (modified) (4 diffs)
• platform/graphics/FontCascade.cpp (modified) (2 diffs)
• platform/graphics/FontDescription.cpp (modified) (4 diffs)
• platform/graphics/FontDescription.h (modified) (5 diffs)
• platform/text/LocaleToScriptMappingDefault.cpp (modified) (2 diffs)
• rendering/style/RenderStyle.cpp (modified) (1 diff)
• rendering/style/RenderStyle.h (modified) (3 diffs)
• rendering/style/StyleRareInheritedData.cpp (modified) (2 diffs)
• rendering/style/StyleRareInheritedData.h (modified) (1 diff)
• style/StyleResolveForDocument.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-07-30  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Move locale information into FontDescription
+        https://bugs.webkit.org/show_bug.cgi?id=147457
+
+        Reviewed by Andreas Kling.
+
+        Currently, the "lang" attribute on a node sets locale information in RenderStyle.
+        Font selection is sensitive to this locale information, and occurs deep within
+        platform/ code, far away from RenderStyle. Because every RenderStyle owns a
+        FontDescription, and font selection can consult with FontDescriptions, it makes
+        sense to move the variable from RenderStyle to FontDescription, and provide
+        convenience methods on RenderStyle which inspect its FontDescription for locale
+        information.
+
+        This patch is in preparation for correctly obeying locale information when
+        performing font fallback.
+
+        No new tests because there is no behavior change.
+
+        * css/CSSPropertyNames.in:
+        * css/StyleBuilderCustom.h:
+        (WebCore::StyleBuilderCustom::applyValueWebkitLocale):
+        * platform/graphics/FontCache.h:
+        (WebCore::FontDescriptionKey::FontDescriptionKey):
+        (WebCore::FontDescriptionKey::operator==):
+        * platform/graphics/FontCascade.cpp:
+        * platform/graphics/FontDescription.cpp:
+        (WebCore::FontDescription::FontDescription):
+        (WebCore::FontDescription::setLocale):
+        * platform/graphics/FontDescription.h:
+        (WebCore::FontDescription::locale):
+        (WebCore::FontDescription::initialLocale):
+        (WebCore::FontDescription::operator==):
+        (WebCore::FontDescription::FontDescription): Deleted.
+        (WebCore::FontDescription::setScript): Deleted.
+        * platform/text/LocaleToScriptMappingDefault.cpp:
+        (WebCore::localeToScriptCodeForFontSelection):
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::changeRequiresLayout): Deleted.
+        * rendering/style/RenderStyle.h:
+        * rendering/style/StyleRareInheritedData.cpp:
+        (WebCore::StyleRareInheritedData::StyleRareInheritedData): Deleted.
+        (WebCore::StyleRareInheritedData::operator==): Deleted.
+        * rendering/style/StyleRareInheritedData.h:
+        * style/StyleResolveForDocument.cpp:
+        (WebCore::Style::resolveForDocument):
+
 2015-07-30  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/css/CSSPropertyNames.in

@@ -110 +110 @@
 -webkit-font-smoothing [Inherited, FontProperty]
 -webkit-font-variant-ligatures [Inherited, Custom=All]
--webkit-locale [Inherited, Custom=Value]
+-webkit-locale [Inherited, FontProperty, Custom=Value]
 -webkit-text-orientation [Inherited, Custom=Value]
 -epub-text-orientation = -webkit-text-orientation

trunk/Source/WebCore/css/StyleBuilderCustom.h

@@ -41 +41 @@
 #include "Frame.h"
 #include "HTMLElement.h"
-#include "LocaleToScriptMapping.h"
 #include "Rect.h"
 #include "RenderTheme.h"
@@ -692 +691 @@
 {
     auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
-
-    if (primitiveValue.getValueID() == CSSValueAuto)
-        styleResolver.style()->setLocale(nullAtom);
-    else
-        styleResolver.style()->setLocale(primitiveValue.getStringValue());
     
     FontDescription fontDescription = styleResolver.style()->fontDescription();
-    fontDescription.setScript(localeToScriptCodeForFontSelection(styleResolver.style()->locale()));
+    if (primitiveValue.getValueID() == CSSValueAuto)
+        fontDescription.setLocale(nullAtom);
+    else
+        fontDescription.setLocale(primitiveValue.getStringValue());
     styleResolver.setFontDescription(fontDescription);
 }

trunk/Source/WebCore/platform/graphics/FontCache.h

@@ -72 +72 @@
         , weight(0)
         , flags(0)
+        , localeHash(0)
     { }
     FontDescriptionKey(const FontDescription& description)
@@ -77 +78 @@
         , weight(description.weight())
         , flags(makeFlagKey(description))
+        , localeHash(description.locale().isNull() ? 0 : description.locale().impl()->existingHash())
     { }
     static unsigned makeFlagKey(const FontDescription& description)
@@ -92 +94 @@
     bool operator==(const FontDescriptionKey& other) const
     {
-        return size == other.size && weight == other.weight && flags == other.flags;
+        return size == other.size && weight == other.weight && flags == other.flags && localeHash == other.localeHash;
     }
     bool operator!=(const FontDescriptionKey& other) const
@@ -105 +107 @@
     unsigned weight;
     unsigned flags;
+    unsigned localeHash; // FIXME: Here, and every client of us, makes hashes of hashes.
 };
 

trunk/Source/WebCore/platform/graphics/FontCascade.cpp

@@ -179 +179 @@
 
 struct FontCascadeCacheKey {
-    // This part of the key is shared with the lower level FontCache (caching FontData objects).
-    FontDescriptionKey fontDescriptionKey;
+    FontDescriptionKey fontDescriptionKey; // Shared with the lower level FontCache (caching Font objects)
     Vector<AtomicString, 3> families;
     unsigned fontSelectorId;
@@ -242 +241 @@
 }
 
+// FIXME: Why can't we just teach HashMap about FontCascadeCacheKey instead of hashing a hash?
 static unsigned computeFontCascadeCacheHash(const FontCascadeCacheKey& key)
 {

trunk/Source/WebCore/platform/graphics/FontDescription.cpp

@@ +1 @@
+
 /*
  * Copyright (C) 2007 Nicholas Shanks <contact@nickshanks.com>
@@ -30 +31 @@
 #include "config.h"
 #include "FontDescription.h"
+#include "LocaleToScriptMapping.h"
 
 namespace WebCore {
 
 struct SameSizeAsFontDescription {
-    void* pointers[2];
+    void* pointers[3];
     float sizes[2];
-    // FXIME: Make them fit into one word.
+    // FIXME: Make them fit into one word.
     uint32_t bitfields;
     uint32_t bitfields2 : 8;
@@ -42 +44 @@
 
 COMPILE_ASSERT(sizeof(FontDescription) == sizeof(SameSizeAsFontDescription), FontDescription_should_stay_small);
+
+FontDescription::FontDescription()
+    : m_orientation(Horizontal)
+    , m_nonCJKGlyphOrientation(NonCJKGlyphOrientationVerticalRight)
+    , m_widthVariant(RegularWidth)
+    , m_italic(FontItalicOff)
+    , m_smallCaps(FontSmallCapsOff)
+    , m_isAbsoluteSize(false)
+    , m_weight(FontWeightNormal)
+    , m_renderingMode(NormalRenderingMode)
+    , m_kerning(AutoKerning)
+    , m_commonLigaturesState(NormalLigaturesState)
+    , m_discretionaryLigaturesState(NormalLigaturesState)
+    , m_historicalLigaturesState(NormalLigaturesState)
+    , m_keywordSize(0)
+    , m_fontSmoothing(AutoSmoothing)
+    , m_textRendering(AutoTextRendering)
+    , m_isSpecifiedFont(false)
+    , m_script(localeToScriptCodeForFontSelection(m_locale))
+    , m_fontSynthesis(initialFontSynthesis())
+{
+}
 
 FontWeight FontDescription::lighterWeight(void) const
@@ -95 +119 @@
 }
 
+void FontDescription::setLocale(const AtomicString& locale)
+{
+    m_locale = locale;
+    m_script = localeToScriptCodeForFontSelection(m_locale);
+}
+
 #if ENABLE(IOS_TEXT_AUTOSIZING)
 bool FontDescription::familiesEqualForTextAutoSizing(const FontDescription& other) const

trunk/Source/WebCore/platform/graphics/FontDescription.h

@@ -45 +45 @@
     enum LigaturesState { NormalLigaturesState, DisabledLigaturesState, EnabledLigaturesState };
 
-    FontDescription()
-        : m_families(1)
-        , m_specifiedSize(0)
-        , m_computedSize(0)
-        , m_orientation(Horizontal)
-        , m_nonCJKGlyphOrientation(NonCJKGlyphOrientationVerticalRight)
-        , m_widthVariant(RegularWidth)
-        , m_italic(FontItalicOff)
-        , m_smallCaps(FontSmallCapsOff)
-        , m_isAbsoluteSize(false)
-        , m_weight(FontWeightNormal)
-        , m_renderingMode(NormalRenderingMode)
-        , m_kerning(AutoKerning)
-        , m_commonLigaturesState(NormalLigaturesState)
-        , m_discretionaryLigaturesState(NormalLigaturesState)
-        , m_historicalLigaturesState(NormalLigaturesState)
-        , m_keywordSize(0)
-        , m_fontSmoothing(AutoSmoothing)
-        , m_textRendering(AutoTextRendering)
-        , m_isSpecifiedFont(false)
-        , m_script(USCRIPT_COMMON)
-        , m_fontSynthesis(initialFontSynthesis())
-    {
-    }
+    WEBCORE_EXPORT FontDescription();
 
     bool operator==(const FontDescription&) const;
@@ -104 +81 @@
     TextRenderingMode textRenderingMode() const { return static_cast<TextRenderingMode>(m_textRendering); }
     UScriptCode script() const { return static_cast<UScriptCode>(m_script); }
+    const AtomicString& locale() const { return m_locale; }
 
     FontTraitsMask traitsMask() const;
@@ -148 +126 @@
     void setNonCJKGlyphOrientation(NonCJKGlyphOrientation orientation) { m_nonCJKGlyphOrientation = orientation; }
     void setWidthVariant(FontWidthVariant widthVariant) { m_widthVariant = widthVariant; }
-    void setScript(UScriptCode s) { m_script = s; }
+    void setLocale(const AtomicString&);
     void setFeatureSettings(PassRefPtr<FontFeatureSettings> settings) { m_featureSettings = settings; }
     void setFontSynthesis(FontSynthesis fontSynthesis) { m_fontSynthesis = fontSynthesis; }
@@ -171 +149 @@
     static TextRenderingMode initialTextRenderingMode() { return AutoTextRendering; }
     static FontSynthesis initialFontSynthesis() { return FontSynthesisWeight | FontSynthesisStyle; }
+    static const AtomicString& initialLocale() { return nullAtom; }
 
 private:
-    RefCountedArray<AtomicString> m_families;
+    RefCountedArray<AtomicString> m_families { 1 };
     RefPtr<FontFeatureSettings> m_featureSettings;
-
-    float m_specifiedSize;   // Specified CSS value. Independent of rendering issues such as integer
+    AtomicString m_locale { initialLocale() };
+
+    float m_specifiedSize { 0 };   // Specified CSS value. Independent of rendering issues such as integer
                              // rounding, minimum font sizes, and zooming.
-    float m_computedSize;    // Computed size adjusted for the minimum font size and the zoom factor.  
+    float m_computedSize { 0 };    // Computed size adjusted for the minimum font size and the zoom factor.
 
     unsigned m_orientation : 1; // FontOrientation - Whether the font is rendering on a horizontal line or a vertical line.
@@ -230 +210 @@
         && m_nonCJKGlyphOrientation == other.m_nonCJKGlyphOrientation
         && m_widthVariant == other.m_widthVariant
-        && m_script == other.m_script
+        && m_locale == other.m_locale
         && m_featureSettings == other.m_featureSettings
         && m_fontSynthesis == other.m_fontSynthesis;

trunk/Source/WebCore/platform/text/LocaleToScriptMappingDefault.cpp

@@ -34 +34 @@
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
+#include <wtf/NeverDestroyed.h>
 #include <wtf/text/StringHash.h>
 
@@ -390 +391 @@
 UScriptCode localeToScriptCodeForFontSelection(const String& locale)
 {
-    DEPRECATED_DEFINE_STATIC_LOCAL(LocaleScriptMap, localeScriptMap, ());
-    if (localeScriptMap.isEmpty()) {
+    static NeverDestroyed<LocaleScriptMap> localeScriptMap;
+    if (localeScriptMap.get().isEmpty()) {
         for (size_t i = 0; i < sizeof(localeScriptList) / sizeof(LocaleScript); ++i)
-            localeScriptMap.set(ASCIILiteral(localeScriptList[i].locale), localeScriptList[i].script);
+            localeScriptMap.get().set(ASCIILiteral(localeScriptList[i].locale), localeScriptList[i].script);
     }
 
     String canonicalLocale = locale.lower().replace('-', '_');
     while (!canonicalLocale.isEmpty()) {
-        LocaleScriptMap::iterator it = localeScriptMap.find(canonicalLocale);
-        if (it != localeScriptMap.end())
+        LocaleScriptMap::iterator it = localeScriptMap.get().find(canonicalLocale);
+        if (it != localeScriptMap.get().end())
             return it->value;
         size_t pos = canonicalLocale.reverseFind('_');

trunk/Source/WebCore/rendering/style/RenderStyle.cpp

@@ -577 +577 @@
             || rareInheritedData->hyphenationLimitAfter != other.rareInheritedData->hyphenationLimitAfter
             || rareInheritedData->hyphenationString != other.rareInheritedData->hyphenationString
-            || rareInheritedData->locale != other.rareInheritedData->locale
             || rareInheritedData->m_rubyPosition != other.rareInheritedData->m_rubyPosition
             || rareInheritedData->textEmphasisMark != other.rareInheritedData->textEmphasisMark

trunk/Source/WebCore/rendering/style/RenderStyle.h

@@ -999 +999 @@
     short hyphenationLimitLines() const { return rareInheritedData->hyphenationLimitLines; }
     const AtomicString& hyphenationString() const { return rareInheritedData->hyphenationString; }
-    const AtomicString& locale() const { return rareInheritedData->locale; }
+    const AtomicString& locale() const { return fontDescription().locale(); }
     EBorderFit borderFit() const { return static_cast<EBorderFit>(rareNonInheritedData->m_borderFit); }
     EResize resize() const { return static_cast<EResize>(rareInheritedData->resize); }
@@ -1573 +1573 @@
     void setHyphenationLimitLines(short limit) { SET_VAR(rareInheritedData, hyphenationLimitLines, limit); }
     void setHyphenationString(const AtomicString& h) { SET_VAR(rareInheritedData, hyphenationString, h); }
-    void setLocale(const AtomicString& locale) { SET_VAR(rareInheritedData, locale, locale); }
     void setBorderFit(EBorderFit b) { SET_VAR(rareNonInheritedData, m_borderFit, b); }
     void setResize(EResize r) { SET_VAR(rareInheritedData, resize, r); }
@@ -1967 +1966 @@
     static short initialHyphenationLimitLines() { return -1; }
     static const AtomicString& initialHyphenationString() { return nullAtom; }
-    static const AtomicString& initialLocale() { return nullAtom; }
     static EBorderFit initialBorderFit() { return BorderFitBorder; }
     static EResize initialResize() { return RESIZE_NONE; }

trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp

@@ -207 +207 @@
     , hyphenationLimitAfter(o.hyphenationLimitAfter)
     , hyphenationLimitLines(o.hyphenationLimitLines)
-    , locale(o.locale)
     , textEmphasisCustomMark(o.textEmphasisCustomMark)
     , m_lineGrid(o.m_lineGrid)
@@ -303 +302 @@
 #endif
         && hyphenationString == o.hyphenationString
-        && locale == o.locale
         && textEmphasisCustomMark == o.textEmphasisCustomMark
         && quotesDataEquivalent(quotes.get(), o.quotes.get())

trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h

@@ -140 +140 @@
     short hyphenationLimitLines;
 
-    AtomicString locale;
-
     AtomicString textEmphasisCustomMark;
     RefPtr<QuotesData> quotes;

trunk/Source/WebCore/style/StyleResolveForDocument.cpp

@@ -60 +60 @@
     documentStyle.get().setZoom(!document.printing() ? renderView.frame().pageZoomFactor() : 1);
     documentStyle.get().setPageScaleTransform(renderView.frame().frameScaleFactor());
-    documentStyle.get().setLocale(document.contentLanguage());
+    FontDescription documentFontDescription = documentStyle.get().fontDescription();
+    documentFontDescription.setLocale(document.contentLanguage());
+    documentStyle.get().setFontDescription(WTF::move(documentFontDescription));
 
     // This overrides any -webkit-user-modify inherited from the parent iframe.
@@ -98 +100 @@
 
     FontDescription fontDescription;
-    fontDescription.setScript(localeToScriptCodeForFontSelection(documentStyle.get().locale()));
+    fontDescription.setLocale(document.contentLanguage());
     fontDescription.setRenderingMode(settings.fontRenderingMode());
     fontDescription.setOneFamily(standardFamily);