Index: content/browser/tab_contents/navigation_entry.h |
diff --git a/content/browser/tab_contents/navigation_entry.h b/content/browser/tab_contents/navigation_entry.h |
index eea3f350213ba3a1a7d71533dcaca5d2a63b8458..9e0202a78916172c48bc7bda4df48826399e0e88 100644 |
--- a/content/browser/tab_contents/navigation_entry.h |
+++ b/content/browser/tab_contents/navigation_entry.h |
@@ -10,6 +10,7 @@ |
#include "base/basictypes.h" |
#include "base/memory/ref_counted.h" |
+#include "content/browser/renderer_host/global_request_id.h" |
#include "content/common/content_export.h" |
#include "content/public/common/page_transition_types.h" |
#include "content/public/common/page_type.h" |
@@ -412,6 +413,15 @@ class CONTENT_EXPORT NavigationEntry { |
return restore_type_; |
} |
+ void set_transferred_global_request_id( |
+ const GlobalRequestID& transferred_global_request_id) { |
+ transferred_global_request_id_ = transferred_global_request_id; |
+ } |
+ |
+ GlobalRequestID transferred_global_request_id() const { |
+ return transferred_global_request_id_; |
+ } |
+ |
private: |
// WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING |
// Session/Tab restore save portions of this class so that it can be recreated |
@@ -451,6 +461,13 @@ class CONTENT_EXPORT NavigationEntry { |
// cleared to force a refresh. |
mutable string16 cached_display_title_; |
+ // In case a navigation is transferred to a new RVH but the request has |
+ // been generated in the renderer already, |transferred_global_request_id_| |
+ // identifies the old request so that it can be recycled. The old request |
+ // is stored until the ResourceDispatcher receives the a navigation from the |
Charlie Reis
2011/12/02 22:38:11
nit: the a
Also, please clarify that this gets re
Matt Perry
2011/12/03 00:14:24
Done.
|
+ // renderer which carries this |transferred_global_request_id_| annotation. |
+ GlobalRequestID transferred_global_request_id_; |
+ |
// Copy and assignment is explicitly allowed for this class. |
}; |