diff options
| author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 01:13:54 +0000 |
|---|---|---|
| committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 01:13:54 +0000 |
| commit | 6a90d5c514d82080a8d15265094e10e1a79a3c55 (patch) | |
| tree | e185002a465b75abd38965311f2f98f33deaf63d /webkit/glue/webclipboard_impl.cc | |
| parent | d4de021797b34583cdf72983cdbf653fe4d290fe (diff) | |
| download | chromium_src-6a90d5c514d82080a8d15265094e10e1a79a3c55.zip chromium_src-6a90d5c514d82080a8d15265094e10e1a79a3c55.tar.gz chromium_src-6a90d5c514d82080a8d15265094e10e1a79a3c55.tar.bz2 | |
Revert r78134+r78136
BUG=none
TEST=none
TBR=levin@chromium.org
Review URL: http://codereview.chromium.org/6698011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78139 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webclipboard_impl.cc')
| -rw-r--r-- | webkit/glue/webclipboard_impl.cc | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/webkit/glue/webclipboard_impl.cc b/webkit/glue/webclipboard_impl.cc index 9eddb68..b917677 100644 --- a/webkit/glue/webclipboard_impl.cc +++ b/webkit/glue/webclipboard_impl.cc @@ -10,7 +10,6 @@ #include "googleurl/src/gurl.h" #include "net/base/escape.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebData.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebImage.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" @@ -25,7 +24,6 @@ #endif using WebKit::WebClipboard; -using WebKit::WebData; using WebKit::WebImage; using WebKit::WebString; using WebKit::WebURL; @@ -126,16 +124,6 @@ WebString WebClipboardImpl::readHTML(Buffer buffer, WebURL* source_url) { return html_stdstr; } -WebData WebClipboardImpl::readImage(Buffer buffer) { - ui::Clipboard::Buffer buffer_type; - if (!ConvertBufferType(buffer, &buffer_type)) - return WebData(); - - std::string png_data; - ClipboardReadImage(buffer_type, &png_data); - return WebData(png_data); -} - void WebClipboardImpl::writeHTML( const WebString& html_text, const WebURL& source_url, const WebString& plain_text, bool write_smart_paste) { |