Add #ifdefs to separate NaCl and non-NaCl PPAPI Proxy code.

ppapi/proxy/interface_list.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 "ppapi/proxy/interface_list.h"
 
 #include "base/memory/singleton.h"
 #include "ppapi/c/dev/ppb_audio_input_dev.h"
 #include "ppapi/c/dev/ppb_buffer_dev.h"
 #include "ppapi/c/dev/ppb_char_set_dev.h"
@@ skipping 153 matching lines @@
   #define PROXIED_API(api_name) \
       AddProxy(PROXY_API_ID(api_name), &PROXY_FACTORY_NAME(api_name));
 
   // Register each proxied interface by calling AddPPB for each supported
   // interface.
   #define PROXIED_IFACE(api_name, iface_str, iface_struct) \
       AddPPB(iface_str, PROXY_API_ID(api_name), \
              INTERFACE_THUNK_NAME(iface_struct)());
 
   #include "ppapi/thunk/interfaces_ppb_public_stable.h"
+#if !defined(OS_NACL)
   #include "ppapi/thunk/interfaces_ppb_public_dev.h"
   #include "ppapi/thunk/interfaces_ppb_private.h"
+#endif
 
   #undef PROXIED_API
   #undef PROXIED_IFACE
 
   // Manually add some special proxies. Some of these don't have interfaces
   // that they support, so aren't covered by the macros above, but have proxies
   // for message routing. Others have different implementations between the
   // proxy and the impl and there's no obvious message routing.
   AddProxy(API_ID_RESOURCE_CREATION, &ResourceCreationProxy::Create);
   AddProxy(API_ID_PPP_CLASS, &PPP_Class_Proxy::Create);
   AddPPB(PPB_CORE_INTERFACE_1_0, API_ID_PPB_CORE,
          PPB_Core_Proxy::GetPPB_Core_Interface());
   AddPPB(PPB_MESSAGELOOP_DEV_INTERFACE_0_1, API_ID_NONE,
          PPB_MessageLoop_Proxy::GetInterface());
+#if !defined(OS_NACL)
   AddPPB(PPB_OPENGLES2_INTERFACE_1_0, API_ID_NONE,
          PPB_OpenGLES2_Shared::GetInterface());
   AddPPB(PPB_OPENGLES2_INSTANCEDARRAYS_DEV_INTERFACE_1_0, API_ID_NONE,
          PPB_OpenGLES2_Shared::GetInstancedArraysInterface());
   AddPPB(PPB_OPENGLES2_FRAMEBUFFERBLIT_DEV_INTERFACE_1_0, API_ID_NONE,
          PPB_OpenGLES2_Shared::GetFramebufferBlitInterface());
   AddPPB(PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_DEV_INTERFACE_1_0, API_ID_NONE,
          PPB_OpenGLES2_Shared::GetFramebufferMultisampleInterface());
   AddPPB(PPB_OPENGLES2_CHROMIUMENABLEFEATURE_DEV_INTERFACE_1_0, API_ID_NONE,
          PPB_OpenGLES2_Shared::GetChromiumEnableFeatureInterface());
   AddPPB(PPB_OPENGLES2_CHROMIUMMAPSUB_DEV_INTERFACE_1_0, API_ID_NONE,
          PPB_OpenGLES2_Shared::GetChromiumMapSubInterface());
   AddPPB(PPB_OPENGLES2_QUERY_DEV_INTERFACE_1_0, API_ID_NONE,
          PPB_OpenGLES2_Shared::GetQueryInterface());
+#endif
   AddPPB(PPB_VAR_ARRAY_BUFFER_INTERFACE_1_0, API_ID_NONE,
          PPB_Var_Shared::GetVarArrayBufferInterface1_0());
   AddPPB(PPB_VAR_INTERFACE_1_1, API_ID_NONE,
          PPB_Var_Shared::GetVarInterface1_1());
   AddPPB(PPB_VAR_INTERFACE_1_0, API_ID_NONE,
          PPB_Var_Shared::GetVarInterface1_0());
 
+#if !defined(OS_NACL)
   AddFlashInterfaces();
 
   // PPB (browser) interfaces.
   // Do not add more stuff here, they should be added to interface_list*.h
   // TODO(brettw) remove these.
   AddPPB(PPB_Instance_Proxy::GetInfoPrivate());
   AddPPB(PPB_PDF_Proxy::GetInfo());
   AddPPB(PPB_Testing_Proxy::GetInfo());
   AddPPB(PPB_URLLoader_Proxy::GetTrustedInfo());
   AddPPB(PPB_Var_Deprecated_Proxy::GetInfo());
+#endif
 
   // PPP (plugin) interfaces.
   // TODO(brettw) move these to interface_list*.h
   AddProxy(API_ID_PPP_INSTANCE, &ProxyFactory<PPP_Instance_Proxy>);
   AddPPP(PPP_INSTANCE_INTERFACE_1_1, API_ID_PPP_INSTANCE,
          PPP_Instance_Proxy::GetInstanceInterface());
   AddProxy(API_ID_PPP_PRINTING, &ProxyFactory<PPP_Printing_Proxy>);
   AddPPP(PPP_PRINTING_DEV_INTERFACE, API_ID_PPP_PRINTING,
          PPP_Printing_Proxy::GetProxyInterface());
   AddProxy(API_ID_PPP_TEXT_INPUT, &ProxyFactory<PPP_TextInput_Proxy>);
   AddPPP(PPP_TEXTINPUT_DEV_INTERFACE, API_ID_PPP_TEXT_INPUT,
          PPP_TextInput_Proxy::GetProxyInterface());
 
   // Old-style GetInfo PPP interfaces.
   // Do not add more stuff here, they should be added to interface_list*.h
   // TODO(brettw) remove these.
-  AddPPP(PPP_Graphics3D_Proxy::GetInfo());
   AddPPP(PPP_InputEvent_Proxy::GetInfo());
-  AddPPP(PPP_Instance_Private_Proxy::GetInfo());
   AddPPP(PPP_Messaging_Proxy::GetInfo());
   AddPPP(PPP_MouseLock_Proxy::GetInfo());
+#if !defined(OS_NACL)
+  AddPPP(PPP_Graphics3D_Proxy::GetInfo());
+  AddPPP(PPP_Instance_Private_Proxy::GetInfo());
   AddPPP(PPP_VideoCapture_Proxy::GetInfo());
   AddPPP(PPP_VideoDecoder_Proxy::GetInfo());
+#endif
 }
 
 InterfaceList::~InterfaceList() {
 }
 
 // static
 InterfaceList* InterfaceList::GetInstance() {
   return Singleton<InterfaceList>::get();
 }
 
@@ skipping 30 matching lines @@
 }
 
 const void* InterfaceList::GetInterfaceForPPP(const std::string& name) const {
   NameToInterfaceInfoMap::const_iterator found =
       name_to_plugin_info_.find(name);
   if (found == name_to_plugin_info_.end())
     return NULL;
   return found->second.iface;
 }
 
+#if !defined(OS_NACL)
 void InterfaceList::AddFlashInterfaces() {
-#if !defined(OS_NACL)
   AddProxy(API_ID_PPB_FLASH, &ProxyFactory<PPB_Flash_Proxy>);
   AddPPB(PPB_FLASH_INTERFACE_11_0, API_ID_PPB_FLASH,
          PPB_Flash_Proxy::GetInterface11());
   AddPPB(PPB_FLASH_INTERFACE_12_0, API_ID_PPB_FLASH,
          PPB_Flash_Proxy::GetInterface12_0());
   AddPPB(PPB_FLASH_INTERFACE_12_1, API_ID_PPB_FLASH,
          PPB_Flash_Proxy::GetInterface12_1());
   AddPPB(PPB_FLASH_INTERFACE_12_2, API_ID_PPB_FLASH,
          PPB_Flash_Proxy::GetInterface12_2());
 
@@ skipping 22 matching lines @@
          thunk::GetPPB_Flash_Menu_0_2_Thunk());
 
   AddProxy(API_ID_PPB_FLASH_MESSAGELOOP,
            &ProxyFactory<PPB_Flash_MessageLoop_Proxy>);
   AddPPB(PPB_FLASH_MESSAGELOOP_INTERFACE_0_1, API_ID_PPB_FLASH_MESSAGELOOP,
          thunk::GetPPB_Flash_MessageLoop_0_1_Thunk());
 
   // Only add the interface; PPB_TCPSocket_Private provides the API ID's proxy.
   AddPPB(PPB_FLASH_TCPSOCKET_INTERFACE_0_2, API_ID_PPB_TCPSOCKET_PRIVATE,
          thunk::GetPPB_TCPSocket_Private_0_3_Thunk());
+}
 #endif  // !defined(OS_NACL)
-}
 
 void InterfaceList::AddProxy(ApiID id,
                              InterfaceProxy::Factory factory) {
   // For interfaces with no corresponding _Proxy objects, the macros will
   // generate calls to this function with API_ID_NONE. This means we
   // should just skip adding a factory for these functions.
   if (id == API_ID_NONE)
     return;
 
   // The factory should be an exact dupe of the one we already have if it
@@ skipping 23 matching lines @@
   AddPPB(info->name, info->id, info->interface_ptr);
 }
 
 void InterfaceList::AddPPP(const InterfaceProxy::Info* info) {
   AddProxy(info->id, info->create_proxy);
   AddPPP(info->name, info->id, info->interface_ptr);
 }
 
 }  // namespace proxy
 }  // namespace ppapi