summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authorraymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-02 22:10:05 +0000
committerraymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-02 22:10:05 +0000
commit4dfb8f00b69ec3dde0660c4790a469df5596a3ab (patch)
treedefc06b4fc11ced9c365bf502c5475bee4b3620a /webkit/tools
parent28cc10a26ffaaf8ff7f4f2e05ab6d03926951167 (diff)
downloadchromium_src-4dfb8f00b69ec3dde0660c4790a469df5596a3ab.zip
chromium_src-4dfb8f00b69ec3dde0660c4790a469df5596a3ab.tar.gz
chromium_src-4dfb8f00b69ec3dde0660c4790a469df5596a3ab.tar.bz2
Added RTF support to pepper API.
BUG=120435 TEST=out/Release/browser_tests --gtest_filter=*PPAPITest.*Clipboard* Review URL: http://codereview.chromium.org/9921018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130223 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/test_shell/simple_clipboard_impl.cc5
-rw-r--r--webkit/tools/test_shell/simple_clipboard_impl.h2
2 files changed, 7 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/simple_clipboard_impl.cc b/webkit/tools/test_shell/simple_clipboard_impl.cc
index ec5a65c..06d6c8b 100644
--- a/webkit/tools/test_shell/simple_clipboard_impl.cc
+++ b/webkit/tools/test_shell/simple_clipboard_impl.cc
@@ -80,6 +80,11 @@ void SimpleClipboardClient::ReadHTML(ui::Clipboard::Buffer buffer,
*url = GURL(url_str);
}
+void SimpleClipboardClient::ReadRTF(ui::Clipboard::Buffer buffer,
+ std::string* result) {
+ GetClipboard()->ReadRTF(buffer, result);
+}
+
void SimpleClipboardClient::ReadImage(ui::Clipboard::Buffer buffer,
std::string* data) {
SkBitmap bitmap = GetClipboard()->ReadImage(buffer);
diff --git a/webkit/tools/test_shell/simple_clipboard_impl.h b/webkit/tools/test_shell/simple_clipboard_impl.h
index 389ec36..52571bf 100644
--- a/webkit/tools/test_shell/simple_clipboard_impl.h
+++ b/webkit/tools/test_shell/simple_clipboard_impl.h
@@ -28,6 +28,8 @@ class SimpleClipboardClient : public webkit_glue::ClipboardClient {
virtual void ReadHTML(ui::Clipboard::Buffer buffer, string16* markup,
GURL* url, uint32* fragment_start,
uint32* fragment_end) OVERRIDE;
+ virtual void ReadRTF(ui::Clipboard::Buffer buffer,
+ std::string* result) OVERRIDE;
virtual void ReadImage(ui::Clipboard::Buffer buffer,
std::string* data) OVERRIDE;
virtual void ReadCustomData(ui::Clipboard::Buffer buffer,