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

diff --cc WebCore/platform/graphics/android/BaseLayerAndroid.cpp
index 35c3b36,00eac74..d2c41dc
--- 1/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
--- 2/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));

diff --cc WebCore/platform/graphics/android/LayerAndroid.cpp
Simple merge