diff options
Diffstat (limited to 'webkit/plugins/ppapi/resource_creation_impl.cc')
| -rw-r--r-- | webkit/plugins/ppapi/resource_creation_impl.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/webkit/plugins/ppapi/resource_creation_impl.cc b/webkit/plugins/ppapi/resource_creation_impl.cc index 1f3943b..b1480a0 100644 --- a/webkit/plugins/ppapi/resource_creation_impl.cc +++ b/webkit/plugins/ppapi/resource_creation_impl.cc @@ -6,6 +6,7 @@ #include "ppapi/c/pp_size.h" #include "ppapi/shared_impl/ppb_audio_config_shared.h" +#include "ppapi/shared_impl/private/ppb_font_shared.h" #include "ppapi/shared_impl/ppb_input_event_shared.h" #include "ppapi/shared_impl/ppb_resource_array_shared.h" #include "ppapi/shared_impl/var.h" @@ -21,7 +22,6 @@ #include "webkit/plugins/ppapi/ppb_file_system_impl.h" #include "webkit/plugins/ppapi/ppb_flash_menu_impl.h" #include "webkit/plugins/ppapi/ppb_flash_net_connector_impl.h" -#include "webkit/plugins/ppapi/ppb_font_impl.h" #include "webkit/plugins/ppapi/ppb_graphics_2d_impl.h" #include "webkit/plugins/ppapi/ppb_graphics_3d_impl.h" #include "webkit/plugins/ppapi/ppb_image_data_impl.h" @@ -35,6 +35,7 @@ #include "webkit/plugins/ppapi/ppb_video_decoder_impl.h" #include "webkit/plugins/ppapi/ppb_video_layer_impl.h" #include "webkit/plugins/ppapi/ppb_websocket_impl.h" +#include "webkit/plugins/ppapi/resource_helper.h" using ppapi::InputEventData; using ppapi::PPB_InputEvent_Shared; @@ -142,7 +143,12 @@ PP_Resource ResourceCreationImpl::CreateFlashNetConnector( PP_Resource ResourceCreationImpl::CreateFontObject( PP_Instance instance, const PP_FontDescription_Dev* description) { - return PPB_Font_Impl::Create(instance, *description); + PluginInstance* plugin_instance = + ResourceHelper::PPInstanceToPluginInstance(instance); + if (!plugin_instance) + return 0; + return ::ppapi::PPB_Font_Shared::CreateAsImpl( + instance, *description, plugin_instance->delegate()->GetPreferences()); } PP_Resource ResourceCreationImpl::CreateGraphics2D( |