Index: ppapi/proxy/flash_resource.h |
diff --git a/ppapi/proxy/flash_resource.h b/ppapi/proxy/flash_resource.h |
index 1fa8697ae461d94ff41d050f9670863a0f8a547e..b8c819ec143c7a14e6e3194c61e39d47a2717393 100644 |
--- a/ppapi/proxy/flash_resource.h |
+++ b/ppapi/proxy/flash_resource.h |
@@ -10,7 +10,6 @@ |
#include "ppapi/c/private/ppb_flash.h" |
#include "ppapi/proxy/connection.h" |
#include "ppapi/proxy/plugin_resource.h" |
-#include "ppapi/proxy/ppapi_proxy_export.h" |
#include "ppapi/thunk/ppb_flash_functions_api.h" |
namespace ppapi { |
@@ -18,9 +17,9 @@ namespace proxy { |
class PluginDispatcher; |
-class PPAPI_PROXY_EXPORT FlashResource |
+class FlashResource |
: public PluginResource, |
- public NON_EXPORTED_BASE(thunk::PPB_Flash_Functions_API) { |
+ public thunk::PPB_Flash_Functions_API { |
public: |
FlashResource(Connection connection, |
PP_Instance instance, |
@@ -41,6 +40,26 @@ class PPAPI_PROXY_EXPORT FlashResource |
PP_Time t) OVERRIDE; |
virtual PP_Var GetSetting(PP_Instance instance, |
PP_FlashSetting setting) OVERRIDE; |
+ 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_BrowserFont_Trusted_Description* 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 int32_t Navigate(PP_Instance instance, |
+ PP_Resource request_info, |
+ const char* target, |
+ PP_Bool from_user_action) OVERRIDE; |
+ virtual PP_Bool IsRectTopmost(PP_Instance instance, |
+ const PP_Rect* rect) OVERRIDE; |
private: |
// Non-owning pointer to the PluginDispatcher that owns this object. |