diff options
| author | Derek Sollenberger <djsollen@google.com> | 2011-03-02 16:33:19 -0500 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2011-03-02 17:46:40 -0800 |
| commit | 1a87f05e2263f9e256d65d4a61f9cd7b5d53e72b (patch) | |
| tree | aa3645e007c1117ec236dae46ed87f7a5edc70fe /WebCore/platform | |
| parent | 9002de961a78d8c63b2399846d290bff2d79a3f4 (diff) | |
| download | external_webkit-1a87f05e2263f9e256d65d4a61f9cd7b5d53e72b.zip external_webkit-1a87f05e2263f9e256d65d4a61f9cd7b5d53e72b.tar.gz external_webkit-1a87f05e2263f9e256d65d4a61f9cd7b5d53e72b.tar.bz2 | |
Do not merge: Cherry-pick change I21555e92 from master
Bug: 3471680
Enable the plugin to specify the BGRA internal format for textures.
Change-Id: Ied336c0a2309d14033a065b74e675d6d4405551b
Diffstat (limited to 'WebCore/platform')
| -rw-r--r-- | WebCore/platform/graphics/android/MediaLayer.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/WebCore/platform/graphics/android/MediaLayer.cpp b/WebCore/platform/graphics/android/MediaLayer.cpp index 9bc2a3e..46f0dfc 100644 --- a/WebCore/platform/graphics/android/MediaLayer.cpp +++ b/WebCore/platform/graphics/android/MediaLayer.cpp @@ -98,6 +98,7 @@ bool MediaLayer::drawGL(SkMatrix& matrix) } bool forceBlending = textureInfo->m_internalFormat == GL_RGBA || + textureInfo->m_internalFormat == GL_BGRA_EXT || textureInfo->m_internalFormat == GL_ALPHA; TilesManager::instance()->shader()->drawLayerQuad(m, rect, textureInfo->m_textureId, |