| OLD | NEW |
| 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 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ | 5 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ |
| 6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ | 6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 namespace blink { | 23 namespace blink { |
| 24 class WebFrame; | 24 class WebFrame; |
| 25 class WebMediaPlayerClient; | 25 class WebMediaPlayerClient; |
| 26 class WebSecurityOrigin; | 26 class WebSecurityOrigin; |
| 27 class WebString; | 27 class WebString; |
| 28 } | 28 } |
| 29 | 29 |
| 30 namespace media { | 30 namespace media { |
| 31 class MediaLog; | 31 class MediaLog; |
| 32 class VideoFrame; | 32 class VideoFrame; |
| 33 enum VideoRotation; |
| 33 } | 34 } |
| 34 | 35 |
| 35 namespace cc_blink { | 36 namespace cc_blink { |
| 36 class WebLayerImpl; | 37 class WebLayerImpl; |
| 37 } | 38 } |
| 38 | 39 |
| 39 namespace gpu { | 40 namespace gpu { |
| 40 namespace gles2 { | 41 namespace gles2 { |
| 41 class GLES2Interface; | 42 class GLES2Interface; |
| 42 } | 43 } |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 197 scoped_refptr<MediaStreamVideoRenderer> video_frame_provider_; // Weak | 198 scoped_refptr<MediaStreamVideoRenderer> video_frame_provider_; // Weak |
| 198 | 199 |
| 199 std::unique_ptr<cc_blink::WebLayerImpl> video_weblayer_; | 200 std::unique_ptr<cc_blink::WebLayerImpl> video_weblayer_; |
| 200 | 201 |
| 201 scoped_refptr<MediaStreamAudioRenderer> audio_renderer_; // Weak | 202 scoped_refptr<MediaStreamAudioRenderer> audio_renderer_; // Weak |
| 202 media::SkCanvasVideoRenderer video_renderer_; | 203 media::SkCanvasVideoRenderer video_renderer_; |
| 203 | 204 |
| 204 bool paused_; | 205 bool paused_; |
| 205 bool render_frame_suspended_; | 206 bool render_frame_suspended_; |
| 206 bool received_first_frame_; | 207 bool received_first_frame_; |
| 208 media::VideoRotation video_rotation_; |
| 207 | 209 |
| 208 scoped_refptr<media::MediaLog> media_log_; | 210 scoped_refptr<media::MediaLog> media_log_; |
| 209 | 211 |
| 210 std::unique_ptr<MediaStreamRendererFactory> renderer_factory_; | 212 std::unique_ptr<MediaStreamRendererFactory> renderer_factory_; |
| 211 | 213 |
| 212 const scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_; | 214 const scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_; |
| 213 const scoped_refptr<base::TaskRunner> worker_task_runner_; | 215 const scoped_refptr<base::TaskRunner> worker_task_runner_; |
| 214 media::GpuVideoAcceleratorFactories* gpu_factories_; | 216 media::GpuVideoAcceleratorFactories* gpu_factories_; |
| 215 | 217 |
| 216 // Used for DCHECKs to ensure methods calls executed in the correct thread. | 218 // Used for DCHECKs to ensure methods calls executed in the correct thread. |
| (...skipping 18 matching lines...) Expand all Loading... |
| 235 // True if playback should be started upon the next call to OnShown(). Only | 237 // True if playback should be started upon the next call to OnShown(). Only |
| 236 // used on Android. | 238 // used on Android. |
| 237 bool should_play_upon_shown_; | 239 bool should_play_upon_shown_; |
| 238 | 240 |
| 239 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS); | 241 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS); |
| 240 }; | 242 }; |
| 241 | 243 |
| 242 } // namespace content | 244 } // namespace content |
| 243 | 245 |
| 244 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ | 246 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ |
| OLD | NEW |