Refactor Pickle Read methods to use higher performance PickleIterator.

webkit/glue/webcursor.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 "webkit/glue/webcursor.h"
 
 #include "base/logging.h"
 #include "base/pickle.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebImage.h"
 
@@ skipping 51 matching lines @@
 void WebCursor::GetCursorInfo(WebCursorInfo* cursor_info) const {
   cursor_info->type = static_cast<WebCursorInfo::Type>(type_);
   cursor_info->hotSpot = hotspot_;
   ImageFromCustomData(&cursor_info->customImage);
 
 #if defined(OS_WIN) && !defined(USE_AURA)
   cursor_info->externalHandle = external_cursor_;
 #endif
 }
 
-bool WebCursor::Deserialize(const Pickle* pickle, void** iter) {
+bool WebCursor::Deserialize(PickleIterator* iter) {
   int type, hotspot_x, hotspot_y, size_x, size_y, data_len;
 
   const char* data;
 
   // Leave |this| unmodified unless we are going to return success.
-  if (!pickle->ReadInt(iter, &type) ||
-      !pickle->ReadInt(iter, &hotspot_x) ||
-      !pickle->ReadInt(iter, &hotspot_y) ||
-      !pickle->ReadLength(iter, &size_x) ||
-      !pickle->ReadLength(iter, &size_y) ||
-      !pickle->ReadData(iter, &data, &data_len))
+  if (!iter->ReadInt(&type) ||
+      !iter->ReadInt(&hotspot_x) ||
+      !iter->ReadInt(&hotspot_y) ||
+      !iter->ReadLength(&size_x) ||
+      !iter->ReadLength(&size_y) ||
+      !iter->ReadData(&data, &data_len))
     return false;
 
   // Ensure the size is sane, and there is enough data.
   if (size_x > kMaxCursorDimension ||
       size_y > kMaxCursorDimension)
     return false;
 
   type_ = type;
 
   if (type == WebCursorInfo::TypeCustom) {
     if (size_x > 0 && size_y > 0) {
       // The * 4 is because the expected format is an array of RGBA pixel
       // values.
       if (size_x * size_y * 4 > data_len)
         return false;
 
       hotspot_.set_x(hotspot_x);
       hotspot_.set_y(hotspot_y);
       custom_size_.set_width(size_x);
       custom_size_.set_height(size_y);
       ClampHotspot();
 
       custom_data_.clear();
       if (data_len > 0) {
         custom_data_.resize(data_len);
         memcpy(&custom_data_[0], data, data_len);
       }
     }
   }
-  return DeserializePlatformData(pickle, iter);
+  return DeserializePlatformData(iter);
 }
 
 bool WebCursor::Serialize(Pickle* pickle) const {
   if (!pickle->WriteInt(type_) ||
       !pickle->WriteInt(hotspot_.x()) ||
       !pickle->WriteInt(hotspot_.y()) ||
       !pickle->WriteInt(custom_size_.width()) ||
       !pickle->WriteInt(custom_size_.height()))
     return false;
 
@@ skipping 75 matching lines @@
 void WebCursor::ClampHotspot() {
   if (!IsCustom())
     return;
 
   // Clamp the hotspot to the custom image's dimensions.
   hotspot_.set_x(std::max(0,
                           std::min(custom_size_.width() - 1, hotspot_.x())));
   hotspot_.set_y(std::max(0,
                           std::min(custom_size_.height() - 1, hotspot_.y())));
 }