diff options
| author | jam <jam@chromium.org> | 2016-02-08 18:13:03 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-09 02:13:58 +0000 |
| commit | b82272abe4f64121f0bdd95f18f84c7455420cf6 (patch) | |
| tree | c919adf0f1cb543c59f0aedb175f005fbd8acfdf /extensions/renderer | |
| parent | c11d345c76dbf3ad45fdb45d7818f3709f551bf0 (diff) | |
| download | chromium_src-b82272abe4f64121f0bdd95f18f84c7455420cf6.zip chromium_src-b82272abe4f64121f0bdd95f18f84c7455420cf6.tar.gz chromium_src-b82272abe4f64121f0bdd95f18f84c7455420cf6.tar.bz2 | |
Switch extension struct members that are sent over IPC to use uint32_t instead of size_t.
size_t's size depends on the architecture. We need IPCs to match as we're now going to support 32 and 64 bit processes communicating on Android.
This is split off from https://codereview.chromium.org/1619363002/.
BUG=581409
Review URL: https://codereview.chromium.org/1676093003
Cr-Commit-Position: refs/heads/master@{#374268}
Diffstat (limited to 'extensions/renderer')
| -rw-r--r-- | extensions/renderer/user_script_set.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extensions/renderer/user_script_set.cc b/extensions/renderer/user_script_set.cc index 200f84c..e289f3f 100644 --- a/extensions/renderer/user_script_set.cc +++ b/extensions/renderer/user_script_set.cc @@ -109,15 +109,15 @@ bool UserScriptSet::UpdateUserScripts(base::SharedMemoryHandle shared_memory, return false; // Unpickle scripts. - size_t num_scripts = 0; + uint32_t num_scripts = 0; base::Pickle pickle(reinterpret_cast<char*>(shared_memory_->memory()), pickle_size); base::PickleIterator iter(pickle); - CHECK(iter.ReadSizeT(&num_scripts)); + CHECK(iter.ReadUInt32(&num_scripts)); scripts_.clear(); scripts_.reserve(num_scripts); - for (size_t i = 0; i < num_scripts; ++i) { + for (uint32_t i = 0; i < num_scripts; ++i) { scoped_ptr<UserScript> script(new UserScript()); script->Unpickle(pickle, &iter); |