Index: webkit/glue/webclipboard_impl.cc |
diff --git a/webkit/glue/webclipboard_impl.cc b/webkit/glue/webclipboard_impl.cc |
index b917677e230e2bd7b2e43b1b15f44051f027bbb6..9eddb68bd46f68f9c84b2a7e5a64d29e1e567b32 100644 |
--- a/webkit/glue/webclipboard_impl.cc |
+++ b/webkit/glue/webclipboard_impl.cc |
@@ -10,6 +10,7 @@ |
#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" |
@@ -24,6 +25,7 @@ |
#endif |
using WebKit::WebClipboard; |
+using WebKit::WebData; |
using WebKit::WebImage; |
using WebKit::WebString; |
using WebKit::WebURL; |
@@ -124,6 +126,16 @@ 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) { |