First pass at making the proxy handle multiple renderers. This associates the...

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/pp_completion_callback.h"
 #include "ppapi/c/ppb_audio.h"
 #include "ppapi/c/ppb_audio_config.h"
@@ skipping 31 matching lines @@
 
   scoped_refptr<PPB_AudioConfig_Impl> config(
       new PPB_AudioConfig_Impl(instance, sample_rate, sample_frame_count));
   return config->GetReference();
 }
 
 uint32_t RecommendSampleFrameCount(PP_AudioSampleRate sample_rate,
                                    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.
+  //
+  // Danger: this code is duplicated in the audio config proxy.
   if (requested_sample_frame_count < PP_AUDIOMINSAMPLEFRAMECOUNT)
     return PP_AUDIOMINSAMPLEFRAMECOUNT;
   if (requested_sample_frame_count > PP_AUDIOMAXSAMPLEFRAMECOUNT)
     return PP_AUDIOMAXSAMPLEFRAMECOUNT;
   return requested_sample_frame_count;
 }
 
 PP_Bool IsAudioConfig(PP_Resource resource) {
   scoped_refptr<PPB_AudioConfig_Impl> config =
       Resource::GetAs<PPB_AudioConfig_Impl>(resource);
@@ skipping 150 matching lines @@
 
 PPB_Audio_Impl::PPB_Audio_Impl(PluginInstance* instance)
     : Resource(instance),
       audio_(NULL),
       create_callback_pending_(false) {
   create_callback_ = PP_MakeCompletionCallback(NULL, NULL);
 }
 
 PPB_Audio_Impl::~PPB_Audio_Impl() {
   // Calling ShutDown() makes sure StreamCreated cannot be called anymore.
-  audio_->ShutDown();
-  audio_ = NULL;
+  if (audio_) {
+    audio_->ShutDown();
+    audio_ = NULL;
+  }
 
   // If the completion callback hasn't fired yet, do so here
   // with an error condition.
   if (create_callback_pending_) {
     PP_RunCompletionCallback(&create_callback_, PP_ERROR_ABORTED);
     create_callback_pending_ = false;
   }
 }
 
 const PPB_Audio* PPB_Audio_Impl::GetInterface() {
@@ skipping 22 matching lines @@
                                         config_->sample_frame_count(),
                                         this);
   return audio_ != NULL;
 }
 
 PP_Resource PPB_Audio_Impl::GetCurrentConfig() {
   return config_->GetReference();
 }
 
 bool PPB_Audio_Impl::StartPlayback() {
+  if (!audio_)
+    return false;
   if (playing())
     return true;
   SetStartPlaybackState();
   return audio_->StartPlayback();
 }
 
 bool PPB_Audio_Impl::StopPlayback() {
+  if (!audio_)
+    return false;
   if (!playing())
     return true;
   if (!audio_->StopPlayback())
     return false;
   SetStopPlaybackState();
   return true;
 }
 
 int32_t PPB_Audio_Impl::Open(PluginDelegate* plugin_delegate,
                              PP_Resource config_id,
@@ skipping 72 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