PPAPI Fullscreen: In ViewChanged, check if the browser entered fullscreen mode

webkit/plugins/ppapi/ppapi_plugin_instance.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 718 matching lines @@
   // consistent since this is given to the plugin, so force everything to 0
   // in the "everything is clipped" case.
   gfx::Rect new_clip;
   if (!clip.IsEmpty())
     new_clip = clip;
 
   // Don't notify the plugin if we've already sent these same params before.
   if (sent_did_change_view_ && position == position_ && new_clip == clip_)
     return;
 
+  if (desired_fullscreen_state_ || fullscreen_) {
+    WebKit::WebElement element = container_->element();

[darin (slow to review), 2011/10/14 05:03:41]

nit: add a 'using WebKit::WebElement' at the top of this file so you can just
say WebElement here.  there is already a using directive for WebDocument, so you
can at least drop the WebKit:: prefix in front of WebDocument.

[polina, 2011/10/14 06:54:06]

Done.

+    WebKit::WebDocument document = element.document();
+    bool is_fullscreen_element = (element == document.fullScreenElement());

[darin (slow to review), 2011/10/14 05:06:03]

by the way, to make this easier to land, without having to wait for the webkit
piece to appear first, you can wrap the fullScreenElement() accessor with a
#ifdef.

#ifdef WEBKIT_WEBDOCUMENT_HAS_FULLSCREENELEMENT
...

Then, add that as a #define to WebDocument.h in your WebKit patch.  This way the
patches can land independently.

[polina, 2011/10/14 06:54:06]

Done.

+    if (!fullscreen_ && desired_fullscreen_state_ &&
+        delegate()->IsInFullscreenMode() && is_fullscreen_element) {
+      // Entered fullscreen. Only possible via SetFullscreen.
+      fullscreen_ = true;
+    } else if (fullscreen_ && !is_fullscreen_element) {
+      // Exited fullscreen. Possible via SetFullscreen or F11,
+      // so desired_fullscreen_state might be out-of-date.
+      desired_fullscreen_state_ = false;
+      fullscreen_ = false;
+    }
+  }
+
   sent_did_change_view_ = true;
   position_ = position;
   clip_ = new_clip;
-  fullscreen_ = desired_fullscreen_state_;
   flash_fullscreen_ = (fullscreen_container_ != NULL);
 
   PP_Rect pp_position, pp_clip;
   RectToPPRect(position_, &pp_position);
   RectToPPRect(clip_, &pp_clip);
   instance_interface_->DidChangeView(pp_instance(), &pp_position, &pp_clip);
 }
 
 void PluginInstance::SetWebKitFocus(bool has_focus) {
   if (has_webkit_focus_ == has_focus)
@@ skipping 1220 matching lines @@
   }
   WebKit::WebDocument main_document =
       containing_document.frame()->view()->mainFrame()->document();
 
   return containing_document.securityOrigin().canAccess(
       main_document.securityOrigin());
 }
 
 }  // namespace ppapi
 }  // namespace webkit