| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #ifndef WebMediaPlayerClientImpl_h | 31 #ifndef WebMediaPlayerClientImpl_h |
| 32 #define WebMediaPlayerClientImpl_h | 32 #define WebMediaPlayerClientImpl_h |
| 33 | 33 |
| 34 #include "WebAudioSourceProviderClient.h" | 34 #include "WebAudioSourceProviderClient.h" |
| 35 #include "WebMediaPlayerClient.h" | 35 #include "WebMediaPlayerClient.h" |
| 36 #include "platform/audio/AudioSourceProvider.h" | 36 #include "platform/audio/AudioSourceProvider.h" |
| 37 #include "core/platform/graphics/InbandTextTrackPrivate.h" | 37 #include "platform/graphics/media/InbandTextTrackPrivate.h" |
| 38 #include "core/platform/graphics/MediaPlayer.h" | 38 #include "platform/graphics/media/MediaPlayer.h" |
| 39 #if OS(ANDROID) | 39 #if OS(ANDROID) |
| 40 #include "third_party/skia/include/core/SkBitmap.h" | 40 #include "third_party/skia/include/core/SkBitmap.h" |
| 41 #include "third_party/skia/include/core/SkRefCnt.h" | 41 #include "third_party/skia/include/core/SkRefCnt.h" |
| 42 #include "third_party/skia/include/gpu/GrTexture.h" | 42 #include "third_party/skia/include/gpu/GrTexture.h" |
| 43 #endif | 43 #endif |
| 44 #include "weborigin/KURL.h" | 44 #include "weborigin/KURL.h" |
| 45 #include "wtf/OwnPtr.h" | 45 #include "wtf/OwnPtr.h" |
| 46 #include "wtf/PassOwnPtr.h" | 46 #include "wtf/PassOwnPtr.h" |
| 47 #include "wtf/ThreadingPrimitives.h" | 47 #include "wtf/ThreadingPrimitives.h" |
| 48 | 48 |
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 | 225 |
| 226 AudioSourceProviderImpl m_audioSourceProvider; | 226 AudioSourceProviderImpl m_audioSourceProvider; |
| 227 #endif | 227 #endif |
| 228 | 228 |
| 229 RefPtr<WebCore::HTMLMediaSource> m_mediaSource; | 229 RefPtr<WebCore::HTMLMediaSource> m_mediaSource; |
| 230 }; | 230 }; |
| 231 | 231 |
| 232 } // namespace WebKit | 232 } // namespace WebKit |
| 233 | 233 |
| 234 #endif | 234 #endif |
| OLD | NEW |