summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webkitclient_impl.h
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 /webkit/glue/webkitclient_impl.h
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 'webkit/glue/webkitclient_impl.h')
-rw-r--r--webkit/glue/webkitclient_impl.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/webkit/glue/webkitclient_impl.h b/webkit/glue/webkitclient_impl.h
index e53605d..9fc95fa 100644
--- a/webkit/glue/webkitclient_impl.h
+++ b/webkit/glue/webkitclient_impl.h
@@ -7,7 +7,6 @@
#include "base/timer.h"
#include "third_party/WebKit/WebKit/chromium/public/WebKitClient.h"
-#include "webkit/glue/webclipboard_impl.h"
#if defined(OS_WIN)
#include "webkit/glue/webthemeengine_impl_win.h"
#endif
@@ -21,7 +20,6 @@ class WebKitClientImpl : public WebKit::WebKitClient {
WebKitClientImpl();
// WebKitClient methods (partial implementation):
- virtual WebKit::WebClipboard* clipboard();
virtual WebKit::WebThemeEngine* themeEngine();
virtual void decrementStatsCounter(const char* name);
virtual void incrementStatsCounter(const char* name);
@@ -40,7 +38,6 @@ class WebKitClientImpl : public WebKit::WebKitClient {
shared_timer_func_();
}
- WebClipboardImpl clipboard_;
MessageLoop* main_loop_;
base::OneShotTimer<WebKitClientImpl> shared_timer_;
void (*shared_timer_func_)();