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 WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ | 5 #ifndef WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ |
6 #define WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ | 6 #define WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ |
7 | 7 |
8 #include "base/memory/ref_counted.h" | 8 #include "base/memory/ref_counted.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/memory/weak_ptr.h" | 10 #include "base/memory/weak_ptr.h" |
11 #include "base/synchronization/lock.h" | 11 #include "base/synchronization/lock.h" |
| 12 #include "base/threading/thread_checker.h" |
12 #include "cc/layers/video_frame_provider.h" | 13 #include "cc/layers/video_frame_provider.h" |
13 #include "media/filters/skcanvas_video_renderer.h" | 14 #include "media/filters/skcanvas_video_renderer.h" |
14 #include "skia/ext/platform_canvas.h" | 15 #include "skia/ext/platform_canvas.h" |
15 #include "third_party/WebKit/public/web/WebMediaPlayer.h" | 16 #include "third_party/WebKit/public/web/WebMediaPlayer.h" |
16 #include "url/gurl.h" | 17 #include "url/gurl.h" |
17 | 18 |
18 namespace WebKit { | 19 namespace WebKit { |
19 class WebFrame; | 20 class WebFrame; |
20 class WebMediaPlayerClient; | 21 class WebMediaPlayerClient; |
21 } | 22 } |
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
183 scoped_refptr<MediaStreamAudioRenderer> audio_renderer_; | 184 scoped_refptr<MediaStreamAudioRenderer> audio_renderer_; |
184 | 185 |
185 scoped_refptr<media::MediaLog> media_log_; | 186 scoped_refptr<media::MediaLog> media_log_; |
186 | 187 |
187 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS); | 188 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS); |
188 }; | 189 }; |
189 | 190 |
190 } // namespace webkit_media | 191 } // namespace webkit_media |
191 | 192 |
192 #endif // WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ | 193 #endif // WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ |
OLD | NEW |