Fix scroll restoration when exiting fullscreen mode.

chrome/browser/ui/exclusive_access/fullscreen_controller.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 "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h"
 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.h"
 #include "chrome/browser/ui/status_bubble.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/web_contents_sizer.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
+#include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/extension.h"
 
 #if !defined(OS_MACOSX)
 #include "base/prefs/pref_service.h"
 #include "chrome/common/pref_names.h"
 #endif
 
 using base::UserMetricsAction;
 using content::RenderViewHost;
+using content::RenderWidgetHost;
+using content::RenderWidgetHostView;
 using content::WebContents;
 
 FullscreenController::FullscreenController(ExclusiveAccessManager* manager)
     : ExclusiveAccessControllerBase(manager),
       state_prior_to_tab_fullscreen_(STATE_INVALID),
       tab_fullscreen_accepted_(false),
       toggled_into_fullscreen_(false),
       reentrant_window_state_change_call_check_(false),
       is_privileged_fullscreen_for_testing_(false),
       ptr_factory_(this) {
@@ skipping 161 matching lines @@
   // If currently there is a tab in "tab fullscreen" mode and fullscreen
   // was not caused by it (i.e., previously it was in "browser fullscreen"
   // mode), we need to switch back to "browser fullscreen" mode. In this
   // case, all we have to do is notifying the tab that it has exited "tab
   // fullscreen" mode.
   NotifyTabExclusiveAccessLost();
 
   // This is only a change between Browser and Tab fullscreen. We generate
   // a fullscreen notification now because there is no window change.
   PostFullscreenChangeNotification(true);
+
+  // Ensure web contents exit fullscreen state by sending a resize message,

[scheib, 2015/12/01 00:30:18]

I'm a bit wondering why this isn't part of ::NotifyTabExclusiveAccessLost and
then ExitFullscreen calling ExitFullscreenMode. I haven't traced through yet to
see why the call is needed to be moved here instead of web_contents. Calling
from FullscreenController feels as if the implementation details of WebContents
are too exposed. 

[bokan, 2015/12/01 20:46:10]

I rarely dwell in these parts so it's entirely likely this code doesn't belong
here. The reason it was a problem before is that WasResized gets called even if
we're going from Tab Fullscreen -> Normal but that would happen before the
renderer bounds would change. So the renderer would get a resize IPC with
"is_fullscreen" toggled. Then it would get a second resize with the bounds
changed. This is a problem because the renderer then doesn't know when to
restore the pre-fullscreen state without resorting to some awkward bookkeeping .

I've uploaded a new patch that instead passes a parameter through to
WebContents::ExitFullscreen that tells it whether exiting fullscreen will cause
the bounds to change. That way WebContents can then decide whether or not to
send the WasResized. I'm happy to move it elsewhere if it makes more sense, any
suggestions?

+  // which includes the fullscreen state. This is required for the situation
+  // of the browser moving the view into a fullscreen state "browser fullscreen"
+  // and then the contents entering "tab fullscreen". Exiting the contents
+  // "tab fullscreen" then won't have the side effect of the view resizing,
+  // hence the explicit call here is required.
+  if (RenderWidgetHostView* rwhv = web_contents->GetRenderWidgetHostView()) {
+      if (RenderWidgetHost* render_widget_host = rwhv->GetRenderWidgetHost())
+        render_widget_host->WasResized();
+  }
 }
 
 #if defined(OS_WIN)
 bool FullscreenController::IsInMetroSnapMode() {
   return exclusive_access_manager()->context()->IsInMetroSnapMode();
 }
 
 void FullscreenController::SetMetroSnapMode(bool enable) {
   reentrant_window_state_change_call_check_ = false;
 
@@ skipping 365 matching lines @@
     return fullscreened_origin_;
 
   return exclusive_access_tab()->GetLastCommittedURL();
 }
 
 GURL FullscreenController::GetEmbeddingOrigin() const {
   DCHECK(exclusive_access_tab());
 
   return exclusive_access_tab()->GetLastCommittedURL();
 }