[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[senorblanco at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 0740db70c0e910c9a8f9b7a38975846e5f63dbe7
Author: senorblanco at chromium.org <senorblanco at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 17 18:01:34 2010 +0000

    2010-09-17  Stephen White  <senorblanco at chromium.org>
    
            Reviewed by Kenneth Russell.
    
            [CHROMIUM] GPU-accelerated canvas should work in test_shell.
            https://bugs.webkit.org/show_bug.cgi?id=45968
    
            In order for the shaders in GPU-accelerated canvas to work in both the
            GraphicsContext3D / GLES2 path as well as chromium's test_shell (which
            passes them to the Mesa backend unmodified), the precision specifiers
            in the fragment shader have to be wrapped in #if GL_ES.
    
            Soon to be covered by many layout tests.
    
            * platform/graphics/gpu/SolidFillShader.cpp:
            (WebCore::SolidFillShader::create):
            * platform/graphics/gpu/TexShader.cpp:
            (WebCore::TexShader::create):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67727 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2cdb467..3940f37 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-09-17  Stephen White  <senorblanco at chromium.org>
+
+        Reviewed by Kenneth Russell.
+
+        [CHROMIUM] GPU-accelerated canvas should work in test_shell.
+        https://bugs.webkit.org/show_bug.cgi?id=45968
+
+        In order for the shaders in GPU-accelerated canvas to work in both the
+        GraphicsContext3D / GLES2 path as well as chromium's test_shell (which
+        passes them to the Mesa backend unmodified), the precision specifiers
+        in the fragment shader have to be wrapped in #if GL_ES.
+
+        Soon to be covered by many layout tests.
+
+        * platform/graphics/gpu/SolidFillShader.cpp:
+        (WebCore::SolidFillShader::create):
+        * platform/graphics/gpu/TexShader.cpp:
+        (WebCore::TexShader::create):
+
 2010-09-17  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Xan Lopez.
diff --git a/WebCore/platform/graphics/gpu/SolidFillShader.cpp b/WebCore/platform/graphics/gpu/SolidFillShader.cpp
index bbc4792..ff1b1fa 100644
--- a/WebCore/platform/graphics/gpu/SolidFillShader.cpp
+++ b/WebCore/platform/graphics/gpu/SolidFillShader.cpp
@@ -54,7 +54,9 @@ PassOwnPtr<SolidFillShader> SolidFillShader::create(GraphicsContext3D* context)
             "    gl_Position = vec4(matrix * position, 1.0);\n"
             "}\n";
     static const char* fragmentShaderSource =
+            "#ifdef GL_ES\n"
             "precision mediump float;\n"
+            "#endif\n"
             "uniform mat3 matrix;\n"
             "uniform vec4 color;\n"
             "void main() {\n"
diff --git a/WebCore/platform/graphics/gpu/TexShader.cpp b/WebCore/platform/graphics/gpu/TexShader.cpp
index ba3ecdd..01f4306 100644
--- a/WebCore/platform/graphics/gpu/TexShader.cpp
+++ b/WebCore/platform/graphics/gpu/TexShader.cpp
@@ -57,7 +57,9 @@ PassOwnPtr<TexShader> TexShader::create(GraphicsContext3D* context)
         "    gl_Position = vec4(matrix * position, 1.0);\n"
         "}\n";
     static const char* fragmentShaderSource =
+        "#ifdef GL_ES\n"
         "precision mediump float;\n"
+        "#endif\n"
         "uniform sampler2D sampler;\n"
         "uniform float alpha;\n"
         "varying vec3 texCoord;\n"

-- 
WebKit Debian packaging