Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #ifndef MediaPlayer_h | 26 #ifndef MediaPlayer_h |
| 27 #define MediaPlayer_h | 27 #define MediaPlayer_h |
| 28 | 28 |
| 29 #include "platform/PlatformExport.h" | 29 #include "platform/PlatformExport.h" |
| 30 #include "platform/graphics/GraphicsTypes3D.h" | 30 #include "platform/graphics/GraphicsTypes3D.h" |
| 31 #include "public/platform/WebMediaPlayer.h" | 31 #include "public/platform/WebMediaPlayer.h" |
| 32 #include "public/platform/WebMediaPlayerClient.h" | |
|
acolwell GONE FROM CHROMIUM
2014/05/12 18:23:11
Why do we need this?
philipj_slow
2014/05/15 14:55:53
blink::WebMediaPlayerClient::AudioTrackKind and ::
| |
| 32 #include "wtf/Forward.h" | 33 #include "wtf/Forward.h" |
| 33 #include "wtf/Noncopyable.h" | 34 #include "wtf/Noncopyable.h" |
| 34 | 35 |
| 35 namespace blink { | 36 namespace blink { |
| 36 class WebGraphicsContext3D; | 37 class WebGraphicsContext3D; |
| 37 class WebContentDecryptionModule; | 38 class WebContentDecryptionModule; |
| 38 class WebInbandTextTrack; | 39 class WebInbandTextTrack; |
| 39 class WebLayer; | 40 class WebLayer; |
| 40 class WebMediaSource; | 41 class WebMediaSource; |
| 41 } | 42 } |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 174 | 175 |
| 175 #if ENABLE(WEB_AUDIO) | 176 #if ENABLE(WEB_AUDIO) |
| 176 virtual AudioSourceProvider* audioSourceProvider() = 0; | 177 virtual AudioSourceProvider* audioSourceProvider() = 0; |
| 177 #endif | 178 #endif |
| 178 virtual blink::WebMediaPlayer* webMediaPlayer() const = 0; | 179 virtual blink::WebMediaPlayer* webMediaPlayer() const = 0; |
| 179 }; | 180 }; |
| 180 | 181 |
| 181 } | 182 } |
| 182 | 183 |
| 183 #endif // MediaPlayer_h | 184 #endif // MediaPlayer_h |
| OLD | NEW |