OLD | NEW |
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 "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 resource_tracker_(ResourceTracker::THREAD_SAFE), |
11 callback_tracker_(new CallbackTracker) { | 12 callback_tracker_(new CallbackTracker) { |
12 } | 13 } |
13 | 14 |
14 TestGlobals::TestGlobals(PpapiGlobals::PerThreadForTest per_thread_for_test) | 15 TestGlobals::TestGlobals(PpapiGlobals::PerThreadForTest per_thread_for_test) |
15 : ppapi::PpapiGlobals(per_thread_for_test), | 16 : ppapi::PpapiGlobals(per_thread_for_test), |
| 17 resource_tracker_(ResourceTracker::THREAD_SAFE), |
16 callback_tracker_(new CallbackTracker) { | 18 callback_tracker_(new CallbackTracker) { |
17 } | 19 } |
18 | 20 |
19 TestGlobals::~TestGlobals() { | 21 TestGlobals::~TestGlobals() { |
20 } | 22 } |
21 | 23 |
22 ResourceTracker* TestGlobals::GetResourceTracker() { | 24 ResourceTracker* TestGlobals::GetResourceTracker() { |
23 return &resource_tracker_; | 25 return &resource_tracker_; |
24 } | 26 } |
25 | 27 |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
73 return NULL; | 75 return NULL; |
74 } | 76 } |
75 | 77 |
76 bool TestGlobals::IsHostGlobals() const { | 78 bool TestGlobals::IsHostGlobals() const { |
77 // Pretend to be the host-side, for code that expects one or the other. | 79 // Pretend to be the host-side, for code that expects one or the other. |
78 // TODO(dmichael): just make it settable which one we're pretending to be? | 80 // TODO(dmichael): just make it settable which one we're pretending to be? |
79 return true; | 81 return true; |
80 } | 82 } |
81 | 83 |
82 } // namespace ppapi | 84 } // namespace ppapi |
OLD | NEW |