diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-10 04:47:31 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-10 04:47:31 +0000 |
| commit | f1ca6dfe8f214f66dd7ab58d8bc30fe1e8553352 (patch) | |
| tree | 5107ccd0d038153d126a1d3e842dd042944f31f3 /webkit/media/active_loader.h | |
| parent | c2e45bf3a3207e2072c78804b012309de511275a (diff) | |
| download | chromium_src-f1ca6dfe8f214f66dd7ab58d8bc30fe1e8553352.zip chromium_src-f1ca6dfe8f214f66dd7ab58d8bc30fe1e8553352.tar.gz chromium_src-f1ca6dfe8f214f66dd7ab58d8bc30fe1e8553352.tar.bz2 | |
Take advantage of the new Pass() machinery on scoped_ptr{,_malloc}.
Pass() was announced in
https://groups.google.com/a/chromium.org/d/topic/chromium-dev/RTd7rNxHjqk/discussion
This CL replaces comments about ownership transfer (in all files whose paths
contain media/) with the explicit passing of the appropriate scoper.
The exceptions that are not touched by this CL:
- scoped_refptr<> doesn't support Pass() and so is untouched.
- media/audio code defines its own callback machinery, mimicking the old-style
callbacks (pass by pointer, explicit deletes). I think that whole pile needs
to be replaced with new-style (Bind) callbacks, so left it alone for now.
BUG=none
TEST=trybots
Review URL: http://codereview.chromium.org/9015015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117009 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media/active_loader.h')
| -rw-r--r-- | webkit/media/active_loader.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/webkit/media/active_loader.h b/webkit/media/active_loader.h index 8a63ed0..b7300fc 100644 --- a/webkit/media/active_loader.h +++ b/webkit/media/active_loader.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -21,9 +21,7 @@ class ActiveLoader { public: // Creates an ActiveLoader with the given loader. It is assumed that the // initial state of |loader| is loading and not deferred. - // - // ActiveLoader takes ownership of |loader|. - explicit ActiveLoader(WebKit::WebURLLoader* loader); + explicit ActiveLoader(scoped_ptr<WebKit::WebURLLoader> loader); ~ActiveLoader(); // Starts or stops deferring the resource load. |