Convert flash to thunk

ppapi/proxy/ppb_flash_proxy.h

Index: ppapi/proxy/ppb_flash_proxy.h
diff --git a/ppapi/proxy/ppb_flash_proxy.h b/ppapi/proxy/ppb_flash_proxy.h
index 00ee011ad349e5831b2968f4a9bd08d469f13458..1c051e54fb69692144f323f5025c9d3bc63fb04f 100644
--- a/ppapi/proxy/ppb_flash_proxy.h
+++ b/ppapi/proxy/ppb_flash_proxy.h
@@ -8,6 +8,7 @@
 #include <string>
 #include <vector>
 
+#include "base/compiler_specific.h"
 #include "ipc/ipc_platform_file.h"
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_instance.h"
@@ -16,6 +17,7 @@
 #include "ppapi/c/private/ppb_flash.h"
 #include "ppapi/proxy/interface_proxy.h"
 #include "ppapi/shared_impl/host_resource.h"
+#include "ppapi/thunk/ppb_flash_api.h"
 
 namespace ppapi {
 
@@ -26,41 +28,78 @@ namespace proxy {
 struct PPBFlash_DrawGlyphs_Params;
 class SerializedVarReturnValue;
 
-class PPB_Flash_Proxy : public InterfaceProxy {
+class PPB_Flash_Proxy : public InterfaceProxy,
+                        public thunk::PPB_Flash_API {
  public:
   explicit PPB_Flash_Proxy(Dispatcher* dispatcher);
   virtual ~PPB_Flash_Proxy();
 
-  // Returns the corresponding version of the Flash interface pointer.
-  static const PPB_Flash_11* GetInterface11();
-  static const PPB_Flash_12_0* GetInterface12_0();
-  static const PPB_Flash_12_1* GetInterface12_1();
-  static const PPB_Flash_12_2* GetInterface12_2();
-
   // InterfaceProxy implementation.
   virtual bool OnMessageReceived(const IPC::Message& msg);
 
+  // PPB_Flash_API implementation.
+  virtual void SetInstanceAlwaysOnTop(PP_Instance instance,
+                                      PP_Bool on_top) OVERRIDE;
+  virtual PP_Bool DrawGlyphs(PP_Instance instance,
+                             PP_Resource pp_image_data,
+                             const PP_FontDescription_Dev* font_desc,
+                             uint32_t color,
+                             const PP_Point* position,
+                             const PP_Rect* clip,
+                             const float transformation[3][3],
+                             PP_Bool allow_subpixel_aa,
+                             uint32_t glyph_count,
+                             const uint16_t glyph_indices[],
+                             const PP_Point glyph_advances[]) OVERRIDE;
+  virtual PP_Var GetProxyForURL(PP_Instance instance, const char* url) OVERRIDE;
+  virtual int32_t Navigate(PP_Instance instance,
+                           PP_Resource request_info,
+                           const char* target,
+                           PP_Bool from_user_action) OVERRIDE;
+  virtual void RunMessageLoop(PP_Instance instance) OVERRIDE;
+  virtual void QuitMessageLoop(PP_Instance instance) OVERRIDE;
+  virtual double GetLocalTimeZoneOffset(PP_Instance instance,
+                                        PP_Time t) OVERRIDE;
+  virtual PP_Bool IsRectTopmost(PP_Instance instance,
+                                const PP_Rect* rect) OVERRIDE;
+  virtual int32_t InvokePrinting(PP_Instance instance) OVERRIDE;
+  virtual void UpdateActivity(PP_Instance instance) OVERRIDE;
+  virtual PP_Var GetDeviceID(PP_Instance instance) OVERRIDE;
+  virtual PP_Bool FlashIsFullscreen(PP_Instance instance) OVERRIDE;
+  virtual PP_Bool FlashSetFullscreen(PP_Instance instance,
+                                     PP_Bool fullscreen) OVERRIDE;
+  virtual PP_Bool FlashGetScreenSize(PP_Instance instance,
+                                     PP_Size* size) OVERRIDE;
+
+  static const ApiID kApiID = API_ID_PPB_FLASH;
+
  private:
   // Message handlers.
-  void OnMsgSetInstanceAlwaysOnTop(PP_Instance instance,
-                                   PP_Bool on_top);
-  void OnMsgDrawGlyphs(const PPBFlash_DrawGlyphs_Params& params,
-                       PP_Bool* result);
-  void OnMsgGetProxyForURL(PP_Instance instance,
-                           const std::string& url,
-                           SerializedVarReturnValue result);
-  void OnMsgNavigate(PP_Instance instance,
-                     const PPB_URLRequestInfo_Data& data,
-                     const std::string& target,
-                     PP_Bool from_user_action,
-                     int32_t* result);
-  void OnMsgRunMessageLoop(PP_Instance instance);
-  void OnMsgQuitMessageLoop(PP_Instance instance);
-  void OnMsgGetLocalTimeZoneOffset(PP_Instance instance, PP_Time t,
-                                   double* result);
-  void OnMsgIsRectTopmost(PP_Instance instance,
-                          PP_Rect rect,
-                          PP_Bool* result);
+  void OnHostMsgSetInstanceAlwaysOnTop(PP_Instance instance,
+                                       PP_Bool on_top);
+  void OnHostMsgDrawGlyphs(const PPBFlash_DrawGlyphs_Params& params,
+                           PP_Bool* result);
+  void OnHostMsgGetProxyForURL(PP_Instance instance,
+                               const std::string& url,
+                               SerializedVarReturnValue result);
+  void OnHostMsgNavigate(PP_Instance instance,
+                         const PPB_URLRequestInfo_Data& data,
+                         const std::string& target,
+                         PP_Bool from_user_action,
+                         int32_t* result);
+  void OnHostMsgRunMessageLoop(PP_Instance instance);
+  void OnHostMsgQuitMessageLoop(PP_Instance instance);
+  void OnHostMsgGetLocalTimeZoneOffset(PP_Instance instance, PP_Time t,
+                                       double* result);
+  void OnHostMsgIsRectTopmost(PP_Instance instance,
+                              PP_Rect rect,
+                              PP_Bool* result);
+  void OnHostMsgFlashSetFullscreen(PP_Instance instance,
+                                   PP_Bool fullscreen,
+                                   PP_Bool* result);
+  void OnHostMsgFlashGetScreenSize(PP_Instance instance,
+                                   PP_Bool* result,
+                                   PP_Size* size);
 
   // When this proxy is in the host side, this value caches the interface
   // pointer so we don't have to retrieve it from the dispatcher each time.