From 4d3eb1da483f0c50282e4f78fd0344a0dc3ffd42 Mon Sep 17 00:00:00 2001 From: "tc@google.com" Date: Mon, 23 Mar 2009 23:50:10 +0000 Subject: 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 --- chrome/common/worker_messages_internal.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'chrome/common') 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) -- cgit v1.1