OLD | NEW |
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/proxy/ppb_var_proxy.h" | 5 #include "ppapi/proxy/ppb_var_proxy.h" |
6 | 6 |
7 #include "ppapi/c/pp_var.h" | 7 #include "ppapi/c/pp_var.h" |
8 #include "ppapi/c/ppb_var.h" | 8 #include "ppapi/c/ppb_var.h" |
9 #include "ppapi/shared_impl/ppapi_globals.h" | 9 #include "ppapi/proxy/plugin_resource_tracker.h" |
| 10 #include "ppapi/proxy/plugin_var_tracker.h" |
10 #include "ppapi/shared_impl/proxy_lock.h" | 11 #include "ppapi/shared_impl/proxy_lock.h" |
11 #include "ppapi/shared_impl/var.h" | 12 #include "ppapi/shared_impl/var.h" |
12 #include "ppapi/shared_impl/var_tracker.h" | |
13 | 13 |
14 namespace ppapi { | 14 namespace ppapi { |
15 namespace proxy { | 15 namespace proxy { |
16 | 16 |
17 namespace { | 17 namespace { |
18 | 18 |
19 // PPP_Var plugin -------------------------------------------------------------- | 19 // PPP_Var plugin -------------------------------------------------------------- |
20 | 20 |
21 void AddRefVar(PP_Var var) { | 21 void AddRefVar(PP_Var var) { |
22 ppapi::ProxyAutoLock lock; | 22 ppapi::ProxyAutoLock lock; |
23 PpapiGlobals::Get()->GetVarTracker()->AddRefVar(var); | 23 PluginResourceTracker::GetInstance()->var_tracker().AddRefVar(var); |
24 } | 24 } |
25 | 25 |
26 void ReleaseVar(PP_Var var) { | 26 void ReleaseVar(PP_Var var) { |
27 ppapi::ProxyAutoLock lock; | 27 ppapi::ProxyAutoLock lock; |
28 PpapiGlobals::Get()->GetVarTracker()->ReleaseVar(var); | 28 PluginResourceTracker::GetInstance()->var_tracker().ReleaseVar(var); |
29 } | 29 } |
30 | 30 |
31 PP_Var VarFromUtf8(PP_Module module, const char* data, uint32_t len) { | 31 PP_Var VarFromUtf8(PP_Module module, const char* data, uint32_t len) { |
32 ppapi::ProxyAutoLock lock; | 32 ppapi::ProxyAutoLock lock; |
33 return StringVar::StringToPPVar(module, data, len); | 33 return StringVar::StringToPPVar(module, data, len); |
34 } | 34 } |
35 | 35 |
36 const char* VarToUtf8(PP_Var var, uint32_t* len) { | 36 const char* VarToUtf8(PP_Var var, uint32_t* len) { |
37 ppapi::ProxyAutoLock lock; | 37 ppapi::ProxyAutoLock lock; |
38 StringVar* str = StringVar::FromPPVar(var); | 38 StringVar* str = StringVar::FromPPVar(var); |
(...skipping 13 matching lines...) Expand all Loading... |
52 }; | 52 }; |
53 | 53 |
54 } // namespace | 54 } // namespace |
55 | 55 |
56 const PPB_Var* GetPPB_Var_Interface() { | 56 const PPB_Var* GetPPB_Var_Interface() { |
57 return &var_interface; | 57 return &var_interface; |
58 } | 58 } |
59 | 59 |
60 } // namespace proxy | 60 } // namespace proxy |
61 } // namespace ppapi | 61 } // namespace ppapi |
OLD | NEW |