Title: [190701] trunk/Source/WebCore
- Revision
- 190701
- Author
- [email protected]
- Date
- 2015-10-07 19:06:37 -0700 (Wed, 07 Oct 2015)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (190700 => 190701)
--- trunk/Source/WebCore/ChangeLog 2015-10-08 00:55:00 UTC (rev 190700)
+++ trunk/Source/WebCore/ChangeLog 2015-10-08 02:06:37 UTC (rev 190701)
@@ -1,3 +1,17 @@
+2015-10-07 Chris Dumez <[email protected]>
+
+ 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.
+
2015-10-07 Zalan Bujtas <[email protected]>
RenderObject::computeRectForRepaint/computeFloatRectForRepaint should return the computed rectangle.
Modified: trunk/Source/WebCore/platform/graphics/FontCache.h (190700 => 190701)
--- trunk/Source/WebCore/platform/graphics/FontCache.h 2015-10-08 00:55:00 UTC (rev 190700)
+++ trunk/Source/WebCore/platform/graphics/FontCache.h 2015-10-08 02:06:37 UTC (rev 190701)
@@ -75,7 +75,6 @@
: m_size(description.computedPixelSize())
, m_weight(description.weight())
, m_flags(makeFlagsKey(description))
- , m_locale(description.locale())
, m_featureSettings(description.featureSettings())
{ }
@@ -85,7 +84,7 @@
bool operator==(const FontDescriptionKey& other) const
{
- return m_size == other.m_size && m_weight == other.m_weight && m_flags == other.m_flags && m_locale == other.m_locale
+ return m_size == other.m_size && m_weight == other.m_weight && m_flags == other.m_flags
&& m_featureSettings == other.m_featureSettings;
}
@@ -103,7 +102,6 @@
hasher.add(m_weight);
for (unsigned flagItem : m_flags)
hasher.add(flagItem);
- hasher.add(m_locale.isNull() ? 0 : m_locale.impl()->existingHash());
hasher.add(m_featureSettings.hash());
return hasher.hash();
}
@@ -144,7 +142,6 @@
unsigned m_size { 0 };
unsigned m_weight { 0 };
std::array<unsigned, 2> m_flags {{ 0, 0 }};
- AtomicString m_locale;
FontFeatureSettings m_featureSettings;
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
