Index: webkit/glue/npruntime_util.cc |
diff --git a/webkit/glue/npruntime_util.cc b/webkit/glue/npruntime_util.cc |
index a408770ee79e47e9adcd62b343352fdd6cd7e1e0..4c448aefe5caafcbaed8c2d7e91bd33a05736e04 100644 |
--- a/webkit/glue/npruntime_util.cc |
+++ b/webkit/glue/npruntime_util.cc |
@@ -1,4 +1,4 @@ |
-// Copyright (c) 2006-2009 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. |
@@ -26,22 +26,22 @@ bool SerializeNPIdentifier(NPIdentifier identifier, Pickle* pickle) { |
return pickle->WriteInt(number); |
} |
-bool DeserializeNPIdentifier(const Pickle& pickle, void** pickle_iter, |
+bool DeserializeNPIdentifier(PickleIterator* pickle_iter, |
NPIdentifier* identifier) { |
bool is_string; |
- if (!pickle.ReadBool(pickle_iter, &is_string)) |
+ if (!pickle_iter->ReadBool(&is_string)) |
return false; |
if (is_string) { |
const char* data; |
int data_len; |
- if (!pickle.ReadData(pickle_iter, &data, &data_len)) |
+ if (!pickle_iter->ReadData(&data, &data_len)) |
return false; |
DCHECK_EQ((static_cast<size_t>(data_len)), strlen(data) + 1); |
*identifier = WebBindings::getStringIdentifier(data); |
} else { |
int number; |
- if (!pickle.ReadInt(pickle_iter, &number)) |
+ if (!pickle_iter->ReadInt(&number)) |
return false; |
*identifier = WebBindings::getIntIdentifier(number); |
} |