Fullscreen: make fullscreen requests come from RenderFrame

content/browser/web_contents/web_contents_impl.cc

 // Copyright (c) 2012 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/browser/web_contents/web_contents_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 1271 matching lines @@
   }
 
   std::set<RenderWidgetHostImpl*>::iterator iter =
       created_widgets_.find(render_widget_host);
   if (iter != created_widgets_.end())
     created_widgets_.erase(iter);
 
   if (render_widget_host &&
       render_widget_host->GetRoutingID() == fullscreen_widget_routing_id_) {
     if (delegate_ && delegate_->EmbedsFullscreenWidget())
-      delegate_->ToggleFullscreenModeForTab(this, false);
+      delegate_->ExitFullscreenModeForTab(this);
     FOR_EACH_OBSERVER(WebContentsObserver,
                       observers_,
                       DidDestroyFullscreenWidget(
                           fullscreen_widget_routing_id_));
     fullscreen_widget_routing_id_ = MSG_ROUTING_NONE;
     if (fullscreen_widget_had_focus_at_shutdown_)
       view_->RestoreFocus();
   }
 }
 
@@ skipping 107 matching lines @@
 void WebContentsImpl::HandleGestureBegin() {
   if (delegate_)
     delegate_->HandleGestureBegin();
 }
 
 void WebContentsImpl::HandleGestureEnd() {
   if (delegate_)
     delegate_->HandleGestureEnd();
 }
 
-void WebContentsImpl::ToggleFullscreenMode(bool enter_fullscreen) {
+void WebContentsImpl::ExitFullscreen() {

[scheib, 2014/12/10 21:36:30]

declaration & definition order should match:
http://google-styleguide.googlecode.com/svn/trunk/cppguide.html#Declaration_O...

[mlamouri (slow - plz ping), 2014/12/11 16:03:19]

Done.

+  // The callers of this method seem to call it when they expect |WebContents|

[Charlie Reis, 2014/12/10 19:22:57]

This seems a bit hand-wavy.  Let's just say "Clean up related state and initiate
the fullscreen exit."

[mlamouri (slow - plz ping), 2014/12/11 16:03:20]

Done.

+  // to clean-up or to actually initiate the exit. This will do both.
+  GetRenderViewHostImpl()->RejectMouseLockOrUnlockIfNecessary();
+  ExitFullscreenMode();
+}
+
+void WebContentsImpl::EnterFullscreenMode(const GURL& origin) {
   // This method is being called to enter or leave renderer-initiated fullscreen

[Charlie Reis, 2014/12/10 19:22:57]

nit: Remove "or leave"

[mlamouri (slow - plz ping), 2014/12/11 16:03:19]

Done. Updated the comment for both ::EnterFullscreenMode and
::ExitFullscreenMode

   // mode.  Either way, make sure any existing fullscreen widget is shut down
   // first.
+  RenderWidgetHostView* const widget_view = GetFullscreenRenderWidgetHostView();
+  if (widget_view)
+    RenderWidgetHostImpl::From(widget_view->GetRenderWidgetHost())->Shutdown();
+
+  if (delegate_)
+    delegate_->EnterFullscreenModeForTab(this, origin);
+
+  FOR_EACH_OBSERVER(WebContentsObserver,
+                    observers_,
+                    DidToggleFullscreenModeForTab(IsFullscreenForCurrentTab()));
+}
+
+void WebContentsImpl::ExitFullscreenMode() {
+  // This method is being called to enter or leave renderer-initiated fullscreen
+  // mode.  Either way, make sure any existing fullscreen widget is shut down
+  // first.
   RenderWidgetHostView* const widget_view = GetFullscreenRenderWidgetHostView();
   if (widget_view)
     RenderWidgetHostImpl::From(widget_view->GetRenderWidgetHost())->Shutdown();
 
   if (delegate_)
-    delegate_->ToggleFullscreenModeForTab(this, enter_fullscreen);
+    delegate_->ExitFullscreenModeForTab(this);
 
   FOR_EACH_OBSERVER(WebContentsObserver,
                     observers_,
                     DidToggleFullscreenModeForTab(IsFullscreenForCurrentTab()));
 }
 
 bool WebContentsImpl::IsFullscreenForCurrentTab() const {
   return delegate_ ? delegate_->IsFullscreenForTabOrPending(this) : false;
 }
 
@@ skipping 242 matching lines @@
   } else {
     view = GetRenderWidgetHostView();
   }
 
   if (is_fullscreen) {
     DCHECK_EQ(MSG_ROUTING_NONE, fullscreen_widget_routing_id_);
     view_->StoreFocus();
     fullscreen_widget_routing_id_ = route_id;
     if (delegate_ && delegate_->EmbedsFullscreenWidget()) {
       widget_host_view->InitAsChild(GetRenderWidgetHostView()->GetNativeView());
-      delegate_->ToggleFullscreenModeForTab(this, true);
+      delegate_->EnterFullscreenModeForTab(this, GURL());
     } else {
       widget_host_view->InitAsFullscreen(view);
     }
     FOR_EACH_OBSERVER(WebContentsObserver,
                       observers_,
                       DidShowFullscreenWidget(route_id));
     if (!widget_host_view->HasFocus())
       widget_host_view->Focus();
   } else {
     widget_host_view->InitAsPopup(view, initial_pos);
@@ skipping 853 matching lines @@
 void WebContentsImpl::DidNavigateMainFramePreCommit(
     bool navigation_is_within_page) {
   // Ensure fullscreen mode is exited before committing the navigation to a
   // different page.  The next page will not start out assuming it is in
   // fullscreen mode.
   if (navigation_is_within_page) {
     // No page change?  Then, the renderer and browser can remain in fullscreen.
     return;
   }
   if (IsFullscreenForCurrentTab())
-    GetRenderViewHost()->ExitFullscreen();
+    ExitFullscreen();
   DCHECK(!IsFullscreenForCurrentTab());
 }
 
 void WebContentsImpl::DidNavigateMainFramePostCommit(
     const LoadCommittedDetails& details,
     const FrameHostMsg_DidCommitProvisionalLoad_Params& params) {
   if (details.is_navigation_to_different_page()) {
     // Clear the status bubble. This is a workaround for a bug where WebKit
     // doesn't let us know that the cursor left an element during a
     // transition (this is also why the mouse cursor remains as a hand after
@@ skipping 990 matching lines @@
                                            base::TerminationStatus status,
                                            int error_code) {
   if (rvh != GetRenderViewHost()) {
     // The pending page's RenderViewHost is gone.
     return;
   }
 
   // Ensure fullscreen mode is exited in the |delegate_| since a crashed
   // renderer may not have made a clean exit.
   if (IsFullscreenForCurrentTab())
-    ToggleFullscreenMode(false);
+    ExitFullscreenMode();
 
   // Cancel any visible dialogs so they are not left dangling over the sad tab.
   if (dialog_manager_)
     dialog_manager_->CancelActiveAndPendingDialogs(this);
 
   if (delegate_)
     delegate_->HideValidationMessage(this);
 
   SetIsLoading(rvh, false, true, NULL);
   NotifyDisconnected();
@@ skipping 767 matching lines @@
   node->render_manager()->ResumeResponseDeferredAtStart();
 }
 
 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
   force_disable_overscroll_content_ = force_disable;
   if (view_)
     view_->SetOverscrollControllerEnabled(CanOverscrollContent());
 }
 
 }  // namespace content