Refactor Pickle Read methods to use higher performance PickleIterator.

webkit/glue/glue_serialize.cc

 // 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.
 
 #include "webkit/glue/glue_serialize.h"
 
 #include <string>
 
 #include "base/pickle.h"
 #include "base/utf_string_conversions.h"
@@ skipping 14 matching lines @@
 using WebKit::WebPoint;
 using WebKit::WebSerializedScriptValue;
 using WebKit::WebString;
 using WebKit::WebUChar;
 using WebKit::WebVector;
 
 namespace webkit_glue {
 
 namespace {
 struct SerializeObject {
-  SerializeObject() : iter(NULL), version(0) {}
+  SerializeObject() : version(0) {}
   SerializeObject(const char* data, int len)
-      : pickle(data, len), iter(NULL), version(0) {}
+      : pickle(data, len), version(0) { iter = PickleIterator(pickle); }
 
   std::string GetAsString() {
     return std::string(static_cast<const char*>(pickle.data()), pickle.size());
   }
 
   Pickle pickle;
-  mutable void* iter;
+  mutable PickleIterator iter;
   mutable int version;
 };
 
 // TODO(mpcomplete): obsolete versions 1 and 2 after 1/1/2008.
 // Version ID used in reading/writing history items.
 // 1: Initial revision.
 // 2: Added case for NULL string versus "". Version 2 code can read Version 1
 //    data, but not vice versa.
 // 3: Version 2 was broken, it stored number of WebUChars, not number of bytes.
 //    This version checks and reads v1 and v2 correctly.
@@ skipping 479 matching lines @@
   kVersion = version;
 
   SerializeObject obj;
   WriteHistoryItem(item, &obj);
   *serialized_item = obj.GetAsString();
 
   kVersion = real_version;
 }
 
 }  // namespace webkit_glue