summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-18 22:51:03 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-18 22:51:03 +0000
commit11de3e98153ad8dcb9e6628e527f7bfb2ca0a8ed (patch)
tree53cd07aaba6e6294b18a43a362980f8aa4a27142 /webkit
parent51570ddfc079a32dc5e78887f730b7aa270b916e (diff)
downloadchromium_src-11de3e98153ad8dcb9e6628e527f7bfb2ca0a8ed.zip
chromium_src-11de3e98153ad8dcb9e6628e527f7bfb2ca0a8ed.tar.gz
chromium_src-11de3e98153ad8dcb9e6628e527f7bfb2ca0a8ed.tar.bz2
Implement a max worker count of 16 per tab and 64 total. Any workers created after that are queued.
Review URL: http://codereview.chromium.org/125242 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18763 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webworker_impl.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/glue/webworker_impl.cc b/webkit/glue/webworker_impl.cc
index 6cd3bd0..b648cf1 100644
--- a/webkit/glue/webworker_impl.cc
+++ b/webkit/glue/webworker_impl.cc
@@ -184,7 +184,8 @@ void WebWorkerImpl::startWorkerContext(const WebURL& script_url,
}
void WebWorkerImpl::terminateWorkerContext() {
- worker_thread_->stop();
+ if (worker_thread_)
+ worker_thread_->stop();
}
void WebWorkerImpl::postMessageToWorkerContext(const WebString& message) {