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

Side by Side Diff: content/renderer/media/webmediaplayer_impl.cc

Issue 515093003: Manual fixups in media code for scoped_refptr operator T* removal. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moar Created 6 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/media/webmediaplayer_impl.h" 5 #include "content/renderer/media/webmediaplayer_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 should_notify_time_changed_(false), 174 should_notify_time_changed_(false),
175 client_(client), 175 client_(client),
176 delegate_(delegate), 176 delegate_(delegate),
177 defer_load_cb_(params.defer_load_cb()), 177 defer_load_cb_(params.defer_load_cb()),
178 incremented_externally_allocated_memory_(false), 178 incremented_externally_allocated_memory_(false),
179 gpu_factories_(RenderThreadImpl::current()->GetGpuFactories()), 179 gpu_factories_(RenderThreadImpl::current()->GetGpuFactories()),
180 supports_save_(true), 180 supports_save_(true),
181 chunk_demuxer_(NULL), 181 chunk_demuxer_(NULL),
182 // Threaded compositing isn't enabled universally yet. 182 // Threaded compositing isn't enabled universally yet.
183 compositor_task_runner_( 183 compositor_task_runner_(
184 RenderThreadImpl::current()->compositor_message_loop_proxy() 184 RenderThreadImpl::current()->compositor_message_loop_proxy().get()
185 ? RenderThreadImpl::current()->compositor_message_loop_proxy() 185 ? RenderThreadImpl::current()->compositor_message_loop_proxy()
186 : base::MessageLoopProxy::current()), 186 : base::MessageLoopProxy::current()),
187 compositor_(new VideoFrameCompositor( 187 compositor_(new VideoFrameCompositor(
188 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnNaturalSizeChanged), 188 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnNaturalSizeChanged),
189 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnOpacityChanged))), 189 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnOpacityChanged))),
190 text_track_index_(0), 190 text_track_index_(0),
191 encrypted_media_support_(EncryptedMediaPlayerSupport::Create(client)) { 191 encrypted_media_support_(EncryptedMediaPlayerSupport::Create(client)) {
192 DCHECK(encrypted_media_support_); 192 DCHECK(encrypted_media_support_);
193 193
194 media_log_->AddEvent( 194 media_log_->AddEvent(
(...skipping 870 matching lines...) Expand 10 before | Expand all | Expand 10 after
1065 compositor_task_runner_->PostTask(FROM_HERE, 1065 compositor_task_runner_->PostTask(FROM_HERE,
1066 base::Bind(&GetCurrentFrameAndSignal, 1066 base::Bind(&GetCurrentFrameAndSignal,
1067 base::Unretained(compositor_), 1067 base::Unretained(compositor_),
1068 &video_frame, 1068 &video_frame,
1069 &event)); 1069 &event));
1070 event.Wait(); 1070 event.Wait();
1071 return video_frame; 1071 return video_frame;
1072 } 1072 }
1073 1073
1074 } // namespace content 1074 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/video_frame_compositor_unittest.cc ('k') | content/renderer/media/webrtc_audio_renderer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698