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

content/browser/frame_host/frame_navigation_entry.h

 // Copyright 2015 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.
 
 #ifndef CONTENT_BROWSER_FRAME_HOST_FRAME_NAVIGATION_ENTRY_H_
 #define CONTENT_BROWSER_FRAME_HOST_FRAME_NAVIGATION_ENTRY_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "content/browser/site_instance_impl.h"
+#include "content/common/page_state_serialization.h"
 #include "content/public/common/page_state.h"
 #include "content/public/common/referrer.h"
 
 namespace content {
 
 // Represents a session history item for a particular frame.
 //
 // This class is refcounted and can be shared across multiple NavigationEntries.
 // For now, it is owned by a single NavigationEntry and only tracks the main
 // frame.
@@ skipping 18 matching lines @@
   // independently from the original.
   FrameNavigationEntry* Clone() const;
 
   // Updates all the members of this entry.
   void UpdateEntry(const std::string& frame_unique_name,
                    int64 item_sequence_number,
                    int64 document_sequence_number,
                    SiteInstanceImpl* site_instance,
                    const GURL& url,
                    const Referrer& referrer,
-                   const PageState& page_state);
+                   const ExplodedFrameState& page_state);
 
   // The ID of the FrameTreeNode this entry is for.  -1 for the main frame,
   // since we don't always know the FrameTreeNode ID when creating the overall
   // NavigationEntry.
   // TODO(creis): Consider removing |frame_tree_node_id| in favor of
   // |frame_unique_name|, if we can move unique name computation to the browser
   // process.
   int frame_tree_node_id() const { return frame_tree_node_id_; }
   void set_frame_tree_node_id(int frame_tree_node_id) {
     frame_tree_node_id_ = frame_tree_node_id;
@@ skipping 33 matching lines @@
 
   // The actual URL loaded in the frame.  This is in contrast to the virtual
   // URL, which is shown to the user.
   void set_url(const GURL& url) { url_ = url; }
   const GURL& url() const { return url_; }
 
   // The referring URL.  Can be empty.
   void set_referrer(const Referrer& referrer) { referrer_ = referrer; }
   const Referrer& referrer() const { return referrer_; }
 
-  void set_page_state(const PageState& page_state) { page_state_ = page_state; }
-  const PageState& page_state() const { return page_state_; }
+  void set_frame_state(const ExplodedFrameState& frame_state) {
+    frame_state_ = frame_state;
+  }
+  const ExplodedFrameState& frame_state() const { return frame_state_; }
 
  private:
   friend class base::RefCounted<FrameNavigationEntry>;
   virtual ~FrameNavigationEntry();
 
   // WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
   // Add all new fields to |UpdateEntry|.
   // TODO(creis): These fields have implications for session restore.  This is
   // currently managed by NavigationEntry, but the logic will move here.
+  // TODO(creis): Update this comment.
   // WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
 
   // See the accessors above for descriptions.
   int frame_tree_node_id_;
   std::string frame_unique_name_;
   int64 item_sequence_number_;
   int64 document_sequence_number_;
   scoped_refptr<SiteInstanceImpl> site_instance_;
   GURL url_;
   Referrer referrer_;
-  // TODO(creis): Change this to FrameState.
-  PageState page_state_;
+  // TODO(creis): Drop ISN/DSN; add list of referenced files.
+  ExplodedFrameState frame_state_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameNavigationEntry);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_FRAME_NAVIGATION_ENTRY_H_