summaryrefslogtreecommitdiffstats
path: root/content/common
diff options
context:
space:
mode:
authordcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-07 08:19:51 +0000
committerdcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-07 08:19:51 +0000
commit3152ef0d6ce224da636fae49699c9b26f6aeaeb6 (patch)
treef9e98518df64c5768bc93fafd93b2b0f9c70d1e8 /content/common
parent8a94ea1faf5f96d4cd92d52edee54d47be033b20 (diff)
downloadchromium_src-3152ef0d6ce224da636fae49699c9b26f6aeaeb6.zip
chromium_src-3152ef0d6ce224da636fae49699c9b26f6aeaeb6.tar.gz
chromium_src-3152ef0d6ce224da636fae49699c9b26f6aeaeb6.tar.bz2
Rewrite scoped_array<T> to scoped_ptr<T[]> in content/, Linux edition.
This changelist was automatically generated using a clang tool. BUG=171111 Review URL: https://codereview.chromium.org/13749004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192769 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common')
-rw-r--r--content/common/child_process_sandbox_support_impl_linux.cc2
-rw-r--r--content/common/common_param_traits_unittest.cc2
-rw-r--r--content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc12
3 files changed, 8 insertions, 8 deletions
diff --git a/content/common/child_process_sandbox_support_impl_linux.cc b/content/common/child_process_sandbox_support_impl_linux.cc
index 19cdb08..6eec6fe 100644
--- a/content/common/child_process_sandbox_support_impl_linux.cc
+++ b/content/common/child_process_sandbox_support_impl_linux.cc
@@ -127,7 +127,7 @@ bool GetFontTable(int fd, uint32_t table_tag, off_t offset,
// Read the table directory.
static const size_t kTableEntrySize = 16;
const size_t directory_size = num_tables * kTableEntrySize;
- scoped_array<uint8_t> table_entries(new uint8_t[directory_size]);
+ scoped_ptr<uint8_t[]> table_entries(new uint8_t[directory_size]);
n = HANDLE_EINTR(pread(fd, table_entries.get(), directory_size,
12 /* skip the SFNT header */));
if (n != base::checked_numeric_cast<ssize_t>(directory_size))
diff --git a/content/common/common_param_traits_unittest.cc b/content/common/common_param_traits_unittest.cc
index 0540032..432f8f9 100644
--- a/content/common/common_param_traits_unittest.cc
+++ b/content/common/common_param_traits_unittest.cc
@@ -113,7 +113,7 @@ TEST(IPCMessageTest, Bitmap) {
bad_msg.WriteData(fixed_data, fixed_data_size);
// Add some bogus pixel data.
const size_t bogus_pixels_size = bitmap.getSize() * 2;
- scoped_array<char> bogus_pixels(new char[bogus_pixels_size]);
+ scoped_ptr<char[]> bogus_pixels(new char[bogus_pixels_size]);
memset(bogus_pixels.get(), 'B', bogus_pixels_size);
bad_msg.WriteData(bogus_pixels.get(), bogus_pixels_size);
// Make sure we don't read out the bitmap!
diff --git a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc
index 8484974..90f7d9d 100644
--- a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc
+++ b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc
@@ -999,7 +999,7 @@ bool WebGraphicsContext3DCommandBufferImpl::getActiveAttrib(
program, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, &max_name_length);
if (max_name_length < 0)
return false;
- scoped_array<GLchar> name(new GLchar[max_name_length]);
+ scoped_ptr<GLchar[]> name(new GLchar[max_name_length]);
if (!name.get()) {
synthesizeGLError(GL_OUT_OF_MEMORY);
return false;
@@ -1025,7 +1025,7 @@ bool WebGraphicsContext3DCommandBufferImpl::getActiveUniform(
program, GL_ACTIVE_UNIFORM_MAX_LENGTH, &max_name_length);
if (max_name_length < 0)
return false;
- scoped_array<GLchar> name(new GLchar[max_name_length]);
+ scoped_ptr<GLchar[]> name(new GLchar[max_name_length]);
if (!name.get()) {
synthesizeGLError(GL_OUT_OF_MEMORY);
return false;
@@ -1093,7 +1093,7 @@ WebKit::WebString WebGraphicsContext3DCommandBufferImpl::getProgramInfoLog(
gl_->GetProgramiv(program, GL_INFO_LOG_LENGTH, &logLength);
if (!logLength)
return WebKit::WebString();
- scoped_array<GLchar> log(new GLchar[logLength]);
+ scoped_ptr<GLchar[]> log(new GLchar[logLength]);
if (!log.get())
return WebKit::WebString();
GLsizei returnedLogLength = 0;
@@ -1116,7 +1116,7 @@ WebKit::WebString WebGraphicsContext3DCommandBufferImpl::getShaderInfoLog(
gl_->GetShaderiv(shader, GL_INFO_LOG_LENGTH, &logLength);
if (!logLength)
return WebKit::WebString();
- scoped_array<GLchar> log(new GLchar[logLength]);
+ scoped_ptr<GLchar[]> log(new GLchar[logLength]);
if (!log.get())
return WebKit::WebString();
GLsizei returnedLogLength = 0;
@@ -1137,7 +1137,7 @@ WebKit::WebString WebGraphicsContext3DCommandBufferImpl::getShaderSource(
gl_->GetShaderiv(shader, GL_SHADER_SOURCE_LENGTH, &logLength);
if (!logLength)
return WebKit::WebString();
- scoped_array<GLchar> log(new GLchar[logLength]);
+ scoped_ptr<GLchar[]> log(new GLchar[logLength]);
if (!log.get())
return WebKit::WebString();
GLsizei returnedLogLength = 0;
@@ -1158,7 +1158,7 @@ WebKit::WebString WebGraphicsContext3DCommandBufferImpl::
shader, GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE, &logLength);
if (!logLength)
return WebKit::WebString();
- scoped_array<GLchar> log(new GLchar[logLength]);
+ scoped_ptr<GLchar[]> log(new GLchar[logLength]);
if (!log.get())
return WebKit::WebString();
GLsizei returnedLogLength = 0;