OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_MEDIA_WEBMEDIAPLAYER_MS_H_ | 5 #ifndef WEBKIT_MEDIA_WEBMEDIAPLAYER_MS_H_ |
6 #define WEBKIT_MEDIA_WEBMEDIAPLAYER_MS_H_ | 6 #define WEBKIT_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 "googleurl/src/gurl.h" | 12 #include "googleurl/src/gurl.h" |
13 #include "media/filters/skcanvas_video_renderer.h" | 13 #include "media/filters/skcanvas_video_renderer.h" |
14 #include "skia/ext/platform_canvas.h" | 14 #include "skia/ext/platform_canvas.h" |
15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h" | 15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h" |
16 | 16 |
17 namespace WebKit { | 17 namespace WebKit { |
18 class WebFrame; | 18 class WebFrame; |
19 class WebMediaPlayerClient; | 19 class WebMediaPlayerClient; |
| 20 class WebVideoFrame; |
20 } | 21 } |
21 | 22 |
22 namespace media { | 23 namespace media { |
23 class MediaLog; | 24 class MediaLog; |
24 } | 25 } |
25 | 26 |
26 namespace webkit_media { | 27 namespace webkit_media { |
27 | 28 |
28 class MediaStreamAudioRenderer; | 29 class MediaStreamAudioRenderer; |
29 class MediaStreamClient; | 30 class MediaStreamClient; |
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
171 scoped_refptr<MediaStreamAudioRenderer> audio_renderer_; | 172 scoped_refptr<MediaStreamAudioRenderer> audio_renderer_; |
172 | 173 |
173 scoped_refptr<media::MediaLog> media_log_; | 174 scoped_refptr<media::MediaLog> media_log_; |
174 | 175 |
175 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS); | 176 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS); |
176 }; | 177 }; |
177 | 178 |
178 } // namespace webkit_media | 179 } // namespace webkit_media |
179 | 180 |
180 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_MS_H_ | 181 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_MS_H_ |
OLD | NEW |