| Index: ppapi/proxy/flash_resource.h
|
| diff --git a/ppapi/proxy/flash_resource.h b/ppapi/proxy/flash_resource.h
|
| index 891de4c1a875c45bfb24d0a67f0fb96276441a0e..21cdbb73bce4b96eff759e3c19d493deade2625a 100644
|
| --- a/ppapi/proxy/flash_resource.h
|
| +++ b/ppapi/proxy/flash_resource.h
|
| @@ -24,25 +24,21 @@ class FlashResource
|
| FlashResource(Connection connection,
|
| PP_Instance instance,
|
| PluginDispatcher* plugin_dispatcher);
|
| - virtual ~FlashResource();
|
| + ~FlashResource() override;
|
|
|
| // Resource override.
|
| - virtual thunk::PPB_Flash_Functions_API* AsPPB_Flash_Functions_API() override;
|
| + thunk::PPB_Flash_Functions_API* AsPPB_Flash_Functions_API() override;
|
|
|
| // PPB_Flash_Functions_API implementation.
|
| - virtual PP_Var GetProxyForURL(PP_Instance instance,
|
| - const std::string& url) override;
|
| - virtual void UpdateActivity(PP_Instance instance) override;
|
| - virtual PP_Bool SetCrashData(PP_Instance instance,
|
| - PP_FlashCrashKey key,
|
| - PP_Var value) override;
|
| - virtual double GetLocalTimeZoneOffset(PP_Instance instance,
|
| - 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_Var GetProxyForURL(PP_Instance instance, const std::string& url) override;
|
| + void UpdateActivity(PP_Instance instance) override;
|
| + PP_Bool SetCrashData(PP_Instance instance,
|
| + PP_FlashCrashKey key,
|
| + PP_Var value) override;
|
| + double GetLocalTimeZoneOffset(PP_Instance instance, PP_Time t) override;
|
| + PP_Var GetSetting(PP_Instance instance, PP_FlashSetting setting) override;
|
| + void SetInstanceAlwaysOnTop(PP_Instance instance, PP_Bool on_top) override;
|
| + PP_Bool DrawGlyphs(
|
| PP_Instance instance,
|
| PP_Resource pp_image_data,
|
| const PP_BrowserFont_Trusted_Description* font_desc,
|
| @@ -54,13 +50,12 @@ class FlashResource
|
| 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;
|
| - virtual void InvokePrinting(PP_Instance instance) override;
|
| + int32_t Navigate(PP_Instance instance,
|
| + PP_Resource request_info,
|
| + const char* target,
|
| + PP_Bool from_user_action) override;
|
| + PP_Bool IsRectTopmost(PP_Instance instance, const PP_Rect* rect) override;
|
| + void InvokePrinting(PP_Instance instance) override;
|
|
|
| private:
|
| // Non-owning pointer to the PluginDispatcher that owns this object.
|
|
|