Modify the PPB_Audio_Shared code for NaCl.

ppapi/proxy/plugin_main_nacl.cc

 // Copyright (c) 2012 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 <map>
 #include <set>
 
 #include "build/build_config.h"
 // Need to include this before most other files because it defines
 // IPC_MESSAGE_LOG_ENABLED. We need to use it to define
 // IPC_MESSAGE_MACROS_LOG_ENABLED so ppapi_messages.h will generate the
 // ViewMsgLog et al. functions.
 
 #include "base/message_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_logging.h"
 #include "ipc/ipc_message.h"
 #include "native_client/src/shared/ppapi_proxy/ppruntime.h"
 #include "native_client/src/untrusted/irt/irt_ppapi.h"
 #include "ppapi/c/ppp.h"
 #include "ppapi/c/ppp_instance.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/plugin_globals.h"
+#include "ppapi/shared_impl/ppb_audio_shared.h"
 
 #if defined(IPC_MESSAGE_LOG_ENABLED)
 #define IPC_MESSAGE_MACROS_LOG_ENABLED
 #include "ppapi/proxy/ppapi_messages.h"
 #endif
 
 // This must match up with NACL_CHROME_INITIAL_IPC_DESC,
 // defined in sel_main_chrome.h
 #define NACL_IPC_FD 6
 
 using ppapi::proxy::PluginDispatcher;
 using ppapi::proxy::PluginGlobals;
 
 namespace {
 
-struct PP_ThreadFunctions thread_funcs;
-
 // Copied from src/content/ppapi_plugin/ppapi_thread. This is a minimal
 // implementation to get us started.
 class PluginDispatcherDelegate : public PluginDispatcher::PluginDelegate {
  public:
   explicit PluginDispatcherDelegate(
       scoped_refptr<base::MessageLoopProxy> io_loop)
       : message_loop_(io_loop),
         shutdown_event_(true, false) {
   }
 
@@ skipping 41 matching lines @@
   std::set<PP_Instance> instances_;
   std::map<uint32, PluginDispatcher*> plugin_dispatchers_;
   uint32 next_plugin_dispatcher_id_;
   scoped_refptr<base::MessageLoopProxy> message_loop_;
   base::WaitableEvent shutdown_event_;
 };
 
 }  // namespace
 
 void PpapiPluginRegisterThreadCreator(
-    const struct PP_ThreadFunctions* new_funcs) {
-  thread_funcs = *new_funcs;
+    const struct PP_ThreadFunctions* thread_functions) {
+  // Initialize all classes that need to create threads that call back into
+  // user code.
+  ppapi::PPB_Audio_Shared::SetThreadFunctions(thread_functions);

[bbudge, 2012/07/24 20:10:46]

We have to call down to shared code rather than the other way around because of
DEPS layering.

 }
 
 int IrtInit() {
   return 0;
 }
 
 int PpapiPluginMain() {
   base::AtExitManager exit_manager;
   MessageLoop loop;
   IPC::Logging::set_log_function_map(&g_log_function_mapping);
@@ skipping 15 matching lines @@
   // TODO(dmichael) Figure out how to determine if we're in incognito
   PluginDispatcher dispatcher(::PPP_GetInterface, false /* incognito */);
   IPC::ChannelHandle channel_handle("NaCl IPC",
                                     base::FileDescriptor(NACL_IPC_FD, false));
   dispatcher.InitPluginWithChannel(&delegate, channel_handle, false);
 
   loop.Run();
   return 0;
 }