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