diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-23 23:50:10 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-23 23:50:10 +0000 |
| commit | 4d3eb1da483f0c50282e4f78fd0344a0dc3ffd42 (patch) | |
| tree | e07a8daf01551fbe199adeae938fe55ba23e75f3 /chrome | |
| parent | ce7466172c196bf06ccd473677b218eead15b089 (diff) | |
| download | chromium_src-4d3eb1da483f0c50282e4f78fd0344a0dc3ffd42.zip chromium_src-4d3eb1da483f0c50282e4f78fd0344a0dc3ffd42.tar.gz chromium_src-4d3eb1da483f0c50282e4f78fd0344a0dc3ffd42.tar.bz2 | |
Chrome side of webkit merge from r41860 to 41906.
The encoding parameter got dropped from Workers (r41871) so
drop it through the whole stack.
The upstream WorkerContextExecutionProxy has trackEvent with a lower
case t, but we pull in the wrong header in some places so make
both headers match.
Review URL: http://codereview.chromium.org/42538
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12326 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/common/worker_messages_internal.h | 3 | ||||
| -rw-r--r-- | chrome/renderer/webworker_proxy.cc | 3 | ||||
| -rw-r--r-- | chrome/renderer/webworker_proxy.h | 1 |
3 files changed, 2 insertions, 5 deletions
diff --git a/chrome/common/worker_messages_internal.h b/chrome/common/worker_messages_internal.h index 5d8449e..7691c79 100644 --- a/chrome/common/worker_messages_internal.h +++ b/chrome/common/worker_messages_internal.h @@ -29,10 +29,9 @@ IPC_END_MESSAGES(WorkerProcess) // Worker messages // These are messages sent from the renderer process to the worker process. IPC_BEGIN_MESSAGES(Worker) - IPC_MESSAGE_ROUTED4(WorkerMsg_StartWorkerContext, + IPC_MESSAGE_ROUTED3(WorkerMsg_StartWorkerContext, GURL /* url */, string16 /* user_agent */, - string16 /* encoding */, string16 /* source_code */) IPC_MESSAGE_ROUTED0(WorkerMsg_TerminateWorkerContext) diff --git a/chrome/renderer/webworker_proxy.cc b/chrome/renderer/webworker_proxy.cc index 1dbce20..0da55f3 100644 --- a/chrome/renderer/webworker_proxy.cc +++ b/chrome/renderer/webworker_proxy.cc @@ -19,7 +19,6 @@ WebWorkerProxy::~WebWorkerProxy() { void WebWorkerProxy::StartWorkerContext( const GURL& script_url, const string16& user_agent, - const string16& encoding, const string16& source_code) { RenderThread::current()->Send( new ViewHostMsg_CreateDedicatedWorker(script_url, &route_id_)); @@ -28,7 +27,7 @@ void WebWorkerProxy::StartWorkerContext( RenderThread::current()->AddRoute(route_id_, this); Send(new WorkerMsg_StartWorkerContext( - route_id_, script_url, user_agent, encoding, source_code)); + route_id_, script_url, user_agent, source_code)); for (size_t i = 0; i < queued_messages_.size(); ++i) { queued_messages_[i]->set_routing_id(route_id_); diff --git a/chrome/renderer/webworker_proxy.h b/chrome/renderer/webworker_proxy.h index 5ab8af0..e068e8e 100644 --- a/chrome/renderer/webworker_proxy.h +++ b/chrome/renderer/webworker_proxy.h @@ -34,7 +34,6 @@ class WebWorkerProxy : public WebWorker, // converted by glue code). virtual void StartWorkerContext(const GURL& script_url, const string16& user_agent, - const string16& encoding, const string16& source_code); virtual void TerminateWorkerContext(); virtual void PostMessageToWorkerContext(const string16& message); |