Refactor Pickle Read methods to use higher performance PickleIterator.

content/common/child_process_sandbox_support_impl_linux.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 "content/common/child_process_sandbox_support_impl_linux.h"
 
 #include <sys/stat.h>
 
 #include "base/eintr_wrapper.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/pickle.h"
@@ skipping 17 matching lines @@
 
   uint8_t buf[512];
   const ssize_t n = UnixDomainSocket::SendRecvMsg(GetSandboxFD(), buf,
                                                   sizeof(buf), NULL, request);
 
   std::string family_name;
   bool isBold = false;
   bool isItalic = false;
   if (n != -1) {
     Pickle reply(reinterpret_cast<char*>(buf), n);
-    void* pickle_iter = NULL;
+    PickleIterator pickle_iter(reply);
     if (reply.ReadString(&pickle_iter, &family_name) &&
         reply.ReadBool(&pickle_iter, &isBold) &&
         reply.ReadBool(&pickle_iter, &isItalic)) {
       family->name = family_name;
       family->isBold = isBold;
       family->isItalic = isItalic;
     }
   }
 }
 
 void GetRenderStyleForStrike(const char* family, int sizeAndStyle,
                              WebKit::WebFontRenderStyle* out) {
   Pickle request;
   request.WriteInt(LinuxSandbox::METHOD_GET_STYLE_FOR_STRIKE);
   request.WriteString(family);
   request.WriteInt(sizeAndStyle);
 
   uint8_t buf[512];
   const ssize_t n = UnixDomainSocket::SendRecvMsg(GetSandboxFD(), buf,
                                                   sizeof(buf), NULL, request);
 
   out->setDefaults();
   if (n == -1) {
     return;
   }
 
   Pickle reply(reinterpret_cast<char*>(buf), n);
-  void* pickle_iter = NULL;
+  PickleIterator pickle_iter(reply);
   int useBitmaps, useAutoHint, useHinting, hintStyle, useAntiAlias, useSubpixel;
   if (reply.ReadInt(&pickle_iter, &useBitmaps) &&
       reply.ReadInt(&pickle_iter, &useAutoHint) &&
       reply.ReadInt(&pickle_iter, &useHinting) &&
       reply.ReadInt(&pickle_iter, &hintStyle) &&
       reply.ReadInt(&pickle_iter, &useAntiAlias) &&
       reply.ReadInt(&pickle_iter, &useSubpixel)) {
     out->useBitmaps = useBitmaps;
     out->useAutoHint = useAutoHint;
     out->useHinting = useHinting;
@@ skipping 89 matching lines @@
 
   *output_length = length;
   n = HANDLE_EINTR(pread(fd, output, length, offset));
   if (n != static_cast<ssize_t>(length))
     return false;
 
   return true;
 }
 
 }  // namespace content