Changeset 190746 in webkit


Ignore:
Timestamp:
Oct 8, 2015 3:00:46 PM (8 years ago)
Author:
Chris Dumez
Message:

Unreviewed, rolling out r190701.
https://bugs.webkit.org/show_bug.cgi?id=149937

"It did not help, will try a full roll out instead" (Requested
by cdumez on #webkit).

Reverted changeset:

"Partial revert of r187626 as it caused a PLT regression"
https://bugs.webkit.org/show_bug.cgi?id=149898
http://trac.webkit.org/changeset/190701

Patch by Commit Queue <commit-queue@webkit.org> on 2015-10-08

Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r190734 r190746  
     12015-10-08  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r190701.
     4        https://bugs.webkit.org/show_bug.cgi?id=149937
     5
     6        "It did not help, will try a full roll out instead" (Requested
     7        by cdumez on #webkit).
     8
     9        Reverted changeset:
     10
     11        "Partial revert of r187626 as it caused a PLT regression"
     12        https://bugs.webkit.org/show_bug.cgi?id=149898
     13        http://trac.webkit.org/changeset/190701
     14
    1152015-10-08  Zalan Bujtas  <zalan@apple.com>
    216
  • trunk/Source/WebCore/platform/graphics/FontCache.h

    r190701 r190746  
    7676        , m_weight(description.weight())
    7777        , m_flags(makeFlagsKey(description))
     78        , m_locale(description.locale())
    7879        , m_featureSettings(description.featureSettings())
    7980    { }
     
    8586    bool operator==(const FontDescriptionKey& other) const
    8687    {
    87         return m_size == other.m_size && m_weight == other.m_weight && m_flags == other.m_flags
     88        return m_size == other.m_size && m_weight == other.m_weight && m_flags == other.m_flags && m_locale == other.m_locale
    8889            && m_featureSettings == other.m_featureSettings;
    8990    }
     
    103104        for (unsigned flagItem : m_flags)
    104105            hasher.add(flagItem);
     106        hasher.add(m_locale.isNull() ? 0 : m_locale.impl()->existingHash());
    105107        hasher.add(m_featureSettings.hash());
    106108        return hasher.hash();
     
    143145    unsigned m_weight { 0 };
    144146    std::array<unsigned, 2> m_flags {{ 0, 0 }};
     147    AtomicString m_locale;
    145148    FontFeatureSettings m_featureSettings;
    146149};
Note: See TracChangeset for help on using the changeset viewer.