diff options
author | tsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 23:26:03 +0000 |
---|---|---|
committer | tsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 23:26:03 +0000 |
commit | b512bc23896d3efe23f3566a07552e6fe741c825 (patch) | |
tree | 9820b8e0c281b26e3f66a222e10700cc767ee41a | |
parent | 1cf2a8c8318b02125d86dce2c31945f9b709d22a (diff) | |
download | chromium_src-b512bc23896d3efe23f3566a07552e6fe741c825.zip chromium_src-b512bc23896d3efe23f3566a07552e6fe741c825.tar.gz chromium_src-b512bc23896d3efe23f3566a07552e6fe741c825.tar.bz2 |
Revert 135727 - Add AllowSuddenTermination to API. This provide means for plugins to let us know those windows where they need a renderer at shutdown to finish saving state.
Updated flash api version to 12.4.
BUG=https://code.google.com/p/flapper/issues/detail?id=120
Review URL: https://chromiumcodereview.appspot.com/10302021
TBR=tsepez@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10387071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136443 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | content/renderer/pepper/pepper_plugin_delegate_impl.cc | 4 | ||||
-rw-r--r-- | content/renderer/pepper/pepper_plugin_delegate_impl.h | 1 | ||||
-rw-r--r-- | content/renderer/render_thread_impl.cc | 4 | ||||
-rw-r--r-- | content/renderer/render_thread_impl.h | 2 | ||||
-rw-r--r-- | ppapi/api/private/ppb_flash.idl | 14 | ||||
-rw-r--r-- | ppapi/c/private/ppb_flash.h | 45 | ||||
-rw-r--r-- | ppapi/cpp/private/flash.cc | 22 | ||||
-rw-r--r-- | ppapi/cpp/private/flash.h | 3 | ||||
-rw-r--r-- | ppapi/proxy/ppapi_messages.h | 3 | ||||
-rw-r--r-- | ppapi/proxy/ppb_flash_proxy.cc | 17 | ||||
-rw-r--r-- | ppapi/proxy/ppb_flash_proxy.h | 4 | ||||
-rw-r--r-- | ppapi/thunk/interfaces_ppb_private_flash.h | 3 | ||||
-rw-r--r-- | ppapi/thunk/ppb_flash_api.h | 2 | ||||
-rw-r--r-- | ppapi/thunk/ppb_flash_thunk.cc | 28 | ||||
-rw-r--r-- | webkit/plugins/ppapi/mock_plugin_delegate.cc | 3 | ||||
-rw-r--r-- | webkit/plugins/ppapi/mock_plugin_delegate.h | 1 | ||||
-rw-r--r-- | webkit/plugins/ppapi/plugin_delegate.h | 3 | ||||
-rw-r--r-- | webkit/plugins/ppapi/ppb_flash_impl.cc | 5 | ||||
-rw-r--r-- | webkit/plugins/ppapi/ppb_flash_impl.h | 2 |
19 files changed, 8 insertions, 158 deletions
diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.cc b/content/renderer/pepper/pepper_plugin_delegate_impl.cc index 95085f5..5803ffb 100644 --- a/content/renderer/pepper/pepper_plugin_delegate_impl.cc +++ b/content/renderer/pepper/pepper_plugin_delegate_impl.cc @@ -545,10 +545,6 @@ void PepperPluginDelegateImpl::InstanceDeleted( PluginFocusChanged(instance, false); } -void PepperPluginDelegateImpl::SetAllowSuddenTermination(bool allowed) { - RenderThreadImpl::current()->SetAllowSuddenTermination(allowed); -} - SkBitmap* PepperPluginDelegateImpl::GetSadPluginBitmap() { return GetContentClient()->renderer()->GetSadPluginBitmap(); } diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.h b/content/renderer/pepper/pepper_plugin_delegate_impl.h index f1f4dc3..a7ce753 100644 --- a/content/renderer/pepper/pepper_plugin_delegate_impl.h +++ b/content/renderer/pepper/pepper_plugin_delegate_impl.h @@ -167,7 +167,6 @@ class PepperPluginDelegateImpl webkit::ppapi::PluginInstance* instance) OVERRIDE; virtual void InstanceDeleted( webkit::ppapi::PluginInstance* instance) OVERRIDE; - virtual void SetAllowSuddenTermination(bool allowed) OVERRIDE; virtual SkBitmap* GetSadPluginBitmap() OVERRIDE; virtual WebKit::WebPlugin* CreatePluginReplacement( const FilePath& file_path) OVERRIDE; diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index 308dc60..b15660b 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -697,10 +697,6 @@ void RenderThreadImpl::PostponeIdleNotification() { idle_notifications_to_skip_ = 2; } -void RenderThreadImpl::SetAllowSuddenTermination(bool allowed) { - webkit_platform_support_->suddenTerminationChanged(allowed); -} - #if defined(OS_WIN) void RenderThreadImpl::PreCacheFont(const LOGFONT& log_font) { Send(new ChildProcessHostMsg_PreCacheFont(log_font)); diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h index 015b7fd..305bd16 100644 --- a/content/renderer/render_thread_impl.h +++ b/content/renderer/render_thread_impl.h @@ -200,8 +200,6 @@ class CONTENT_EXPORT RenderThreadImpl : public content::RenderThread, // not sent for at least one notification delay. void PostponeIdleNotification(); - void SetAllowSuddenTermination(bool allowed); - private: virtual bool OnControlMessageReceived(const IPC::Message& msg) OVERRIDE; diff --git a/ppapi/api/private/ppb_flash.idl b/ppapi/api/private/ppb_flash.idl index 6f005a4..a08c4d0 100644 --- a/ppapi/api/private/ppb_flash.idl +++ b/ppapi/api/private/ppb_flash.idl @@ -11,8 +11,7 @@ label Chrome { M17 = 12.0, M19 = 12.1, M20_0 = 12.2, - M20_1 = 12.3, - M20_2 = 12.4 + M20_1 = 12.3 }; [assert_size(4)] @@ -168,17 +167,6 @@ interface PPB_Flash { */ [version=12.3] int32_t GetSettingInt(PP_Instance instance, PP_FlashSetting setting); - - /** - * Indicates whether simply killing the renderer as a means of "fast shutdown" - * is acceptable. The initial state is that fast shutdown is allowed. Used - * when the plugin has shutdown actions that depend on a live renderer to - * complete. - */ - [version=12.4] - void SetAllowSuddenTermination( - [in] PP_Instance instance, - [in] PP_Bool allowed); }; #inline c diff --git a/ppapi/c/private/ppb_flash.h b/ppapi/c/private/ppb_flash.h index 54959b9..b7dc4bc 100644 --- a/ppapi/c/private/ppb_flash.h +++ b/ppapi/c/private/ppb_flash.h @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -/* From private/ppb_flash.idl modified Fri May 4 10:14:01 2012. */ +/* From private/ppb_flash.idl modified Tue May 01 16:01:19 2012. */ #ifndef PPAPI_C_PRIVATE_PPB_FLASH_H_ #define PPAPI_C_PRIVATE_PPB_FLASH_H_ @@ -25,8 +25,7 @@ #define PPB_FLASH_INTERFACE_12_1 "PPB_Flash;12.1" #define PPB_FLASH_INTERFACE_12_2 "PPB_Flash;12.2" #define PPB_FLASH_INTERFACE_12_3 "PPB_Flash;12.3" -#define PPB_FLASH_INTERFACE_12_4 "PPB_Flash;12.4" -#define PPB_FLASH_INTERFACE PPB_FLASH_INTERFACE_12_4 +#define PPB_FLASH_INTERFACE PPB_FLASH_INTERFACE_12_3 /** * @file @@ -71,7 +70,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_FlashSetting, 4); * The <code>PPB_Flash</code> interface contains pointers to various functions * that are only needed to support Pepper Flash. */ -struct PPB_Flash_12_4 { +struct PPB_Flash_12_3 { /** * Sets or clears the rendering hint that the given plugin instance is always * on top of page content. Somewhat more optimized painting can be used in @@ -163,16 +162,9 @@ struct PPB_Flash_12_4 { * result in -1 return value. */ int32_t (*GetSettingInt)(PP_Instance instance, PP_FlashSetting setting); - /** - * Indicates whether simply killing the renderer as a means of "fast shutdown" - * is acceptable. The initial state is that fast shutdown is allowed. Used - * when the plugin has shutdown actions that depend on a live renderer to - * complete. - */ - void (*SetAllowSuddenTermination)(PP_Instance instance, PP_Bool allowed); }; -typedef struct PPB_Flash_12_4 PPB_Flash; +typedef struct PPB_Flash_12_3 PPB_Flash; struct PPB_Flash_12_0 { void (*SetInstanceAlwaysOnTop)(PP_Instance instance, PP_Bool on_top); @@ -252,35 +244,6 @@ struct PPB_Flash_12_2 { void (*UpdateActivity)(PP_Instance instance); struct PP_Var (*GetDeviceID)(PP_Instance instance); }; - -struct PPB_Flash_12_3 { - void (*SetInstanceAlwaysOnTop)(PP_Instance instance, PP_Bool on_top); - PP_Bool (*DrawGlyphs)(PP_Instance instance, - PP_Resource pp_image_data, - const struct PP_FontDescription_Dev* font_desc, - uint32_t color, - const struct PP_Point* position, - const struct PP_Rect* clip, - const float transformation[3][3], - PP_Bool allow_subpixel_aa, - uint32_t glyph_count, - const uint16_t glyph_indices[], - const struct PP_Point glyph_advances[]); - struct PP_Var (*GetProxyForURL)(PP_Instance instance, const char* url); - int32_t (*Navigate)(PP_Resource request_info, - const char* target, - PP_Bool from_user_action); - void (*RunMessageLoop)(PP_Instance instance); - void (*QuitMessageLoop)(PP_Instance instance); - double (*GetLocalTimeZoneOffset)(PP_Instance instance, PP_Time t); - struct PP_Var (*GetCommandLineArgs)(PP_Module module); - void (*PreloadFontWin)(const void* logfontw); - PP_Bool (*IsRectTopmost)(PP_Instance instance, const struct PP_Rect* rect); - int32_t (*InvokePrinting)(PP_Instance instance); - void (*UpdateActivity)(PP_Instance instance); - struct PP_Var (*GetDeviceID)(PP_Instance instance); - int32_t (*GetSettingInt)(PP_Instance instance, PP_FlashSetting setting); -}; /** * @} */ diff --git a/ppapi/cpp/private/flash.cc b/ppapi/cpp/private/flash.cc index 6fa4ded..0eb83d6 100644 --- a/ppapi/cpp/private/flash.cc +++ b/ppapi/cpp/private/flash.cc @@ -24,10 +24,6 @@ namespace pp { namespace { -template <> const char* interface_name<PPB_Flash_12_4>() { - return PPB_FLASH_INTERFACE_12_4; -} - template <> const char* interface_name<PPB_Flash_12_3>() { return PPB_FLASH_INTERFACE_12_3; } @@ -61,10 +57,7 @@ PPB_Flash flash_12_combined_interface; void InitializeCombinedInterface() { if (initialized_combined_interface) return; - if (has_interface<PPB_Flash_12_4>()) { - memcpy(&flash_12_combined_interface, get_interface<PPB_Flash_12_4>(), - sizeof(PPB_Flash_12_4)); - } else if (has_interface<PPB_Flash_12_3>()) { + if (has_interface<PPB_Flash_12_3>()) { memcpy(&flash_12_combined_interface, get_interface<PPB_Flash_12_3>(), sizeof(PPB_Flash_12_3)); } else if (has_interface<PPB_Flash_12_2>()) { @@ -86,8 +79,7 @@ namespace flash { // static bool Flash::IsAvailable() { - return has_interface<PPB_Flash_12_4>() || - has_interface<PPB_Flash_12_3>() || + return has_interface<PPB_Flash_12_3>() || has_interface<PPB_Flash_12_2>() || has_interface<PPB_Flash_12_1>() || has_interface<PPB_Flash_12_0>() || @@ -241,16 +233,6 @@ int32_t Flash::GetSettingInt(const InstanceHandle& instance, } // static -void Flash::SetAllowSuddenTermination(const InstanceHandle& instance, - bool allowed) { - InitializeCombinedInterface(); - if (flash_12_combined_interface.SetAllowSuddenTermination) { - flash_12_combined_interface.SetAllowSuddenTermination( - instance.pp_instance(), PP_FromBool(allowed)); - } -} - -// static bool Flash::InvokePrinting(const InstanceHandle& instance) { if (has_interface<PPB_Flash_Print_1_0>()) { get_interface<PPB_Flash_Print_1_0>()->InvokePrinting( diff --git a/ppapi/cpp/private/flash.h b/ppapi/cpp/private/flash.h index d14dbfe..8b1e81b 100644 --- a/ppapi/cpp/private/flash.h +++ b/ppapi/cpp/private/flash.h @@ -60,8 +60,7 @@ class Flash { static Var GetDeviceID(const InstanceHandle& instance); static int32_t GetSettingInt(const InstanceHandle& instance, PP_FlashSetting setting); - static void SetAllowSuddenTermination(const InstanceHandle& instance, - bool allowed); + // PPB_Flash_Print. static bool InvokePrinting(const InstanceHandle& instance); }; diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h index f6918d2..b40d9a8 100644 --- a/ppapi/proxy/ppapi_messages.h +++ b/ppapi/proxy/ppapi_messages.h @@ -1175,9 +1175,6 @@ IPC_SYNC_MESSAGE_ROUTED1_2(PpapiHostMsg_PPBFlash_FlashGetScreenSize, PP_Instance /* instance */, PP_Bool /* result */, PP_Size /* size */) -IPC_SYNC_MESSAGE_ROUTED2_0(PpapiHostMsg_PPBFlash_SetAllowSuddenTermination, - PP_Instance /* instance */, - PP_Bool /* allowed */) IPC_MESSAGE_ROUTED0(PpapiHostMsg_PPBFlash_UpdateActivity) IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBFlash_GetDeviceID, PP_Instance /* instance */, diff --git a/ppapi/proxy/ppb_flash_proxy.cc b/ppapi/proxy/ppb_flash_proxy.cc index 6832ce2..ded0880 100644 --- a/ppapi/proxy/ppb_flash_proxy.cc +++ b/ppapi/proxy/ppb_flash_proxy.cc @@ -420,8 +420,6 @@ bool PPB_Flash_Proxy::OnMessageReceived(const IPC::Message& msg) { OnHostMsgFlashSetFullscreen) IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_FlashGetScreenSize, OnHostMsgFlashGetScreenSize) - IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_SetAllowSuddenTermination, - OnHostMsgFlashSetAllowSuddenTermination) IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_IsClipboardFormatAvailable, OnHostMsgIsClipboardFormatAvailable) IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBFlash_ReadClipboardData, @@ -823,12 +821,6 @@ PP_Bool PPB_Flash_Proxy::FlashGetScreenSize(PP_Instance instance, return result; } -void PPB_Flash_Proxy::SetAllowSuddenTermination(PP_Instance instance, - PP_Bool allowed) { - dispatcher()->Send(new PpapiHostMsg_PPBFlash_SetAllowSuddenTermination( - API_ID_PPB_FLASH, instance, allowed)); -} - void PPB_Flash_Proxy::OnHostMsgSetInstanceAlwaysOnTop(PP_Instance instance, PP_Bool on_top) { EnterInstanceNoLock enter(instance); @@ -977,15 +969,6 @@ void PPB_Flash_Proxy::OnHostMsgFlashGetScreenSize(PP_Instance instance, } } -void PPB_Flash_Proxy::OnHostMsgFlashSetAllowSuddenTermination( - PP_Instance instance, PP_Bool allowed) { - EnterInstanceNoLock enter(instance); - if (enter.succeeded()) { - enter.functions()->GetFlashAPI()->SetAllowSuddenTermination(instance, - allowed); - } -} - void PPB_Flash_Proxy::OnHostMsgIsClipboardFormatAvailable( PP_Instance instance, int clipboard_type, diff --git a/ppapi/proxy/ppb_flash_proxy.h b/ppapi/proxy/ppb_flash_proxy.h index 171db5b..b9ae9d0 100644 --- a/ppapi/proxy/ppb_flash_proxy.h +++ b/ppapi/proxy/ppb_flash_proxy.h @@ -117,8 +117,6 @@ class PPB_Flash_Proxy : public InterfaceProxy, public PPB_Flash_Shared { PP_Bool fullscreen) OVERRIDE; virtual PP_Bool FlashGetScreenSize(PP_Instance instance, PP_Size* size) OVERRIDE; - virtual void SetAllowSuddenTermination(PP_Instance instance, - PP_Bool allowed) OVERRIDE; static const ApiID kApiID = API_ID_PPB_FLASH; @@ -150,8 +148,6 @@ class PPB_Flash_Proxy : public InterfaceProxy, public PPB_Flash_Shared { void OnHostMsgFlashGetScreenSize(PP_Instance instance, PP_Bool* result, PP_Size* size); - void OnHostMsgFlashSetAllowSuddenTermination(PP_Instance instance, - PP_Bool allowed); void OnHostMsgIsClipboardFormatAvailable(PP_Instance instance, int clipboard_type, int format, diff --git a/ppapi/thunk/interfaces_ppb_private_flash.h b/ppapi/thunk/interfaces_ppb_private_flash.h index fa8842a..e36f502 100644 --- a/ppapi/thunk/interfaces_ppb_private_flash.h +++ b/ppapi/thunk/interfaces_ppb_private_flash.h @@ -20,9 +20,6 @@ PROXIED_IFACE(PPB_Flash, PROXIED_IFACE(PPB_Flash, PPB_FLASH_INTERFACE_12_3, PPB_Flash_12_3) -PROXIED_IFACE(PPB_Flash, - PPB_FLASH_INTERFACE_12_4, - PPB_Flash_12_4) PROXIED_IFACE(PPB_Flash, PPB_FLASH_CLIPBOARD_INTERFACE_3_LEGACY, diff --git a/ppapi/thunk/ppb_flash_api.h b/ppapi/thunk/ppb_flash_api.h index 04fa66f..fe7ec50 100644 --- a/ppapi/thunk/ppb_flash_api.h +++ b/ppapi/thunk/ppb_flash_api.h @@ -44,8 +44,6 @@ class PPAPI_THUNK_EXPORT PPB_Flash_API { virtual PP_Var GetDeviceID(PP_Instance instance) = 0; virtual int32_t GetSettingInt(PP_Instance instance, PP_FlashSetting setting) = 0; - virtual void SetAllowSuddenTermination(PP_Instance instance, - PP_Bool allowed) = 0; // FlashClipboard. virtual PP_Bool IsClipboardFormatAvailable( diff --git a/ppapi/thunk/ppb_flash_thunk.cc b/ppapi/thunk/ppb_flash_thunk.cc index 15b0d43..57d86f9 100644 --- a/ppapi/thunk/ppb_flash_thunk.cc +++ b/ppapi/thunk/ppb_flash_thunk.cc @@ -137,14 +137,6 @@ int32_t GetSettingInt(PP_Instance instance, PP_FlashSetting setting) { return enter.functions()->GetFlashAPI()->GetSettingInt(instance, setting); } -void SetAllowSuddenTermination(PP_Instance instance, PP_Bool allowed) { - EnterInstance enter(instance); - if (enter.succeeded()) { - enter.functions()->GetFlashAPI()->SetAllowSuddenTermination(instance, - allowed); - } -} - const PPB_Flash_12_0 g_ppb_flash_12_0_thunk = { &SetInstanceAlwaysOnTop, &DrawGlyphs, @@ -205,23 +197,6 @@ const PPB_Flash_12_3 g_ppb_flash_12_3_thunk = { &GetSettingInt }; -const PPB_Flash_12_4 g_ppb_flash_12_4_thunk = { - &SetInstanceAlwaysOnTop, - &DrawGlyphs, - &GetProxyForURL, - &Navigate, - &RunMessageLoop, - &QuitMessageLoop, - &GetLocalTimeZoneOffset, - &GetCommandLineArgs, - &PreLoadFontWin, - &IsRectTopmost, - &InvokePrinting, - &UpdateActivity, - &GetDeviceID, - &GetSettingInt, - &SetAllowSuddenTermination -}; } // namespace const PPB_Flash_12_0* GetPPB_Flash_12_0_Thunk() { @@ -240,8 +215,5 @@ const PPB_Flash_12_3* GetPPB_Flash_12_3_Thunk() { return &g_ppb_flash_12_3_thunk; } -const PPB_Flash_12_4* GetPPB_Flash_12_4_Thunk() { - return &g_ppb_flash_12_4_thunk; -} } // namespace thunk } // namespace ppapi diff --git a/webkit/plugins/ppapi/mock_plugin_delegate.cc b/webkit/plugins/ppapi/mock_plugin_delegate.cc index ef7df7a..971754c 100644 --- a/webkit/plugins/ppapi/mock_plugin_delegate.cc +++ b/webkit/plugins/ppapi/mock_plugin_delegate.cc @@ -46,9 +46,6 @@ void MockPluginDelegate::InstanceCreated(PluginInstance* instance) { void MockPluginDelegate::InstanceDeleted(PluginInstance* instance) { } -void MockPluginDelegate::SetAllowSuddenTermination(bool allowed) { -} - SkBitmap* MockPluginDelegate::GetSadPluginBitmap() { return NULL; } diff --git a/webkit/plugins/ppapi/mock_plugin_delegate.h b/webkit/plugins/ppapi/mock_plugin_delegate.h index 48ab17d..91c62e0 100644 --- a/webkit/plugins/ppapi/mock_plugin_delegate.h +++ b/webkit/plugins/ppapi/mock_plugin_delegate.h @@ -27,7 +27,6 @@ class MockPluginDelegate : public PluginDelegate { virtual void PluginCrashed(PluginInstance* instance); virtual void InstanceCreated(PluginInstance* instance); virtual void InstanceDeleted(PluginInstance* instance); - virtual void SetAllowSuddenTermination(bool allowed); virtual SkBitmap* GetSadPluginBitmap(); virtual WebKit::WebPlugin* CreatePluginReplacement(const FilePath& file_path); virtual PlatformImage2D* CreateImage2D(int width, int height); diff --git a/webkit/plugins/ppapi/plugin_delegate.h b/webkit/plugins/ppapi/plugin_delegate.h index c71767a..304cb09 100644 --- a/webkit/plugins/ppapi/plugin_delegate.h +++ b/webkit/plugins/ppapi/plugin_delegate.h @@ -330,9 +330,6 @@ class PluginDelegate { // from this call. virtual void InstanceDeleted(PluginInstance* instance) = 0; - // Indicates if the plugin needs a live renderer at termination. - virtual void SetAllowSuddenTermination(bool allowed) = 0; - // Returns a pointer (ownership not transferred) to the bitmap to paint the // sad plugin screen with. Returns NULL on failure. virtual SkBitmap* GetSadPluginBitmap() = 0; diff --git a/webkit/plugins/ppapi/ppb_flash_impl.cc b/webkit/plugins/ppapi/ppb_flash_impl.cc index 37a3673..668a8c1 100644 --- a/webkit/plugins/ppapi/ppb_flash_impl.cc +++ b/webkit/plugins/ppapi/ppb_flash_impl.cc @@ -247,11 +247,6 @@ int32_t PPB_Flash_Impl::GetSettingInt(PP_Instance instance, return -1; } -void PPB_Flash_Impl::SetAllowSuddenTermination(PP_Instance instance, - PP_Bool allowed) { - instance_->delegate()->SetAllowSuddenTermination(PP_ToBool(allowed)); -} - PP_Bool PPB_Flash_Impl::IsClipboardFormatAvailable( PP_Instance instance, PP_Flash_Clipboard_Type clipboard_type, diff --git a/webkit/plugins/ppapi/ppb_flash_impl.h b/webkit/plugins/ppapi/ppb_flash_impl.h index 76674e7..83c08d3 100644 --- a/webkit/plugins/ppapi/ppb_flash_impl.h +++ b/webkit/plugins/ppapi/ppb_flash_impl.h @@ -56,8 +56,6 @@ class PPB_Flash_Impl : public ::ppapi::PPB_Flash_Shared { virtual PP_Var GetDeviceID(PP_Instance instance) OVERRIDE; virtual int32_t GetSettingInt(PP_Instance instance, PP_FlashSetting settiny) OVERRIDE; - virtual void SetAllowSuddenTermination(PP_Instance instance, - PP_Bool allowed) OVERRIDE; virtual PP_Bool IsClipboardFormatAvailable( PP_Instance instance, PP_Flash_Clipboard_Type clipboard_type, |