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_->ToggleFullscreenModeForTab(this, GURL(), false);
     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::EnterFullscreenMode(const GURL& origin) {
+  ToggleFullscreenMode(origin, true);
+}
+
+void WebContentsImpl::ExitFullscreenMode() {
+  ToggleFullscreenMode(GURL(), false);
+}
+
+void WebContentsImpl::ToggleFullscreenMode(const GURL& origin,
+                                           bool enter_fullscreen) {
+  DCHECK(!enter_fullscreen || origin.is_valid());
+  DCHECK(enter_fullscreen || origin.is_empty());

[dcheng, 2014/12/10 06:58:00]

I'm not fond of this pattern. It seems that things would read much more clearly
as:

r->EnterFullscreenMode(origin);

and

r->ExitFullscreen();

Clearly this isn't actually a toggling function, since you have to specify
whether you're entering or exiting fullscreen mode anyway. I realize that this
pattern is older than this patch. However, IMO, all the new calls to
ToggleFullscreen(..., GURL(), false) are a lot less readable, so it would be
nice to fix it.

If having one entry point for this really is that much simpler, then it should
be called SetFullscreen() or something, not ToggleFullscreen().

[mlamouri (slow - plz ping), 2014/12/10 15:47:02]

I've change WebContentsDelegate to have EnterFullscreenModeForTab and
ExitFullscreenModeForTab. In most places I redirected to the previous
ToggleFullscreenModeForTab method but it should be better.

+
   // 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_->ToggleFullscreenModeForTab(this, origin, enter_fullscreen);
 
   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_->ToggleFullscreenModeForTab(this, GURL(), true);
     } 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 1874 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 763 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