| Index: ppapi/proxy/ppb_image_data_proxy.cc
|
| diff --git a/ppapi/proxy/ppb_image_data_proxy.cc b/ppapi/proxy/ppb_image_data_proxy.cc
|
| index 18f9e02c38a69a726672e954639c0cf4b95ca6a6..dec6efc4bf42638e95736ec59d29cd9035590221 100644
|
| --- a/ppapi/proxy/ppb_image_data_proxy.cc
|
| +++ b/ppapi/proxy/ppb_image_data_proxy.cc
|
| @@ -13,14 +13,16 @@
|
| #include "ppapi/c/pp_completion_callback.h"
|
| #include "ppapi/c/pp_errors.h"
|
| #include "ppapi/c/pp_resource.h"
|
| -#include "ppapi/proxy/host_resource.h"
|
| #include "ppapi/proxy/plugin_dispatcher.h"
|
| #include "ppapi/proxy/plugin_resource_tracker.h"
|
| #include "ppapi/proxy/ppapi_messages.h"
|
| +#include "ppapi/shared_impl/host_resource.h"
|
| #include "ppapi/thunk/thunk.h"
|
| #include "skia/ext/platform_canvas.h"
|
| #include "ui/gfx/surface/transport_dib.h"
|
|
|
| +using ppapi::HostResource;
|
| +
|
| namespace pp {
|
| namespace proxy {
|
|
|
| @@ -80,10 +82,6 @@ ImageData::~ImageData() {
|
| return this;
|
| }
|
|
|
| -ImageData* ImageData::AsImageData() {
|
| - return this;
|
| -}
|
| -
|
| PP_Bool ImageData::Describe(PP_ImageDataDesc* desc) {
|
| memcpy(desc, &desc_, sizeof(PP_ImageDataDesc));
|
| return PP_TRUE;
|
|
|