Changeset 190701 in webkit


Ignore:
Timestamp:
Oct 7, 2015 7:06:37 PM (8 years ago)
Author:
Chris Dumez
Message:

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

Reviewed by Myles C. Maxfield.

Do a partial revert of r187626 as it caused a regression on PLT.

  • platform/graphics/FontCache.h:

(WebCore::FontDescriptionKey::operator==):
(WebCore::FontDescriptionKey::FontDescriptionKey): Deleted.
(WebCore::FontDescriptionKey::computeHash): Deleted.

Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r190685 r190701  
     12015-10-07  Chris Dumez  <cdumez@apple.com>
     2
     3        Partial revert of r187626 as it caused a PLT regression
     4        https://bugs.webkit.org/show_bug.cgi?id=149898
     5
     6        Reviewed by Myles C. Maxfield.
     7
     8        Do a partial revert of r187626 as it caused a regression on PLT.
     9
     10        * platform/graphics/FontCache.h:
     11        (WebCore::FontDescriptionKey::operator==):
     12        (WebCore::FontDescriptionKey::FontDescriptionKey): Deleted.
     13        (WebCore::FontDescriptionKey::computeHash): Deleted.
     14
    1152015-10-07  Zalan Bujtas  <zalan@apple.com>
    216
  • trunk/Source/WebCore/platform/graphics/FontCache.h

    r190242 r190701  
    7676        , m_weight(description.weight())
    7777        , m_flags(makeFlagsKey(description))
    78         , m_locale(description.locale())
    7978        , m_featureSettings(description.featureSettings())
    8079    { }
     
    8685    bool operator==(const FontDescriptionKey& other) const
    8786    {
    88         return m_size == other.m_size && m_weight == other.m_weight && m_flags == other.m_flags && m_locale == other.m_locale
     87        return m_size == other.m_size && m_weight == other.m_weight && m_flags == other.m_flags
    8988            && m_featureSettings == other.m_featureSettings;
    9089    }
     
    104103        for (unsigned flagItem : m_flags)
    105104            hasher.add(flagItem);
    106         hasher.add(m_locale.isNull() ? 0 : m_locale.impl()->existingHash());
    107105        hasher.add(m_featureSettings.hash());
    108106        return hasher.hash();
     
    145143    unsigned m_weight { 0 };
    146144    std::array<unsigned, 2> m_flags {{ 0, 0 }};
    147     AtomicString m_locale;
    148145    FontFeatureSettings m_featureSettings;
    149146};
Note: See TracChangeset for help on using the changeset viewer.