Remove webkit::ppapi::Resource.

webkit/plugins/ppapi/ppb_context_3d_impl.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/plugins/ppapi/ppb_context_3d_impl.h"
 
 #include "base/logging.h"
 #include "base/shared_memory.h"
 #include "gpu/command_buffer/client/gles2_cmd_helper.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/common/command_buffer.h"
 #include "ppapi/c/dev/ppb_context_3d_trusted_dev.h"
 #include "ppapi/thunk/enter.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/ppb_surface_3d_impl.h"
+#include "webkit/plugins/ppapi/resource_helper.h"
 
 using ppapi::thunk::EnterResourceNoLock;
 using ppapi::thunk::PPB_Context3D_API;
 using ppapi::thunk::PPB_Surface3D_API;
 
 namespace webkit {
 namespace ppapi {
 
 namespace {
 
@@ skipping 32 matching lines @@
       s.put_offset,
       s.token,
       static_cast<PPB_Context3DTrustedError>(s.error),
       s.generation
   };
   return state;
 }
 
 }  // namespace
 
-PPB_Context3D_Impl::PPB_Context3D_Impl(PluginInstance* instance)
+PPB_Context3D_Impl::PPB_Context3D_Impl(PP_Instance instance)
     : Resource(instance),
-      instance_(instance),
       transfer_buffer_id_(0),
       draw_surface_(NULL),
       read_surface_(NULL),
       callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
 }
 
 PPB_Context3D_Impl::~PPB_Context3D_Impl() {
   Destroy();
 }
 
 // static
-PP_Resource PPB_Context3D_Impl::Create(PP_Instance pp_instance,
+PP_Resource PPB_Context3D_Impl::Create(PP_Instance instance,
                                        PP_Config3D_Dev config,
                                        PP_Resource share_context,
                                        const int32_t* attrib_list) {
   // TODO(alokp): Support shared context.
   DCHECK_EQ(0, share_context);
   if (share_context != 0)
     return 0;
 
-  PluginInstance* instance = ResourceTracker::Get()->GetInstance(pp_instance);
-  if (!instance)
-    return 0;
-
-  scoped_refptr<PPB_Context3D_Impl> context(
-      new PPB_Context3D_Impl(instance));
+  scoped_refptr<PPB_Context3D_Impl> context(new PPB_Context3D_Impl(instance));
   if (!context->Init(config, share_context, attrib_list))
     return 0;
 
   return context->GetReference();
 }
 
 // static
-PP_Resource PPB_Context3D_Impl::CreateRaw(PP_Instance pp_instance,
+PP_Resource PPB_Context3D_Impl::CreateRaw(PP_Instance instance,
                                           PP_Config3D_Dev config,
                                           PP_Resource share_context,
                                           const int32_t* attrib_list) {
   // TODO(alokp): Support shared context.
   DCHECK_EQ(0, share_context);
   if (share_context != 0)
     return 0;
 
-  PluginInstance* instance = ResourceTracker::Get()->GetInstance(pp_instance);
-  if (!instance)
-    return 0;
-
-  scoped_refptr<PPB_Context3D_Impl> context(
-      new PPB_Context3D_Impl(instance));
+  scoped_refptr<PPB_Context3D_Impl> context(new PPB_Context3D_Impl(instance));
   if (!context->InitRaw(config, share_context, attrib_list))
     return 0;
 
   return context->GetReference();
 }
 
 PPB_Context3D_API* PPB_Context3D_Impl::AsPPB_Context3D_API() {
   return this;
 }
 
@@ skipping 150 matching lines @@
     Destroy();
     return false;
   }
 
   return true;
 }
 
 bool PPB_Context3D_Impl::InitRaw(PP_Config3D_Dev config,
                                  PP_Resource share_context,
                                  const int32_t* attrib_list) {
+  PluginInstance* plugin_instance = ResourceHelper::GetPluginInstance(this);
+  if (!plugin_instance)
+    return false;
+
   // Create and initialize the objects required to issue GLES2 calls.
-  platform_context_.reset(instance()->CreateContext3D());
+  platform_context_.reset(plugin_instance->CreateContext3D());
   if (!platform_context_.get()) {
     Destroy();
     return false;
   }
 
   static const int32 kAttribs[] = {
     PP_GRAPHICS3DATTRIB_ALPHA_SIZE, 8,
     PP_GRAPHICS3DATTRIB_DEPTH_SIZE, 24,
     PP_GRAPHICS3DATTRIB_STENCIL_SIZE, 8,
     PP_GRAPHICS3DATTRIB_SAMPLES, 0,
@@ skipping 67 matching lines @@
 
 void PPB_Context3D_Impl::OnContextLost() {
   if (draw_surface_)
     draw_surface_->OnContextLost();
   if (read_surface_)
     read_surface_->OnContextLost();
 }
 
 }  // namespace ppapi
 }  // namespace webkit