| Index: ppapi/proxy/resource_creation_proxy.cc
|
| ===================================================================
|
| --- ppapi/proxy/resource_creation_proxy.cc (revision 118405)
|
| +++ ppapi/proxy/resource_creation_proxy.cc (working copy)
|
| @@ -33,10 +33,10 @@
|
| #include "ppapi/shared_impl/function_group_base.h"
|
| #include "ppapi/shared_impl/host_resource.h"
|
| #include "ppapi/shared_impl/ppb_audio_config_shared.h"
|
| -#include "ppapi/shared_impl/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/ppb_url_request_info_shared.h"
|
| +#include "ppapi/shared_impl/private/ppb_font_shared.h"
|
| #include "ppapi/shared_impl/var.h"
|
| #include "ppapi/thunk/enter.h"
|
| #include "ppapi/thunk/ppb_image_data_api.h"
|
| @@ -152,10 +152,12 @@
|
| PP_Resource ResourceCreationProxy::CreateFontObject(
|
| PP_Instance instance,
|
| const PP_FontDescription_Dev* description) {
|
| - if (!PPB_Font_Shared::IsPPFontDescriptionValid(*description))
|
| + PluginDispatcher* dispatcher =
|
| + PluginDispatcher::GetForInstance(instance);
|
| + if (!dispatcher)
|
| return 0;
|
| - return (new Font(HostResource::MakeInstanceOnly(instance), *description))->
|
| - GetReference();
|
| + return PPB_Font_Shared::CreateAsProxy(instance, *description,
|
| + dispatcher->preferences());
|
| }
|
|
|
| PP_Resource ResourceCreationProxy::CreateGraphics2D(PP_Instance instance,
|
|
|