Refactor Pickle Read methods to use higher performance PickleIterator.

content/public/common/webkit_param_traits.h

-// 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.
 
 // This file is used to define IPC::ParamTraits<> specializations for a number
 // of WebKit types so that they can be serialized over IPC.  IPC::ParamTraits<>
 // specializations for basic types (like int and std::string) and types in the
 // 'base' project can be found in ipc/ipc_message_utils.h.  This file contains
 // specializations for types that are used by the content code, and which need
 // manual serialization code.  This is usually because they're not structs with
 // public members.
@@ skipping 63 matching lines @@
 
   NPIdentifier identifier;
 };
 
 namespace IPC {
 
 template <>
 struct ParamTraits<webkit_glue::ResourceLoadTimingInfo> {
   typedef webkit_glue::ResourceLoadTimingInfo param_type;
   static void Write(Message* m, const param_type& p);
-  static bool Read(const Message* m, void** iter, param_type* r);
+  static bool Read(const Message* m, PickleIterator* iter, param_type* r);
   static void Log(const param_type& p, std::string* l);
 };
 
 template <>
 struct ParamTraits<scoped_refptr<webkit_glue::ResourceDevToolsInfo> > {
   typedef scoped_refptr<webkit_glue::ResourceDevToolsInfo> param_type;
   static void Write(Message* m, const param_type& p);
-  static bool Read(const Message* m, void** iter, param_type* r);
+  static bool Read(const Message* m, PickleIterator* iter, param_type* r);
   static void Log(const param_type& p, std::string* l);
 };
 
 template <>
 struct ParamTraits<NPVariant_Param> {
   typedef NPVariant_Param param_type;
   static void Write(Message* m, const param_type& p);
-  static bool Read(const Message* m, void** iter, param_type* r);
+  static bool Read(const Message* m, PickleIterator* iter, param_type* r);
   static void Log(const param_type& p, std::string* l);
 };
 
 template <>
 struct ParamTraits<NPIdentifier_Param> {
   typedef NPIdentifier_Param param_type;
   static void Write(Message* m, const param_type& p);
-  static bool Read(const Message* m, void** iter, param_type* r);
+  static bool Read(const Message* m, PickleIterator* iter, param_type* r);
   static void Log(const param_type& p, std::string* l);
 };
 
 template <>
 struct ParamTraits<webkit::WebPluginMimeType> {
   typedef webkit::WebPluginMimeType param_type;
   static void Write(Message* m, const param_type& p);
-  static bool Read(const Message* m, void** iter, param_type* r);
+  static bool Read(const Message* m, PickleIterator* iter, param_type* r);
   static void Log(const param_type& p, std::string* l);
 };
 
 template <>
 struct CONTENT_EXPORT ParamTraits<webkit::WebPluginInfo> {
   typedef webkit::WebPluginInfo param_type;
   static void Write(Message* m, const param_type& p);
-  static bool Read(const Message* m, void** iter, param_type* r);
+  static bool Read(const Message* m, PickleIterator* iter, param_type* r);
   static void Log(const param_type& p, std::string* l);
 };
 
 template <>
 struct ParamTraits<WebCursor> {
   typedef WebCursor param_type;
   static void Write(Message* m, const param_type& p) {
     p.Serialize(m);
   }
-  static bool Read(const Message* m, void** iter, param_type* r)  {
-    return r->Deserialize(m, iter);
+  static bool Read(const Message* m, PickleIterator* iter, param_type* r)  {
+    return r->Deserialize(iter);
   }
   static void Log(const param_type& p, std::string* l) {
     l->append("<WebCursor>");
   }
 };
 
 template <>
 struct ParamTraits<WebKit::WebInputEvent::Type> {
   typedef WebKit::WebInputEvent::Type 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) {
+  static bool Read(const Message* m, PickleIterator* iter, param_type* p) {
     int type;
     if (!m->ReadInt(iter, &type))
       return false;
     *p = static_cast<WebKit::WebInputEvent::Type>(type);
     return true;
   }
   static void Log(const param_type& p, std::string* l) {
     const char* type;
     switch (p) {
      case WebKit::WebInputEvent::MouseDown:
@@ skipping 32 matching lines @@
 };
 
 typedef const WebKit::WebInputEvent* WebInputEventPointer;
 template <>
 struct ParamTraits<WebInputEventPointer> {
   typedef WebInputEventPointer param_type;
   static void Write(Message* m, const param_type& p) {
     m->WriteData(reinterpret_cast<const char*>(p), p->size);
   }
   // Note: upon read, the event has the lifetime of the message.
-  static bool Read(const Message* m, void** iter, param_type* r) {
+  static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
     const char* data;
     int data_length;
     if (!m->ReadData(iter, &data, &data_length)) {
       NOTREACHED();
       return false;
     }
     if (data_length < static_cast<int>(sizeof(WebKit::WebInputEvent))) {
       NOTREACHED();
       return false;
     }
@@ skipping 25 matching lines @@
 
 template <>
 struct SimilarTypeTraits<WindowOpenDisposition> {
   typedef int Type;
 };
 
 template <>
 struct CONTENT_EXPORT ParamTraits<webkit::forms::PasswordForm> {
   typedef webkit::forms::PasswordForm param_type;
   static void Write(Message* m, const param_type& p);
-  static bool Read(const Message* m, void** iter, param_type* p);
+  static bool Read(const Message* m, PickleIterator* iter, param_type* p);
   static void Log(const param_type& p, std::string* l);
 };
 
 }  // namespace IPC
 
 #endif  // CONTENT_PUBLIC_COMMON_WEBKIT_PARAM_TRAITS_H_