Add an instance parameter to var objects, audio, and the 2D API. This replace...

webkit/plugins/ppapi/ppb_audio_impl.cc

 // Copyright (c) 2010 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_audio_impl.h"
 
 #include "base/logging.h"
 #include "ppapi/c/dev/ppb_audio_dev.h"
 #include "ppapi/c/dev/ppb_audio_trusted_dev.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "webkit/plugins/ppapi/common.h"
 
 namespace webkit {
 namespace ppapi {
 
 namespace {
 
 // PPB_AudioConfig -------------------------------------------------------------
 
 uint32_t RecommendSampleFrameCount(uint32_t requested_sample_frame_count);
 
-PP_Resource CreateStereo16bit(PP_Module module_id,
+PP_Resource CreateStereo16bit(PP_Instance instance_id,
                               PP_AudioSampleRate_Dev sample_rate,
                               uint32_t sample_frame_count) {
-  PluginModule* module = ResourceTracker::Get()->GetModule(module_id);
-  if (!module)
+  PluginInstance* instance = ResourceTracker::Get()->GetInstance(instance_id);
+  if (!instance)
     return 0;
 
   // TODO(brettw): Currently we don't actually check what the hardware
   // supports, so just allow sample rates of the "guaranteed working" ones.
   if (sample_rate != PP_AUDIOSAMPLERATE_44100 &&
       sample_rate != PP_AUDIOSAMPLERATE_48000)
     return 0;
 
   // TODO(brettw): Currently we don't actually query to get a value from the
   // hardware, so just validate the range.
   if (RecommendSampleFrameCount(sample_frame_count) != sample_frame_count)
     return 0;
 
   scoped_refptr<PPB_AudioConfig_Impl> config(
-      new PPB_AudioConfig_Impl(module, sample_rate, sample_frame_count));
+      new PPB_AudioConfig_Impl(instance->module(), sample_rate,
+                               sample_frame_count));
   return config->GetReference();
 }
 
 uint32_t RecommendSampleFrameCount(uint32_t requested_sample_frame_count) {
   // TODO(brettw) Currently we don't actually query to get a value from the
   // hardware, so we always return the input for in-range values.
   if (requested_sample_frame_count < PP_AUDIOMINSAMPLEFRAMECOUNT)
     return PP_AUDIOMINSAMPLEFRAMECOUNT;
   if (requested_sample_frame_count > PP_AUDIOMAXSAMPLEFRAMECOUNT)
     return PP_AUDIOMAXSAMPLEFRAMECOUNT;
@@ skipping 43 matching lines @@
   return audio->GetReference();
 }
 
 PP_Bool IsAudio(PP_Resource resource) {
   scoped_refptr<PPB_Audio_Impl> audio =
       Resource::GetAs<PPB_Audio_Impl>(resource);
   return BoolToPPBool(!!audio);
 }
 
 PP_Resource GetCurrentConfig(PP_Resource audio_id) {
-  scoped_refptr<PPB_Audio_Impl> audio = Resource::GetAs<PPB_Audio_Impl>(audio_id);
+  scoped_refptr<PPB_Audio_Impl> audio =
+      Resource::GetAs<PPB_Audio_Impl>(audio_id);
   return audio ? audio->GetCurrentConfig() : 0;
 }
 
 PP_Bool StartPlayback(PP_Resource audio_id) {
   scoped_refptr<PPB_Audio_Impl> audio =
       Resource::GetAs<PPB_Audio_Impl>(audio_id);
   return audio ? BoolToPPBool(audio->StartPlayback()) : PP_FALSE;
 }
 
 PP_Bool StopPlayback(PP_Resource audio_id) {
   scoped_refptr<PPB_Audio_Impl> audio =
       Resource::GetAs<PPB_Audio_Impl>(audio_id);
   return audio ? BoolToPPBool(audio->StopPlayback()) : PP_FALSE;
 }
 
 const PPB_Audio_Dev ppb_audio = {
   &Create,
   &IsAudio,
   &GetCurrentConfig,
   &StartPlayback,
   &StopPlayback,
 };
 
 // PPB_AudioTrusted ------------------------------------------------------------
 
 PP_Resource CreateTrusted(PP_Instance instance_id) {
   PluginInstance* instance = ResourceTracker::Get()->GetInstance(instance_id);
   if (!instance)
     return 0;
-  scoped_refptr<PPB_Audio_Impl> audio(new PPB_Audio_Impl(instance->module(), instance_id));
+  scoped_refptr<PPB_Audio_Impl> audio(
+      new PPB_Audio_Impl(instance->module(), instance_id));
   return audio->GetReference();
 }
 
 int32_t Open(PP_Resource audio_id,
              PP_Resource config_id,
              PP_CompletionCallback created) {
   scoped_refptr<PPB_Audio_Impl> audio =
       Resource::GetAs<PPB_Audio_Impl>(audio_id);
   if (!audio)
     return PP_ERROR_BADRESOURCE;
@@ skipping 210 matching lines @@
     // the I/O thread and back, but this extra complexity doesn't seem worth it
     // just to clean up these handles faster.
   } else {
     SetStreamInfo(shared_memory_handle, shared_memory_size, socket_handle);
   }
 }
 
 }  // namespace ppapi
 }  // namespace webkit