Convert flash to thunk

webkit/plugins/ppapi/ppb_flash_impl.h

Index: webkit/plugins/ppapi/ppb_flash_impl.h
diff --git a/webkit/plugins/ppapi/ppb_flash_impl.h b/webkit/plugins/ppapi/ppb_flash_impl.h
index 564f7464f8c4c101744f1d0abb656b7dd2daa34f..f48c10906f97177c8a6f49b57fe507356f419f4a 100644
--- a/webkit/plugins/ppapi/ppb_flash_impl.h
+++ b/webkit/plugins/ppapi/ppb_flash_impl.h
@@ -6,24 +6,57 @@
 #define WEBKIT_PLUGINS_PPAPI_PPB_FLASH_IMPL_H_
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "build/build_config.h"
-#include "ppapi/c/pp_point.h"
-#include "ppapi/c/pp_rect.h"
-#include "ppapi/c/private/ppb_flash.h"
+#include "ppapi/thunk/ppb_flash_api.h"
 
 namespace webkit {
 namespace ppapi {
 
-class PPB_Flash_Impl {
+class PluginInstance;
+
+class PPB_Flash_Impl : public ::ppapi::thunk::PPB_Flash_API {
  public:
-  // Returns a pointer to the interface implementing PPB_Flash that is
-  // exposed to the plugin.
-  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();
+  PPB_Flash_Impl(PluginInstance* instance);

[yzshen1, 2012/04/18 17:57:22]

explicit, please.

+  virtual ~PPB_Flash_Impl();
+
+  // PPB_Flash_API.
+  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;
 
  private:
+  PluginInstance* instance_;
+
   DISALLOW_COPY_AND_ASSIGN(PPB_Flash_Impl);
 };