Refactor Pickle Read methods to use higher performance PickleIterator.

webkit/glue/webcursor.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 WEBKIT_GLUE_WEBCURSOR_H_
 #define WEBKIT_GLUE_WEBCURSOR_H_
 
 #include "base/basictypes.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/point.h"
@@ skipping 12 matching lines @@
 #ifdef __OBJC__
 @class NSCursor;
 #else
 class NSCursor;
 #endif
 typedef UInt32 ThemeCursor;
 struct Cursor;
 #endif
 
 class Pickle;
+class PickleIterator;
 
 namespace WebKit {
 class WebImage;
 struct WebCursorInfo;
 }
 
 // This class encapsulates a cross-platform description of a cursor.  Platform
 // specific methods are provided to translate the cross-platform cursor into a
 // platform specific cursor.  It is also possible to serialize / de-serialize a
 // WebCursor.
 class WEBKIT_GLUE_EXPORT WebCursor {
  public:
   WebCursor();
   explicit WebCursor(const WebKit::WebCursorInfo& cursor_info);
   ~WebCursor();
 
   // Copy constructor/assignment operator combine.
   WebCursor(const WebCursor& other);
   const WebCursor& operator=(const WebCursor& other);
 
   // Conversion from/to WebCursorInfo.
   void InitFromCursorInfo(const WebKit::WebCursorInfo& cursor_info);
   void GetCursorInfo(WebKit::WebCursorInfo* cursor_info) const;
 
   // Serialization / De-serialization
-  bool Deserialize(const Pickle* pickle, void** iter);
+  bool Deserialize(PickleIterator* iter);
   bool Serialize(Pickle* pickle) const;
 
   // Returns true if GetCustomCursor should be used to allocate a platform
   // specific cursor object.  Otherwise GetCursor should be used.
   bool IsCustom() const;
 
   // Returns true if the current cursor object contains the same cursor as the
   // cursor object passed in. If the current cursor is a custom cursor, we also
   // compare the bitmaps to verify whether they are equal.
   bool IsEqual(const WebCursor& other) const;
@@ skipping 38 matching lines @@
   void Copy(const WebCursor& other);
 
   // Cleans up the WebCursor instance.
   void Clear();
 
   // Platform specific initialization goes here.
   void InitPlatformData();
 
   // Platform specific Serialization / De-serialization
   bool SerializePlatformData(Pickle* pickle) const;
-  bool DeserializePlatformData(const Pickle* pickle, void** iter);
+  bool DeserializePlatformData(PickleIterator* iter);
 
   // Returns true if the platform data in the current cursor object
   // matches that of the cursor passed in.
   bool IsPlatformDataEqual(const WebCursor& other) const ;
 
   // Copies platform specific data from the WebCursor instance passed in.
   void CopyPlatformData(const WebCursor& other);
 
   // Platform specific cleanup.
   void CleanupPlatformData();
@@ skipping 20 matching lines @@
   HCURSOR external_cursor_;
   // A custom cursor created from custom bitmap data by Webkit.
   HCURSOR custom_cursor_;
 #elif defined(TOOLKIT_USES_GTK)
   // A custom cursor created that should be unref'ed from the destructor.
   GdkCursor* unref_;
 #endif
 };
 
 #endif  // WEBKIT_GLUE_WEBCURSOR_H_