Title: [188278] branches/safari-601.1.46-branch/Source/WebCore
- Revision
- 188278
- Author
- [email protected]
- Date
- 2015-08-11 12:47:06 -0700 (Tue, 11 Aug 2015)
Log Message
Merge r188243. rdar://problem/22102378
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (188277 => 188278)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-08-11 19:47:04 UTC (rev 188277)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-08-11 19:47:06 UTC (rev 188278)
@@ -1,5 +1,21 @@
2015-08-11 Matthew Hanson <[email protected]>
+ Merge r188243. rdar://problem/22102378
+
+ 2015-08-10 Myles C. Maxfield <[email protected]>
+
+ Post-review fixup after r188195
+ https://bugs.webkit.org/show_bug.cgi?id=147806
+
+ Unreviewed.
+
+ Covered by fast/text/crash-obscure-text.html.
+
+ * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
+ (WebCore::FontPlatformData::objectForEqualityCheck):
+
+2015-08-11 Matthew Hanson <[email protected]>
+
Merge r188195. rdar://problem/22102378
2015-08-09 Myles C. Maxfield <[email protected]>
Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm (188277 => 188278)
--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2015-08-11 19:47:04 UTC (rev 188277)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2015-08-11 19:47:06 UTC (rev 188278)
@@ -205,7 +205,7 @@
// FIXME: https://bugs.webkit.org/show_bug.cgi?id=138683 This is a shallow pointer compare for web fonts
// because the URL contains the address of the font. This means we might erroneously get false negatives.
RetainPtr<CFURLRef> url = "" kCTFontReferenceURLAttribute)));
- ASSERT(CFGetTypeID(url.get()) == CFURLGetTypeID());
+ ASSERT(!url || CFGetTypeID(url.get()) == CFURLGetTypeID());
return url;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
