Index: chrome/common/render_messages.h |
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h |
index 02790e5b0865596868e92b0db667d21e76fdb5c7..7d03aad6a396700ce78e9aa7f6bb34570ab33371 100644 |
--- a/chrome/common/render_messages.h |
+++ b/chrome/common/render_messages.h |
@@ -52,7 +52,6 @@ |
#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" |
@@ -62,6 +61,10 @@ namespace base { |
class Time; |
} |
+namespace webkit_glue { |
+struct WebAccessibility; |
+} |
+ |
class SkBitmap; |
// Parameters structure for ViewMsg_Navigate, which has too many data |
@@ -3258,55 +3261,9 @@ struct ParamTraits<WindowContainerType> { |
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); |
}; |
} // namespace IPC |