From: Derek Sollenberger <djsollen@google.com>
Date: Wed, 16 Feb 2011 20:48:46 +0000 (-0800)
Subject: Merge "Selectively enable and disable GL_BLEND for better performance."
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5ad675d34069bcdf6bcd983ae4941c0531216354;p=android-x86%2Fexternal-webkit.git

Merge "Selectively enable and disable GL_BLEND for better performance."
---

5ad675d34069bcdf6bcd983ae4941c0531216354
diff --cc WebCore/platform/graphics/android/BaseLayerAndroid.cpp
index 35c3b3676,00eac744f..d2c41dc5e
--- a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
+++ b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
@@@ -280,9 -279,9 +278,10 @@@ bool BaseLayerAndroid::drawGL(IntRect& 
      glUniform1i(shader->textureSampler(), 0);
      shader->setViewRect(viewRect);
      shader->setViewport(visibleRect);
+     shader->resetBlending();
  
 -    ret = drawBasePictureInGL(visibleRect, scale);
 +    double currentTime = WTF::currentTime();
 +    ret = drawBasePictureInGL(visibleRect, scale, currentTime);
  
      if (countChildren() >= 1) {
          LayerAndroid* compositedRoot = static_cast<LayerAndroid*>(getChild(0));