| 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_core_proxy.h" | 5 #include "ppapi/proxy/ppb_core_proxy.h" |
| 6 | 6 |
| 7 #include <stdlib.h> // For malloc | 7 #include <stdlib.h> // For malloc |
| 8 | 8 |
| 9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 } | 34 } |
| 35 | 35 |
| 36 void AddRefResource(PP_Resource resource) { | 36 void AddRefResource(PP_Resource resource) { |
| 37 PluginResourceTracker::GetInstance()->AddRefResource(resource); | 37 PluginResourceTracker::GetInstance()->AddRefResource(resource); |
| 38 } | 38 } |
| 39 | 39 |
| 40 void ReleaseResource(PP_Resource resource) { | 40 void ReleaseResource(PP_Resource resource) { |
| 41 PluginResourceTracker::GetInstance()->ReleaseResource(resource); | 41 PluginResourceTracker::GetInstance()->ReleaseResource(resource); |
| 42 } | 42 } |
| 43 | 43 |
| 44 void* MemAlloc(uint32_t num_bytes) { | |
| 45 return malloc(num_bytes); | |
| 46 } | |
| 47 | |
| 48 void MemFree(void* ptr) { | |
| 49 free(ptr); | |
| 50 } | |
| 51 | |
| 52 double GetTime() { | 44 double GetTime() { |
| 53 return TimeToPPTime(base::Time::Now()); | 45 return TimeToPPTime(base::Time::Now()); |
| 54 } | 46 } |
| 55 | 47 |
| 56 double GetTimeTicks() { | 48 double GetTimeTicks() { |
| 57 return TimeTicksToPPTimeTicks(base::TimeTicks::Now()); | 49 return TimeTicksToPPTimeTicks(base::TimeTicks::Now()); |
| 58 } | 50 } |
| 59 | 51 |
| 60 void CallbackWrapper(PP_CompletionCallback callback, int32_t result) { | 52 void CallbackWrapper(PP_CompletionCallback callback, int32_t result) { |
| 61 TRACE_EVENT2("ppapi proxy", "CallOnMainThread callback", | 53 TRACE_EVENT2("ppapi proxy", "CallOnMainThread callback", |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 void PPB_Core_Proxy::OnMsgAddRefResource(HostResource resource) { | 121 void PPB_Core_Proxy::OnMsgAddRefResource(HostResource resource) { |
| 130 ppb_core_target()->AddRefResource(resource.host_resource()); | 122 ppb_core_target()->AddRefResource(resource.host_resource()); |
| 131 } | 123 } |
| 132 | 124 |
| 133 void PPB_Core_Proxy::OnMsgReleaseResource(HostResource resource) { | 125 void PPB_Core_Proxy::OnMsgReleaseResource(HostResource resource) { |
| 134 ppb_core_target()->ReleaseResource(resource.host_resource()); | 126 ppb_core_target()->ReleaseResource(resource.host_resource()); |
| 135 } | 127 } |
| 136 | 128 |
| 137 } // namespace proxy | 129 } // namespace proxy |
| 138 } // namespace pp | 130 } // namespace pp |
| OLD | NEW |