Refactor the way singleton-style resources are exposed via PPB_Instance

ppapi/thunk/ppb_instance_api.h

 // 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.
 
 #ifndef PPAPI_THUNK_INSTANCE_API_H_
 #define PPAPI_THUNK_INSTANCE_API_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "ppapi/c/dev/ppb_console_dev.h"
 #include "ppapi/c/dev/ppb_text_input_dev.h"
 #include "ppapi/c/dev/ppb_url_util_dev.h"
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_size.h"
 #include "ppapi/c/pp_time.h"
 #include "ppapi/c/ppb_audio_config.h"
 #include "ppapi/c/ppb_gamepad.h"
 #include "ppapi/c/ppb_instance.h"
 #include "ppapi/c/ppb_mouse_cursor.h"
 #include "ppapi/c/private/pp_content_decryptor.h"
 #include "ppapi/c/private/ppb_instance_private.h"
 #include "ppapi/shared_impl/api_id.h"
+#include "ppapi/shared_impl/resource.h"
 
 // Windows headers interfere with this file.
 #ifdef PostMessage
 #undef PostMessage
 #endif
 
 struct PP_DecryptedBlockInfo;
 struct PP_DecryptedFrameInfo;
 
 namespace ppapi {
 
+class Resource;
 class TrackedCallback;
 struct ViewData;
 
 namespace thunk {
 
 class PPB_Flash_API;
-class PPB_Flash_Clipboard_API;
-class PPB_Flash_Functions_API;
-class PPB_Gamepad_API;
 
 class PPB_Instance_API {
  public:
   virtual ~PPB_Instance_API() {}
 
   virtual PP_Bool BindGraphics(PP_Instance instance, PP_Resource device) = 0;
   virtual PP_Bool IsFullFrame(PP_Instance instance) = 0;
 
   // Not an exposed PPAPI function, this returns the internal view data struct.
   virtual const ViewData* GetViewData(PP_Instance instance) = 0;
@@ skipping 31 matching lines @@
   // Font.
   virtual PP_Var GetFontFamilies(PP_Instance instance) = 0;
 
   // Fullscreen.
   virtual PP_Bool SetFullscreen(PP_Instance instance,
                                 PP_Bool fullscreen) = 0;
   virtual PP_Bool GetScreenSize(PP_Instance instance, PP_Size* size) = 0;
 
   // Flash (Deprecated for Flash_Functions).
   virtual PPB_Flash_API* GetFlashAPI() = 0;
-  // Flash_Functions
-  virtual PPB_Flash_Functions_API* GetFlashFunctionsAPI(
-      PP_Instance instance) = 0;
 
-  // Flash_Clipboard.
-  virtual PPB_Flash_Clipboard_API* GetFlashClipboardAPI(
-      PP_Instance instance) = 0;
-
-  // Gamepad.
-  virtual PPB_Gamepad_API* GetGamepadAPI(PP_Instance instance) = 0;
+  // This is an implementation-only function which grabs an instance of a
+  // "singleton resource". These are used to implement instance interfaces
+  // (functions which are associated with the instance itself as opposed to a
+  // resource).
+  virtual Resource* GetSingletonResource(
+      PP_Instance instance, SingletonResourceID id) = 0;
 
   // InputEvent.
   virtual int32_t RequestInputEvents(PP_Instance instance,
                                      uint32_t event_classes) = 0;
   virtual int32_t RequestFilteringInputEvents(PP_Instance instance,
                                               uint32_t event_classes) = 0;
   virtual void ClearInputEventRequest(PP_Instance instance,
                                       uint32_t event_classes) = 0;
   virtual void ClosePendingUserGesture(PP_Instance instance,
                                        PP_TimeTicks timestamp) = 0;
@@ skipping 84 matching lines @@
                                       PP_URLComponents_Dev* components) = 0;
 #endif  // !defined(OS_NACL)
 
   static const ApiID kApiID = API_ID_PPB_INSTANCE;
 };
 
 }  // namespace thunk
 }  // namespace ppapi
 
 #endif  // PPAPI_THUNK_INSTANCE_API_H_