diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-07 23:24:58 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-07 23:24:58 +0000 |
commit | e80c73be12cc2211d5a72a5ff85eb97366b2458f (patch) | |
tree | 5c395779776b368ed6cafdbc5c6bc929776c18a4 /webkit/glue/webview_delegate.h | |
parent | 25a3f6b52228bc68ce63c4032ed6b17cecd7b3c5 (diff) | |
download | chromium_src-e80c73be12cc2211d5a72a5ff85eb97366b2458f.zip chromium_src-e80c73be12cc2211d5a72a5ff85eb97366b2458f.tar.gz chromium_src-e80c73be12cc2211d5a72a5ff85eb97366b2458f.tar.bz2 |
Switch to using WebDragData in WebView and WebViewDelegate.
I also cleaned up some of the WebView and WebViewDelegate methods to pass
WebPoint instead of pairs of ints or gfx::Point.
With this change, I am keeping webkit/glue/webdropdata.{h,cc}, which is what
Chrome uses to pass around the equivalent data. Now, it is possible to
construct a WebDropData from a WebKit::WebDragData and to also get a
WebKit::WebDragData from a WebDropData. Hence, the conversion between
WebDropData and ChromiumDataObject (see clipboard_conversion.{h,cc}) is now
removed in favor of conversion between WebDropData and WebKit::WebDragData.
Conversion between WebKit::WebDragData and WebCore::ChromiumDataObject is very
cheap (just reference counting).
Finally, this change also brings in WebData, which is now used by the return
value of WebKitClient::loadResource. As a companion to that change, I also
changed webkit_glue::GetDataResource to return StringPiece instead of
std::string. That also saves on an unnecessary buffer copy.
R=dglazkov
Review URL: http://codereview.chromium.org/63084
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13305 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webview_delegate.h')
-rw-r--r-- | webkit/glue/webview_delegate.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/webkit/glue/webview_delegate.h b/webkit/glue/webview_delegate.h index c206ef8..4c8775a 100644 --- a/webkit/glue/webview_delegate.h +++ b/webkit/glue/webview_delegate.h @@ -42,8 +42,12 @@ namespace webkit_glue { class WebMediaPlayerDelegate; } +namespace WebKit { +class WebDragData; +struct WebPoint; +} + struct PasswordForm; -struct WebDropData; struct WebPreferences; class AutofillForm; class FilePath; @@ -601,7 +605,9 @@ class WebViewDelegate : virtual public WebWidgetDelegate { // webview: The WebView sending the delegate method. // drop_data: a WebDropData struct which should contain all the necessary // information for dragging data out of the webview. - virtual void StartDragging(WebView* webview, const WebDropData& drop_data) { } + virtual void StartDragging(WebView* webview, + const WebKit::WebDragData& drag_data) { + } // Returns the focus to the client. // reverse: Whether the focus should go to the previous (if true) or the next |