diff options
Diffstat (limited to 'webkit/glue/plugins/pepper_font.cc')
| -rw-r--r-- | webkit/glue/plugins/pepper_font.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/webkit/glue/plugins/pepper_font.cc b/webkit/glue/plugins/pepper_font.cc index 82bf369..cad39f5 100644 --- a/webkit/glue/plugins/pepper_font.cc +++ b/webkit/glue/plugins/pepper_font.cc @@ -33,7 +33,8 @@ namespace { bool IsPPFontDescriptionValid(const PP_FontDescription_Dev& desc) { // Check validity of UTF-8. - if (desc.face.type != PP_VARTYPE_STRING && desc.face.type != PP_VARTYPE_VOID) + if (desc.face.type != PP_VARTYPE_STRING && + desc.face.type != PP_VARTYPE_UNDEFINED) return false; // Check enum ranges. @@ -107,7 +108,7 @@ bool PPTextRunToWebTextRun(const PP_TextRun_Dev* run, WebTextRun* output) { PP_Resource Create(PP_Module module_id, const PP_FontDescription_Dev* description) { - PluginModule* module = PluginModule::FromPPModule(module_id); + PluginModule* module = ResourceTracker::Get()->GetModule(module_id); if (!module) return 0; @@ -198,7 +199,7 @@ const PPB_Font_Dev* Font::GetInterface() { bool Font::Describe(PP_FontDescription_Dev* description, PP_FontMetrics_Dev* metrics) { - if (description->face.type != PP_VARTYPE_VOID) + if (description->face.type != PP_VARTYPE_UNDEFINED) return false; WebFontDescription web_desc = font_->fontDescription(); |