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 727 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;
 
-  // TODO(polina): fullscreen transition might take multiple ViewChanged,
-  // so this will update the state too early. Also, when F11 is used to
-  // exit fullscreen mode, desired_fullscreen_state_ is not properly set
-  // and cannot be relied on.
-  // Pending fix: http://codereview.chromium.org/8273029/
-  // WebKit: https://bugs.webkit.org/show_bug.cgi?id=70076.
-  if (desired_fullscreen_state_ && !fullscreen_) {
-    // Entered fullscreen. Only possible via SetFullscreen.
-    fullscreen_ = true;
-  } else if (!desired_fullscreen_state_ && fullscreen_) {
-    // Exited fullscreen. Possible via SetFullscreen or F11/link.
-    fullscreen_ = false;
-    // Reset the size attributes that we hacked to fill in the screen and
-    // retrigger ViewChanged. Make sure we don't forward duplicates of
-    // this view to the plugin.
-    ResetSizeAttributesAfterFullscreen();
-    SetSentDidChangeView(position, new_clip);
-    MessageLoop::current()->PostTask(
-        FROM_HERE, base::Bind(&PluginInstance::ReportGeometry, this));
-    return;
+  if (desired_fullscreen_state_ || fullscreen_) {
+    WebElement element = container_->element();
+    WebDocument document = element.document();
+    // TODO(polina): temporary hack to ease WebKit/Chromium commit sequence.
+#ifdef WEBKIT_WEBDOCUMENT_HAS_FULLSCREENELEMENT
+    bool is_fullscreen_element = (element == document.fullScreenElement());
+#else
+    bool is_fullscreen_element = desired_fullscreen_state_;
+#endif
+    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/link,
+      // so desired_fullscreen_state might be out-of-date.
+      desired_fullscreen_state_ = false;
+      fullscreen_ = false;
+      // Reset the size attributes that we hacked to fill in the screen and
+      // retrigger ViewChanged. Make sure we don't forward duplicates of
+      // this view to the plugin.
+      ResetSizeAttributesAfterFullscreen();
+      SetSentDidChangeView(position, new_clip);
+      MessageLoop::current()->PostTask(
+          FROM_HERE, base::Bind(&PluginInstance::ReportGeometry, this));
+      return;
+    }
   }
 
   SetSentDidChangeView(position, new_clip);
   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);
 }
@@ skipping 1278 matching lines @@
   screen_size_for_fullscreen_ = gfx::Size();
   WebElement element = container_->element();
   element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_);
 }
 
 }  // namespace ppapi
 }  // namespace webkit