| Index: ppapi/proxy/ppb_graphics_2d_proxy.h
|
| diff --git a/ppapi/proxy/ppb_graphics_2d_proxy.h b/ppapi/proxy/ppb_graphics_2d_proxy.h
|
| index 9be7f83987047e5955ad5ef5138bace5a55371b2..77f0dd6fe3674c6b332abd22896de16ec5d129d2 100644
|
| --- a/ppapi/proxy/ppb_graphics_2d_proxy.h
|
| +++ b/ppapi/proxy/ppb_graphics_2d_proxy.h
|
| @@ -13,10 +13,10 @@
|
| #include "ppapi/c/pp_size.h"
|
| #include "ppapi/c/pp_var.h"
|
| #include "ppapi/cpp/completion_callback.h"
|
| -#include "ppapi/proxy/host_resource.h"
|
| #include "ppapi/proxy/interface_proxy.h"
|
| #include "ppapi/proxy/plugin_resource.h"
|
| #include "ppapi/proxy/proxy_non_thread_safe_ref_count.h"
|
| +#include "ppapi/shared_impl/host_resource.h"
|
|
|
| struct PPB_Graphics2D;
|
| struct PP_Point;
|
| @@ -45,26 +45,26 @@ class PPB_Graphics2D_Proxy : public InterfaceProxy {
|
|
|
| private:
|
| // Plugin->renderer message handlers.
|
| - void OnMsgPaintImageData(const HostResource& graphics_2d,
|
| - const HostResource& image_data,
|
| + void OnMsgPaintImageData(const ppapi::HostResource& graphics_2d,
|
| + const ppapi::HostResource& image_data,
|
| const PP_Point& top_left,
|
| bool src_rect_specified,
|
| const PP_Rect& src_rect);
|
| - void OnMsgScroll(const HostResource& graphics_2d,
|
| + void OnMsgScroll(const ppapi::HostResource& graphics_2d,
|
| bool clip_specified,
|
| const PP_Rect& clip,
|
| const PP_Point& amount);
|
| - void OnMsgReplaceContents(const HostResource& graphics_2d,
|
| - const HostResource& image_data);
|
| - void OnMsgFlush(const HostResource& graphics_2d);
|
| + void OnMsgReplaceContents(const ppapi::HostResource& graphics_2d,
|
| + const ppapi::HostResource& image_data);
|
| + void OnMsgFlush(const ppapi::HostResource& graphics_2d);
|
|
|
| // Renderer->plugin message handlers.
|
| - void OnMsgFlushACK(const HostResource& graphics_2d,
|
| + void OnMsgFlushACK(const ppapi::HostResource& graphics_2d,
|
| int32_t pp_error);
|
|
|
| // Called in the renderer to send the given flush ACK to the plugin.
|
| void SendFlushACKToPlugin(int32_t result,
|
| - const HostResource& graphics_2d);
|
| + const ppapi::HostResource& graphics_2d);
|
|
|
| CompletionCallbackFactory<PPB_Graphics2D_Proxy,
|
| ProxyNonThreadSafeRefCount> callback_factory_;
|
|
|