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

[benjamin.poulain at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit f622884655e8b3ef1d80c00774f3f46269e3b59b
Author: benjamin.poulain at nokia.com <benjamin.poulain at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 25 16:04:32 2010 +0000

    2010-10-25  Benjamin Poulain  <benjamin.poulain at nokia.com>
    
            Reviewed by Antonio Gomes.
    
            Typo in the TextureMapperGL
            https://bugs.webkit.org/show_bug.cgi?id=48241
    
            Fix the typo.
    
            * platform/graphics/opengl/TextureMapperGL.cpp:
            (WebCore::TextureMapperGL::TextureMapperGL):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70455 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e09c09d..7a36ee3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-25  Benjamin Poulain  <benjamin.poulain at nokia.com>
+
+        Reviewed by Antonio Gomes.
+
+        Typo in the TextureMapperGL
+        https://bugs.webkit.org/show_bug.cgi?id=48241
+
+        Fix the typo.
+
+        * platform/graphics/opengl/TextureMapperGL.cpp:
+        (WebCore::TextureMapperGL::TextureMapperGL):
+
 2010-10-25  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebCore/platform/graphics/opengl/TextureMapperGL.cpp b/WebCore/platform/graphics/opengl/TextureMapperGL.cpp
index 35bfec8..5662f21 100644
--- a/WebCore/platform/graphics/opengl/TextureMapperGL.cpp
+++ b/WebCore/platform/graphics/opengl/TextureMapperGL.cpp
@@ -190,14 +190,14 @@ TextureMapperGL::TextureMapperGL(GraphicsContext* context)
         return;
     shadersCompiled = true;
 #ifndef TEXMAP_OPENGL_ES2
-#define OES2_PERCISION_DEFINITIONS \
+#define OES2_PRECISION_DEFINITIONS \
     "#define lowp\n#define highp\n"
 #else
-#define OES2_PERCISION_DEFINITIONS
+#define OES2_PRECISION_DEFINITIONS
 #endif
 
     const char* fragmentShaderSourceOpacityAndMask =
-            OES2_PERCISION_DEFINITIONS
+            OES2_PRECISION_DEFINITIONS
 "               uniform sampler2D SourceTexture, MaskTexture;                       \n"
 "               uniform lowp float Opacity;                                         \n"
 "               varying highp vec2 OutTexCoordSource, OutTexCoordMask;              \n"
@@ -210,7 +210,7 @@ TextureMapperGL::TextureMapperGL(GraphicsContext* context)
 "               }                                                                   \n";
 
     const char* vertexShaderSourceOpacityAndMask =
-            OES2_PERCISION_DEFINITIONS
+            OES2_PRECISION_DEFINITIONS
 "               uniform mat4 InMatrix, InSourceMatrix, InMaskMatrix;            \n"
 "               attribute vec4 InVertex;                                        \n"
 "               varying highp vec2 OutTexCoordSource, OutTexCoordMask;          \n"
@@ -222,7 +222,7 @@ TextureMapperGL::TextureMapperGL(GraphicsContext* context)
 "               }                                                               \n";
 
     const char* fragmentShaderSourceSimple =
-            OES2_PERCISION_DEFINITIONS
+            OES2_PRECISION_DEFINITIONS
 "               uniform sampler2D SourceTexture;                                    \n"
 "               uniform lowp float Opacity;                                         \n"
 "               varying highp vec2 OutTexCoordSource;                               \n"
@@ -233,7 +233,7 @@ TextureMapperGL::TextureMapperGL(GraphicsContext* context)
 "               }                                                                   \n";
 
     const char* vertexShaderSourceSimple =
-            OES2_PERCISION_DEFINITIONS
+            OES2_PRECISION_DEFINITIONS
 "               uniform mat4 InMatrix, InSourceMatrix;                      \n"
 "               attribute vec4 InVertex;                                    \n"
 "               varying highp vec2 OutTexCoordSource;                       \n"
@@ -244,7 +244,7 @@ TextureMapperGL::TextureMapperGL(GraphicsContext* context)
 "               }                                                           \n";
 
     const char* fragmentShaderSourceTarget =
-            OES2_PERCISION_DEFINITIONS
+            OES2_PRECISION_DEFINITIONS
 "               uniform sampler2D SourceTexture;                                            \n"
 "               uniform lowp float Opacity;                                                 \n"
 "               varying highp vec2 OutTexCoordSource;                                       \n"

-- 
WebKit Debian packaging