Title: [183347] trunk/Source/WebCore
- Revision
- 183347
- Author
- [email protected]
- Date
- 2015-04-25 21:16:27 -0700 (Sat, 25 Apr 2015)
Log Message
Unreviewed, rolling out r183305.
https://bugs.webkit.org/show_bug.cgi?id=144213
Crashes on wikipedia (Requested by litherum on #webkit).
Reverted changeset:
"[Cocoa] FontPlatformData's equality check should always use
reference URLs"
https://bugs.webkit.org/show_bug.cgi?id=144168
http://trac.webkit.org/changeset/183305
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (183346 => 183347)
--- trunk/Source/WebCore/ChangeLog 2015-04-26 04:12:05 UTC (rev 183346)
+++ trunk/Source/WebCore/ChangeLog 2015-04-26 04:16:27 UTC (rev 183347)
@@ -1,3 +1,17 @@
+2015-04-25 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r183305.
+ https://bugs.webkit.org/show_bug.cgi?id=144213
+
+ Crashes on wikipedia (Requested by litherum on #webkit).
+
+ Reverted changeset:
+
+ "[Cocoa] FontPlatformData's equality check should always use
+ reference URLs"
+ https://bugs.webkit.org/show_bug.cgi?id=144168
+ http://trac.webkit.org/changeset/183305
+
2015-04-25 Dan Bernstein <[email protected]>
WebCore part of <rdar://problem/20697966> Avoid using TBD as an argument to NS_AVAILABLE
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm (183346 => 183347)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2015-04-26 04:12:05 UTC (rev 183346)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2015-04-26 04:16:27 UTC (rev 183347)
@@ -268,12 +268,16 @@
RetainPtr<CFTypeRef> FontPlatformData::objectForEqualityCheck(CTFontRef ctFont)
{
+#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED <= 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000)
auto fontDescriptor = adoptCF(CTFontCopyFontDescriptor(ctFont));
// 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());
return url;
+#else
+ return adoptCF(CTFontCopyGraphicsFont(ctFont, 0));
+#endif
}
RetainPtr<CFTypeRef> FontPlatformData::objectForEqualityCheck() const
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
