Reapplies r55735, fixing some message code that was checked in that I collided with.

chrome/common/render_messages.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_COMMON_RENDER_MESSAGES_H_
 #define CHROME_COMMON_RENDER_MESSAGES_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 34 matching lines @@
 #include "third_party/WebKit/WebKit/chromium/public/WebTextDirection.h"
 #include "webkit/appcache/appcache_interfaces.h"
 #include "webkit/glue/context_menu.h"
 #include "webkit/glue/form_data.h"
 #include "webkit/glue/form_field.h"
 #include "webkit/glue/password_form.h"
 #include "webkit/glue/password_form_dom_manager.h"
 #include "webkit/glue/plugins/webplugin.h"
 #include "webkit/glue/plugins/webplugininfo.h"
 #include "webkit/glue/resource_loader_bridge.h"
-#include "webkit/glue/webaccessibility.h"
 #include "webkit/glue/webcookie.h"
 #include "webkit/glue/webdropdata.h"
 #include "webkit/glue/webmenuitem.h"
 #include "webkit/glue/webpreferences.h"
 
 namespace base {
 class Time;
 }
 
+namespace webkit_glue {
+struct WebAccessibility;
+}
+
 class SkBitmap;
 
 // Parameters structure for ViewMsg_Navigate, which has too many data
 // parameters to be reasonably put in a predefined IPC message.
 struct ViewMsg_Navigate_Params {
   enum NavigationType {
     // Reload the page.
     RELOAD,
 
     // Reload the page, ignoring any cache entries.
@@ skipping 3233 matching lines @@
   static bool Read(const Message* m, void** iter, param_type* p) {
     int val = 0;
     if (!ReadParam(m, iter, &val) ||
         val < WINDOW_CONTAINER_TYPE_NORMAL ||
         val >= WINDOW_CONTAINER_TYPE_MAX_VALUE)
       return false;
     *p = static_cast<param_type>(val);
     return true;
   }
   static void Log(const param_type& p, std::wstring* l) {
-    LogParam(p, l);
+    ParamTraits<int>::Log(static_cast<int>(p), l);
   }
 };
 
 template <>
 struct ParamTraits<webkit_glue::WebAccessibility> {
   typedef webkit_glue::WebAccessibility param_type;
-  static void Write(Message* m, const param_type& p) {
-    WriteParam(m, p.id);
-    WriteParam(m, p.name);
-    WriteParam(m, p.value);
-    WriteParam(m, static_cast<int>(p.role));
-    WriteParam(m, static_cast<int>(p.state));
-    WriteParam(m, p.location);
-    WriteParam(m, p.attributes);
-    WriteParam(m, p.children);
-  }
-  static bool Read(const Message* m, void** iter, param_type* p) {
-    bool ret = ReadParam(m, iter, &p->id);
-    ret = ret && ReadParam(m, iter, &p->name);
-    ret = ret && ReadParam(m, iter, &p->value);
-    int role = -1;
-    ret = ret && ReadParam(m, iter, &role);
-    if (role >= webkit_glue::WebAccessibility::ROLE_NONE &&
-      role < webkit_glue::WebAccessibility::NUM_ROLES) {
-      p->role = static_cast<webkit_glue::WebAccessibility::Role>(role);
-    } else {
-      p->role = webkit_glue::WebAccessibility::ROLE_NONE;
-    }
-    int state = 0;
-    ret = ret && ReadParam(m, iter, &state);
-    p->state = static_cast<webkit_glue::WebAccessibility::State>(state);
-    ret = ret && ReadParam(m, iter, &p->location);
-    ret = ret && ReadParam(m, iter, &p->attributes);
-    ret = ret && ReadParam(m, iter, &p->children);
-    return ret;
-  }
-  static void Log(const param_type& p, std::wstring* l) {
-    l->append(L"(");
-    LogParam(p.id, l);
-    l->append(L", ");
-    LogParam(p.name, l);
-    l->append(L", ");
-    LogParam(p.value, l);
-    l->append(L", ");
-    LogParam(static_cast<int>(p.role), l);
-    l->append(L", ");
-    LogParam(static_cast<int>(p.state), l);
-    l->append(L", ");
-    LogParam(p.location, l);
-    l->append(L", ");
-    LogParam(p.attributes, l);
-    l->append(L", ");
-    LogParam(p.children, l);
-    l->append(L")");
-  }
+  static void Write(Message* m, const param_type& p);
+  static bool Read(const Message* m, void** iter, param_type* p);
+  static void Log(const param_type& p, std::wstring* l);
 };
 
 // Traits for ViewMsg_DeviceOrientationUpdated_Params
 // structure to pack/unpack.
 template <>
 struct ParamTraits<ViewMsg_DeviceOrientationUpdated_Params> {
   typedef ViewMsg_DeviceOrientationUpdated_Params param_type;
   static void Write(Message* m, const param_type& p) {
     WriteParam(m, p.can_provide_alpha);
     WriteParam(m, p.alpha);
@@ skipping 26 matching lines @@
     LogParam(p.gamma, l);
     l->append(L")");
   }
 };
 }  // namespace IPC
 
 #define MESSAGES_INTERNAL_FILE "chrome/common/render_messages_internal.h"
 #include "ipc/ipc_message_macros.h"
 
 #endif  // CHROME_COMMON_RENDER_MESSAGES_H_