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

1 files changed, 6 insertions, 3 deletions

diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index dd24b99..6727436 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -4113,6 +4113,8 @@
         '../third_party/WebKit/WebKit/chromium/public/WebCommon.h',
         '../third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h',
         '../third_party/WebKit/WebKit/chromium/public/WebCString.h',
+        '../third_party/WebKit/WebKit/chromium/public/WebData.h',
+        '../third_party/WebKit/WebKit/chromium/public/WebDragData.h',
         '../third_party/WebKit/WebKit/chromium/public/WebFindOptions.h',
         '../third_party/WebKit/WebKit/chromium/public/WebImage.h',
         '../third_party/WebKit/WebKit/chromium/public/WebInputEvent.h',
@@ -4126,6 +4128,7 @@
         '../third_party/WebKit/WebKit/chromium/public/WebSize.h',
         '../third_party/WebKit/WebKit/chromium/public/WebString.h',
         '../third_party/WebKit/WebKit/chromium/public/WebURL.h',
+        '../third_party/WebKit/WebKit/chromium/public/WebVector.h',
         '../third_party/WebKit/WebKit/chromium/public/win/WebInputEventFactory.h',
         '../third_party/WebKit/WebKit/chromium/public/win/WebSandboxSupport.h',
         '../third_party/WebKit/WebKit/chromium/public/win/WebScreenInfoFactory.h',
@@ -4139,6 +4142,8 @@
         '../third_party/WebKit/WebKit/chromium/src/mac/WebScreenInfoFactory.mm',
         '../third_party/WebKit/WebKit/chromium/src/WebCache.cpp',
         '../third_party/WebKit/WebKit/chromium/src/WebCString.cpp',
+        '../third_party/WebKit/WebKit/chromium/src/WebData.cpp',
+        '../third_party/WebKit/WebKit/chromium/src/WebDragData.cpp',
         '../third_party/WebKit/WebKit/chromium/src/WebImageSkia.cpp',
         '../third_party/WebKit/WebKit/chromium/src/WebInputEvent.cpp',
         '../third_party/WebKit/WebKit/chromium/src/WebKit.cpp',
@@ -4299,8 +4304,6 @@
         'glue/chrome_client_impl.cc',
         'glue/chrome_client_impl.h',
         'glue/chromium_bridge_impl.cc',
-        'glue/clipboard_conversion.cc',
-        'glue/clipboard_conversion.h',
         'glue/context_menu.h',
         'glue/context_menu_client_impl.cc',
         'glue/context_menu_client_impl.h',
@@ -4387,6 +4390,7 @@
         'glue/webdevtoolsclient_impl.cc',
         'glue/webdevtoolsclient_impl.h',
         'glue/webdropdata.cc',
+        'glue/webdropdata_win.cc',
         'glue/webdropdata.h',
         'glue/weberror.h',
         'glue/weberror_impl.cc',
@@ -4476,7 +4480,6 @@
             'glue/plugins/mozilla_extensions.cc',
             'glue/plugins/webplugin_delegate_impl.cc',
             'glue/glue_accessibility.cc',
-            'glue/webdropdata.cc',
             'pending/AccessibleBase.cpp',
             'pending/AccessibleDocument.cpp',
           ],