Refactor Pickle Read methods to use higher performance PickleIterator.

content/public/common/webkit_param_traits.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
 // NOTE: New trait definitions that will be used by Chrome Frame must be placed
 // in common_param_traits2.cc.
 
 #include "content/public/common/webkit_param_traits.h"
 
 #include "base/string_number_conversions.h"
 #include "content/public/common/common_param_traits.h"
@@ skipping 38 matching lines @@
   WriteParam(m, p.connect_end);
   WriteParam(m, p.ssl_start);
   WriteParam(m, p.ssl_end);
   WriteParam(m, p.send_start);
   WriteParam(m, p.send_end);
   WriteParam(m, p.receive_headers_start);
   WriteParam(m, p.receive_headers_end);
 }
 
 bool ParamTraits<webkit_glue::ResourceLoadTimingInfo>::Read(
-    const Message* m, void** iter, param_type* r) {
+    const Message* m, PickleIterator* iter, param_type* r) {
   bool is_null;
   if (!ReadParam(m, iter, &is_null))
     return false;
   if (is_null)
     return true;
 
   return
       ReadParam(m, iter, &r->base_ticks) &&
       ReadParam(m, iter, &r->base_time) &&
       ReadParam(m, iter, &r->proxy_start) &&
@@ skipping 50 matching lines @@
     WriteParam(m, p->http_status_code);
     WriteParam(m, p->http_status_text);
     WriteParam(m, p->request_headers);
     WriteParam(m, p->response_headers);
     WriteParam(m, p->request_headers_text);
     WriteParam(m, p->response_headers_text);
   }
 }
 
 bool ParamTraits<scoped_refptr<webkit_glue::ResourceDevToolsInfo> >::Read(
-    const Message* m, void** iter, param_type* r) {
+    const Message* m, PickleIterator* iter, param_type* r) {
   bool has_object;
   if (!ReadParam(m, iter, &has_object))
     return false;
   if (!has_object)
     return true;
   *r = new webkit_glue::ResourceDevToolsInfo();
   return
       ReadParam(m, iter, &(*r)->http_status_code) &&
       ReadParam(m, iter, &(*r)->http_status_text) &&
       ReadParam(m, iter, &(*r)->request_headers) &&
@@ skipping 28 matching lines @@
     // This is the routing id used to connect NPObjectProxy in the other
     // process with NPObjectStub in this process or to identify the raw
     // npobject pointer to be used in the callee process.
     WriteParam(m, p.npobject_routing_id);
   } else {
     DCHECK(p.type == NPVARIANT_PARAM_VOID || p.type == NPVARIANT_PARAM_NULL);
   }
 }
 
 bool ParamTraits<NPVariant_Param>::Read(const Message* m,
-                                        void** iter,
+                                        PickleIterator* iter,
                                         param_type* r) {
   int type;
   if (!ReadParam(m, iter, &type))
     return false;
 
   bool result = false;
   r->type = static_cast<NPVariant_ParamEnum>(type);
   if (r->type == NPVARIANT_PARAM_BOOL) {
     result = ReadParam(m, iter, &r->bool_value);
   } else if (r->type == NPVARIANT_PARAM_INT) {
@@ skipping 32 matching lines @@
     l->append("<none>");
   }
   l->append(")");
 }
 
 void ParamTraits<NPIdentifier_Param>::Write(Message* m, const param_type& p) {
   webkit_glue::SerializeNPIdentifier(p.identifier, m);
 }
 
 bool ParamTraits<NPIdentifier_Param>::Read(const Message* m,
-                                           void** iter,
+                                           PickleIterator* iter,
                                            param_type* r) {
-  return webkit_glue::DeserializeNPIdentifier(*m, iter, &r->identifier);
+  return webkit_glue::DeserializeNPIdentifier(iter, &r->identifier);
 }
 
 void ParamTraits<NPIdentifier_Param>::Log(const param_type& p, std::string* l) {
   if (WebKit::WebBindings::identifierIsString(p.identifier)) {
     NPUTF8* str = WebKit::WebBindings::utf8FromIdentifier(p.identifier);
     l->append(str);
     webkit::npapi::PluginHost::Singleton()->host_functions()->memfree(str);
   } else {
     l->append(base::IntToString(
         WebKit::WebBindings::intFromIdentifier(p.identifier)));
   }
 }
 
 void ParamTraits<webkit::WebPluginMimeType>::Write(Message* m,
                                                    const param_type& p) {
   WriteParam(m, p.mime_type);
   WriteParam(m, p.file_extensions);
   WriteParam(m, p.description);
   WriteParam(m, p.additional_param_names);
   WriteParam(m, p.additional_param_values);
 }
 
 bool ParamTraits<webkit::WebPluginMimeType>::Read(const Message* m,
-                                                  void** iter,
+                                                  PickleIterator* iter,
                                                   param_type* p) {
   return
       ReadParam(m, iter, &p->mime_type) &&
       ReadParam(m, iter, &p->file_extensions) &&
       ReadParam(m, iter, &p->description) &&
       ReadParam(m, iter, &p->additional_param_names) &&
       ReadParam(m, iter, &p->additional_param_values);
 }
 
 void ParamTraits<webkit::WebPluginMimeType>::Log(
@@ skipping 11 matching lines @@
                                                const param_type& p) {
   WriteParam(m, p.name);
   WriteParam(m, p.path);
   WriteParam(m, p.version);
   WriteParam(m, p.desc);
   WriteParam(m, p.mime_types);
   WriteParam(m, p.type);
 }
 
 bool ParamTraits<webkit::WebPluginInfo>::Read(const Message* m,
-                                              void** iter,
+                                              PickleIterator* iter,
                                               param_type* p) {
   return
       ReadParam(m, iter, &p->name) &&
       ReadParam(m, iter, &p->path) &&
       ReadParam(m, iter, &p->version) &&
       ReadParam(m, iter, &p->desc) &&
       ReadParam(m, iter, &p->mime_types) &&
       ReadParam(m, iter, &p->type);
 }
 void ParamTraits<webkit::WebPluginInfo>::Log(const param_type& p,
@@ skipping 19 matching lines @@
   WriteParam(m, p.password_element);
   WriteParam(m, p.password_value);
   WriteParam(m, p.old_password_element);
   WriteParam(m, p.old_password_value);
   WriteParam(m, p.ssl_valid);
   WriteParam(m, p.preferred);
   WriteParam(m, p.blacklisted_by_user);
 }
 
 bool ParamTraits<webkit::forms::PasswordForm>::Read(const Message* m,
-                                                    void** iter,
+                                                    PickleIterator* iter,
                                                     param_type* p) {
   return
       ReadParam(m, iter, &p->signon_realm) &&
       ReadParam(m, iter, &p->origin) &&
       ReadParam(m, iter, &p->action) &&
       ReadParam(m, iter, &p->submit_element) &&
       ReadParam(m, iter, &p->username_element) &&
       ReadParam(m, iter, &p->username_value) &&
       ReadParam(m, iter, &p->password_element) &&
       ReadParam(m, iter, &p->password_value) &&
       ReadParam(m, iter, &p->old_password_element) &&
       ReadParam(m, iter, &p->old_password_value) &&
       ReadParam(m, iter, &p->ssl_valid) &&
       ReadParam(m, iter, &p->preferred) &&
       ReadParam(m, iter, &p->blacklisted_by_user);
 }
 void ParamTraits<webkit::forms::PasswordForm>::Log(const param_type& p,
                                                    std::string* l) {
   l->append("<PasswordForm>");
 }
 
 }  // namespace IPC