Refactor Pickle Read methods to use higher performance PickleIterator.

webkit/glue/webcursor_win.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.
 
 #include "base/logging.h"
 #include "base/pickle.h"
 #include "grit/webkit_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
 #include "ui/gfx/gdi_util.h"
 #include "webkit/glue/webcursor.h"
@@ skipping 197 matching lines @@
   custom_cursor_ = NULL;
 }
 
 bool WebCursor::SerializePlatformData(Pickle* pickle) const {
   // There are some issues with converting certain HCURSORS to bitmaps. The
   // HCURSOR being a user object can be marshaled as is.
   // HCURSORs are always 32 bits on Windows, even on 64 bit systems.
   return pickle->WriteUInt32(reinterpret_cast<uint32>(external_cursor_));
 }
 
-bool WebCursor::DeserializePlatformData(const Pickle* pickle, void** iter) {
-  return pickle->ReadUInt32(iter, reinterpret_cast<uint32*>(&external_cursor_));
+bool WebCursor::DeserializePlatformData(PickleIterator* iter) {
+  return iter->ReadUInt32(reinterpret_cast<uint32*>(&external_cursor_));
 }
 
 bool WebCursor::IsPlatformDataEqual(const WebCursor& other) const {
   if (!IsCustom())
     return true;
 
   return (external_cursor_ == other.external_cursor_);
 }
 
 void WebCursor::CopyPlatformData(const WebCursor& other) {
   external_cursor_ = other.external_cursor_;
   // The custom_cursor_ member will be initialized to a HCURSOR the next time
   // the GetCursor member function is invoked on this WebCursor instance. The
   // cursor is created using the data in the custom_data_ vector.
   custom_cursor_ = NULL;
 }
 
 void WebCursor::CleanupPlatformData() {
   external_cursor_ = NULL;
 
   if (custom_cursor_) {
     DestroyIcon(custom_cursor_);
     custom_cursor_ = NULL;
   }
 }