Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1635)

Unified Diff: Source/platform/fonts/FontCustomPlatformData.cpp

Issue 983973004: Provide user friendly messages for OTS parsing of fonts (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Correcting Method call Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/platform/fonts/FontCustomPlatformData.cpp
diff --git a/Source/platform/fonts/FontCustomPlatformData.cpp b/Source/platform/fonts/FontCustomPlatformData.cpp
index 1cae8696dde0622b8f6c7993a978996dd3b131e5..4920ea8c52e7ea4638fdf36ecf823ff5b823e1df 100644
--- a/Source/platform/fonts/FontCustomPlatformData.cpp
+++ b/Source/platform/fonts/FontCustomPlatformData.cpp
@@ -85,14 +85,19 @@ FontPlatformData FontCustomPlatformData::fontPlatformData(float size, bool bold,
return FontPlatformData(m_typeface.get(), "", size, bold && !m_typeface->isBold(), italic && !m_typeface->isItalic(), orientation);
}
-PassOwnPtr<FontCustomPlatformData> FontCustomPlatformData::create(SharedBuffer* buffer)
+PassOwnPtr<FontCustomPlatformData> FontCustomPlatformData::create(SharedBuffer* buffer, String& otsParseMessage)
{
ASSERT_ARG(buffer, buffer);
OpenTypeSanitizer sanitizer(buffer);
RefPtr<SharedBuffer> transcodeBuffer = sanitizer.sanitize();
- if (!transcodeBuffer)
+
+ if (!transcodeBuffer) {
+ // If error was faced at time of OTS parsing, we need to pass on OTS error to Blink
+ if (sanitizer.isParsingError())
+ otsParseMessage = sanitizer.getErrorString();
jungshik at Google 2015/06/01 23:22:19 If you set |errorString| whenever sanitize() retur
h.joshi 2015/06/04 15:19:16 Done.
return nullptr; // validation failed.
+ }
buffer = transcodeBuffer.get();
SkMemoryStream* stream = new SkMemoryStream(buffer->getAsSkData().get());

Powered by Google App Engine
This is Rietveld 408576698