summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
authorBart Sears <bsears@google.com>2011-03-02 15:35:34 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-02 15:35:34 -0800
commit4417a4174f6854268e88a67389d7780ae95f18e3 (patch)
tree25748d3c609b61e74899a228cf6355e9dd75d4bd /WebCore
parent77a54022da2cf1cc0daef87ce65f584248630079 (diff)
parenta579b9f5b57352b553ff8260356b2afb6aac2717 (diff)
downloadexternal_webkit-4417a4174f6854268e88a67389d7780ae95f18e3.zip
external_webkit-4417a4174f6854268e88a67389d7780ae95f18e3.tar.gz
external_webkit-4417a4174f6854268e88a67389d7780ae95f18e3.tar.bz2
Merge "Enable the plugin to specify the BGRA internal format for textures."
Diffstat (limited to 'WebCore')
-rw-r--r--WebCore/platform/graphics/android/MediaLayer.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/WebCore/platform/graphics/android/MediaLayer.cpp b/WebCore/platform/graphics/android/MediaLayer.cpp
index fbcd494..3d95211 100644
--- a/WebCore/platform/graphics/android/MediaLayer.cpp
+++ b/WebCore/platform/graphics/android/MediaLayer.cpp
@@ -106,6 +106,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,