Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(131)

Unified Diff: webkit/plugins/ppapi/ppapi_plugin_instance.h

Issue 10091003: Convert flash to thunk (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/plugins/ppapi/ppapi_plugin_instance.h
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.h b/webkit/plugins/ppapi/ppapi_plugin_instance.h
index dc430e713daaeb3627a6c548ecfedfa5fd5ed177..3dcbab716d4e7f6f7f952846a09bed7d12962616 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.h
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h
@@ -45,6 +45,7 @@
#include "ui/base/ime/text_input_type.h"
#include "ui/gfx/rect.h"
#include "webkit/plugins/ppapi/plugin_delegate.h"
+#include "webkit/plugins/ppapi/ppb_flash_impl.h"
#include "webkit/plugins/ppapi/ppp_pdf.h"
#include "webkit/plugins/webkit_plugins_export.h"
@@ -289,6 +290,8 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance :
// view_data_.is_fullscreen = true
bool IsFullscreenOrPending();
+ bool flash_fullscreen() const { return flash_fullscreen_; }
+
// Switches between fullscreen and normal mode. The transition is
// asynchronous. WebKit will trigger corresponding VewChanged calls.
// Returns true on success, false on failure (e.g. trying to enter fullscreen
@@ -354,15 +357,11 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance :
PP_Bool final_result) OVERRIDE;
virtual void SelectedFindResultChanged(PP_Instance instance,
int32_t index) 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;
virtual PP_Bool SetFullscreen(PP_Instance instance,
PP_Bool fullscreen) OVERRIDE;
virtual PP_Bool GetScreenSize(PP_Instance instance, PP_Size* size)
OVERRIDE;
+ virtual ::ppapi::thunk::PPB_Flash_API* GetFlashAPI() OVERRIDE;
virtual int32_t RequestInputEvents(PP_Instance instance,
uint32_t event_classes) OVERRIDE;
virtual int32_t RequestFilteringInputEvents(PP_Instance instance,
@@ -648,6 +647,9 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance :
// a user gesture after it has been processed.
PP_TimeTicks pending_user_gesture_;
+ // The Flash proxy is associated with the instance.
+ PPB_Flash_Impl flash_impl_;
+
DISALLOW_COPY_AND_ASSIGN(PluginInstance);
};

Powered by Google App Engine
This is Rietveld 408576698