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

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

Issue 9139054: Revert 117399 - Make it possible to have 1 PpapiGlobals per thread. Update unit tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « ppapi/shared_impl/test_globals.h ('k') | ppapi/shared_impl/var_tracker.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 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/test_globals.h" 5 #include "ppapi/shared_impl/test_globals.h"
6 6
7 namespace ppapi { 7 namespace ppapi {
8 8
9 TestGlobals::TestGlobals() 9 TestGlobals::TestGlobals()
10 : ppapi::PpapiGlobals(), 10 : ppapi::PpapiGlobals(),
11 callback_tracker_(new CallbackTracker) { 11 callback_tracker_(new CallbackTracker) {
12 } 12 }
13 13
14 TestGlobals::TestGlobals(PpapiGlobals::ForTest for_test)
15 : ppapi::PpapiGlobals(for_test),
16 callback_tracker_(new CallbackTracker) {
17 }
18
19 TestGlobals::~TestGlobals() { 14 TestGlobals::~TestGlobals() {
20 } 15 }
21 16
22 ResourceTracker* TestGlobals::GetResourceTracker() { 17 ResourceTracker* TestGlobals::GetResourceTracker() {
23 return &resource_tracker_; 18 return &resource_tracker_;
24 } 19 }
25 20
26 VarTracker* TestGlobals::GetVarTracker() { 21 VarTracker* TestGlobals::GetVarTracker() {
27 return &var_tracker_; 22 return &var_tracker_;
28 } 23 }
29 24
30 CallbackTracker* TestGlobals::GetCallbackTrackerForInstance( 25 CallbackTracker* TestGlobals::GetCallbackTrackerForInstance(
31 PP_Instance instance) { 26 PP_Instance instance) {
32 return callback_tracker_.get(); 27 return callback_tracker_.get();
33 } 28 }
34 29
35 FunctionGroupBase* TestGlobals::GetFunctionAPI(PP_Instance inst, ApiID id) { 30 FunctionGroupBase* TestGlobals::GetFunctionAPI(PP_Instance inst, ApiID id) {
36 return NULL; 31 return NULL;
37 } 32 }
38 33
39 PP_Module TestGlobals::GetModuleForInstance(PP_Instance instance) { 34 PP_Module TestGlobals::GetModuleForInstance(PP_Instance instance) {
40 return 0; 35 return 0;
41 } 36 }
42 37
43 base::Lock* TestGlobals::GetProxyLock() {
44 return NULL;
45 }
46
47 } // namespace ppapi 38 } // namespace ppapi
OLDNEW
« no previous file with comments | « ppapi/shared_impl/test_globals.h ('k') | ppapi/shared_impl/var_tracker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698