Revert r15940 again. Unexpected layout test failures :(

TBR=mpcomplete


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15942 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 0 deletions

diff --git a/webkit/glue/webframe_impl.h b/webkit/glue/webframe_impl.h
index 45cdc91..fe7e3ef 100644
--- a/webkit/glue/webframe_impl.h
+++ b/webkit/glue/webframe_impl.h
@@ -43,6 +43,7 @@ class AltErrorPageResourceFetcher;
 class ChromePrintContext;
 class WebDataSourceImpl;
 class WebErrorImpl;
+class WebHistoryItemImpl;
 class WebPluginDelegate;
 class WebRequest;
 class WebView;
@@ -225,6 +226,8 @@ class WebFrameImpl : public WebFrame, public base::RefCounted<WebFrameImpl> {
   // If currently_loading_request is NULL, does nothing.
   void CacheCurrentRequestInfo(WebDataSourceImpl* datasource);
 
+  void set_currently_loading_history_item(WebHistoryItemImpl* item);
+
   // Getters for the impls corresponding to Get(Provisional)DataSource. They
   // may return NULL if there is no corresponding data source.
   WebDataSourceImpl* GetDataSourceImpl() const;
@@ -307,6 +310,10 @@ class WebFrameImpl : public WebFrame, public base::RefCounted<WebFrameImpl> {
   // information to him.  Only non-NULL during a call to LoadRequest.
   const WebRequest* currently_loading_request_;
 
+  // Similar to currently_loading_request_, except this will be set when
+  // WebCore initiates a history navigation (probably via javascript).
+  scoped_refptr<WebHistoryItemImpl> currently_loading_history_item_;
+
   // Plugins sometimes need to be notified when loads are complete so we keep
   // a pointer back to the appropriate plugin.
   WebPluginDelegate* plugin_delegate_;