summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
authorojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-30 23:09:37 +0000
committerojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-30 23:09:37 +0000
commitb9a0b1b39c5bcf551178cab7a2aa5f24d5afc929 (patch)
treed59dbb65ae4d905230a9c3a112f7302fb531096e /chrome/renderer
parent3c85b8003597b96007ed2e6a98007bb6f3c0ddb2 (diff)
downloadchromium_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 'chrome/renderer')
-rw-r--r--chrome/renderer/renderer_webkitclient_impl.cc4
-rw-r--r--chrome/renderer/renderer_webkitclient_impl.h4
2 files changed, 8 insertions, 0 deletions
diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc
index 26eb73d..f35e9d1 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/chrome/renderer/renderer_webkitclient_impl.cc
@@ -21,6 +21,10 @@ using WebKit::WebURL;
//------------------------------------------------------------------------------
+WebKit::WebClipboard* RendererWebKitClientImpl::clipboard() {
+ return &clipboard_;
+}
+
WebKit::WebMimeRegistry* RendererWebKitClientImpl::mimeRegistry() {
return &mime_registry_;
}
diff --git a/chrome/renderer/renderer_webkitclient_impl.h b/chrome/renderer/renderer_webkitclient_impl.h
index 603cad9..2efdf66 100644
--- a/chrome/renderer/renderer_webkitclient_impl.h
+++ b/chrome/renderer/renderer_webkitclient_impl.h
@@ -6,6 +6,7 @@
#define CHROME_RENDERER_RENDERER_WEBKIT_CLIENT_IMPL_H_
#include "webkit/glue/simple_webmimeregistry_impl.h"
+#include "webkit/glue/webclipboard_impl.h"
#include "webkit/glue/webkitclient_impl.h"
#if defined(OS_WIN)
@@ -15,6 +16,7 @@
class RendererWebKitClientImpl : public webkit_glue::WebKitClientImpl {
public:
// WebKitClient methods:
+ virtual WebKit::WebClipboard* clipboard();
virtual WebKit::WebMimeRegistry* mimeRegistry();
virtual WebKit::WebSandboxSupport* sandboxSupport();
virtual uint64_t visitedLinkHash(const char* canonicalURL, size_t length);
@@ -43,6 +45,8 @@ class RendererWebKitClientImpl : public webkit_glue::WebKitClientImpl {
};
#endif
+ webkit_glue::WebClipboardImpl clipboard_;
+
MimeRegistry mime_registry_;
#if defined(OS_WIN)
SandboxSupport sandbox_support_;