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

content/renderer/render_view_impl.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_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 1633 matching lines @@
   // it.  We replace it with an empty GURL so the appropriate items are disabled
   // in the context menu.
   // TODO(jcivelli): http://crbug.com/45160 This prevents us from saving large
   //                 data encoded images.  We should have a way to save them.
   if (params.src_url.spec().size() > content::kMaxURLChars)
     params.src_url = GURL();
   context_menu_node_ = data.node;
   Send(new ViewHostMsg_ContextMenu(routing_id_, params));
 }
 
-bool RenderViewImpl::supportsFullscreen() {
-  return CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableVideoFullscreen);
-}
-
-void RenderViewImpl::enterFullscreenForNode(const WebKit::WebNode& node) {
-  NOTIMPLEMENTED();
-}
-
-void RenderViewImpl::exitFullscreenForNode(const WebKit::WebNode& node) {
-  NOTIMPLEMENTED();
-}
-
 void RenderViewImpl::enterFullscreen() {
-  Send(new ViewHostMsg_ToggleFullscreen(routing_id_, true));
+  // TODO(darin): Remove once WebKit roll is complete.
+  enterFullScreen();
 }
 
 void RenderViewImpl::exitFullscreen() {
-  Send(new ViewHostMsg_ToggleFullscreen(routing_id_, false));
+  // TODO(darin): Remove once WebKit roll is complete.
+  exitFullScreen();
 }
 
 void RenderViewImpl::setStatusText(const WebString& text) {
 }
 
 void RenderViewImpl::UpdateTargetURL(const GURL& url,
                                      const GURL& fallback_url) {
   GURL latest_url = url.is_empty() ? fallback_url : url;
   if (latest_url == target_url_)
     return;
@@ skipping 170 matching lines @@
   // TODO(darin): WebKit should really be smarter about suppressing events and
   // timers so that we do not need to manage the shared timer in such a heavy
   // handed manner.
   //
   if (RenderThreadImpl::current())  // Will be NULL during unit tests.
     RenderThreadImpl::current()->DoNotSuspendWebKitSharedTimer();
 
   SendAndRunNestedMessageLoop(new ViewHostMsg_RunModal(routing_id_));
 }
 
+bool RenderViewImpl::enterFullScreen() {
+  Send(new ViewHostMsg_ToggleFullscreen(routing_id_, true));
+  return true;
+}
+
+void RenderViewImpl::exitFullScreen() {
+  Send(new ViewHostMsg_ToggleFullscreen(routing_id_, false));
+}
+
 // WebKit::WebFrameClient -----------------------------------------------------
 
 WebPlugin* RenderViewImpl::createPlugin(WebFrame* frame,
                                         const WebPluginParams& params) {
   WebPlugin* plugin = NULL;
   if (content::GetContentClient()->renderer()->OverrideCreatePlugin(
           this, frame, params, &plugin)) {
     return plugin;
   }
 
@@ skipping 1688 matching lines @@
   webview()->setZoomLevel(false, zoom_level);
   zoomLevelChanged();
 }
 
 void RenderViewImpl::OnSetZoomLevelForLoadingURL(const GURL& url,
                                                  double zoom_level) {
   host_zoom_levels_[url] = zoom_level;
 }
 
 void RenderViewImpl::OnExitFullscreen() {
+  // TODO(darin): Remove this IPC once WebKit has been updated.
+#ifndef WEBKIT_HAS_NEW_FULLSCREEN_API
   webview()->exitFullscreen();
+#endif
 }
 
 void RenderViewImpl::OnSetPageEncoding(const std::string& encoding_name) {
   webview()->setPageEncoding(WebString::fromUTF8(encoding_name));
 }
 
 void RenderViewImpl::OnResetPageEncodingToDefault() {
   WebString no_encoding;
   webview()->setPageEncoding(no_encoding);
 }
@@ skipping 1057 matching lines @@
   pepper_delegate_.OnLockMouseACK(succeeded);
 }
 
 void RenderViewImpl::OnMouseLockLost() {
   pepper_delegate_.OnMouseLockLost();
 }
 
 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
   return webview()->settings()->useThreadedCompositor();
 }