Changeset 176789 in webkit

Timestamp:

Dec 4, 2014 3:50:26 AM (9 years ago)

Author:

Antti Koivisto

Message:

Remove isSpecifiedFont boolean from FontDescription
​https://bugs.webkit.org/show_bug.cgi?id=139233

Reviewed by Andreas Kling.

It is barely used.

• css/StyleBuilderCustom.h:

(WebCore::StyleBuilderCustom::applyInheritFontFamily):
(WebCore::StyleBuilderCustom::applyValueFontFamily):

• platform/graphics/FontDescription.cpp:

(WebCore::genericFamiliesSet):
(WebCore::FontDescription::hasGenericFirstFamily):

Add a function to test for generic families.

• platform/graphics/FontDescription.h:

(WebCore::FontDescription::FontDescription):
(WebCore::FontDescription::setTextRenderingMode):
(WebCore::FontDescription::operator==):
(WebCore::FontDescription::isSpecifiedFont): Deleted.
(WebCore::FontDescription::setIsSpecifiedFont): Deleted.

• rendering/RenderText.cpp:

(WebCore::RenderText::computeUseBackslashAsYenSymbol):

This is the only client.
Figure out the equivalent information dynamically if needed.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/StyleBuilderCustom.h (modified) (4 diffs)
• platform/graphics/FontDescription.cpp (modified) (2 diffs)
• platform/graphics/FontDescription.h (modified) (5 diffs)
• rendering/RenderText.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-12-03  Antti Koivisto  <antti@apple.com>
+
+        Remove isSpecifiedFont boolean from FontDescription
+        https://bugs.webkit.org/show_bug.cgi?id=139233
+
+        Reviewed by Andreas Kling.
+
+        It is barely used.
+
+        * css/StyleBuilderCustom.h:
+        (WebCore::StyleBuilderCustom::applyInheritFontFamily):
+        (WebCore::StyleBuilderCustom::applyValueFontFamily):
+        * platform/graphics/FontDescription.cpp:
+        (WebCore::genericFamiliesSet):
+        (WebCore::FontDescription::hasGenericFirstFamily):
+
+            Add a function to test for generic families.
+
+        * platform/graphics/FontDescription.h:
+        (WebCore::FontDescription::FontDescription):
+        (WebCore::FontDescription::setTextRenderingMode):
+        (WebCore::FontDescription::operator==):
+        (WebCore::FontDescription::isSpecifiedFont): Deleted.
+        (WebCore::FontDescription::setIsSpecifiedFont): Deleted.
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::computeUseBackslashAsYenSymbol):
+
+            This is the only client.
+            Figure out the equivalent information dynamically if needed.
+
 2014-12-03  Joonghun Park  <jh718.park@samsung.com>
 

trunk/Source/WebCore/css/StyleBuilderCustom.h

@@ -912 +912 @@
 
     fontDescription.setFamilies(parentFontDescription.families());
-    fontDescription.setIsSpecifiedFont(parentFontDescription.isSpecifiedFont());
     styleResolver.setFontDescription(fontDescription);
 }
@@ -930 +929 @@
         auto& contentValue = downcast<CSSPrimitiveValue>(item.get());
         AtomicString family;
-        bool isGenericFamily = false;
         if (contentValue.isString())
             family = contentValue.getStringValue();
@@ -941 +939 @@
             case CSSValueSerif:
                 family = serifFamily;
-                isGenericFamily = true;
                 break;
             case CSSValueSansSerif:
                 family = sansSerifFamily;
-                isGenericFamily = true;
                 break;
             case CSSValueCursive:
                 family = cursiveFamily;
-                isGenericFamily = true;
                 break;
             case CSSValueFantasy:
                 family = fantasyFamily;
-                isGenericFamily = true;
                 break;
             case CSSValueMonospace:
                 family = monospaceFamily;
-                isGenericFamily = true;
                 break;
             case CSSValueWebkitPictograph:
                 family = pictographFamily;
-                isGenericFamily = true;
                 break;
             default:
@@ -967 +959 @@
             }
         }
-
         if (family.isEmpty())
             continue;
-        if (families.isEmpty())
-            fontDescription.setIsSpecifiedFont(!isGenericFamily);
         families.uncheckedAppend(family);
     }

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

@@ -30 +30 @@
 #include "config.h"
 #include "FontDescription.h"
+
+#include <wtf/HashSet.h>
+#include <wtf/NeverDestroyed.h>
+#include <wtf/text/AtomicStringHash.h>
 
 namespace WebCore {
@@ -102 +106 @@
 }
 
+static const HashSet<AtomicString>& genericFamiliesSet()
+{
+    static NeverDestroyed<HashSet<AtomicString>> set;
+    if (set.get().isEmpty()) {
+        set.get().add(cursiveFamily);
+        set.get().add(fantasyFamily);
+        set.get().add(monospaceFamily);
+        set.get().add(pictographFamily);
+        set.get().add(sansSerifFamily);
+        set.get().add(serifFamily);
+        set.get().add(standardFamily);
+    }
+    return set.get();
+}
+
+bool FontDescription::hasGenericFirstFamily() const
+{
+    auto& family = firstFamily();
+    if (family.isNull())
+        return false;
+    return genericFamiliesSet().contains(family);
+}
+
 #if ENABLE(IOS_TEXT_AUTOSIZING)
 bool FontDescription::familiesEqualForTextAutoSizing(const FontDescription& other) const

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

@@ -94 +94 @@
         , m_fontSmoothing(AutoSmoothing)
         , m_textRendering(AutoTextRendering)
-        , m_isSpecifiedFont(false)
         , m_script(USCRIPT_COMMON)
     {
@@ -128 +127 @@
     TextRenderingMode textRenderingMode() const { return static_cast<TextRenderingMode>(m_textRendering); }
     UScriptCode script() const { return static_cast<UScriptCode>(m_script); }
+    bool hasGenericFirstFamily() const;
 
     FontTraitsMask traitsMask() const;
-    bool isSpecifiedFont() const { return m_isSpecifiedFont; }
     FontOrientation orientation() const { return static_cast<FontOrientation>(m_orientation); }
     NonCJKGlyphOrientation nonCJKGlyphOrientation() const { return static_cast<NonCJKGlyphOrientation>(m_nonCJKGlyphOrientation); }
@@ -157 +156 @@
     void setFontSmoothing(FontSmoothingMode smoothing) { m_fontSmoothing = smoothing; }
     void setTextRenderingMode(TextRenderingMode rendering) { m_textRendering = rendering; }
-    void setIsSpecifiedFont(bool isSpecifiedFont) { m_isSpecifiedFont = isSpecifiedFont; }
     void setOrientation(FontOrientation orientation) { m_orientation = orientation; }
     void setNonCJKGlyphOrientation(NonCJKGlyphOrientation orientation) { m_nonCJKGlyphOrientation = orientation; }
@@ -210 +208 @@
     unsigned m_fontSmoothing : 2; // FontSmoothingMode
     unsigned m_textRendering : 2; // TextRenderingMode
-    unsigned m_isSpecifiedFont : 1; // True if a web page specifies a non-generic font family as the first font family.
     unsigned m_script : 7; // Used to help choose an appropriate font for generic font families.
 };
@@ -232 +229 @@
         && m_fontSmoothing == other.m_fontSmoothing
         && m_textRendering == other.m_textRendering
-        && m_isSpecifiedFont == other.m_isSpecifiedFont
         && m_orientation == other.m_orientation
         && m_nonCJKGlyphOrientation == other.m_nonCJKGlyphOrientation

trunk/Source/WebCore/rendering/RenderText.cpp

@@ -214 +214 @@
 {
     const RenderStyle& style = this->style();
-    const FontDescription& fontDescription = style.font().fontDescription();
     if (style.font().useBackslashAsYenSymbol())
         return true;
-    if (fontDescription.isSpecifiedFont())
+    if (!document().decoder() || document().decoder()->encoding().backslashAsCurrencySymbol() == '\\')
         return false;
-    const TextEncoding* encoding = document().decoder() ? &document().decoder()->encoding() : 0;
-    if (encoding && encoding->backslashAsCurrencySymbol() != '\\')
-        return true;
-    return false;
+    return style.font().fontDescription().hasGenericFirstFamily() || style.font().primaryFontDataIsSystemFont();
 }