https://bugs.webkit.org/show_bug.cgi?id=134904
Reviewed by Andreas Kling.
No new tests because there is no behavior change.
* loader/cache/CachedFont.cpp:
(WebCore::CachedFont::ensureCustomFontData):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@171375
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2014-07-22 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [iOS] [OSX] Don't transcode WOFF on platforms that support it natively
+ https://bugs.webkit.org/show_bug.cgi?id=134904
+
+ Reviewed by Andreas Kling.
+
+ No new tests because there is no behavior change.
+
+ * loader/cache/CachedFont.cpp:
+ (WebCore::CachedFont::ensureCustomFontData):
+
2014-07-22 peavo@outlook.com <peavo@outlook.com>
[Win] Crash after plugin is unloaded.
SharedBuffer* buffer = m_data.get()->sharedBuffer();
ASSERT(buffer);
+ bool fontIsWOFF = false;
+#if (!PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090) && (!PLATFORM(IOS) || __IPHONE_OS_VERSION_MIN_REQUIRED < 80000)
RefPtr<SharedBuffer> sfntBuffer;
- bool fontIsWOFF = isWOFF(buffer);
+ fontIsWOFF = isWOFF(buffer);
if (fontIsWOFF) {
Vector<char> sfnt;
if (convertWOFFToSfnt(buffer, sfnt)) {
} else
buffer = nullptr;
}
+#endif
m_fontData = buffer ? createFontCustomPlatformData(*buffer) : nullptr;
if (m_fontData)