| Index: ppapi/proxy/ppb_font_proxy.h
|
| diff --git a/ppapi/proxy/ppb_font_proxy.h b/ppapi/proxy/ppb_font_proxy.h
|
| index 05c0e7e20d3e277d6e13f9fd243759dd12a32117..8058fdf22e988b01b9407609c9fe8b297c60b0ba 100644
|
| --- a/ppapi/proxy/ppb_font_proxy.h
|
| +++ b/ppapi/proxy/ppb_font_proxy.h
|
| @@ -7,9 +7,9 @@
|
|
|
| #include "base/basictypes.h"
|
| #include "base/synchronization/waitable_event.h"
|
| -#include "ppapi/proxy/host_resource.h"
|
| #include "ppapi/proxy/interface_proxy.h"
|
| #include "ppapi/proxy/plugin_resource.h"
|
| +#include "ppapi/shared_impl/host_resource.h"
|
| #include "ppapi/shared_impl/webkit_forwarding.h"
|
| #include "ppapi/thunk/ppb_font_api.h"
|
|
|
| @@ -50,15 +50,12 @@ class Font : public PluginResource,
|
| // resource should be 0. However, various code assumes the instance in the
|
| // host resource is valid (this is how resources are associated with
|
| // instances), so that should be set.
|
| - Font(const HostResource& resource, const PP_FontDescription_Dev& desc);
|
| + Font(const ppapi::HostResource& resource, const PP_FontDescription_Dev& desc);
|
| virtual ~Font();
|
|
|
| // ResourceObjectBase.
|
| virtual ppapi::thunk::PPB_Font_API* AsPPB_Font_API() OVERRIDE;
|
|
|
| - // PluginResource overrides.
|
| - virtual Font* AsFont() OVERRIDE;
|
| -
|
| // PPB_Font_API implementation.
|
| virtual PP_Bool Describe(PP_FontDescription_Dev* description,
|
| PP_FontMetrics_Dev* metrics) OVERRIDE;
|
|
|