diff options
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/plugins/ppapi/plugin_module.cc | 3 | ||||
| -rw-r--r-- | webkit/plugins/ppapi/ppapi_plugin_instance.cc | 4 | ||||
| -rw-r--r-- | webkit/plugins/ppapi/ppapi_plugin_instance.h | 8 |
3 files changed, 9 insertions, 6 deletions
diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc index cb5f134..9742f89 100644 --- a/webkit/plugins/ppapi/plugin_module.cc +++ b/webkit/plugins/ppapi/plugin_module.cc @@ -51,6 +51,7 @@ #include "ppapi/c/ppb_file_io.h" #include "ppapi/c/ppb_file_ref.h" #include "ppapi/c/ppb_file_system.h" +#include "ppapi/c/ppb_fullscreen.h" #include "ppapi/c/ppb_graphics_2d.h" #include "ppapi/c/ppb_graphics_3d.h" #include "ppapi/c/ppb_image_data.h" @@ -275,6 +276,8 @@ const void* GetInterface(const char* name) { return ::ppapi::thunk::GetPPB_Flash_UDPSocket_Thunk(); if (strcmp(name, PPB_FULLSCREEN_DEV_INTERFACE_0_4) == 0) return ::ppapi::thunk::GetPPB_FlashFullscreen_Thunk(); + if (strcmp(name, PPB_FULLSCREEN_DEV_INTERFACE) == 0) + return ::ppapi::thunk::GetPPB_Fullscreen_Thunk(); if (strcmp(name, PPB_GPU_BLACKLIST_INTERFACE) == 0) return PPB_GpuBlacklist_Private_Impl::GetInterface(); if (strcmp(name, PPB_GRAPHICS_3D_TRUSTED_INTERFACE) == 0) diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc index 91ca489..df74b5d 100644 --- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc @@ -1576,7 +1576,7 @@ PPB_Surface3D_Impl* PluginInstance::GetBoundSurface3D() const { void PluginInstance::setBackingTextureId(unsigned int id) { // If we have a fullscreen_container_ (under PPB_FlashFullscreen) - // or desired_fullscreen_state is true (under PPB_Fullscreen_Dev), + // or desired_fullscreen_state is true (under PPB_Fullscreen), // then the plugin is fullscreen or transitioning to fullscreen // and the parent context is not the one for the browser page, // but for the fullscreen window, and so the parent texture ID @@ -1647,7 +1647,7 @@ PP_Bool PluginInstance::BindGraphics(PP_Instance instance, } // Refuse to bind if in transition to fullscreen with PPB_FlashFullscreen or - // to/from fullscreen with PPB_Fullscreen_Dev. + // to/from fullscreen with PPB_Fullscreen. if ((fullscreen_container_ && !flash_fullscreen_) || desired_fullscreen_state_ != fullscreen_) return PP_FALSE; diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.h b/webkit/plugins/ppapi/ppapi_plugin_instance.h index af1be92..8cfc5e3d 100644 --- a/webkit/plugins/ppapi/ppapi_plugin_instance.h +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h @@ -229,8 +229,8 @@ class PluginInstance : public base::RefCounted<PluginInstance>, void Graphics3DContextLost(); // There are 2 implementations of the fullscreen interface - // PPB_FlashFullscreen_Dev is used by Pepper Flash. - // PPB_Fullscreen_Dev is intended for other applications including NaCl. + // PPB_FlashFullscreen is used by Pepper Flash. + // PPB_Fullscreen is intended for other applications including NaCl. // The two interface are mutually exclusive. // Implementation of PPB_FlashFullscreen. @@ -261,7 +261,7 @@ class PluginInstance : public base::RefCounted<PluginInstance>, return fullscreen_container_; } - // Implementation of PPB_Fullscreen_Dev. + // Implementation of PPB_Fullscreen. // Because going to/from fullscreen is asynchronous, there are 4 states: // - normal : desired_fullscreen_state_ == false @@ -569,7 +569,7 @@ class PluginInstance : public base::RefCounted<PluginInstance>, // in transition to fullscreen. bool flash_fullscreen_; - // Implementation of PPB_Fullscreen_Dev. + // Implementation of PPB_Fullscreen. // Since entering fullscreen mode is an asynchronous operation, we set this // variable to the desired state at the time we issue the fullscreen change |