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 17 matching lines...) Expand all Loading... | |
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 #if ENABLE(VIDEO) | 34 #if ENABLE(VIDEO) |
35 | 35 |
36 #include "AudioSourceProvider.h" | 36 #include "AudioSourceProvider.h" |
37 #include "MediaPlayerPrivate.h" | 37 #include "MediaPlayerPrivate.h" |
38 #if defined(OS_ANDROID) | |
39 #include "SkRefCnt.h" | |
40 #include "SkBitmap.h" | |
41 #endif | |
38 #include "WebAudioSourceProviderClient.h" | 42 #include "WebAudioSourceProviderClient.h" |
39 #include "WebMediaPlayerClient.h" | 43 #include "WebMediaPlayerClient.h" |
40 #include <wtf/OwnPtr.h> | 44 #include <wtf/OwnPtr.h> |
41 #include <wtf/PassOwnPtr.h> | 45 #include <wtf/PassOwnPtr.h> |
42 | 46 |
43 namespace WebCore { class AudioSourceProviderClient; } | 47 namespace WebCore { class AudioSourceProviderClient; } |
44 | 48 |
45 namespace WebKit { | 49 namespace WebKit { |
46 | 50 |
47 class WebHelperPluginImpl; | 51 class WebHelperPluginImpl; |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
164 static WebCore::MediaPlayer::SupportsType supportsType( | 168 static WebCore::MediaPlayer::SupportsType supportsType( |
165 const WTF::String& type, const WTF::String& codecs, const String& keySys tem, const WebCore::KURL&); | 169 const WTF::String& type, const WTF::String& codecs, const String& keySys tem, const WebCore::KURL&); |
166 #else | 170 #else |
167 static WebCore::MediaPlayer::SupportsType supportsType( | 171 static WebCore::MediaPlayer::SupportsType supportsType( |
168 const WTF::String& type, const WTF::String& codecs, const WebCore::KURL& ); | 172 const WTF::String& type, const WTF::String& codecs, const WebCore::KURL& ); |
169 #endif | 173 #endif |
170 #if USE(ACCELERATED_COMPOSITING) | 174 #if USE(ACCELERATED_COMPOSITING) |
171 bool acceleratedRenderingInUse(); | 175 bool acceleratedRenderingInUse(); |
172 #endif | 176 #endif |
173 | 177 |
178 #if defined(OS_ANDROID) | |
179 // FIXME: This path "only works" on Android. It is a workaround for the prob lem that Skia could not handle Android's GL_TEXTURE_EXTERNAL_OES | |
180 // texture internally. It should be removed and replaced by the normal paint path. | |
181 // https://code.google.com/p/skia/issues/detail?id=1189&q=texture&colspec=ID %20Type%20Status%20Priority%20Owner%20Summary | |
scherkus (not reviewing)
2013/04/09 18:31:26
nit: can you remove everything starting from "&q="
hkuang
2013/04/09 21:38:09
Done. Going to land this change.
| |
182 void paintOnAndroid(WebCore::GraphicsContext* context, WebCore::GraphicsCont ext3D* context3D, const WebCore::IntRect& rect, uint8_t alpha); | |
183 SkAutoTUnref<GrTexture> m_texture; | |
184 SkBitmap m_bitmap; | |
185 #endif | |
186 | |
174 WebCore::MediaPlayer* m_mediaPlayer; | 187 WebCore::MediaPlayer* m_mediaPlayer; |
175 OwnPtr<WebMediaPlayer> m_webMediaPlayer; | 188 OwnPtr<WebMediaPlayer> m_webMediaPlayer; |
176 WebCore::KURL m_url; | 189 WebCore::KURL m_url; |
177 bool m_delayingLoad; | 190 bool m_delayingLoad; |
178 WebCore::MediaPlayer::Preload m_preload; | 191 WebCore::MediaPlayer::Preload m_preload; |
179 RefPtr<WebHelperPluginImpl> m_helperPlugin; | 192 RefPtr<WebHelperPluginImpl> m_helperPlugin; |
180 WebLayer* m_videoLayer; | 193 WebLayer* m_videoLayer; |
181 bool m_opaque; | 194 bool m_opaque; |
182 bool m_needsWebLayerForVideo; | 195 bool m_needsWebLayerForVideo; |
183 static bool m_isEnabled; | 196 static bool m_isEnabled; |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
232 #if ENABLE(MEDIA_SOURCE) | 245 #if ENABLE(MEDIA_SOURCE) |
233 RefPtr<WebCore::MediaSource> m_mediaSource; | 246 RefPtr<WebCore::MediaSource> m_mediaSource; |
234 #endif | 247 #endif |
235 }; | 248 }; |
236 | 249 |
237 } // namespace WebKit | 250 } // namespace WebKit |
238 | 251 |
239 #endif | 252 #endif |
240 | 253 |
241 #endif | 254 #endif |
OLD | NEW |