Refactor Pickle Read methods to use higher performance PickleIterator.

ppapi/proxy/serialized_var.h

 // 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.
 
 #ifndef PPAPI_PROXY_SERIALIZED_VAR_H_
 #define PPAPI_PROXY_SERIALIZED_VAR_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
 
+class PickleIterator;
+
 namespace IPC {
 class Message;
 }
 
 namespace ppapi {
 namespace proxy {
 
 class Dispatcher;
 class VarSerializationRules;
 
@@ skipping 38 matching lines @@
 // behavior and will enforce that you don't do stupid things.
 class PPAPI_PROXY_EXPORT SerializedVar {
  public:
   SerializedVar();
   ~SerializedVar();
 
   // Backend implementation for IPC::ParamTraits<SerializedVar>.
   void WriteToMessage(IPC::Message* m) const {
     inner_->WriteToMessage(m);
   }
-  bool ReadFromMessage(const IPC::Message* m, void** iter) {
+  bool ReadFromMessage(const IPC::Message* m, PickleIterator* iter) {
     return inner_->ReadFromMessage(m, iter);
   }
 
  protected:
   friend class SerializedVarReceiveInput;
   friend class SerializedVarReturnValue;
   friend class SerializedVarOutParam;
   friend class SerializedVarSendInput;
   friend class SerializedVarTestConstructor;
   friend class SerializedVarVectorReceiveInput;
@@ skipping 13 matching lines @@
 
     // See outer class's declarations above.
     PP_Var GetVar() const;
     void SetVar(PP_Var var);
 
     // For the SerializedVarTestConstructor, this writes the Var value as if
     // it was just received off the wire, without any serialization rules.
     void ForceSetVarValueForTest(PP_Var value);
 
     void WriteToMessage(IPC::Message* m) const;
-    bool ReadFromMessage(const IPC::Message* m, void** iter);
+    bool ReadFromMessage(const IPC::Message* m, PickleIterator* iter);
 
     // Sets the cleanup mode. See the CleanupMode enum below. These functions
     // are not just a simple setter in order to require that the appropriate
     // data is set along with the corresponding mode.
     void SetCleanupModeToEndSendPassRef(Dispatcher* dispatcher);
     void SetCleanupModeToEndReceiveCallerOwned();
 
    private:
     enum CleanupMode {
       // The serialized var won't do anything special in the destructor
@@ skipping 323 matching lines @@
   // IDs have not yet been converted, so this is the thing that tests will
   // actually want to check.
   PP_Var GetVar() const { return inner_->GetVar(); }
 };
 
 }  // namespace proxy
 }  // namespace ppapi
 
 #endif  // PPAPI_PROXY_SERIALIZED_VAR_H_