diff options
author | dimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-14 00:35:08 +0000 |
---|---|---|
committer | dimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-14 00:35:08 +0000 |
commit | 76f565227a89e88b6a0a32bf36cc5c01f6e418ca (patch) | |
tree | 4c9a9f557701a1faef9cb33a8a7ad40896a7ae8c /webkit/tools/test_shell | |
parent | 8872aae93c8be5953338ab6eda9b81d7846d6690 (diff) | |
download | chromium_src-76f565227a89e88b6a0a32bf36cc5c01f6e418ca.zip chromium_src-76f565227a89e88b6a0a32bf36cc5c01f6e418ca.tar.gz chromium_src-76f565227a89e88b6a0a32bf36cc5c01f6e418ca.tar.bz2 |
Roll WebKit DEPS from 45738 to 45840.
Review URL: http://codereview.chromium.org/149575
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20589 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell')
-rw-r--r-- | webkit/tools/test_shell/test_worker/test_webworker.cc | 5 | ||||
-rw-r--r-- | webkit/tools/test_shell/test_worker/test_webworker.h | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/test_worker/test_webworker.cc b/webkit/tools/test_shell/test_worker/test_webworker.cc index 29733b4..9adacd8 100644 --- a/webkit/tools/test_shell/test_worker/test_webworker.cc +++ b/webkit/tools/test_shell/test_worker/test_webworker.cc @@ -87,14 +87,15 @@ void TestWebWorker::postExceptionToWorkerObject(const WebString& error_message, void TestWebWorker::postConsoleMessageToWorkerObject( int destination_id, int source_id, + int message_type, int message_level, const WebString& message, int line_number, const WebString& source_url) { if (webworkerclient_delegate_) webworkerclient_delegate_->postConsoleMessageToWorkerObject( - destination_id, source_id, message_level, message, line_number, - source_url); + destination_id, source_id, message_type, message_level, + message, line_number, source_url); } void TestWebWorker::confirmMessageFromWorkerObject(bool has_pending_activity) { diff --git a/webkit/tools/test_shell/test_worker/test_webworker.h b/webkit/tools/test_shell/test_worker/test_webworker.h index 171b09c..f0ee118 100644 --- a/webkit/tools/test_shell/test_worker/test_webworker.h +++ b/webkit/tools/test_shell/test_worker/test_webworker.h @@ -41,6 +41,7 @@ class TestWebWorker : public WebKit::WebWorker, virtual void postConsoleMessageToWorkerObject( int destination_id, int source_id, + int message_type, int message_level, const WebKit::WebString& message, int line_number, |