Title: [190746] trunk/Source/WebCore
- Revision
- 190746
- Author
- [email protected]
- Date
- 2015-10-08 15:00:46 -0700 (Thu, 08 Oct 2015)
Log 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 <[email protected]> on 2015-10-08
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (190745 => 190746)
--- trunk/Source/WebCore/ChangeLog 2015-10-08 21:08:45 UTC (rev 190745)
+++ trunk/Source/WebCore/ChangeLog 2015-10-08 22:00:46 UTC (rev 190746)
@@ -1,3 +1,17 @@
+2015-10-08 Commit Queue <[email protected]>
+
+ 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
+
2015-10-08 Zalan Bujtas <[email protected]>
Fallback to the RenderView when repaint container is null.
Modified: trunk/Source/WebCore/platform/graphics/FontCache.h (190745 => 190746)
--- trunk/Source/WebCore/platform/graphics/FontCache.h 2015-10-08 21:08:45 UTC (rev 190745)
+++ trunk/Source/WebCore/platform/graphics/FontCache.h 2015-10-08 22:00:46 UTC (rev 190746)
@@ -75,6 +75,7 @@
: m_size(description.computedPixelSize())
, m_weight(description.weight())
, m_flags(makeFlagsKey(description))
+ , m_locale(description.locale())
, m_featureSettings(description.featureSettings())
{ }
@@ -84,7 +85,7 @@
bool operator==(const FontDescriptionKey& other) const
{
- return m_size == other.m_size && m_weight == other.m_weight && m_flags == other.m_flags
+ return m_size == other.m_size && m_weight == other.m_weight && m_flags == other.m_flags && m_locale == other.m_locale
&& m_featureSettings == other.m_featureSettings;
}
@@ -102,6 +103,7 @@
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();
}
@@ -142,6 +144,7 @@
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
