Fix fullscreen API event delivery to be delayed until the state change has

content/renderer/render_widget.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 "content/renderer/render_widget.h"
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 254 matching lines @@
   // During shutdown we can just ignore this message.
   if (!webwidget_)
     return;
 
   // We shouldn't be asked to resize to our current size.
   DCHECK(size_ != new_size || resizer_rect_ != resizer_rect);
 
   // Remember the rect where the resize corner will be drawn.
   resizer_rect_ = resizer_rect;
 
-  if (size_ == new_size)
-    return;
-
-  // TODO(darin): We should not need to reset this here.
-  SetHidden(false);
-  needs_repainting_on_restore_ = false;
-
-  size_ = new_size;
+  // NOTE: We may have entered fullscreen mode without changing our size.
+  bool fullscreen_change = is_fullscreen_ != is_fullscreen;
+  if (fullscreen_change)
+    WillToggleFullscreen();
   is_fullscreen_ = is_fullscreen;
 
-  // We should not be sent a Resize message if we have not ACK'd the previous
-  DCHECK(!next_paint_is_resize_ack());
+  if (size_ != new_size) {
+    // TODO(darin): We should not need to reset this here.
+    SetHidden(false);
+    needs_repainting_on_restore_ = false;
 
-  paint_aggregator_.ClearPendingUpdate();
+    size_ = new_size;
 
-  // When resizing, we want to wait to paint before ACK'ing the resize.  This
-  // ensures that we only resize as fast as we can paint.  We only need to send
-  // an ACK if we are resized to a non-empty rect.
-  webwidget_->resize(new_size);
-  if (!new_size.IsEmpty()) {
-    if (!is_accelerated_compositing_active_) {
-      // Resize should have caused an invalidation of the entire view.
-      DCHECK(paint_aggregator_.HasPendingUpdate());
+    // We should not be sent a Resize message if we have not ACK'd the previous
+    DCHECK(!next_paint_is_resize_ack());
+
+    paint_aggregator_.ClearPendingUpdate();
+
+    // When resizing, we want to wait to paint before ACK'ing the resize.  This
+    // ensures that we only resize as fast as we can paint.  We only need to
+    // send an ACK if we are resized to a non-empty rect.
+    webwidget_->resize(new_size);
+    if (!new_size.IsEmpty()) {
+      if (!is_accelerated_compositing_active_) {
+        // Resize should have caused an invalidation of the entire view.
+        DCHECK(paint_aggregator_.HasPendingUpdate());
+      }
+
+      // We will send the Resize_ACK flag once we paint again.
+      set_next_paint_is_resize_ack();
     }
+  }
 
-    // We will send the Resize_ACK flag once we paint again.
-    set_next_paint_is_resize_ack();
-  }
+  if (fullscreen_change)
+    DidToggleFullscreen();
 }
 
 void RenderWidget::OnWasHidden() {
   TRACE_EVENT0("renderer", "RenderWidget::OnWasHidden");
   // Go into a mode where we stop generating paint and scrolling events.
   SetHidden(true);
 }
 
 void RenderWidget::OnWasRestored(bool needs_repainting) {
   TRACE_EVENT0("renderer", "RenderWidget::OnWasRestored");
@@ skipping 949 matching lines @@
     return;
 
   // The status has changed.  Tell the RenderThread about it.
   is_hidden_ = hidden;
   if (is_hidden_)
     RenderThread::Get()->WidgetHidden();
   else
     RenderThread::Get()->WidgetRestored();
 }
 
+void RenderWidget::WillToggleFullscreen() {
+#ifdef WEBKIT_HAS_NEW_FULLSCREEN_API
+  if (!webwidget_)
+    return;
+
+  if (is_fullscreen_) {
+    webwidget_->willExitFullScreen();
+  } else {
+    webwidget_->willEnterFullScreen();
+  }
+#endif
+}
+
+void RenderWidget::DidToggleFullscreen() {
+#ifdef WEBKIT_HAS_NEW_FULLSCREEN_API
+  if (!webwidget_)
+    return;
+
+  if (is_fullscreen_) {
+    webwidget_->didEnterFullScreen();
+  } else {
+    webwidget_->didExitFullScreen();
+  }
+#endif
+}
+
 void RenderWidget::SetBackground(const SkBitmap& background) {
   background_ = background;
 
   // Generate a full repaint.
   didInvalidateRect(gfx::Rect(size_.width(), size_.height()));
 }
 
 bool RenderWidget::next_paint_is_resize_ack() const {
   return ViewHostMsg_UpdateRect_Flags::is_resize_ack(next_paint_flags_);
 }
@@ skipping 146 matching lines @@
   }
 }
 
 bool RenderWidget::WillHandleMouseEvent(const WebKit::WebMouseEvent& event) {
   return false;
 }
 
 bool RenderWidget::WebWidgetHandlesCompositorScheduling() const {
   return false;
 }