| 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 16c7fff1010501f0a8737eb69cd7ec88e3f2a23f..2ce47515e6dd958a93d2c30589100adee71d053f 100644
|
| --- a/webkit/plugins/ppapi/ppapi_plugin_instance.h
|
| +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h
|
| @@ -64,7 +64,6 @@ class Resource;
|
| namespace webkit {
|
| namespace ppapi {
|
|
|
| -class FullscreenContainer;
|
| class MessageChannel;
|
| class ObjectVar;
|
| class PluginDelegate;
|
| @@ -242,10 +241,6 @@ class PluginInstance : public base::RefCounted<PluginInstance>,
|
| // embedded in a page).
|
| bool IsFullPagePlugin() const;
|
|
|
| - FullscreenContainer* fullscreen_container() const {
|
| - return fullscreen_container_;
|
| - }
|
| -
|
| // FunctionGroupBase overrides.
|
| virtual ::ppapi::thunk::PPB_Instance_FunctionAPI* AsPPB_Instance_FunctionAPI()
|
| OVERRIDE;
|
| @@ -467,10 +462,11 @@ class PluginInstance : public base::RefCounted<PluginInstance>,
|
| // to use a more optimized painting path in some cases.
|
| bool always_on_top_;
|
|
|
| - // Plugin container for fullscreen mode. NULL if not in fullscreen mode. Note:
|
| - // there is a transition state where fullscreen_container_ is non-NULL but
|
| - // fullscreen_ is false (see above).
|
| - FullscreenContainer* fullscreen_container_;
|
| + // Since entering fullscreen mode is an asynchronous operation, we set this
|
| + // variable to the desired state at the time we issue the fullscreen change
|
| + // request. The plugin will receive a DidChangeView event when it goes
|
| + // fullscreen.
|
| + bool desired_fullscreen_state_;
|
|
|
| // True if we are in fullscreen mode. Note: it is false during the transition.
|
| bool fullscreen_;
|
|
|