diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-13 06:02:39 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-13 06:02:39 +0000 |
commit | efdb3e59f68fe34ef19dd6e52a5555e19f9b26b4 (patch) | |
tree | 717f7caca9e5b8191c0f1ff4cb1f3b00c0281e75 /webkit/glue/webframe_impl.h | |
parent | 235df3ac876638d8f09eb62c6b8504446e19b63b (diff) | |
download | chromium_src-efdb3e59f68fe34ef19dd6e52a5555e19f9b26b4.zip chromium_src-efdb3e59f68fe34ef19dd6e52a5555e19f9b26b4.tar.gz chromium_src-efdb3e59f68fe34ef19dd6e52a5555e19f9b26b4.tar.bz2 |
Re-do r15244 again.
Originally reviewed at http://codereview.chromium.org/100353
Eliminate webkit/glue/webhistoryitem* in favor of adding a
NavigateBackForwardSoon method WebViewDelegate. This moves
all of the hacky details of how we intercept "history.{back,
forward,go}" into the webkit layer. My eventual plan is to
teach WebCore how to make this not hacky.
In this version of the CL, TestWebViewDelegate performs the
back/forward navigation directly in NavigateBackForwardSoon
instead of using PostTask to delay it. I'm doing this to
minimize regressions so that I can hopefully get the rest of
this CL landed.
I also already made the changes to WebKit to force history.
{back,forward,go} to be processed asynchronously.
BUG=11423
TBR=mpcomplete
Review URL: http://codereview.chromium.org/115288
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15940 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webframe_impl.h')
-rw-r--r-- | webkit/glue/webframe_impl.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/webkit/glue/webframe_impl.h b/webkit/glue/webframe_impl.h index fe7e3ef..45cdc91 100644 --- a/webkit/glue/webframe_impl.h +++ b/webkit/glue/webframe_impl.h @@ -43,7 +43,6 @@ class AltErrorPageResourceFetcher; class ChromePrintContext; class WebDataSourceImpl; class WebErrorImpl; -class WebHistoryItemImpl; class WebPluginDelegate; class WebRequest; class WebView; @@ -226,8 +225,6 @@ 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; @@ -310,10 +307,6 @@ 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_; |