diff options
| author | japhet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-08 22:16:05 +0000 |
|---|---|---|
| committer | japhet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-08 22:16:05 +0000 |
| commit | 65a6150d49263ff6e3135c5631f9ba5eb12823df (patch) | |
| tree | 36f5b8624ae02cc69ae29ade9923404f6fec80b3 /webkit/glue/webclipboard_impl.h | |
| parent | 9f53c7d5f1ce83bb2025b1797300c6d60dd7d8ff (diff) | |
| download | chromium_src-65a6150d49263ff6e3135c5631f9ba5eb12823df.zip chromium_src-65a6150d49263ff6e3135c5631f9ba5eb12823df.tar.gz chromium_src-65a6150d49263ff6e3135c5631f9ba5eb12823df.tar.bz2 | |
Roll webkit deps 48155:48185 and remove a couple of passing tests from test_expectations.txt.
Also, merge in http://codereview.chromium.org/174367 (original author: vandebo@chromium.org), which is the downstream half of r48168.
BUG=4360
BUG=21228
BUG=18792
TEST=none
TBR=eroman
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25669 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webclipboard_impl.h')
| -rw-r--r-- | webkit/glue/webclipboard_impl.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/webkit/glue/webclipboard_impl.h b/webkit/glue/webclipboard_impl.h index 52762da..cc86505 100644 --- a/webkit/glue/webclipboard_impl.h +++ b/webkit/glue/webclipboard_impl.h @@ -5,6 +5,7 @@ #ifndef WEBCLIPBOARD_IMPL_H_ #define WEBCLIPBOARD_IMPL_H_ +#include "base/clipboard.h" #include "webkit/api/public/WebClipboard.h" #include <string> @@ -21,9 +22,9 @@ class WebClipboardImpl : public WebKit::WebClipboard { virtual ~WebClipboardImpl() {} // WebClipboard methods: - virtual bool isFormatAvailable(WebKit::WebClipboard::Format); - virtual WebKit::WebString readPlainText(); - virtual WebKit::WebString readHTML(WebKit::WebURL* source_url); + virtual bool isFormatAvailable(Format, Buffer); + virtual WebKit::WebString readPlainText(Buffer); + virtual WebKit::WebString readHTML(Buffer, WebKit::WebURL* source_url); virtual void writeHTML( const WebKit::WebString& html_text, const WebKit::WebURL& source_url, @@ -36,6 +37,9 @@ class WebClipboardImpl : public WebKit::WebClipboard { const WebKit::WebImage&, const WebKit::WebURL& source_url, const WebKit::WebString& title); + + private: + bool ConvertBufferType(Buffer, Clipboard::Buffer*); }; } // namespace webkit_glue |