| Index: webkit/plugins/ppapi/ppb_surface_3d_impl.h
|
| diff --git a/webkit/plugins/ppapi/ppb_surface_3d_impl.h b/webkit/plugins/ppapi/ppb_surface_3d_impl.h
|
| index 11703af022bdef0ad5cecf0d53f893341f18a382..deea404efd78305fcd3b51fc8658a8df19be907d 100644
|
| --- a/webkit/plugins/ppapi/ppb_surface_3d_impl.h
|
| +++ b/webkit/plugins/ppapi/ppb_surface_3d_impl.h
|
| @@ -6,10 +6,10 @@
|
| #define WEBKIT_PLUGINS_PPAPI_PPB_SURFACE_3D_IMPL_H_
|
|
|
| #include "base/memory/ref_counted.h"
|
| +#include "ppapi/shared_impl/resource.h"
|
| #include "ppapi/thunk/ppb_surface_3d_api.h"
|
| #include "webkit/plugins/ppapi/callbacks.h"
|
| #include "webkit/plugins/ppapi/plugin_delegate.h"
|
| -#include "webkit/plugins/ppapi/resource.h"
|
|
|
| namespace gfx {
|
| class Size;
|
| @@ -20,12 +20,12 @@ namespace ppapi {
|
|
|
| class PPB_Context3D_Impl;
|
|
|
| -class PPB_Surface3D_Impl : public Resource,
|
| +class PPB_Surface3D_Impl : public ::ppapi::Resource,
|
| public ::ppapi::thunk::PPB_Surface3D_API {
|
| public:
|
| virtual ~PPB_Surface3D_Impl();
|
|
|
| - static PP_Resource Create(PluginInstance* instance_id,
|
| + static PP_Resource Create(PP_Instance instance,
|
| PP_Config3D_Dev config,
|
| const int32_t* attrib_list);
|
|
|
| @@ -58,7 +58,7 @@ class PPB_Surface3D_Impl : public Resource,
|
| void OnContextLost();
|
|
|
| private:
|
| - explicit PPB_Surface3D_Impl(PluginInstance* instance);
|
| + explicit PPB_Surface3D_Impl(PP_Instance instance);
|
|
|
| bool Init(PP_Config3D_Dev config, const int32_t* attrib_list);
|
|
|
|
|