diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-23 04:57:18 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-23 04:57:18 +0000 |
| commit | c7fa15058776d40563cf04d4f2994d196f5da30b (patch) | |
| tree | f452b018acc31aa28110e4cf5f606bcf473d885b /webkit | |
| parent | da8df5546dc8fbccfa572000c855da51b60c5e55 (diff) | |
| download | chromium_src-c7fa15058776d40563cf04d4f2994d196f5da30b.zip chromium_src-c7fa15058776d40563cf04d4f2994d196f5da30b.tar.gz chromium_src-c7fa15058776d40563cf04d4f2994d196f5da30b.tar.bz2 | |
Hook up Surface3D, which I forgot to do in the previous patch. Also, change
it to take a PluginInstance pointer which makes the code a bit simpler.
TEST=3d works (manual)
BUG=none
Review URL: http://codereview.chromium.org/7241005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90164 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/plugins/ppapi/ppb_surface_3d_impl.cc | 6 | ||||
| -rw-r--r-- | webkit/plugins/ppapi/ppb_surface_3d_impl.h | 2 | ||||
| -rw-r--r-- | webkit/plugins/ppapi/resource_creation_impl.cc | 3 |
3 files changed, 3 insertions, 8 deletions
diff --git a/webkit/plugins/ppapi/ppb_surface_3d_impl.cc b/webkit/plugins/ppapi/ppb_surface_3d_impl.cc index d4b7fe4..40c40cd 100644 --- a/webkit/plugins/ppapi/ppb_surface_3d_impl.cc +++ b/webkit/plugins/ppapi/ppb_surface_3d_impl.cc @@ -33,13 +33,9 @@ PPB_Surface3D_Impl::~PPB_Surface3D_Impl() { } // static -PP_Resource PPB_Surface3D_Impl::Create(PP_Instance instance_id, +PP_Resource PPB_Surface3D_Impl::Create(PluginInstance* instance, PP_Config3D_Dev config, const int32_t* attrib_list) { - PluginInstance* instance = ResourceTracker::Get()->GetInstance(instance_id); - if (!instance) - return 0; - scoped_refptr<PPB_Surface3D_Impl> surface( new PPB_Surface3D_Impl(instance)); if (!surface->Init(config, attrib_list)) diff --git a/webkit/plugins/ppapi/ppb_surface_3d_impl.h b/webkit/plugins/ppapi/ppb_surface_3d_impl.h index 16b1c6f..7f4a7d1 100644 --- a/webkit/plugins/ppapi/ppb_surface_3d_impl.h +++ b/webkit/plugins/ppapi/ppb_surface_3d_impl.h @@ -24,7 +24,7 @@ class PPB_Surface3D_Impl : public Resource, public: virtual ~PPB_Surface3D_Impl(); - static PP_Resource Create(PP_Instance instance_id, + static PP_Resource Create(PluginInstance* instance_id, PP_Config3D_Dev config, const int32_t* attrib_list); diff --git a/webkit/plugins/ppapi/resource_creation_impl.cc b/webkit/plugins/ppapi/resource_creation_impl.cc index 35ff381..5d72737 100644 --- a/webkit/plugins/ppapi/resource_creation_impl.cc +++ b/webkit/plugins/ppapi/resource_creation_impl.cc @@ -186,8 +186,7 @@ PP_Resource ResourceCreationImpl::CreateSurface3D( PP_Instance instance, PP_Config3D_Dev config, const int32_t* attrib_list) { - NOTIMPLEMENTED(); - return 0; + return PPB_Surface3D_Impl::Create(instance_, config, attrib_list); } PP_Resource ResourceCreationImpl::CreateTransport(PP_Instance instance, |