summaryrefslogtreecommitdiffstats
path: root/chrome/worker
diff options
context:
space:
mode:
authordimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-14 00:35:08 +0000
committerdimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-14 00:35:08 +0000
commit76f565227a89e88b6a0a32bf36cc5c01f6e418ca (patch)
tree4c9a9f557701a1faef9cb33a8a7ad40896a7ae8c /chrome/worker
parent8872aae93c8be5953338ab6eda9b81d7846d6690 (diff)
downloadchromium_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 'chrome/worker')
-rw-r--r--chrome/worker/webworkerclient_proxy.cc4
-rw-r--r--chrome/worker/webworkerclient_proxy.h1
2 files changed, 4 insertions, 1 deletions
diff --git a/chrome/worker/webworkerclient_proxy.cc b/chrome/worker/webworkerclient_proxy.cc
index 85a410b..84cf05f 100644
--- a/chrome/worker/webworkerclient_proxy.cc
+++ b/chrome/worker/webworkerclient_proxy.cc
@@ -93,12 +93,14 @@ void WebWorkerClientProxy::postExceptionToWorkerObject(
void WebWorkerClientProxy::postConsoleMessageToWorkerObject(
int destination,
int source,
+ int type,
int level,
const WebString& message,
int line_number,
const WebString& source_url) {
Send(new WorkerHostMsg_PostConsoleMessageToWorkerObject(
- route_id_, destination, source, level,message, line_number, source_url));
+ route_id_, destination, source, type, level,
+ message, line_number, source_url));
}
void WebWorkerClientProxy::confirmMessageFromWorkerObject(
diff --git a/chrome/worker/webworkerclient_proxy.h b/chrome/worker/webworkerclient_proxy.h
index ccff6f1..341c15a 100644
--- a/chrome/worker/webworkerclient_proxy.h
+++ b/chrome/worker/webworkerclient_proxy.h
@@ -33,6 +33,7 @@ class WebWorkerClientProxy : public WebKit::WebWorkerClient,
virtual void postConsoleMessageToWorkerObject(
int destination,
int source,
+ int type,
int level,
const WebKit::WebString& message,
int line_number,