OOPIF: Support session restore by combining/splitting frame states.

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/lazy_instance.h"
@@ skipping 4189 matching lines @@
   FOR_EACH_OBSERVER(WebContentsObserver, observers_,
                     DocumentOnLoadCompletedInMainFrame());
 
   // TODO(avi): Remove. http://crbug.com/170921
   NotificationService::current()->Notify(
       NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
       Source<WebContents>(this),
       NotificationService::NoDetails());
 }
 
-void WebContentsImpl::UpdateStateForFrame(RenderFrameHost* render_frame_host,
-                                          const PageState& page_state) {
+void WebContentsImpl::UpdateStateForFrame(
+    RenderFrameHost* render_frame_host,
+    const ExplodedFrameState& frame_state) {
   DCHECK(SiteIsolationPolicy::UseSubframeNavigationEntries());
 
   // The state update affects the last NavigationEntry associated with the given
   // |render_frame_host|. This may not be the last committed NavigationEntry (as
   // in the case of an UpdateState from a frame being swapped out). We track
   // which entry this is in the RenderFrameHost's nav_entry_id.
   RenderFrameHostImpl* rfhi =
       static_cast<RenderFrameHostImpl*>(render_frame_host);
   NavigationEntryImpl* entry =
       controller_.GetEntryWithUniqueID(rfhi->nav_entry_id());
   if (!entry)
     return;
 
   FrameNavigationEntry* frame_entry =
       entry->GetFrameEntry(rfhi->frame_tree_node());
   if (!frame_entry)
     return;
 
   // The SiteInstance might not match if we do a cross-process navigation with
   // replacement (e.g., auto-subframe), in which case the swap out of the old
   // RenderFrameHost runs in the background after the old FrameNavigationEntry
   // has already been replaced and destroyed.
   if (frame_entry->site_instance() != rfhi->GetSiteInstance())
     return;
 
-  if (page_state == frame_entry->page_state())
-    return;  // Nothing to update.
+  PageState old_page_state = entry->GetPageState();
 
-  frame_entry->set_page_state(page_state);
+  frame_entry->set_frame_state(frame_state);
+  entry->UpdatePageState();
+
+  if (entry->GetPageState() == old_page_state)
+    return;  // No reason to notify.
+
   controller_.NotifyEntryChanged(entry);
 }
 
 void WebContentsImpl::UpdateTitle(RenderFrameHost* render_frame_host,
                                   int32 page_id,
                                   const base::string16& title,
                                   base::i18n::TextDirection title_direction) {
   // If we have a title, that's a pretty good indication that we've started
   // getting useful data.
   SetNotWaitingForResponse();
@@ skipping 589 matching lines @@
   return NULL;
 }
 
 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
   force_disable_overscroll_content_ = force_disable;
   if (view_)
     view_->SetOverscrollControllerEnabled(CanOverscrollContent());
 }
 
 }  // namespace content