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

Side by Side Diff: ppapi/shared_impl/var_tracker.cc

Issue 8982006: Add GetLiveVars to PPB_Testing_Dev. Fix leaks it uncovered. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 years 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "ppapi/shared_impl/var_tracker.h" 5 #include "ppapi/shared_impl/var_tracker.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "ppapi/shared_impl/id_assignment.h" 10 #include "ppapi/shared_impl/id_assignment.h"
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 return type >= PP_VARTYPE_STRING; 142 return type >= PP_VARTYPE_STRING;
143 } 143 }
144 144
145 PP_Var VarTracker::MakeArrayBufferPPVar(uint32 size_in_bytes) { 145 PP_Var VarTracker::MakeArrayBufferPPVar(uint32 size_in_bytes) {
146 scoped_refptr<ArrayBufferVar> array_buffer(CreateArrayBuffer(size_in_bytes)); 146 scoped_refptr<ArrayBufferVar> array_buffer(CreateArrayBuffer(size_in_bytes));
147 if (!array_buffer) 147 if (!array_buffer)
148 return PP_MakeNull(); 148 return PP_MakeNull();
149 return array_buffer->GetPPVar(); 149 return array_buffer->GetPPVar();
150 } 150 }
151 151
152 std::vector<PP_Var> VarTracker::GetLiveVars() {
153 std::vector<PP_Var> var_vector;
154 var_vector.reserve(live_vars_.size());
155 for (VarMap::const_iterator iter = live_vars_.begin();
156 iter != live_vars_.end();
157 ++iter) {
158 var_vector.push_back(iter->second.var->GetPPVar());
159 }
160 return var_vector;
161 }
162
152 void VarTracker::TrackedObjectGettingOneRef(VarMap::const_iterator obj) { 163 void VarTracker::TrackedObjectGettingOneRef(VarMap::const_iterator obj) {
153 // Anybody using tracked objects should override this. 164 // Anybody using tracked objects should override this.
154 NOTREACHED(); 165 NOTREACHED();
155 } 166 }
156 167
157 void VarTracker::ObjectGettingZeroRef(VarMap::iterator iter) { 168 void VarTracker::ObjectGettingZeroRef(VarMap::iterator iter) {
158 DeleteObjectInfoIfNecessary(iter); 169 DeleteObjectInfoIfNecessary(iter);
159 } 170 }
160 171
161 bool VarTracker::DeleteObjectInfoIfNecessary(VarMap::iterator iter) { 172 bool VarTracker::DeleteObjectInfoIfNecessary(VarMap::iterator iter) {
162 if (iter->second.ref_count != 0 || 173 if (iter->second.ref_count != 0 ||
163 iter->second.track_with_no_reference_count != 0) 174 iter->second.track_with_no_reference_count != 0)
164 return false; // Object still alive. 175 return false; // Object still alive.
165 iter->second.var->ResetVarID(); 176 iter->second.var->ResetVarID();
166 live_vars_.erase(iter); 177 live_vars_.erase(iter);
167 return true; 178 return true;
168 } 179 }
169 180
170 } // namespace ppapi 181 } // namespace ppapi
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698