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

Unified Diff: content/renderer/media/video_track_adapter.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_frame_compositor.cc ('k') | content/renderer/media/webmediaplayer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/video_track_adapter.cc
diff --git a/content/renderer/media/video_track_adapter.cc b/content/renderer/media/video_track_adapter.cc
index 9a9ab08460f8889e80639d3db8ba3fa07181ae8d..ebb47ba9f86b3f0fd4c3d70329706f435ddeff80 100644
--- a/content/renderer/media/video_track_adapter.cc
+++ b/content/renderer/media/video_track_adapter.cc
@@ -124,7 +124,7 @@ VideoFrameResolutionAdapter::VideoFrameResolutionAdapter(
frame_rate_(MediaStreamVideoSource::kDefaultFrameRate),
max_frame_rate_(max_frame_rate),
keep_frame_counter_(0.0f) {
- DCHECK(renderer_task_runner_);
+ DCHECK(renderer_task_runner_.get());
DCHECK(io_thread_checker_.CalledOnValidThread());
DCHECK_GE(max_aspect_ratio_, min_aspect_ratio_);
CHECK_NE(0, max_aspect_ratio_);
@@ -311,7 +311,7 @@ VideoTrackAdapter::VideoTrackAdapter(
renderer_task_runner_(base::MessageLoopProxy::current()),
frame_counter_(0),
source_frame_rate_(0.0f) {
- DCHECK(io_message_loop_);
+ DCHECK(io_message_loop_.get());
}
VideoTrackAdapter::~VideoTrackAdapter() {
@@ -361,7 +361,7 @@ void VideoTrackAdapter::AddTrackOnIO(
break;
}
}
- if (!adapter) {
+ if (!adapter.get()) {
adapter = new VideoFrameResolutionAdapter(renderer_task_runner_,
max_frame_size,
min_aspect_ratio,
« no previous file with comments | « content/renderer/media/video_frame_compositor.cc ('k') | content/renderer/media/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698