summaryrefslogtreecommitdiffstats
path: root/webkit/media
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-08 14:27:23 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-08 14:27:23 +0000
commit2033fb861781de480cacc9c0bfb7998d7fa828e5 (patch)
tree94fd8f829e55ca7c02bd5761e51db5187d9468ad /webkit/media
parent7521b65a904d1a21f85e6d28501e83ee27d6a3fc (diff)
downloadchromium_src-2033fb861781de480cacc9c0bfb7998d7fa828e5.zip
chromium_src-2033fb861781de480cacc9c0bfb7998d7fa828e5.tar.gz
chromium_src-2033fb861781de480cacc9c0bfb7998d7fa828e5.tar.bz2
Cleanup: Remove unnecessary ".get()" from scoped_ptrs<>.
In r174057, enne@ added support for implicit testing to scoped_ptr<>. Removes these in webkit/. BUG=232084 Review URL: https://chromiumcodereview.appspot.com/14886011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198894 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media')
-rw-r--r--webkit/media/android/webmediaplayer_android.cc2
-rw-r--r--webkit/media/buffered_data_source.cc4
-rw-r--r--webkit/media/buffered_resource_loader.cc8
-rw-r--r--webkit/media/webmediaplayer_ms.cc6
4 files changed, 10 insertions, 10 deletions
diff --git a/webkit/media/android/webmediaplayer_android.cc b/webkit/media/android/webmediaplayer_android.cc
index 8f0cdb0..3edcbf7 100644
--- a/webkit/media/android/webmediaplayer_android.cc
+++ b/webkit/media/android/webmediaplayer_android.cc
@@ -72,7 +72,7 @@ WebMediaPlayerAndroid::WebMediaPlayerAndroid(
if (manager_)
player_id_ = manager_->RegisterMediaPlayer(this);
- if (stream_texture_factory_.get()) {
+ if (stream_texture_factory_) {
stream_texture_proxy_.reset(stream_texture_factory_->CreateProxy());
stream_id_ = stream_texture_factory_->CreateStreamTexture(&texture_id_);
ReallocateVideoFrame();
diff --git a/webkit/media/buffered_data_source.cc b/webkit/media/buffered_data_source.cc
index 60b3621..67341c5 100644
--- a/webkit/media/buffered_data_source.cc
+++ b/webkit/media/buffered_data_source.cc
@@ -128,7 +128,7 @@ BufferedResourceLoader* BufferedDataSource::CreateResourceLoader(
void BufferedDataSource::set_host(media::DataSourceHost* host) {
DataSource::set_host(host);
- if (loader_.get()) {
+ if (loader_) {
base::AutoLock auto_lock(lock_);
UpdateHostState_Locked();
}
@@ -275,7 +275,7 @@ void BufferedDataSource::StopInternal_Locked() {
void BufferedDataSource::StopLoader() {
DCHECK(render_loop_->BelongsToCurrentThread());
- if (loader_.get())
+ if (loader_)
loader_->Stop();
}
diff --git a/webkit/media/buffered_resource_loader.cc b/webkit/media/buffered_resource_loader.cc
index 8468002..5177c89 100644
--- a/webkit/media/buffered_resource_loader.cc
+++ b/webkit/media/buffered_resource_loader.cc
@@ -178,7 +178,7 @@ void BufferedResourceLoader::Start(
// Check for our test WebURLLoader.
scoped_ptr<WebURLLoader> loader;
- if (test_loader_.get()) {
+ if (test_loader_) {
loader = test_loader_.Pass();
} else {
WebURLLoaderOptions options;
@@ -596,7 +596,7 @@ void BufferedResourceLoader::UpdateBufferWindow() {
}
void BufferedResourceLoader::UpdateDeferBehavior() {
- if (!active_loader_.get())
+ if (!active_loader_)
return;
SetDeferred(ShouldDefer());
@@ -638,7 +638,7 @@ bool BufferedResourceLoader::CanFulfillRead() const {
// At the point, we verified that first byte requested is within the buffer.
// If the request has completed, then just returns with what we have now.
- if (!active_loader_.get())
+ if (!active_loader_)
return true;
// If the resource request is still active, make sure the whole requested
@@ -660,7 +660,7 @@ bool BufferedResourceLoader::WillFulfillRead() const {
// The resource request has completed, there's no way we can fulfill the
// read request.
- if (!active_loader_.get())
+ if (!active_loader_)
return false;
return true;
diff --git a/webkit/media/webmediaplayer_ms.cc b/webkit/media/webmediaplayer_ms.cc
index 50b3e9f..134c809 100644
--- a/webkit/media/webmediaplayer_ms.cc
+++ b/webkit/media/webmediaplayer_ms.cc
@@ -250,7 +250,7 @@ double WebMediaPlayerMS::duration() const {
double WebMediaPlayerMS::currentTime() const {
DCHECK(thread_checker_.CalledOnValidThread());
- if (current_frame_.get()) {
+ if (current_frame_) {
return current_frame_->GetTimestamp().InSecondsF();
} else if (audio_renderer_) {
return audio_renderer_->GetCurrentRenderTime().InSecondsF();
@@ -311,7 +311,7 @@ void WebMediaPlayerMS::paint(WebCanvas* canvas,
{
base::AutoLock auto_lock(current_frame_lock_);
- if (current_frame_.get())
+ if (current_frame_)
current_frame_used_ = true;
}
}
@@ -423,7 +423,7 @@ void WebMediaPlayerMS::OnFrameAvailable(
{
base::AutoLock auto_lock(current_frame_lock_);
- if (!current_frame_used_ && current_frame_.get())
+ if (!current_frame_used_ && current_frame_)
++dropped_frame_count_;
current_frame_ = frame;
current_frame_->SetTimestamp(frame->GetTimestamp() - start_time_);