Add LayoutLocale class

third_party/WebKit/Source/platform/fonts/FontDescription.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 12 matching lines @@
  */
 
 #ifndef FontDescription_h
 #define FontDescription_h
 
 #include "SkFontStyle.h"
 #include "platform/FontFamilyNames.h"
 #include "platform/fonts/FontCacheKey.h"
 #include "platform/fonts/FontFamily.h"
 #include "platform/fonts/FontFeatureSettings.h"
+#include "platform/fonts/FontLocale.h"
 #include "platform/fonts/FontOrientation.h"
 #include "platform/fonts/FontSmoothingMode.h"
 #include "platform/fonts/FontTraits.h"
 #include "platform/fonts/FontVariantNumeric.h"
 #include "platform/fonts/FontWidthVariant.h"
 #include "platform/fonts/TextRenderingMode.h"
 #include "platform/fonts/TypesettingFeatures.h"
-#include "platform/text/LocaleToScriptMapping.h"
 #include "wtf/Allocator.h"
 #include "wtf/MathExtras.h"
 
 #include "wtf/RefPtr.h"
 
 #include <unicode/uscript.h>
 
 namespace blink {
 
 const float FontSizeAdjustNone = -1;
@@ skipping 32 matching lines @@
         m_fields.m_stretch = FontStretchNormal;
         m_fields.m_genericFamily = NoFamily;
         m_fields.m_kerning = AutoKerning;
         m_fields.m_commonLigaturesState = NormalLigaturesState;
         m_fields.m_discretionaryLigaturesState = NormalLigaturesState;
         m_fields.m_historicalLigaturesState = NormalLigaturesState;
         m_fields.m_contextualLigaturesState = NormalLigaturesState;
         m_fields.m_keywordSize = 0;
         m_fields.m_fontSmoothing = AutoSmoothing;
         m_fields.m_textRendering = AutoTextRendering;
-        m_fields.m_script = USCRIPT_COMMON;
         m_fields.m_syntheticBold = false;
         m_fields.m_syntheticItalic = false;
         m_fields.m_subpixelTextPosition = s_useSubpixelTextPositioning;
         m_fields.m_typesettingFeatures = s_defaultTypesettingFeatures;
         m_fields.m_variantNumeric = FontVariantNumeric().m_fieldsAsUnsigned;
     }
 
     bool operator==(const FontDescription&) const;
     bool operator!=(const FontDescription& other) const { return !(*this == other); }
 
@@ skipping 67 matching lines @@
     Kerning getKerning() const { return static_cast<Kerning>(m_fields.m_kerning); }
     VariantLigatures getVariantLigatures() const;
     FontVariantNumeric variantNumeric() const  { return FontVariantNumeric::initializeFromUnsigned(m_fields.m_variantNumeric); };
     LigaturesState commonLigaturesState() const { return static_cast<LigaturesState>(m_fields.m_commonLigaturesState); }
     LigaturesState discretionaryLigaturesState() const { return static_cast<LigaturesState>(m_fields.m_discretionaryLigaturesState); }
     LigaturesState historicalLigaturesState() const { return static_cast<LigaturesState>(m_fields.m_historicalLigaturesState); }
     LigaturesState contextualLigaturesState() const { return static_cast<LigaturesState>(m_fields.m_contextualLigaturesState); }
     unsigned keywordSize() const { return m_fields.m_keywordSize; }
     FontSmoothingMode fontSmoothing() const { return static_cast<FontSmoothingMode>(m_fields.m_fontSmoothing); }
     TextRenderingMode textRendering() const { return static_cast<TextRenderingMode>(m_fields.m_textRendering); }
-    UScriptCode script() const { return static_cast<UScriptCode>(m_fields.m_script); }
-    const AtomicString& locale(bool includeDefault = true) const;
+    const FontLocale& localeOrDefault() const { return m_locale ? *m_locale : FontLocale::getDefault(); }
+    const FontLocale* locale() const { return m_locale.get(); }

[drott, 2016/07/19 15:28:53]

Perhaps we can reduce this to one method on FontDescription, and then have a
valueOrDefault() and initialLocaleString() and script() or something on
FontLocale itself?

[kojii, 2016/07/20 06:01:53]

Thanks, that's a good idea, added static methods and removed localeString().

However, I'm in favor to keep locale() and localeOrDefault(). Most of current
use is includeDefault=true, and because it's an optional argument, I see several
incorrect usages. Having these methods help developers to be aware of the
distinction.

[drott, 2016/07/21 09:23:49]

Sounds good to me.

+    const AtomicString& localeString() const { return m_locale ? m_locale->localeString() : nullAtom; }
+    UScriptCode script() const { return localeOrDefault().script(); }
     bool isSyntheticBold() const { return m_fields.m_syntheticBold; }
     bool isSyntheticItalic() const { return m_fields.m_syntheticItalic; }
     bool useSubpixelPositioning() const { return m_fields.m_subpixelTextPosition; }
 
     FontTraits traits() const;
     float wordSpacing() const { return m_wordSpacing; }
     float letterSpacing() const { return m_letterSpacing; }
     FontOrientation orientation() const { return static_cast<FontOrientation>(m_fields.m_orientation); }
     bool isVerticalAnyUpright() const { return blink::isVerticalAnyUpright(orientation()); }
     bool isVerticalNonCJKUpright() const { return blink::isVerticalNonCJKUpright(orientation()); }
@@ skipping 17 matching lines @@
     void setIsAbsoluteSize(bool s) { m_fields.m_isAbsoluteSize = s; }
     void setWeight(FontWeight w) { m_fields.m_weight = w; }
     void setStretch(FontStretch s) { m_fields.m_stretch = s; }
     void setGenericFamily(GenericFamilyType genericFamily) { m_fields.m_genericFamily = genericFamily; }
     void setKerning(Kerning kerning) { m_fields.m_kerning = kerning; updateTypesettingFeatures(); }
     void setKeywordSize(unsigned s) { m_fields.m_keywordSize = s; }
     void setFontSmoothing(FontSmoothingMode smoothing) { m_fields.m_fontSmoothing = smoothing; }
     void setTextRendering(TextRenderingMode rendering) { m_fields.m_textRendering = rendering; updateTypesettingFeatures(); }
     void setOrientation(FontOrientation orientation) { m_fields.m_orientation = static_cast<unsigned>(orientation); }
     void setWidthVariant(FontWidthVariant widthVariant) { m_fields.m_widthVariant = widthVariant; }
-    void setLocale(const AtomicString& locale)
-    {
-        m_locale = locale;
-        m_fields.m_script = localeToScriptCodeForFontSelection(locale);

[drott, 2016/07/19 15:28:53]

Good to see this going away.

-    }
+    void setLocale(PassRefPtr<const FontLocale> locale) { m_locale = locale; }
     void setSyntheticBold(bool syntheticBold) { m_fields.m_syntheticBold = syntheticBold; }
     void setSyntheticItalic(bool syntheticItalic) { m_fields.m_syntheticItalic = syntheticItalic; }
     void setFeatureSettings(PassRefPtr<FontFeatureSettings> settings) { m_featureSettings = settings; }
     void setTraits(FontTraits);
     void setWordSpacing(float s) { m_wordSpacing = s; }
     void setLetterSpacing(float s) { m_letterSpacing = s; updateTypesettingFeatures(); }
 
     TypesettingFeatures getTypesettingFeatures() const { return static_cast<TypesettingFeatures>(m_fields.m_typesettingFeatures); }
 
     static void setSubpixelPositioning(bool b) { s_useSubpixelTextPositioning = b; }
     static bool subpixelPositioning() { return s_useSubpixelTextPositioning; }
 
     static void setDefaultTypesettingFeatures(TypesettingFeatures);
     static TypesettingFeatures defaultTypesettingFeatures();
 
     unsigned styleHashWithoutFamilyList() const;
     // TODO(drott): We should not expose internal structure here, but rather introduce
     // a hash function here.
     unsigned bitmapFields() const { return m_fieldsAsUnsigned.parts[0]; }
     unsigned auxiliaryBitmapFields() const { return m_fieldsAsUnsigned.parts[1]; }
 
     SkFontStyle skiaFontStyle() const;
 
 private:
     FontFamily m_familyList; // The list of font families to be used.
     RefPtr<FontFeatureSettings> m_featureSettings;
-    AtomicString m_locale;
+    RefPtr<const FontLocale> m_locale;
 
     void updateTypesettingFeatures();
 
     float m_specifiedSize;   // 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.
 
     // (Given aspect value / aspect value of a font family) * specifiedSize.
     // This value is adjusted for the minimum font size and the zoom factor
     // as well as a computed size is.
@@ skipping 25 matching lines @@
         unsigned m_discretionaryLigaturesState : 2;
         unsigned m_historicalLigaturesState : 2;
         unsigned m_contextualLigaturesState : 2;
 
         unsigned m_keywordSize : 4; // We cache whether or not a font is currently represented by a CSS keyword (e.g., medium).  If so,
         // then we can accurately translate across different generic families to adjust for different preference settings
         // (e.g., 13px monospace vs. 16px everything else).  Sizes are 1-8 (like the HTML size values for <font>).
 
         unsigned m_fontSmoothing : 2; // FontSmoothingMode
         unsigned m_textRendering : 2; // TextRenderingMode
-        unsigned m_script : 7; // Used to help choose an appropriate font for generic font families.
         unsigned m_syntheticBold : 1;
         unsigned m_syntheticItalic : 1;
         unsigned m_subpixelTextPosition : 1;
         unsigned m_typesettingFeatures : 3;
         unsigned m_variantNumeric : 8;
     };
 
     static_assert(sizeof(BitFields) == sizeof(FieldsAsUnsignedType),
         "Mapped bitfield datatypes must have identical size.");
     union {
@@ skipping 17 matching lines @@
         && m_letterSpacing == other.m_letterSpacing
         && m_wordSpacing == other.m_wordSpacing
         && m_fieldsAsUnsigned.parts[0] == other.m_fieldsAsUnsigned.parts[0]
         && m_fieldsAsUnsigned.parts[1] == other.m_fieldsAsUnsigned.parts[1]
         && (m_featureSettings == other.m_featureSettings || (m_featureSettings && other.m_featureSettings && *m_featureSettings == *other.m_featureSettings));
 }
 
 } // namespace blink
 
 #endif