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 "webkit/plugins/ppapi/plugin_module.h" | 5 #include "webkit/plugins/ppapi/plugin_module.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
130 DLOG(WARNING) << "AddRefResource()ing a nonexistent resource"; | 130 DLOG(WARNING) << "AddRefResource()ing a nonexistent resource"; |
131 } | 131 } |
132 } | 132 } |
133 | 133 |
134 void ReleaseResource(PP_Resource resource) { | 134 void ReleaseResource(PP_Resource resource) { |
135 if (!ResourceTracker::Get()->UnrefResource(resource)) { | 135 if (!ResourceTracker::Get()->UnrefResource(resource)) { |
136 DLOG(WARNING) << "ReleaseResource()ing a nonexistent resource"; | 136 DLOG(WARNING) << "ReleaseResource()ing a nonexistent resource"; |
137 } | 137 } |
138 } | 138 } |
139 | 139 |
140 void* MemAlloc(size_t num_bytes) { | 140 void* MemAlloc(uint32_t num_bytes) { |
141 return malloc(num_bytes); | 141 return malloc(num_bytes); |
142 } | 142 } |
143 | 143 |
144 void MemFree(void* ptr) { | 144 void MemFree(void* ptr) { |
145 free(ptr); | 145 free(ptr); |
146 } | 146 } |
147 | 147 |
148 double GetTime() { | 148 double GetTime() { |
149 return base::Time::Now().ToDoubleT(); | 149 return base::Time::Now().ToDoubleT(); |
150 } | 150 } |
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
529 if (retval != 0) { | 529 if (retval != 0) { |
530 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval; | 530 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval; |
531 return false; | 531 return false; |
532 } | 532 } |
533 return true; | 533 return true; |
534 } | 534 } |
535 | 535 |
536 } // namespace ppapi | 536 } // namespace ppapi |
537 } // namespace webkit | 537 } // namespace webkit |
538 | 538 |
OLD | NEW |