diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-18 20:32:51 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-18 20:32:51 +0000 |
commit | 5dfbf1abfc81152f4e10539f99ce37ce19116aa1 (patch) | |
tree | cdb69a21f8da0e54b6855c42d45fd634e5b667c6 /webkit/glue | |
parent | ac09c92224d0ee428b2c667841e5ba007075e5c3 (diff) | |
download | chromium_src-5dfbf1abfc81152f4e10539f99ce37ce19116aa1.zip chromium_src-5dfbf1abfc81152f4e10539f99ce37ce19116aa1.tar.gz chromium_src-5dfbf1abfc81152f4e10539f99ce37ce19116aa1.tar.bz2 |
Remove some unused code. Removes a couple of WebViewDelegate methods
that should really just be public methods on TestWebViewDelegate.
R=dglazkov
Review URL: http://codereview.chromium.org/79080
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14008 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r-- | webkit/glue/webkit_glue.cc | 21 | ||||
-rw-r--r-- | webkit/glue/webview_delegate.cc | 12 | ||||
-rw-r--r-- | webkit/glue/webview_delegate.h | 17 | ||||
-rw-r--r-- | webkit/glue/webview_impl.cc | 26 | ||||
-rw-r--r-- | webkit/glue/webview_impl.h | 8 | ||||
-rw-r--r-- | webkit/glue/webwidget_impl.cc | 20 | ||||
-rw-r--r-- | webkit/glue/webwidget_impl.h | 8 |
7 files changed, 0 insertions, 112 deletions
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc index 51d0c75b..2553716 100644 --- a/webkit/glue/webkit_glue.cc +++ b/webkit/glue/webkit_glue.cc @@ -277,27 +277,6 @@ WebKit::WebString FilePathStringToWebString(const FilePath::StringType& str) { #endif } -// Convert from WebKit types to Glue types and notify the embedder. This should -// not perform complex processing since it may be called a lot. -void NotifyFormStateChanged(const WebCore::Document* document) { - if (!document) - return; - - WebCore::Frame* frame = document->frame(); - if (!frame) - return; - - // Dispatch to the delegate of the view that owns the frame. - WebFrame* webframe = WebFrameImpl::FromFrame(document->frame()); - WebView* webview = webframe->GetView(); - if (!webview) - return; - WebViewDelegate* delegate = webview->GetDelegate(); - if (!delegate) - return; - delegate->OnNavStateChanged(webview); -} - std::string GetWebKitVersion() { return StringPrintf("%d.%d", WEBKIT_VERSION_MAJOR, WEBKIT_VERSION_MINOR); } diff --git a/webkit/glue/webview_delegate.cc b/webkit/glue/webview_delegate.cc index f4afb2b..58eab61 100644 --- a/webkit/glue/webview_delegate.cc +++ b/webkit/glue/webview_delegate.cc @@ -11,18 +11,6 @@ #include "base/logging.h" #include "googleurl/src/gurl.h" -void WebViewDelegate::SetSmartInsertDeleteEnabled(bool enabled) { - // This method is only used in test shell, which overrides this - // method. - NOTREACHED(); -} - -void WebViewDelegate::SetSelectTrailingWhitespaceEnabled(bool enabled) { - // This method is only used in test shell, which overrides this - // method. - NOTREACHED(); -} - GURL WebViewDelegate::GetAlternateErrorPageURL(const GURL& failedURL, ErrorPageType error_type) { return GURL(); diff --git a/webkit/glue/webview_delegate.h b/webkit/glue/webview_delegate.h index b37c718..1a170b3 100644 --- a/webkit/glue/webview_delegate.h +++ b/webkit/glue/webview_delegate.h @@ -134,12 +134,6 @@ class WebViewDelegate : virtual public WebWidgetDelegate { return NULL; } - // This method is called when default plugin has been correctly created and - // initialized, and found that the missing plugin is available to install or - // user has started installation. - virtual void OnMissingPluginStatus(WebPluginDelegate* delegate, int status) { - } - // This method is called to open a URL in the specified manner. virtual void OpenURL(WebView* webview, const GURL& url, const GURL& referrer, @@ -164,13 +158,6 @@ class WebViewDelegate : virtual public WebWidgetDelegate { const WebKit::WebRect& selection) { } - // This function is called to retrieve a resource bitmap from the - // renderer that was cached as a result of the renderer receiving a - // ViewMsg_Preload_Bitmap message from the browser. - virtual const SkBitmap* GetPreloadedResourceBitmap(int resource_id) { - return NULL; - } - // Returns whether this WebView was opened by a user gesture. virtual bool WasOpenedByUserGesture(WebView* webview) const { return true; @@ -666,8 +653,6 @@ class WebViewDelegate : virtual public WebWidgetDelegate { return true; } - virtual void SetSmartInsertDeleteEnabled(bool enabled); - virtual bool IsSelectTrailingWhitespaceEnabled() { #if defined(OS_WIN) return true; @@ -676,8 +661,6 @@ class WebViewDelegate : virtual public WebWidgetDelegate { #endif } - virtual void SetSelectTrailingWhitespaceEnabled(bool enabled); - virtual void DidBeginEditing() { } virtual void DidChangeSelection(bool is_empty_selection) { } virtual void DidChangeContents() { } diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc index ce6d05d..11e1d07 100644 --- a/webkit/glue/webview_impl.cc +++ b/webkit/glue/webview_impl.cc @@ -1825,32 +1825,6 @@ void WebViewImpl::ImageResourceDownloadDone(ImageResourceFetcher* fetcher, DeleteImageResourceFetcher(fetcher); } -//----------------------------------------------------------------------------- -// WebCore::WidgetClientWin - -// TODO(darin): Figure out what to do with these methods. -#if 0 -const SkBitmap* WebViewImpl::getPreloadedResourceBitmap(int resource_id) { - if (!delegate_) - return NULL; - - return delegate_->GetPreloadedResourceBitmap(resource_id); -} - -void WebViewImpl::onScrollPositionChanged(WebCore::Widget* widget) { - // Scroll position changes should be reflected in the session history. - if (delegate_) - delegate_->OnNavStateChanged(this); -} - -bool WebViewImpl::isHidden() { - if (!delegate_) - return true; - - return delegate_->IsHidden(this); -} -#endif - void WebViewImpl::SetCurrentHistoryItem(WebCore::HistoryItem* item) { back_forward_list_client_impl_.SetCurrentHistoryItem(item); } diff --git a/webkit/glue/webview_impl.h b/webkit/glue/webview_impl.h index c0ce294..373bcd5 100644 --- a/webkit/glue/webview_impl.h +++ b/webkit/glue/webview_impl.h @@ -223,14 +223,6 @@ class WebViewImpl : public WebView, public base::RefCounted<WebViewImpl> { WebCore::Frame* frame, const WebCore::PlatformKeyboardEvent& e); - // TODO(darin): Figure out what happens to these methods. -#if 0 - // WebCore::WidgetClientWin - virtual const SkBitmap* getPreloadedResourceBitmap(int resource_id); - virtual void onScrollPositionChanged(WebCore::Widget* widget); - virtual bool isHidden(); -#endif - // Creates and returns a new SearchableFormData for the focused node. // It's up to the caller to free the returned SearchableFormData. // This returns NULL if the focused node is NULL, or not in a valid form. diff --git a/webkit/glue/webwidget_impl.cc b/webkit/glue/webwidget_impl.cc index f8442d6..a17f8b3 100644 --- a/webkit/glue/webwidget_impl.cc +++ b/webkit/glue/webwidget_impl.cc @@ -284,23 +284,3 @@ void WebWidgetImpl::popupClosed(WebCore::FramelessScrollView* widget) { } delegate_->CloseWidgetSoon(this); } - -//----------------------------------------------------------------------------- -// WebCore::WidgetClientWin - -// TODO(darin): Figure out what happens to these methods. -#if 0 -const SkBitmap* WebWidgetImpl::getPreloadedResourceBitmap(int resource_id) { - return NULL; -} - -void WebWidgetImpl::onScrollPositionChanged(Widget* widget) { -} - -bool WebWidgetImpl::isHidden() { - if (!delegate_) - return true; - - return delegate_->IsHidden(this); -} -#endif diff --git a/webkit/glue/webwidget_impl.h b/webkit/glue/webwidget_impl.h index 5b01475..1047673 100644 --- a/webkit/glue/webwidget_impl.h +++ b/webkit/glue/webwidget_impl.h @@ -105,14 +105,6 @@ class WebWidgetImpl : public WebWidget, // WebCore::FramelessScrollViewClient methods: virtual void popupClosed(WebCore::FramelessScrollView* popup_view); - // TODO(darin): Figure out what happens to these methods. -#if 0 - // WebCore::WidgetClientWin - virtual const SkBitmap* getPreloadedResourceBitmap(int resource_id); - virtual void onScrollPositionChanged(WebCore::Widget* widget); - virtual bool isHidden(); -#endif - WebWidgetDelegate* delegate_; WebKit::WebSize size_; |