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

content/renderer/history_serialization.cc

 // Copyright 2014 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/history_serialization.h"
 
 #include "content/common/page_state_serialization.h"
+#include "content/common/site_isolation_policy.h"
 #include "content/public/common/page_state.h"
 #include "content/renderer/history_entry.h"
 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
 #include "third_party/WebKit/public/platform/WebHTTPBody.h"
 #include "third_party/WebKit/public/platform/WebPoint.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/public/web/WebHistoryItem.h"
 #include "third_party/WebKit/public/web/WebSerializedScriptValue.h"
 
@@ skipping 147 matching lines @@
   }
   node->set_item(item);
 
   for (size_t i = 0; i < state.children.size(); ++i)
     RecursivelyGenerateHistoryItem(state.children[i], node->AddChild());
 }
 
 }  // namespace
 
 PageState HistoryEntryToPageState(HistoryEntry* entry) {
+  DCHECK(!SiteIsolationPolicy::UseSubframeNavigationEntries());
+
   ExplodedPageState state;
   RecursivelyGenerateFrameState(entry->root_history_node(), &state.top,
                                 &state.referenced_files);
 
   std::string encoded_data;
   if (!EncodePageState(state, &encoded_data))
     return PageState();
 
   return PageState::CreateFromEncodedData(encoded_data);
 }
 
 PageState SingleHistoryItemToPageState(const WebHistoryItem& item) {
+  DCHECK(!SiteIsolationPolicy::UseSubframeNavigationEntries());
+
   ExplodedPageState state;
   ToNullableString16Vector(item.getReferencedFilePaths(),
                            &state.referenced_files);
   GenerateFrameStateFromItem(item, &state.top);
 
   std::string encoded_data;
   if (!EncodePageState(state, &encoded_data))
     return PageState();
 
   return PageState::CreateFromEncodedData(encoded_data);
 }
 
 scoped_ptr<HistoryEntry> PageStateToHistoryEntry(const PageState& page_state) {
+  DCHECK(!SiteIsolationPolicy::UseSubframeNavigationEntries());
+
   ExplodedPageState state;
   if (!DecodePageState(page_state.ToEncodedData(), &state))
     return scoped_ptr<HistoryEntry>();
 
   scoped_ptr<HistoryEntry> entry(new HistoryEntry());
   RecursivelyGenerateHistoryItem(state.top, entry->root_history_node());
 
   return entry.Pass();
 }
 
+ExplodedFrameState HistoryItemToFrameState(const WebHistoryItem& item) {
+  DCHECK(SiteIsolationPolicy::UseSubframeNavigationEntries());
+
+  // TODO(creis): We're missing the list of referenced_files.
+  ExplodedFrameState state;
+  GenerateFrameStateFromItem(item, &state);
+  return state;
+}
+
+WebHistoryItem FrameStateToHistoryItem(const ExplodedFrameState& state) {
+  DCHECK(SiteIsolationPolicy::UseSubframeNavigationEntries());
+
+  scoped_ptr<HistoryEntry> entry(new HistoryEntry());
+  RecursivelyGenerateHistoryItem(state, entry->root_history_node());
+  return entry->root_history_node()->item();
+}
+
 }  // namespace content