Revert 46842 - Reimplement accessibility of web content by caching the entire...

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_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 693 matching lines @@
       default:
         type = L"UNKNOWN";
         break;
     }
 
     LogParam(type, l);
   }
 };
 
 template <>
+struct ParamTraits<webkit_glue::WebAccessibility::InParams> {
+  typedef webkit_glue::WebAccessibility::InParams param_type;
+  static void Write(Message* m, const param_type& p) {
+    WriteParam(m, p.object_id);
+    WriteParam(m, p.function_id);
+    WriteParam(m, p.child_id);
+    WriteParam(m, p.input_long1);
+    WriteParam(m, p.input_long2);
+  }
+  static bool Read(const Message* m, void** iter, param_type* p) {
+    return
+      ReadParam(m, iter, &p->object_id) &&
+      ReadParam(m, iter, &p->function_id) &&
+      ReadParam(m, iter, &p->child_id) &&
+      ReadParam(m, iter, &p->input_long1) &&
+      ReadParam(m, iter, &p->input_long2);
+  }
+  static void Log(const param_type& p, std::wstring* l) {
+    l->append(L"(");
+    LogParam(p.object_id, l);
+    l->append(L", ");
+    LogParam(p.function_id, l);
+    l->append(L", ");
+    LogParam(p.child_id, l);
+    l->append(L", ");
+    LogParam(p.input_long1, l);
+    l->append(L", ");
+    LogParam(p.input_long2, l);
+    l->append(L")");
+  }
+};
+
+template <>
+struct ParamTraits<webkit_glue::WebAccessibility::OutParams> {
+  typedef webkit_glue::WebAccessibility::OutParams param_type;
+  static void Write(Message* m, const param_type& p) {
+    WriteParam(m, p.object_id);
+    WriteParam(m, p.output_long1);
+    WriteParam(m, p.output_long2);
+    WriteParam(m, p.output_long3);
+    WriteParam(m, p.output_long4);
+    WriteParam(m, p.output_string);
+    WriteParam(m, p.return_code);
+  }
+  static bool Read(const Message* m, void** iter, param_type* p) {
+    return
+      ReadParam(m, iter, &p->object_id) &&
+      ReadParam(m, iter, &p->output_long1) &&
+      ReadParam(m, iter, &p->output_long2) &&
+      ReadParam(m, iter, &p->output_long3) &&
+      ReadParam(m, iter, &p->output_long4) &&
+      ReadParam(m, iter, &p->output_string) &&
+      ReadParam(m, iter, &p->return_code);
+  }
+  static void Log(const param_type& p, std::wstring* l) {
+    l->append(L"(");
+    LogParam(p.object_id, l);
+    l->append(L", ");
+    LogParam(p.output_long1, l);
+    l->append(L", ");
+    LogParam(p.output_long2, l);
+    l->append(L", ");
+    LogParam(p.output_long3, l);
+    l->append(L", ");
+    LogParam(p.output_long4, l);
+    l->append(L", ");
+    LogParam(p.output_string, l);
+    l->append(L", ");
+    LogParam(p.return_code, l);
+    l->append(L")");
+  }
+};
+
+template <>
 struct ParamTraits<ViewHostMsg_ImeControl> {
   typedef ViewHostMsg_ImeControl param_type;
   static void Write(Message* m, const param_type& p) {
     m->WriteInt(p);
   }
   static bool Read(const Message* m, void** iter, param_type* p) {
     int type;
     if (!m->ReadInt(iter, &type))
       return false;
     *p = static_cast<ViewHostMsg_ImeControl>(type);
@@ skipping 1863 matching lines @@
         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);
   }
 };
 
-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, p.action);
-    WriteParam(m, p.description);
-    WriteParam(m, p.help);
-    WriteParam(m, p.shortcut);
-    WriteParam(m, static_cast<int>(p.role));
-    WriteParam(m, static_cast<int>(p.state));
-    WriteParam(m, p.location);
-    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);
-    ret = ret && ReadParam(m, iter, &p->action);
-    ret = ret && ReadParam(m, iter, &p->description);
-    ret = ret && ReadParam(m, iter, &p->help);
-    ret = ret && ReadParam(m, iter, &p->shortcut);
-    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->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(p.action, l);
-    l->append(L", ");
-    LogParam(p.description, l);
-    l->append(L", ");
-    LogParam(p.help, l);
-    l->append(L", ");
-    LogParam(p.shortcut, 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.children, 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_