diff options
author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 17:35:42 +0000 |
---|---|---|
committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 17:35:42 +0000 |
commit | e8328959446df06daed33e7310e935df5496a0b7 (patch) | |
tree | 2fe2476213f85e2bb475054f956ba89ec4b87f3b /ppapi | |
parent | 1427cd5c47cc8c09c8020ed3f1b9ddec4e6e5b60 (diff) | |
download | chromium_src-e8328959446df06daed33e7310e935df5496a0b7.zip chromium_src-e8328959446df06daed33e7310e935df5496a0b7.tar.gz chromium_src-e8328959446df06daed33e7310e935df5496a0b7.tar.bz2 |
Finish scoped_array<T> to scoped_ptr<T[]> conversion on Linux.
There are only a few instances left in the Linux build, so lumping
them all into one patch.
BUG=171111
Review URL: https://codereview.chromium.org/13916003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193134 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r-- | ppapi/proxy/device_enumeration_resource_helper.cc | 2 | ||||
-rw-r--r-- | ppapi/proxy/video_capture_resource.cc | 2 | ||||
-rw-r--r-- | ppapi/shared_impl/ppb_audio_shared.h | 2 | ||||
-rw-r--r-- | ppapi/shared_impl/ppb_device_ref_shared.cc | 2 | ||||
-rw-r--r-- | ppapi/thunk/ppb_flash_clipboard_thunk.cc | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/ppapi/proxy/device_enumeration_resource_helper.cc b/ppapi/proxy/device_enumeration_resource_helper.cc index 2729406..e8d63e1 100644 --- a/ppapi/proxy/device_enumeration_resource_helper.cc +++ b/ppapi/proxy/device_enumeration_resource_helper.cc @@ -184,7 +184,7 @@ void DeviceEnumerationResourceHelper::OnPluginMsgNotifyDeviceChange( CHECK(monitor_callback_.get()); - scoped_array<PP_Resource> elements; + scoped_ptr<PP_Resource[]> elements; uint32_t size = devices.size(); if (size > 0) { elements.reset(new PP_Resource[size]); diff --git a/ppapi/proxy/video_capture_resource.cc b/ppapi/proxy/video_capture_resource.cc index ca88adf..af5c62e 100644 --- a/ppapi/proxy/video_capture_resource.cc +++ b/ppapi/proxy/video_capture_resource.cc @@ -158,7 +158,7 @@ void VideoCaptureResource::OnPluginMsgOnDeviceInfo( PluginResourceTracker* tracker = PluginGlobals::Get()->plugin_resource_tracker(); - scoped_array<PP_Resource> resources(new PP_Resource[buffers.size()]); + scoped_ptr<PP_Resource[]> resources(new PP_Resource[buffers.size()]); for (size_t i = 0; i < buffers.size(); ++i) { // We assume that the browser created a new set of resources. DCHECK(!tracker->PluginResourceForHostResource(buffers[i])); diff --git a/ppapi/shared_impl/ppb_audio_shared.h b/ppapi/shared_impl/ppb_audio_shared.h index 0b6afd4..c164470 100644 --- a/ppapi/shared_impl/ppb_audio_shared.h +++ b/ppapi/shared_impl/ppb_audio_shared.h @@ -109,7 +109,7 @@ class PPAPI_SHARED_EXPORT PPB_Audio_Shared // Internal buffer for client's integer audio data. int client_buffer_size_bytes_; - scoped_array<uint8_t> client_buffer_; + scoped_ptr<uint8_t[]> client_buffer_; DISALLOW_COPY_AND_ASSIGN(PPB_Audio_Shared); }; diff --git a/ppapi/shared_impl/ppb_device_ref_shared.cc b/ppapi/shared_impl/ppb_device_ref_shared.cc index 73a9a7c..4f9c14c 100644 --- a/ppapi/shared_impl/ppb_device_ref_shared.cc +++ b/ppapi/shared_impl/ppb_device_ref_shared.cc @@ -47,7 +47,7 @@ PP_Resource PPB_DeviceRef_Shared::CreateResourceArray( ResourceObjectType type, PP_Instance instance, const std::vector<DeviceRefData>& devices) { - scoped_array<PP_Resource> elements; + scoped_ptr<PP_Resource[]> elements; size_t size = devices.size(); if (size > 0) { elements.reset(new PP_Resource[size]); diff --git a/ppapi/thunk/ppb_flash_clipboard_thunk.cc b/ppapi/thunk/ppb_flash_clipboard_thunk.cc index fcdc52e..359d78f 100644 --- a/ppapi/thunk/ppb_flash_clipboard_thunk.cc +++ b/ppapi/thunk/ppb_flash_clipboard_thunk.cc @@ -70,7 +70,7 @@ int32_t WriteData_4_0(PP_Instance instance, uint32_t data_item_count, const PP_Flash_Clipboard_Format formats[], const PP_Var data_items[]) { - scoped_array<uint32_t> new_formats(new uint32_t[data_item_count]); + scoped_ptr<uint32_t[]> new_formats(new uint32_t[data_item_count]); for (uint32_t i = 0; i < data_item_count; ++i) new_formats[i] = static_cast<uint32_t>(formats[i]); return WriteData(instance, clipboard_type, data_item_count, |