Chromium Code Reviews| Index: Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h |
| diff --git a/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h b/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h |
| index 32e3c4d650c61d14e723ce8f32525c19e2e26b92..6ebf76032efd0df9db0e8d83f8f7c4a15be31ea7 100644 |
| --- a/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h |
| +++ b/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h |
| @@ -35,6 +35,10 @@ |
| #include "AudioSourceProvider.h" |
| #include "MediaPlayerPrivate.h" |
| +#if defined(OS_ANDROID) |
| +#include "SkRefCnt.h" |
| +#include "SkBitmap.h" |
| +#endif |
| #include "WebAudioSourceProviderClient.h" |
| #include "WebMediaPlayerClient.h" |
| #include <wtf/OwnPtr.h> |
| @@ -171,6 +175,15 @@ private: |
| bool acceleratedRenderingInUse(); |
| #endif |
| +#if defined(OS_ANDROID) |
| + // FIXME: This path "only works" on Android. It is a workaround for the problem that Skia could not handle Android's GL_TEXTURE_EXTERNAL_OES |
| + // texture internally. It should be removed and replaced by the normal paint path. |
| + // 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.
|
| + void paintOnAndroid(WebCore::GraphicsContext* context, WebCore::GraphicsContext3D* context3D, const WebCore::IntRect& rect, uint8_t alpha); |
| + SkAutoTUnref<GrTexture> m_texture; |
| + SkBitmap m_bitmap; |
| +#endif |
| + |
| WebCore::MediaPlayer* m_mediaPlayer; |
| OwnPtr<WebMediaPlayer> m_webMediaPlayer; |
| WebCore::KURL m_url; |