diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-05 06:11:00 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-05 06:11:00 +0000 |
commit | 4d4a6356e8e1a6ac0b177cb6bd398148030cb320 (patch) | |
tree | 9b6856e1e8523dc782c08ae917882250c5ed0503 /webkit/glue/webframe_impl.h | |
parent | ca8de285102e2df854f56fce3c7163d5a8db7f5a (diff) | |
download | chromium_src-4d4a6356e8e1a6ac0b177cb6bd398148030cb320.zip chromium_src-4d4a6356e8e1a6ac0b177cb6bd398148030cb320.tar.gz chromium_src-4d4a6356e8e1a6ac0b177cb6bd398148030cb320.tar.bz2 |
Re-do r15244: Fix crash in ~TestWebViewDelegate caused by
shell_ being null. Moved the RevokeDragDrop call to the
TestShell destructor instead.
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.
BUG=11423
R=mpcomplete
Review URL: http://codereview.chromium.org/108004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15278 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 c3cbbb4..7a83467 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; @@ -228,8 +227,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; @@ -315,10 +312,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_; |