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

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

Issue 6625034: Clarify/fix fullscreen semantics, and add GetScreenSize (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 9 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 f96abc77f9007cd1e5c95e5bcd9d5eb0400afd8a..b6d16230650946c97cb6854f0a175daf0a01f9cb 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.h
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h
@@ -186,8 +186,26 @@ class PluginInstance : public base::RefCounted<PluginInstance> {
void Graphics3DContextLost();
// Implementation of PPB_Fullscreen_Dev.
+
+ // Because going to fullscreen is asynchronous (but going out is not), there
+ // are 3 states:
+ // - normal (fullscreen_container_ == NULL)
viettrungluu 2011/03/08 00:06:01 I wonder if it'd be nicer to just have a state var
piman 2011/03/08 00:55:30 Now I would have 2 problems instead of 1 :)
+ // - fullscreen pending (fullscreen_container_ != NULL, fullscreen_ == false)
+ // - fullscreen (fullscreen_container_ != NULL, fullscreen_ = true)
+ //
+ // In normal state, events come from webkit and painting goes back to it.
+ // In fullscreen state, events come from the fullscreen container, and
+ // painting goes back to it
+ // In pending state, events from webkit are ignored, and as soon as we receive
+ // events from the fullscreen container, we go to the fullscreen state.
bool IsFullscreen();
- bool SetFullscreen(bool fullscreen);
+ bool IsFullscreenOrPending();
+
+ // Switches between fullscreen and normal mode. If |delay_report| is set to
+ // false, it may report the new state through DidChangeView immediately. If
+ // true, it will delay it. When called from the plugin, delay_report should be
+ // true to avoid re-entrancy.
+ void SetFullscreen(bool fullscreen, bool delay_report);
// Implementation of PPB_Flash.
bool NavigateToURL(const char* url, const char* target);
@@ -220,6 +238,9 @@ class PluginInstance : public base::RefCounted<PluginInstance> {
// (see has_webkit_focus_ below).
bool PluginHasFocus() const;
+ // Reports the current plugin geometry to the plugin.
viettrungluu 2011/03/08 00:06:01 How does it report the geometry?
piman 2011/03/08 00:55:30 Done.
+ void ReportGeometry();
+
// Queries the plugin for supported print formats and sets |format| to the
// best format to use. Returns false if the plugin does not support any
// print format that we can handle (we can handle raster and PDF).
@@ -328,9 +349,14 @@ 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.
+ // 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 true (see above).
viettrungluu 2011/03/08 00:06:01 is false?
FullscreenContainer* fullscreen_container_;
+ // True if we are in fullscreen mode. Note: it is false during the transition.
+ bool fullscreen_;
+
typedef std::set<PluginObject*> PluginObjectSet;
PluginObjectSet live_plugin_objects_;

Powered by Google App Engine
This is Rietveld 408576698