From 4d4a6356e8e1a6ac0b177cb6bd398148030cb320 Mon Sep 17 00:00:00 2001 From: "darin@chromium.org" Date: Tue, 5 May 2009 06:11:00 +0000 Subject: 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 --- webkit/glue/webframe_impl.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'webkit/glue/webframe_impl.h') 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 { // 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 { // 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 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_; -- cgit v1.1