Index: chrome/common/render_messages.cc |
=================================================================== |
--- chrome/common/render_messages.cc (revision 72573) |
+++ chrome/common/render_messages.cc (working copy) |
@@ -20,8 +20,6 @@ |
#include "third_party/skia/include/core/SkBitmap.h" |
#include "webkit/appcache/appcache_interfaces.h" |
#include "webkit/blob/blob_data.h" |
-#include "webkit/glue/form_field.h" |
-#include "webkit/glue/password_form.h" |
#include "webkit/glue/resource_loader_bridge.h" |
#include "webkit/glue/webaccessibility.h" |
#include "webkit/glue/webcookie.h" |
@@ -71,49 +69,6 @@ |
} |
}; |
- |
-void ParamTraits<webkit_glue::FormField>::Write(Message* m, |
- const param_type& p) { |
- WriteParam(m, p.label()); |
- WriteParam(m, p.name()); |
- WriteParam(m, p.value()); |
- WriteParam(m, p.form_control_type()); |
- WriteParam(m, p.max_length()); |
- WriteParam(m, p.is_autofilled()); |
- WriteParam(m, p.option_strings()); |
-} |
- |
-bool ParamTraits<webkit_glue::FormField>::Read(const Message* m, void** iter, |
- param_type* p) { |
- string16 label, name, value, form_control_type; |
- int max_length = 0; |
- bool is_autofilled; |
- std::vector<string16> options; |
- bool result = ReadParam(m, iter, &label); |
- result = result && ReadParam(m, iter, &name); |
- result = result && ReadParam(m, iter, &value); |
- result = result && ReadParam(m, iter, &form_control_type); |
- result = result && ReadParam(m, iter, &max_length); |
- result = result && ReadParam(m, iter, &is_autofilled); |
- result = result && ReadParam(m, iter, &options); |
- if (!result) |
- return false; |
- |
- p->set_label(label); |
- p->set_name(name); |
- p->set_value(value); |
- p->set_form_control_type(form_control_type); |
- p->set_max_length(max_length); |
- p->set_autofilled(is_autofilled); |
- p->set_option_strings(options); |
- return true; |
-} |
- |
-void ParamTraits<webkit_glue::FormField>::Log(const param_type& p, |
- std::string* l) { |
- l->append("<FormField>"); |
-} |
- |
#if defined(OS_MACOSX) |
void ParamTraits<FontDescriptor>::Write(Message* m, const param_type& p) { |
WriteParam(m, p.font_name); |
@@ -299,26 +254,6 @@ |
l->append(")"); |
} |
-void ParamTraits<webkit_glue::PasswordFormFillData>::Write( |
- Message* m, const param_type& p) { |
- WriteParam(m, p.basic_data); |
- WriteParam(m, p.additional_logins); |
- WriteParam(m, p.wait_for_username); |
-} |
- |
-bool ParamTraits<webkit_glue::PasswordFormFillData>::Read( |
- const Message* m, void** iter, param_type* r) { |
- return |
- ReadParam(m, iter, &r->basic_data) && |
- ReadParam(m, iter, &r->additional_logins) && |
- ReadParam(m, iter, &r->wait_for_username); |
-} |
- |
-void ParamTraits<webkit_glue::PasswordFormFillData>::Log(const param_type& p, |
- std::string* l) { |
- l->append("<PasswordFormFillData>"); |
-} |
- |
void ParamTraits<scoped_refptr<net::HttpResponseHeaders> >::Write( |
Message* m, const param_type& p) { |
WriteParam(m, p.get() != NULL); |
@@ -563,48 +498,22 @@ |
} |
void ParamTraits<SyncLoadResult>::Write(Message* m, const param_type& p) { |
- ParamTraits<ResourceResponseHead>::Write(m, p); |
- WriteParam(m, p.final_url); |
- WriteParam(m, p.data); |
- } |
+ ParamTraits<ResourceResponseHead>::Write(m, p); |
+ WriteParam(m, p.final_url); |
+ WriteParam(m, p.data); |
+} |
bool ParamTraits<SyncLoadResult>::Read(const Message* m, void** iter, |
param_type* r) { |
- return |
- ParamTraits<ResourceResponseHead>::Read(m, iter, r) && |
- ReadParam(m, iter, &r->final_url) && |
- ReadParam(m, iter, &r->data); |
- } |
- |
-void ParamTraits<SyncLoadResult>::Log(const param_type& p, std::string* l) { |
- // log more? |
- ParamTraits<webkit_glue::ResourceResponseInfo>::Log(p, l); |
- } |
- |
-void ParamTraits<webkit_glue::FormData>::Write(Message* m, |
- const param_type& p) { |
- WriteParam(m, p.name); |
- WriteParam(m, p.method); |
- WriteParam(m, p.origin); |
- WriteParam(m, p.action); |
- WriteParam(m, p.user_submitted); |
- WriteParam(m, p.fields); |
-} |
- |
-bool ParamTraits<webkit_glue::FormData>::Read(const Message* m, void** iter, |
- param_type* p) { |
return |
- ReadParam(m, iter, &p->name) && |
- ReadParam(m, iter, &p->method) && |
- ReadParam(m, iter, &p->origin) && |
- ReadParam(m, iter, &p->action) && |
- ReadParam(m, iter, &p->user_submitted) && |
- ReadParam(m, iter, &p->fields); |
+ ParamTraits<ResourceResponseHead>::Read(m, iter, r) && |
+ ReadParam(m, iter, &r->final_url) && |
+ ReadParam(m, iter, &r->data); |
} |
-void ParamTraits<webkit_glue::FormData>::Log(const param_type& p, |
- std::string* l) { |
- l->append("<FormData>"); |
+void ParamTraits<SyncLoadResult>::Log(const param_type& p, std::string* l) { |
+ // log more? |
+ ParamTraits<webkit_glue::ResourceResponseInfo>::Log(p, l); |
} |
void ParamTraits<RendererPreferences>::Write(Message* m, const param_type& p) { |