diff options
| author | gman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-08 01:27:06 +0000 |
|---|---|---|
| committer | gman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-08 01:27:06 +0000 |
| commit | 1e61ca1a183cbdf99cd90bddeb3ec539eb214743 (patch) | |
| tree | 5233d88546ad2f85aa8d50a7db807ed49487a27e /o3d/core/cross/buffer.cc | |
| parent | 7624db8ec35fbfe5ed12a876957bd53c37860fbf (diff) | |
| download | chromium_src-1e61ca1a183cbdf99cd90bddeb3ec539eb214743.zip chromium_src-1e61ca1a183cbdf99cd90bddeb3ec539eb214743.tar.gz chromium_src-1e61ca1a183cbdf99cd90bddeb3ec539eb214743.tar.bz2 | |
These files were meant to be checked in with
http://codereview.chromium.org/149236
The change SourceBuffer to use scoped_array
and they add a test for Class::unqualified_name.
Review URL: http://codereview.chromium.org/149300
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20115 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/core/cross/buffer.cc')
| -rw-r--r-- | o3d/core/cross/buffer.cc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/o3d/core/cross/buffer.cc b/o3d/core/cross/buffer.cc index d467d987..cd1f8d6 100644 --- a/o3d/core/cross/buffer.cc +++ b/o3d/core/cross/buffer.cc @@ -491,7 +491,7 @@ ObjectBase::Ref VertexBuffer::Create(ServiceLocator* service_locator) { SourceBuffer::SourceBuffer(ServiceLocator* service_locator) : VertexBufferBase(service_locator), - buffer_(NULL) { + buffer_() { } SourceBuffer::~SourceBuffer() { @@ -499,31 +499,28 @@ SourceBuffer::~SourceBuffer() { } void SourceBuffer::ConcreteFree() { - if (buffer_) { - delete [] buffer_; - buffer_ = NULL; - } + buffer_.reset(); } bool SourceBuffer::ConcreteAllocate(size_t size_in_bytes) { ConcreteFree(); - buffer_ = new char[size_in_bytes]; + buffer_.reset(new char[size_in_bytes]); return true; } bool SourceBuffer::ConcreteLock(AccessMode access_mode, void **buffer_data) { - if (!buffer_) { + if (!buffer_.get()) { return false; } - *buffer_data = reinterpret_cast<void*>(buffer_); + *buffer_data = reinterpret_cast<void*>(buffer_.get()); return true; } bool SourceBuffer::ConcreteUnlock() { - return buffer_ != NULL; + return buffer_.get() != NULL; } ObjectBase::Ref SourceBuffer::Create(ServiceLocator* service_locator) { |