diff options
| author | Derek Sollenberger <djsollen@google.com> | 2011-03-02 18:26:16 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-02 18:26:16 -0800 |
| commit | 1a2d40c0fc6710c8ccefb3779b3f9c04c6e43ef5 (patch) | |
| tree | 04ff7bf42acf62fcad5f8e63aa55e27f15b76657 /WebCore/platform/graphics | |
| parent | 959e9dbc6321a6dafa3f419e67459e50ea29bc14 (diff) | |
| parent | b715a7c48aa637ebc2832775ea04567c915f6296 (diff) | |
| download | external_webkit-1a2d40c0fc6710c8ccefb3779b3f9c04c6e43ef5.zip external_webkit-1a2d40c0fc6710c8ccefb3779b3f9c04c6e43ef5.tar.gz external_webkit-1a2d40c0fc6710c8ccefb3779b3f9c04c6e43ef5.tar.bz2 | |
am b715a7c4: Do not merge: Cherry-pick change I21555e92 from master
* commit 'b715a7c48aa637ebc2832775ea04567c915f6296':
Do not merge: Cherry-pick change I21555e92 from master
Diffstat (limited to 'WebCore/platform/graphics')
| -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, |