Changeset 190746 in webkit
- Timestamp:
- Oct 8, 2015 3:00:46 PM (8 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r190734 r190746 1 2015-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 1 15 2015-10-08 Zalan Bujtas <zalan@apple.com> 2 16 -
trunk/Source/WebCore/platform/graphics/FontCache.h
r190701 r190746 76 76 , m_weight(description.weight()) 77 77 , m_flags(makeFlagsKey(description)) 78 , m_locale(description.locale()) 78 79 , m_featureSettings(description.featureSettings()) 79 80 { } … … 85 86 bool operator==(const FontDescriptionKey& other) const 86 87 { 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 88 89 && m_featureSettings == other.m_featureSettings; 89 90 } … … 103 104 for (unsigned flagItem : m_flags) 104 105 hasher.add(flagItem); 106 hasher.add(m_locale.isNull() ? 0 : m_locale.impl()->existingHash()); 105 107 hasher.add(m_featureSettings.hash()); 106 108 return hasher.hash(); … … 143 145 unsigned m_weight { 0 }; 144 146 std::array<unsigned, 2> m_flags {{ 0, 0 }}; 147 AtomicString m_locale; 145 148 FontFeatureSettings m_featureSettings; 146 149 };
Note: See TracChangeset
for help on using the changeset viewer.