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

5 files changed, 67 insertions, 2 deletions

diff --git a/chrome/common/ipc_message_macros.h b/chrome/common/ipc_message_macros.h
index 11e5258..4839ecd 100644
--- a/chrome/common/ipc_message_macros.h
+++ b/chrome/common/ipc_message_macros.h
@@ -96,6 +96,7 @@
 #undef IPC_MESSAGE_ROUTED4
 #undef IPC_MESSAGE_ROUTED5
 #undef IPC_MESSAGE_ROUTED6
+#undef IPC_MESSAGE_ROUTED7
 #undef IPC_SYNC_MESSAGE_CONTROL0_0
 #undef IPC_SYNC_MESSAGE_CONTROL0_1
 #undef IPC_SYNC_MESSAGE_CONTROL0_2
@@ -192,6 +193,9 @@
 #define IPC_MESSAGE_ROUTED6(msg_class, type1, type2, type3, type4, type5, type6) \
   msg_class##__ID,
 
+#define IPC_MESSAGE_ROUTED7(msg_class, type1, type2, type3, type4, type5, type6, type7) \
+  msg_class##__ID,
+
 #define IPC_SYNC_MESSAGE_CONTROL0_0(msg_class) \
   msg_class##__ID,
 
@@ -465,6 +469,9 @@ LogFunction g_log_function_mapping[LastMsgIndex];
 #define IPC_MESSAGE_ROUTED6(msg_class, type1, type2, type3, type4, type5, type6) \
   IPC_MESSAGE_LOG(msg_class)
 
+#define IPC_MESSAGE_ROUTED7(msg_class, type1, type2, type3, type4, type5, type6, type7) \
+  IPC_MESSAGE_LOG(msg_class)
+
 #define IPC_SYNC_MESSAGE_CONTROL0_0(msg_class) \
   IPC_MESSAGE_LOG(msg_class)
 
@@ -728,6 +735,22 @@ LogFunction g_log_function_mapping[LastMsgIndex];
           routing_id, ID, MakeRefTuple(arg1, arg2, arg3, arg4, arg5, arg6)) {} \
   };
 
+#define IPC_MESSAGE_ROUTED7(msg_class, type1, type2, type3, type4, type5, \
+                            type6, type7)                               \
+  class msg_class :                                                     \
+      public IPC::MessageWithTuple< Tuple7<type1, type2, type3, type4, type5, \
+                                           type6, type7> > {            \
+ public:                                                                \
+    enum { ID = msg_class##__ID };                                      \
+    msg_class(int32 routing_id, const type1& arg1, const type2& arg2,   \
+              const type3& arg3, const type4& arg4, const type5& arg5,  \
+              const type6& arg6, const type7& arg7)                     \
+      : IPC::MessageWithTuple< Tuple7<type1, type2, type3, type4, type5, \
+      type6, type7> >(                                                  \
+          routing_id, ID, MakeRefTuple(arg1, arg2, arg3, arg4, arg5,    \
+                                       arg6, arg7)) {} \
+  };
+
 #define IPC_SYNC_MESSAGE_CONTROL0_0(msg_class) \
   class msg_class : public IPC::MessageWithReply<Tuple0, Tuple0 > { \
    public: \
diff --git a/chrome/common/ipc_message_utils.h b/chrome/common/ipc_message_utils.h
index 20f8706..516a432d 100644
--- a/chrome/common/ipc_message_utils.h
+++ b/chrome/common/ipc_message_utils.h
@@ -1173,6 +1173,44 @@ struct ParamTraits< Tuple6<A, B, C, D, E, F> > {
   }
 };
 
+template <class A, class B, class C, class D, class E, class F, class G>
+struct ParamTraits< Tuple7<A, B, C, D, E, F, G> > {
+  typedef Tuple7<A, B, C, D, E, F, G> param_type;
+  static void Write(Message* m, const param_type& p) {
+    WriteParam(m, p.a);
+    WriteParam(m, p.b);
+    WriteParam(m, p.c);
+    WriteParam(m, p.d);
+    WriteParam(m, p.e);
+    WriteParam(m, p.f);
+    WriteParam(m, p.g);
+  }
+  static bool Read(const Message* m, void** iter, param_type* r) {
+    return (ReadParam(m, iter, &r->a) &&
+            ReadParam(m, iter, &r->b) &&
+            ReadParam(m, iter, &r->c) &&
+            ReadParam(m, iter, &r->d) &&
+            ReadParam(m, iter, &r->e) &&
+            ReadParam(m, iter, &r->f) &&
+            ReadParam(m, iter, &r->g));
+  }
+  static void Log(const param_type& p, std::wstring* l) {
+    LogParam(p.a, l);
+    l->append(L", ");
+    LogParam(p.b, l);
+    l->append(L", ");
+    LogParam(p.c, l);
+    l->append(L", ");
+    LogParam(p.d, l);
+    l->append(L", ");
+    LogParam(p.e, l);
+    l->append(L", ");
+    LogParam(p.f, l);
+    l->append(L", ");
+    LogParam(p.g, l);
+  }
+};
+
 
 
 //-----------------------------------------------------------------------------
diff --git a/chrome/common/worker_messages_internal.h b/chrome/common/worker_messages_internal.h
index 7691c79..41707fd 100644
--- a/chrome/common/worker_messages_internal.h
+++ b/chrome/common/worker_messages_internal.h
@@ -55,9 +55,10 @@ IPC_BEGIN_MESSAGES(WorkerHost)
                       int  /* line_number */,
                       string16  /* source_url*/)
 
-  IPC_MESSAGE_ROUTED6(WorkerHostMsg_PostConsoleMessageToWorkerObject,
+  IPC_MESSAGE_ROUTED7(WorkerHostMsg_PostConsoleMessageToWorkerObject,
                       int  /* destination */,
                       int  /* source */,
+                      int  /* type */,
                       int  /* level */,
                       string16  /* message */,
                       int  /* line_number */,
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,