diff options
| author | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-30 23:09:37 +0000 |
|---|---|---|
| committer | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-30 23:09:37 +0000 |
| commit | b9a0b1b39c5bcf551178cab7a2aa5f24d5afc929 (patch) | |
| tree | d59dbb65ae4d905230a9c3a112f7302fb531096e /webkit/glue/webclipboard_impl.h | |
| parent | 3c85b8003597b96007ed2e6a98007bb6f3c0ddb2 (diff) | |
| download | chromium_src-b9a0b1b39c5bcf551178cab7a2aa5f24d5afc929.zip chromium_src-b9a0b1b39c5bcf551178cab7a2aa5f24d5afc929.tar.gz chromium_src-b9a0b1b39c5bcf551178cab7a2aa5f24d5afc929.tar.bz2 | |
Enable running webkit tests in parallel and make it use
the number of cpus as the default number of test_shells
to spawn.
This involved ignoring focus/blur messages
and mocking out the clipboard.
The test_shell window still sometimes seems to get focus,
so there's still a bit more work to do, but the tests
seem to all pass.
We still default to 1 test_shell at a time. Once I get this
committed, I'll try multiple. I just don't want to have
to rollback this whole thing.
Review URL: http://codereview.chromium.org/56040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12821 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webclipboard_impl.h')
| -rw-r--r-- | webkit/glue/webclipboard_impl.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/webkit/glue/webclipboard_impl.h b/webkit/glue/webclipboard_impl.h index 6640203..f5b7b50 100644 --- a/webkit/glue/webclipboard_impl.h +++ b/webkit/glue/webclipboard_impl.h @@ -7,10 +7,17 @@ #include "third_party/WebKit/WebKit/chromium/public/WebClipboard.h" +#include <string> + namespace webkit_glue { class WebClipboardImpl : public WebKit::WebClipboard { public: + static std::string URLToMarkup(const WebKit::WebURL& url, + const WebKit::WebString& title); + static std::string URLToImageMarkup(const WebKit::WebURL& url, + const WebKit::WebString& title); + // WebClipboard methods: virtual bool isFormatAvailable(WebKit::WebClipboard::Format); virtual WebKit::WebString readPlainText(); |