diff options
| author | mdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-14 03:42:28 +0000 |
|---|---|---|
| committer | mdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-14 03:42:28 +0000 |
| commit | 276d2e64775e4836e57b64da9c9d9001cb4a9359 (patch) | |
| tree | edc7538e6a0b6f3340f2f4bf451d8dae8d6570f7 /chrome/renderer/extensions/user_script_slave.cc | |
| parent | 4fc91950b9e20a2d58208c7bf5e35c5cea0f008e (diff) | |
| download | chromium_src-276d2e64775e4836e57b64da9c9d9001cb4a9359.zip chromium_src-276d2e64775e4836e57b64da9c9d9001cb4a9359.tar.gz chromium_src-276d2e64775e4836e57b64da9c9d9001cb4a9359.tar.bz2 | |
Avoid using Pickle::WriteSize(), which writes an architecture-dependent amount
of data, in user script pickles. (The goal is to remove that method entirely.
Uses that never persist or send pickles over the network are [probably] safe,
but having the method around is waiting for accidental misuses.)
Review URL: https://chromiumcodereview.appspot.com/9690025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126548 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/extensions/user_script_slave.cc')
| -rw-r--r-- | chrome/renderer/extensions/user_script_slave.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/renderer/extensions/user_script_slave.cc b/chrome/renderer/extensions/user_script_slave.cc index 6aa7171..874454e 100644 --- a/chrome/renderer/extensions/user_script_slave.cc +++ b/chrome/renderer/extensions/user_script_slave.cc @@ -155,14 +155,14 @@ bool UserScriptSlave::UpdateScripts(base::SharedMemoryHandle shared_memory) { return false; // Unpickle scripts. - size_t num_scripts = 0; + uint64 num_scripts = 0; Pickle pickle(reinterpret_cast<char*>(shared_memory_->memory()), pickle_size); PickleIterator iter(pickle); - pickle.ReadSize(&iter, &num_scripts); + pickle.ReadUInt64(&iter, &num_scripts); scripts_.reserve(num_scripts); - for (size_t i = 0; i < num_scripts; ++i) { + for (uint64 i = 0; i < num_scripts; ++i) { scripts_.push_back(new UserScript()); UserScript* script = scripts_.back(); script->Unpickle(pickle, &iter); |