diff options
| author | Derek Sollenberger <djsollen@google.com> | 2011-02-16 12:48:46 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-16 12:48:46 -0800 |
| commit | 5ad675d34069bcdf6bcd983ae4941c0531216354 (patch) | |
| tree | f04ba87adf01e537b817dff8e177e62bad0e495b /WebCore/platform/graphics/android/BaseLayerAndroid.cpp | |
| parent | e9d5f570f22c46f9adaa4181c3fa1b715f15ccb3 (diff) | |
| parent | 87a12aa24a87540251e0d2d0a223e761ceb31da2 (diff) | |
| download | external_webkit-5ad675d34069bcdf6bcd983ae4941c0531216354.zip external_webkit-5ad675d34069bcdf6bcd983ae4941c0531216354.tar.gz external_webkit-5ad675d34069bcdf6bcd983ae4941c0531216354.tar.bz2 | |
Merge "Selectively enable and disable GL_BLEND for better performance."
Diffstat (limited to 'WebCore/platform/graphics/android/BaseLayerAndroid.cpp')
| -rw-r--r-- | WebCore/platform/graphics/android/BaseLayerAndroid.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp index 35c3b36..d2c41dc 100644 --- a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp +++ b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp @@ -267,8 +267,6 @@ bool BaseLayerAndroid::drawGL(IntRect& viewRect, SkRect& visibleRect, (float)m_color.green() / 255.0, (float)m_color.blue() / 255.0, 1); glClear(GL_COLOR_BUFFER_BIT); - glEnable(GL_BLEND); - glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); glViewport(left, top, width, height); ShaderProgram* shader = TilesManager::instance()->shader(); @@ -280,6 +278,7 @@ bool BaseLayerAndroid::drawGL(IntRect& viewRect, SkRect& visibleRect, glUniform1i(shader->textureSampler(), 0); shader->setViewRect(viewRect); shader->setViewport(visibleRect); + shader->resetBlending(); double currentTime = WTF::currentTime(); ret = drawBasePictureInGL(visibleRect, scale, currentTime); |