Title: [175291] branches/safari-600.3-branch/Source/WebCore
- Revision
- 175291
- Author
- [email protected]
- Date
- 2014-10-28 17:29:58 -0700 (Tue, 28 Oct 2014)
Log Message
Merge r174457. <rdar://problem/18640864>
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebCore/ChangeLog (175290 => 175291)
--- branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-10-29 00:27:30 UTC (rev 175290)
+++ branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-10-29 00:29:58 UTC (rev 175291)
@@ -1,5 +1,18 @@
2014-10-28 Dana Burkart <[email protected]>
+ Merge r174457. <rdar://problem/18640864>
+
+ 2014-10-08 Chris Dumez <[email protected]>
+
+ Unreviewed build fix after r174456.
+
+ I was comparing a signed int to an unsigned one.
+
+ * platform/graphics/mac/FontCacheMac.mm:
+ (WebCore::shouldAutoActivateFontIfNeeded):
+
+2014-10-28 Dana Burkart <[email protected]>
+
Merge r174456. <rdar://problem/18640864>
2014-10-08 Christophe Dumez <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm (175290 => 175291)
--- branches/safari-600.3-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2014-10-29 00:27:30 UTC (rev 175290)
+++ branches/safari-600.3-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2014-10-29 00:29:58 UTC (rev 175291)
@@ -100,7 +100,7 @@
#endif
static NeverDestroyed<HashSet<AtomicString>> knownFamilies;
- static const unsigned maxCacheSize = 128;
+ static const int maxCacheSize = 128;
ASSERT(knownFamilies.get().size() <= maxCacheSize);
if (knownFamilies.get().size() == maxCacheSize)
knownFamilies.get().remove(knownFamilies.get().begin());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
