diff options
author | cdn@chromium.org <cdn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-27 21:27:39 +0000 |
---|---|---|
committer | cdn@chromium.org <cdn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-27 21:27:39 +0000 |
commit | 725c68279789e7a3a7726e5a1a919aa2aae27f07 (patch) | |
tree | c69649d528be64e68e2e1d774d40d1a448be2d56 /webkit | |
parent | ad31ae07a1f51fa382fa214de28ca4f371ceaee2 (diff) | |
download | chromium_src-725c68279789e7a3a7726e5a1a919aa2aae27f07.zip chromium_src-725c68279789e7a3a7726e5a1a919aa2aae27f07.tar.gz chromium_src-725c68279789e7a3a7726e5a1a919aa2aae27f07.tar.bz2 |
Add Clipboard GetSequenceNumber interface which allows us to version the data on the clipboard.
BUG=73478
Review URL: http://codereview.chromium.org/7222016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90646 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/glue/webclipboard_impl.cc | 4 | ||||
-rw-r--r-- | webkit/glue/webclipboard_impl.h | 1 | ||||
-rw-r--r-- | webkit/glue/webkit_glue.h | 3 | ||||
-rw-r--r-- | webkit/tools/test_shell/simple_clipboard_impl.cc | 4 |
4 files changed, 12 insertions, 0 deletions
diff --git a/webkit/glue/webclipboard_impl.cc b/webkit/glue/webclipboard_impl.cc index f0a8b1a..86bcaf0 100644 --- a/webkit/glue/webclipboard_impl.cc +++ b/webkit/glue/webclipboard_impl.cc @@ -141,6 +141,10 @@ WebData WebClipboardImpl::readImage(Buffer buffer) { return WebData(png_data); } +uint64 WebClipboardImpl::getSequenceNumber() { + return ClipboardGetSequenceNumber(); +} + void WebClipboardImpl::writeHTML( const WebString& html_text, const WebURL& source_url, const WebString& plain_text, bool write_smart_paste) { diff --git a/webkit/glue/webclipboard_impl.h b/webkit/glue/webclipboard_impl.h index c50f38d..0cee5d2 100644 --- a/webkit/glue/webclipboard_impl.h +++ b/webkit/glue/webclipboard_impl.h @@ -26,6 +26,7 @@ class WebClipboardImpl : public WebKit::WebClipboard { virtual WebKit::WebString readPlainText(Buffer); virtual WebKit::WebString readHTML(Buffer, WebKit::WebURL* source_url); virtual WebKit::WebData readImage(Buffer); + virtual uint64 getSequenceNumber(); virtual void writeHTML( const WebKit::WebString& html_text, const WebKit::WebURL& source_url, diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h index e9c945c..1de78e6 100644 --- a/webkit/glue/webkit_glue.h +++ b/webkit/glue/webkit_glue.h @@ -201,6 +201,9 @@ void ClipboardReadImage(ui::Clipboard::Buffer buffer, std::string* data); bool ClipboardReadData(ui::Clipboard::Buffer buffer, const string16& type, string16* data, string16* metadata); +// Get a sequence number which uniquely identifies clipboard state. +uint64 ClipboardGetSequenceNumber(); + // Reads filenames from the clipboard, if available. bool ClipboardReadFilenames(ui::Clipboard::Buffer buffer, std::vector<string16>* filenames); diff --git a/webkit/tools/test_shell/simple_clipboard_impl.cc b/webkit/tools/test_shell/simple_clipboard_impl.cc index 2bb35df..77910d0 100644 --- a/webkit/tools/test_shell/simple_clipboard_impl.cc +++ b/webkit/tools/test_shell/simple_clipboard_impl.cc @@ -94,4 +94,8 @@ bool ClipboardReadFilenames(ui::Clipboard::Buffer buffer, return false; } +uint64 ClipboardGetSequenceNumber() { + return 0; +} + } // namespace webkit_glue |