Title: [185113] trunk/Source/WebCore
- Revision
- 185113
- Author
- mmaxfi...@apple.com
- Date
- 2015-06-02 12:21:43 -0700 (Tue, 02 Jun 2015)
Log Message
[Cocoa] FontPlatformData's equality check should always use reference URLs
https://bugs.webkit.org/show_bug.cgi?id=144168
Reviewed by Tim Horton.
<rdar://problem/18985642> is not fixed, so we need to continue using the older
objectForEqualityCheck().
No new tests because there is no behavior change.
* platform/graphics/cocoa/FontPlatformDataCocoa.mm:
(WebCore::FontPlatformData::objectForEqualityCheck):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (185112 => 185113)
--- trunk/Source/WebCore/ChangeLog 2015-06-02 19:13:29 UTC (rev 185112)
+++ trunk/Source/WebCore/ChangeLog 2015-06-02 19:21:43 UTC (rev 185113)
@@ -1,3 +1,18 @@
+2015-06-01 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ [Cocoa] FontPlatformData's equality check should always use reference URLs
+ https://bugs.webkit.org/show_bug.cgi?id=144168
+
+ Reviewed by Tim Horton.
+
+ <rdar://problem/18985642> is not fixed, so we need to continue using the older
+ objectForEqualityCheck().
+
+ No new tests because there is no behavior change.
+
+ * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
+ (WebCore::FontPlatformData::objectForEqualityCheck):
+
2015-06-02 Andy Estes <aes...@apple.com>
[Mac] REGRESSION (r175941): Max.app crashes when adding a sound file to a patch due to removing cursor resources from WebCore.framework
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm (185112 => 185113)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2015-06-02 19:13:29 UTC (rev 185112)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2015-06-02 19:21:43 UTC (rev 185113)
@@ -268,16 +268,12 @@
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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
