Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Side by Side Diff: content/renderer/pepper/host_var_tracker.cc

Issue 1547073003: Switch to standard integer types in content/renderer/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/pepper/host_var_tracker.h" 5 #include "content/renderer/pepper/host_var_tracker.h"
6 6
7 #include <tuple> 7 #include <tuple>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "content/renderer/pepper/host_array_buffer_var.h" 10 #include "content/renderer/pepper/host_array_buffer_var.h"
(...skipping 24 matching lines...) Expand all
35 bool HostVarTracker::V8ObjectVarKey::operator<( 35 bool HostVarTracker::V8ObjectVarKey::operator<(
36 const V8ObjectVarKey& other) const { 36 const V8ObjectVarKey& other) const {
37 return std::tie(instance, hash) < std::tie(other.instance, other.hash); 37 return std::tie(instance, hash) < std::tie(other.instance, other.hash);
38 } 38 }
39 39
40 HostVarTracker::HostVarTracker() 40 HostVarTracker::HostVarTracker()
41 : VarTracker(SINGLE_THREADED), last_shared_memory_map_id_(0) {} 41 : VarTracker(SINGLE_THREADED), last_shared_memory_map_id_(0) {}
42 42
43 HostVarTracker::~HostVarTracker() {} 43 HostVarTracker::~HostVarTracker() {}
44 44
45 ArrayBufferVar* HostVarTracker::CreateArrayBuffer(uint32 size_in_bytes) { 45 ArrayBufferVar* HostVarTracker::CreateArrayBuffer(uint32_t size_in_bytes) {
46 return new HostArrayBufferVar(size_in_bytes); 46 return new HostArrayBufferVar(size_in_bytes);
47 } 47 }
48 48
49 ArrayBufferVar* HostVarTracker::CreateShmArrayBuffer( 49 ArrayBufferVar* HostVarTracker::CreateShmArrayBuffer(
50 uint32 size_in_bytes, 50 uint32_t size_in_bytes,
51 base::SharedMemoryHandle handle) { 51 base::SharedMemoryHandle handle) {
52 return new HostArrayBufferVar(size_in_bytes, handle); 52 return new HostArrayBufferVar(size_in_bytes, handle);
53 } 53 }
54 54
55 void HostVarTracker::AddV8ObjectVar(V8ObjectVar* object_var) { 55 void HostVarTracker::AddV8ObjectVar(V8ObjectVar* object_var) {
56 CheckThreadingPreconditions(); 56 CheckThreadingPreconditions();
57 v8::HandleScope handle_scope(object_var->instance()->GetIsolate()); 57 v8::HandleScope handle_scope(object_var->instance()->GetIsolate());
58 DCHECK(GetForV8Object(object_var->instance()->pp_instance(), 58 DCHECK(GetForV8Object(object_var->instance()->pp_instance(),
59 object_var->GetHandle()) == object_map_.end()); 59 object_var->GetHandle()) == object_map_.end());
60 object_map_.insert(std::make_pair(V8ObjectVarKey(object_var), object_var)); 60 object_map_.insert(std::make_pair(V8ObjectVarKey(object_var), object_var));
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 147
148 for (ObjectMap::iterator it = range.first; it != range.second; ++it) { 148 for (ObjectMap::iterator it = range.first; it != range.second; ++it) {
149 if (object == it->second->GetHandle()) 149 if (object == it->second->GetHandle())
150 return it; 150 return it;
151 } 151 }
152 return object_map_.end(); 152 return object_map_.end();
153 } 153 }
154 154
155 int HostVarTracker::TrackSharedMemoryHandle(PP_Instance instance, 155 int HostVarTracker::TrackSharedMemoryHandle(PP_Instance instance,
156 base::SharedMemoryHandle handle, 156 base::SharedMemoryHandle handle,
157 uint32 size_in_bytes) { 157 uint32_t size_in_bytes) {
158 SharedMemoryMapEntry entry; 158 SharedMemoryMapEntry entry;
159 entry.instance = instance; 159 entry.instance = instance;
160 entry.handle = handle; 160 entry.handle = handle;
161 entry.size_in_bytes = size_in_bytes; 161 entry.size_in_bytes = size_in_bytes;
162 162
163 // Find a free id for our map. 163 // Find a free id for our map.
164 while (shared_memory_map_.find(last_shared_memory_map_id_) != 164 while (shared_memory_map_.find(last_shared_memory_map_id_) !=
165 shared_memory_map_.end()) { 165 shared_memory_map_.end()) {
166 ++last_shared_memory_map_id_; 166 ++last_shared_memory_map_id_;
167 } 167 }
168 shared_memory_map_[last_shared_memory_map_id_] = entry; 168 shared_memory_map_[last_shared_memory_map_id_] = entry;
169 return last_shared_memory_map_id_; 169 return last_shared_memory_map_id_;
170 } 170 }
171 171
172 bool HostVarTracker::StopTrackingSharedMemoryHandle( 172 bool HostVarTracker::StopTrackingSharedMemoryHandle(
173 int id, 173 int id,
174 PP_Instance instance, 174 PP_Instance instance,
175 base::SharedMemoryHandle* handle, 175 base::SharedMemoryHandle* handle,
176 uint32* size_in_bytes) { 176 uint32_t* size_in_bytes) {
177 SharedMemoryMap::iterator it = shared_memory_map_.find(id); 177 SharedMemoryMap::iterator it = shared_memory_map_.find(id);
178 if (it == shared_memory_map_.end()) 178 if (it == shared_memory_map_.end())
179 return false; 179 return false;
180 if (it->second.instance != instance) 180 if (it->second.instance != instance)
181 return false; 181 return false;
182 182
183 *handle = it->second.handle; 183 *handle = it->second.handle;
184 *size_in_bytes = it->second.size_in_bytes; 184 *size_in_bytes = it->second.size_in_bytes;
185 shared_memory_map_.erase(it); 185 shared_memory_map_.erase(it);
186 return true; 186 return true;
187 } 187 }
188 188
189 } // namespace content 189 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/pepper/host_var_tracker.h ('k') | content/renderer/pepper/host_var_tracker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698