Title: [188294] branches/safari-601.1.46-branch/Source/WebCore
- Revision
- 188294
- Author
- [email protected]
- Date
- 2015-08-11 14:13:08 -0700 (Tue, 11 Aug 2015)
Log Message
Rollout r188243. rdar://problem/22102378
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (188293 => 188294)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-08-11 21:13:05 UTC (rev 188293)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-08-11 21:13:08 UTC (rev 188294)
@@ -1,5 +1,9 @@
2015-08-11 Matthew Hanson <[email protected]>
+ Rollout r188243. rdar://problem/22102378
+
+2015-08-11 Matthew Hanson <[email protected]>
+
Rollout r188195. rdar://problem/22102378
2015-08-11 Matthew Hanson <[email protected]>
Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm (188293 => 188294)
--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2015-08-11 21:13:05 UTC (rev 188293)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2015-08-11 21:13:08 UTC (rev 188294)
@@ -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(!url || CFGetTypeID(url.get()) == CFURLGetTypeID());
+ ASSERT(CFGetTypeID(url.get()) == CFURLGetTypeID());
return url;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes