OOPIF: Stop using HistoryController and refactor UpdateState.

content/renderer/render_view_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/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 783 matching lines @@
 
   new MHTMLGenerator(this);
 #if defined(OS_MACOSX)
   new TextInputClientObserver(this);
 #endif  // defined(OS_MACOSX)
 
   // The next group of objects all implement RenderViewObserver, so are deleted
   // along with the RenderView automatically.
   mouse_lock_dispatcher_ = new RenderViewMouseLockDispatcher(this);
 
-  history_controller_.reset(new HistoryController(this));
+  // We don't use HistoryController in OOPIF-enabled modes.
+  if (!SiteIsolationPolicy::UseSubframeNavigationEntries())
+    history_controller_.reset(new HistoryController(this));
 
   new IdleUserDetector(this);
 
   if (command_line.HasSwitch(switches::kDomAutomationController))
     enabled_bindings_ |= BINDINGS_POLICY_DOM_AUTOMATION;
   if (command_line.HasSwitch(switches::kStatsCollectionController))
     enabled_bindings_ |= BINDINGS_POLICY_STATS_COLLECTION;
 
   GetContentClient()->renderer()->RenderViewCreated(this);
 
@@ skipping 653 matching lines @@
   if (in_live_resize)
     webview()->willStartLiveResize();
   else
     webview()->willEndLiveResize();
 }
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
 void RenderViewImpl::SendUpdateState() {
-  // Don't send state updates when using subframe FrameNavigationEntries until
-  // PageState and HistoryController have been updated.  For now, the current
-  // entry's root WebHistoryItem sometimes points to data for a subframe (e.g.,
-  // after a subframe back/forward).
-  // TODO(creis): Fix this in https://crbug.com/545219.
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries())
-    return;
+  // We don't use this path in OOPIF-enabled modes.
+  DCHECK(!SiteIsolationPolicy::UseSubframeNavigationEntries());
 
   HistoryEntry* entry = history_controller_->GetCurrentEntry();
   if (!entry)
     return;
 
   // Don't send state updates for kSwappedOutURL.
   if (entry->root().urlString() == WebString::fromUTF8(kSwappedOutURL))
     return;
 
   Send(new ViewHostMsg_UpdateState(
@@ skipping 358 matching lines @@
 }
 
 gfx::RectF RenderViewImpl::ClientRectToPhysicalWindowRect(
     const gfx::RectF& rect) const {
   gfx::RectF window_rect = rect;
   window_rect.Scale(device_scale_factor_ * webview()->pageScaleFactor());
   return window_rect;
 }
 
 void RenderViewImpl::StartNavStateSyncTimerIfNecessary() {
+  // TODO(creis): Move this to RenderFrameHost.  In the meantime, we'll ignore
+  // state changes between navigation events in OOPIF-enabled modes.
+  if (SiteIsolationPolicy::UseSubframeNavigationEntries())
+    return;
+
   int delay;
   if (send_content_state_immediately_)
     delay = 0;
   else if (is_hidden())
     delay = kDelaySecondsForContentStateSyncHidden;
   else
     delay = kDelaySecondsForContentStateSync;
 
   if (nav_state_sync_timer_.IsRunning()) {
     // The timer is already running. If the delay of the timer maches the amount
@@ skipping 1845 matching lines @@
   if (IsUseZoomForDSFEnabled()) {
     compositor_->SetPaintedDeviceScaleFactor(device_scale_factor_);
     webview()->setZoomFactorForDeviceScaleFactor(
         device_scale_factor_);
   } else {
     webview()->setDeviceScaleFactor(device_scale_factor_);
   }
 }
 
 }  // namespace content