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

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

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.cc
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
index ffb0c17a4f95a041e3ee9b3b2cc815af254f7a42..c89f2bdf7f6ffe90714f79aebd34a63322217693 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
@@ -316,7 +316,8 @@ PluginInstance::PluginInstance(
selection_caret_(0),
selection_anchor_(0),
lock_mouse_callback_(PP_BlockUntilComplete()),
- pending_user_gesture_(0.0) {
+ pending_user_gesture_(0.0),
+ flash_impl_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
pp_instance_ = HostGlobals::Get()->AddInstance(this);
memset(&current_print_settings_, 0, sizeof(current_print_settings_));
@@ -1924,30 +1925,19 @@ void PluginInstance::SelectedFindResultChanged(PP_Instance instance,
delegate_->SelectedFindResultChanged(find_identifier_, index);
}
-PP_Bool PluginInstance::FlashIsFullscreen(PP_Instance instance) {
- return PP_FromBool(flash_fullscreen_);
-}
-
PP_Bool PluginInstance::SetFullscreen(PP_Instance instance,
PP_Bool fullscreen) {
return PP_FromBool(SetFullscreen(PP_ToBool(fullscreen)));
}
-PP_Bool PluginInstance::FlashSetFullscreen(PP_Instance instance,
- PP_Bool fullscreen) {
- FlashSetFullscreen(PP_ToBool(fullscreen), true);
- return PP_TRUE;
-}
-
PP_Bool PluginInstance::GetScreenSize(PP_Instance instance, PP_Size* size) {
gfx::Size screen_size = delegate()->GetScreenSize();
*size = PP_MakeSize(screen_size.width(), screen_size.height());
return PP_TRUE;
}
-PP_Bool PluginInstance::FlashGetScreenSize(PP_Instance instance,
- PP_Size* size) {
- return GetScreenSize(instance, size);
+::ppapi::thunk::PPB_Flash_API* PluginInstance::GetFlashAPI() {
+ return &flash_impl_;
}
int32_t PluginInstance::RequestInputEvents(PP_Instance instance,

Powered by Google App Engine
This is Rietveld 408576698