Merge "Shared surface texture"

diff --cc Source/WebCore/platform/graphics/android/ShaderProgram.cpp
index c4abeab,be979ab..c9d2d56
--- 1/Source/WebCore/platform/graphics/android/ShaderProgram.cpp
--- 2/Source/WebCore/platform/graphics/android/ShaderProgram.cpp
+++ b/Source/WebCore/platform/graphics/android/ShaderProgram.cpp
@@@ -342,11 -338,21 +342,22 @@@ void ShaderProgram::drawQuadInternal(Sk
                                       GLint texSampler,
                                       GLenum textureTarget,
                                       GLint position,
 -                                     GLint alpha)
 +                                     GLint alpha,
 +                                     GLint contrast)
  {
      glUseProgram(program);
-     setProjectionMatrix(geometry, projectionMatrixHandle);
+ 
+     if (!geometry.isEmpty())
+          setProjectionMatrix(geometry, projectionMatrixHandle);
+     else {
+         TransformationMatrix matrix;
+         // Map x,y from (0,1) to (-1, 1)
+         matrix.scale3d(2, 2, 1);
+         matrix.translate3d(-0.5, -0.5, 0);
+         GLfloat projectionMatrix[16];
+         GLUtils::toGLMatrix(projectionMatrix, matrix);
+         glUniformMatrix4fv(projectionMatrixHandle, 1, GL_FALSE, projectionMatrix);
+     }
  
      glActiveTexture(GL_TEXTURE0);
      glUniform1i(texSampler, 0);

diff --cc Source/WebCore/platform/graphics/android/TilesManager.h
index 25f6ba2,f5db599..e884fc0
--- 1/Source/WebCore/platform/graphics/android/TilesManager.h
--- 2/Source/WebCore/platform/graphics/android/TilesManager.h
+++ b/Source/WebCore/platform/graphics/android/TilesManager.h
@@@ -150,12 -152,7 +152,11 @@@ public
          m_invertedScreen = invert;
      }
  
 +    void setInvertedScreenContrast(float contrast) {
 +        m_shader.setContrast(contrast);
 +    }
 +
  private:
- 
      TilesManager();
  
      void waitForGenerator()