summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-04 22:57:49 +0000
committerdcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-04 22:57:49 +0000
commit8bbef79e99155a7c35b0dbf4c9794d418d8a8085 (patch)
treeb16e280b884b22c6d25ef72489f51e1306edc843
parent185de2abadae365df302c039725615a9f0fbf512 (diff)
downloadchromium_src-8bbef79e99155a7c35b0dbf4c9794d418d8a8085.zip
chromium_src-8bbef79e99155a7c35b0dbf4c9794d418d8a8085.tar.gz
chromium_src-8bbef79e99155a7c35b0dbf4c9794d418d8a8085.tar.bz2
Update calls to scoped_array<T>::reset(NULL) to use the no-arg version.
scoped_ptr<T[]>, which will replace scoped_array<T>, does not support passing NULL as an explicit argument to reset(). BUG=171118 Review URL: https://codereview.chromium.org/13650005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192407 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--remoting/codec/video_decoder_verbatim.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/remoting/codec/video_decoder_verbatim.cc b/remoting/codec/video_decoder_verbatim.cc
index f9a5e11..56b116f 100644
--- a/remoting/codec/video_decoder_verbatim.cc
+++ b/remoting/codec/video_decoder_verbatim.cc
@@ -43,7 +43,7 @@ bool VideoDecoderVerbatim::IsReadyForData() {
void VideoDecoderVerbatim::Initialize(const SkISize& screen_size) {
updated_region_.setEmpty();
- screen_buffer_.reset(NULL);
+ screen_buffer_.reset();
screen_size_ = screen_size;
// Allocate the screen buffer, if necessary.