diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-06 20:20:22 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-06 20:20:22 +0000 |
commit | e18e7ad1c60f6472c25bc4af2554f471e55a85a6 (patch) | |
tree | 4240f999b4a49da982a2ba91324416db381412f0 /webkit/tools/test_shell/test_worker | |
parent | 63b397506f70501d8089eecf28f50e17417fdd48 (diff) | |
download | chromium_src-e18e7ad1c60f6472c25bc4af2554f471e55a85a6.zip chromium_src-e18e7ad1c60f6472c25bc4af2554f471e55a85a6.tar.gz chromium_src-e18e7ad1c60f6472c25bc4af2554f471e55a85a6.tar.bz2 |
Enable message ports for workers.
TEST=included ui test
Review URL: http://codereview.chromium.org/160576
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22653 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_worker')
-rw-r--r-- | webkit/tools/test_shell/test_worker/test_webworker.cc | 12 | ||||
-rw-r--r-- | webkit/tools/test_shell/test_worker/test_webworker.h | 8 |
2 files changed, 13 insertions, 7 deletions
diff --git a/webkit/tools/test_shell/test_worker/test_webworker.cc b/webkit/tools/test_shell/test_worker/test_webworker.cc index 9adacd8..6fdce06 100644 --- a/webkit/tools/test_shell/test_worker/test_webworker.cc +++ b/webkit/tools/test_shell/test_worker/test_webworker.cc @@ -41,7 +41,7 @@ void TestWebWorker::startWorkerContext(const WebURL& script_url, webworker_impl_->startWorkerContext(script_url, user_agent, source_code); for (size_t i = 0; i < queued_messages_.size(); ++i) - webworker_impl_->postMessageToWorkerContext(queued_messages_[i]); + webworker_impl_->postMessageToWorkerContext(queued_messages_[i], NULL); queued_messages_.clear(); } @@ -50,9 +50,10 @@ void TestWebWorker::terminateWorkerContext() { webworker_impl_->terminateWorkerContext(); } -void TestWebWorker::postMessageToWorkerContext(const WebString& message) { +void TestWebWorker::postMessageToWorkerContext(const WebString& message, + WebKit::WebMessagePortChannel*) { if (webworker_impl_) - webworker_impl_->postMessageToWorkerContext(message); + webworker_impl_->postMessageToWorkerContext(message, NULL); else queued_messages_.push_back(message); } @@ -65,14 +66,15 @@ void TestWebWorker::workerObjectDestroyed() { Release(); // Releases the reference held for worker object. } -void TestWebWorker::postMessageToWorkerObject(const WebString& message) { +void TestWebWorker::postMessageToWorkerObject(const WebString& message, + WebKit::WebMessagePortChannel*) { if (!webworkerclient_delegate_) return; // The string was created in the dll's memory space as a result of a postTask. // If we pass it to test shell's memory space, it'll cause problems when GC // occurs. So duplicate it from the test shell's memory space first. webworkerclient_delegate_->postMessageToWorkerObject( - webworker_helper_->DuplicateString(message)); + webworker_helper_->DuplicateString(message), NULL); } void TestWebWorker::postExceptionToWorkerObject(const WebString& error_message, diff --git a/webkit/tools/test_shell/test_worker/test_webworker.h b/webkit/tools/test_shell/test_worker/test_webworker.h index f0ee118..22ffecd 100644 --- a/webkit/tools/test_shell/test_worker/test_webworker.h +++ b/webkit/tools/test_shell/test_worker/test_webworker.h @@ -29,11 +29,15 @@ class TestWebWorker : public WebKit::WebWorker, const WebKit::WebString& user_agent, const WebKit::WebString& source_code); virtual void terminateWorkerContext(); - virtual void postMessageToWorkerContext(const WebKit::WebString&); + virtual void postMessageToWorkerContext( + const WebKit::WebString& message, + WebKit::WebMessagePortChannel* channel); virtual void workerObjectDestroyed(); // WebWorkerClient methods: - virtual void postMessageToWorkerObject(const WebKit::WebString& message); + virtual void postMessageToWorkerObject( + const WebKit::WebString& message, + WebKit::WebMessagePortChannel* channel); virtual void postExceptionToWorkerObject( const WebKit::WebString& error_message, int line_number, |