Index: content/common/child_process_sandbox_support_impl_linux.cc |
diff --git a/content/common/child_process_sandbox_support_impl_linux.cc b/content/common/child_process_sandbox_support_impl_linux.cc |
index 9040cd055c904b2a180fab4e2521df89f29b691b..bd9a7f29396743d1c69df070fb74b9f9256342cb 100644 |
--- a/content/common/child_process_sandbox_support_impl_linux.cc |
+++ b/content/common/child_process_sandbox_support_impl_linux.cc |
@@ -1,4 +1,4 @@ |
-// 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. |
@@ -36,7 +36,7 @@ void GetFontFamilyForCharacters(const uint16_t* utf16, |
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)) { |
@@ -64,7 +64,7 @@ void GetRenderStyleForStrike(const char* family, int sizeAndStyle, |
} |
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) && |