diff options
author | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
---|---|---|
committer | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
commit | 3345a6884c488ff3a535c2c9acdd33d74b37e311 (patch) | |
tree | 7784b988ef1698cb6967ea1bdf07616237716c6c /webkit/glue/webdropdata.cc | |
parent | efc8475837ec58186051f23bb03542620424f6ce (diff) | |
download | external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.zip external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.gz external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.bz2 |
Merge Chromium at 7.0.540.0 : Initial merge by git
Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.
Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
Diffstat (limited to 'webkit/glue/webdropdata.cc')
-rw-r--r-- | webkit/glue/webdropdata.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/webkit/glue/webdropdata.cc b/webkit/glue/webdropdata.cc index d46987a..ea9e6c6 100644 --- a/webkit/glue/webdropdata.cc +++ b/webkit/glue/webdropdata.cc @@ -15,6 +15,10 @@ using WebKit::WebDragData; using WebKit::WebString; using WebKit::WebVector; +WebDropData::WebDropData(int32 drag_identity) + : identity(drag_identity) { +} + WebDropData::WebDropData(const WebDragData& drag_data) : identity(0), url(drag_data.url()), @@ -36,6 +40,13 @@ WebDropData::WebDropData(const WebDragData& drag_data) file_contents.assign(contents.data(), contents.size()); } +WebDropData::WebDropData() + : identity(0) { +} + +WebDropData::~WebDropData() { +} + WebDragData WebDropData::ToDragData() const { WebDragData result; result.initialize(); |