Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(352)

Unified Diff: content/renderer/media/webmediaplayer_impl.cc

Issue 480233007: Remove implicit conversions from scoped_refptr to T* in content/renderer/media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/media/video_track_adapter.cc ('k') | content/renderer/media/webmediaplayer_ms.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/webmediaplayer_impl.cc
diff --git a/content/renderer/media/webmediaplayer_impl.cc b/content/renderer/media/webmediaplayer_impl.cc
index b56871bb830475bf8b597d15e3ef99f23202322d..3f5baf05c9ece4e8948cdd4f835c3a85fe3aadda 100644
--- a/content/renderer/media/webmediaplayer_impl.cc
+++ b/content/renderer/media/webmediaplayer_impl.cc
@@ -214,7 +214,8 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
// |gpu_factories_| requires that its entry points be called on its
// |GetTaskRunner()|. Since |pipeline_| will own decoders created from the
// factories, require that their message loops are identical.
- DCHECK(!gpu_factories_ || (gpu_factories_->GetTaskRunner() == media_loop_));
+ DCHECK(!gpu_factories_.get() ||
+ (gpu_factories_->GetTaskRunner() == media_loop_.get()));
// Let V8 know we started new thread if we did not do it yet.
// Made separate task to avoid deletion of player currently being created.
@@ -630,7 +631,7 @@ bool WebMediaPlayerImpl::copyVideoTextureToPlatformTexture(
scoped_refptr<media::VideoFrame> video_frame =
GetCurrentFrameFromCompositor();
- if (!video_frame)
+ if (!video_frame.get())
return false;
if (video_frame->format() != media::VideoFrame::NATIVE_TEXTURE)
return false;
« no previous file with comments | « content/renderer/media/video_track_adapter.cc ('k') | content/renderer/media/webmediaplayer_ms.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698