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/tools/test_shell/mock_webclipboard_impl.cc | |
| 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/tools/test_shell/mock_webclipboard_impl.cc')
| -rw-r--r-- | webkit/tools/test_shell/mock_webclipboard_impl.cc | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/webkit/tools/test_shell/mock_webclipboard_impl.cc b/webkit/tools/test_shell/mock_webclipboard_impl.cc index 32f3f01..7a428be 100644 --- a/webkit/tools/test_shell/mock_webclipboard_impl.cc +++ b/webkit/tools/test_shell/mock_webclipboard_impl.cc @@ -16,7 +16,7 @@ using WebKit::WebString; using WebKit::WebURL; -bool MockWebClipboardImpl::isFormatAvailable(Format format) { +bool MockWebClipboardImpl::isFormatAvailable(Format format, Buffer buffer) { switch (format) { case FormatHTML: return !m_htmlText.isEmpty(); @@ -28,15 +28,30 @@ bool MockWebClipboardImpl::isFormatAvailable(Format format) { NOTREACHED(); return false; } + + switch (buffer) { + case BufferStandard: + break; + case BufferSelection: +#if defined(OS_LINUX) + break; +#endif + default: + NOTREACHED(); + return false; + } + return true; } -WebKit::WebString MockWebClipboardImpl::readPlainText() { +WebKit::WebString MockWebClipboardImpl::readPlainText( + WebKit::WebClipboard::Buffer buffer) { return m_plainText; } // TODO(wtc): set output argument *url. -WebKit::WebString MockWebClipboardImpl::readHTML(WebKit::WebURL* url) { +WebKit::WebString MockWebClipboardImpl::readHTML( + WebKit::WebClipboard::Buffer buffer, WebKit::WebURL* url) { return m_htmlText; } |