Fix the commit type for out-of-process iframes.

content/browser/frame_host/navigation_entry_impl.h

 // Copyright 2013 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_NAVIGATION_ENTRY_IMPL_H_
 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
@@ skipping 16 matching lines @@
 class CONTENT_EXPORT NavigationEntryImpl
     : public NON_EXPORTED_BASE(NavigationEntry) {
  public:
   // Represents a tree of FrameNavigationEntries that make up this joint session
   // history item.  The tree currently only tracks the main frame.
   // TODO(creis): Populate the tree with subframe entries in --site-per-process.
   struct TreeNode {
     TreeNode(FrameNavigationEntry* frame_entry);
     ~TreeNode();
 
+    // Returns whether this TreeNode corresponds to |frame_tree_node|.
+    bool MatchesFrame(FrameTreeNode* frame_tree_node) const;
+
     // Returns a deep copy of the tree with copies of each node's
     // FrameNavigationEntries.  We do not yet share FrameNavigationEntries
     // across trees.
     // TODO(creis): For --site-per-process, share FrameNavigationEntries between
     // NavigationEntries of the same tab.
     TreeNode* Clone() const;
 
     // Ref counted pointer that keeps the FrameNavigationEntry alive as long as
     // it is needed by this node's NavigationEntry.
     scoped_refptr<FrameNavigationEntry> frame_entry;
@@ skipping 80 matching lines @@
   // tab) and one that draws them from a different pool (for use in a new tab).
   NavigationEntryImpl* Clone() const;
 
   // Helper functions to construct NavigationParameters for a navigation to this
   // NavigationEntry.
   CommonNavigationParams ConstructCommonNavigationParams(
       FrameMsg_Navigate_Type::Value navigation_type) const;
   StartNavigationParams ConstructStartNavigationParams() const;
   RequestNavigationParams ConstructRequestNavigationParams(
       base::TimeTicks navigation_start,
+      bool has_committed_real_load,
       bool intended_as_new_entry,
       int pending_offset_to_send,
       int current_offset_to_send,
       int current_length_to_send) const;
 
   // Once a navigation entry is committed, we should no longer track several
   // pieces of non-persisted state, as documented on the members below.
   void ResetForCommit();
 
   // Exposes the tree of FrameNavigationEntries that make up this joint session
   // history item.
   // In default Chrome, this tree only has a root node with an unshared
   // FrameNavigationEntry.  Subframes are only added to the tree if the
   // --site-per-process flag is passed.
   TreeNode* root_node() const {
     return frame_tree_.get();
   }
 
   // Finds the TreeNode associated with |frame_tree_node_id| to add or update
   // its FrameNavigationEntry.  A new FrameNavigationEntry is added if none
   // exists, or else the existing one (which might be shared with other
   // NavigationEntries) is updated with the given parameters.
+  // Does nothing if there is no entry already and |url| is about:blank, since
+  // that does not count as a real commit.
   void AddOrUpdateFrameEntry(FrameTreeNode* frame_tree_node,
                              SiteInstanceImpl* site_instance,
                              const GURL& url,
                              const Referrer& referrer);
 
+  // Returns whether this entry has a FrameNavigationEntry for the given
+  // |frame_tree_node|.
+  bool HasFrameEntry(FrameTreeNode* frame_tree_node) const;
+
   void set_unique_id(int unique_id) {
     unique_id_ = unique_id;
   }
 
   // The SiteInstance represents which pages must share processes. This is a
   // reference counted pointer to a shared SiteInstance.
   //
   // Note that the SiteInstance should usually not be changed after it is set,
   // but this may happen if the NavigationEntry was cloned and needs to use a
   // different SiteInstance.
@@ skipping 126 matching lines @@
     return intent_received_timestamp_;
   }
 
   void set_intent_received_timestamp(
       const base::TimeTicks intent_received_timestamp) {
     intent_received_timestamp_ = intent_received_timestamp;
   }
 #endif
 
  private:
+  // Finds the TreeNode associated with |frame_tree_node|, if any.
+  NavigationEntryImpl::TreeNode* FindFrameEntry(
+      FrameTreeNode* frame_tree_node) const;
+
   // WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
   // Session/Tab restore save portions of this class so that it can be recreated
   // later. If you add a new field that needs to be persisted you'll have to
   // update SessionService/TabRestoreService and Android WebView
   // state_serializer.cc appropriately.
   // For all new fields, update |Clone| and possibly |ResetForCommit|.
   // WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
 
   // Tree of FrameNavigationEntries, one for each frame on the page.
   // TODO(creis): Once FrameNavigationEntries can be shared across multiple
@@ skipping 114 matching lines @@
   // persisted, unless specific data is taken out/put back in at save/restore
   // time (see TabNavigation for an example of this).
   std::map<std::string, base::string16> extra_data_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationEntryImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_