Index: ppapi/shared_impl/ppb_resource_array_shared.cc |
diff --git a/ppapi/shared_impl/ppb_resource_array_shared.cc b/ppapi/shared_impl/ppb_resource_array_shared.cc |
index 9949fd5e33a7682bb0f45dcf02623cdf13042d2c..f7353f116620c3571c7d96bdf5f1a39cdaaad872 100644 |
--- a/ppapi/shared_impl/ppb_resource_array_shared.cc |
+++ b/ppapi/shared_impl/ppb_resource_array_shared.cc |
@@ -12,20 +12,20 @@ using ppapi::thunk::PPB_ResourceArray_API; |
namespace ppapi { |
-PPB_ResourceArray_Shared::PPB_ResourceArray_Shared(const InitAsImpl&, |
+PPB_ResourceArray_Shared::PPB_ResourceArray_Shared(ResourceObjectType type, |
PP_Instance instance, |
const PP_Resource elements[], |
uint32_t size) |
- : Resource(instance) { |
- Initialize(elements, size); |
-} |
+ : Resource(type, instance) { |
+ DCHECK(resources_.empty()); |
-PPB_ResourceArray_Shared::PPB_ResourceArray_Shared(const InitAsProxy&, |
- PP_Instance instance, |
- const PP_Resource elements[], |
- uint32_t size) |
- : Resource(HostResource::MakeInstanceOnly(instance)) { |
- Initialize(elements, size); |
+ resources_.reserve(size); |
+ for (uint32_t index = 0; index < size; ++index) { |
+ PP_Resource element = elements[index]; |
+ if (element) |
+ PpapiGlobals::Get()->GetResourceTracker()->AddRefResource(element); |
+ resources_.push_back(element); |
+ } |
} |
PPB_ResourceArray_Shared::~PPB_ResourceArray_Shared() { |
@@ -48,17 +48,4 @@ PP_Resource PPB_ResourceArray_Shared::GetAt(uint32_t index) { |
return index < resources_.size() ? resources_[index] : 0; |
} |
-void PPB_ResourceArray_Shared::Initialize(const PP_Resource elements[], |
- uint32_t size) { |
- DCHECK(resources_.empty()); |
- |
- resources_.reserve(size); |
- for (uint32_t index = 0; index < size; ++index) { |
- PP_Resource element = elements[index]; |
- if (element) |
- PpapiGlobals::Get()->GetResourceTracker()->AddRefResource(element); |
- resources_.push_back(element); |
- } |
-} |
- |
} // namespace ppapi |