[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[zmo at google.com]

The following commit has been merged in the webkit-1.3 branch:
commit 4a8acbe1dec1c63dbffe19d4fdd827faefef2efc
Author: zmo at google.com <zmo at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 13 22:34:43 2011 +0000

    2011-01-13  Zhenyao Mo  <zmo at google.com>
    
            Reviewed by Kenneth Russell.
    
            Relax the ESSL valid charset a little bit to include " ' `
            https://bugs.webkit.org/show_bug.cgi?id=52396
    
            * html/canvas/WebGLRenderingContext.cpp:
    2011-01-13  Zhenyao Mo  <zmo at google.com>
    
            Reviewed by Kenneth Russell.
    
            Relax the ESSL valid charset a little bit to include " ' `
            https://bugs.webkit.org/show_bug.cgi?id=52396
    
            * fast/canvas/webgl/invalid-passed-params-expected.txt:
            * fast/canvas/webgl/invalid-passed-params.html:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75735 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 48a3e3d..35f8a65 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-13  Zhenyao Mo  <zmo at google.com>
+
+        Reviewed by Kenneth Russell.
+
+        Relax the ESSL valid charset a little bit to include " ' `
+        https://bugs.webkit.org/show_bug.cgi?id=52396
+
+        * fast/canvas/webgl/invalid-passed-params-expected.txt:
+        * fast/canvas/webgl/invalid-passed-params.html:
+
 2011-01-13  Matthew Delaney  <mdelaney at apple.com>
 
         Reviewed by nobody - reinstrumenting a test to save burning trees.
diff --git a/LayoutTests/fast/canvas/webgl/invalid-passed-params-expected.txt b/LayoutTests/fast/canvas/webgl/invalid-passed-params-expected.txt
index 793f499..31d01c0 100644
--- a/LayoutTests/fast/canvas/webgl/invalid-passed-params-expected.txt
+++ b/LayoutTests/fast/canvas/webgl/invalid-passed-params-expected.txt
@@ -66,33 +66,21 @@ Test shaderSource() with invalid characters
 PASS context.getError() is context.INVALID_VALUE
 PASS context.getError() is context.INVALID_VALUE
 PASS context.getError() is context.INVALID_VALUE
-PASS context.getError() is context.INVALID_VALUE
-PASS context.getError() is context.INVALID_VALUE
-PASS context.getError() is context.INVALID_VALUE
 
 Test bindAttribLocation() with invalid characters
 PASS context.getError() is context.INVALID_VALUE
 PASS context.getError() is context.INVALID_VALUE
 PASS context.getError() is context.INVALID_VALUE
-PASS context.getError() is context.INVALID_VALUE
-PASS context.getError() is context.INVALID_VALUE
-PASS context.getError() is context.INVALID_VALUE
 
 Test getAttribLocation() with invalid characters
 PASS context.getError() is context.INVALID_VALUE
 PASS context.getError() is context.INVALID_VALUE
 PASS context.getError() is context.INVALID_VALUE
-PASS context.getError() is context.INVALID_VALUE
-PASS context.getError() is context.INVALID_VALUE
-PASS context.getError() is context.INVALID_VALUE
 
 Test getUniformLocation() with invalid characters
 PASS context.getError() is context.INVALID_VALUE
 PASS context.getError() is context.INVALID_VALUE
 PASS context.getError() is context.INVALID_VALUE
-PASS context.getError() is context.INVALID_VALUE
-PASS context.getError() is context.INVALID_VALUE
-PASS context.getError() is context.INVALID_VALUE
 
 PASS successfullyParsed is true
 
diff --git a/LayoutTests/fast/canvas/webgl/invalid-passed-params.html b/LayoutTests/fast/canvas/webgl/invalid-passed-params.html
index 04c096e..59f6cd4 100644
--- a/LayoutTests/fast/canvas/webgl/invalid-passed-params.html
+++ b/LayoutTests/fast/canvas/webgl/invalid-passed-params.html
@@ -77,7 +77,7 @@ shouldGenerateGLError(context, context.NO_ERROR, "context.viewport(0, 0, 16, 16)
 
 debug("");
 debug("Set up a program to test invalid characters");
-var invalidSet = ['"', '$', '`', '@', '\\', "'"];
+var invalidSet = ['$', '@', '\\'];
 var validUniformName = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_1234567890";
 var validAttribName = "abcdefghijklmnopqrstuvwxyz_ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
 var validShaderSource = "uniform float " + validUniformName + ";\n"
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index d3c2d74..6ef43b6 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-13  Zhenyao Mo  <zmo at google.com>
+
+        Reviewed by Kenneth Russell.
+
+        Relax the ESSL valid charset a little bit to include " ' `
+        https://bugs.webkit.org/show_bug.cgi?id=52396
+
+        * html/canvas/WebGLRenderingContext.cpp:
+
 2011-01-13  Adrienne Walker  <enne at google.com>
 
         Reviewed by Kenneth Russell.
diff --git a/Source/WebCore/html/canvas/WebGLRenderingContext.cpp b/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
index 79a26ee..1c32233 100644
--- a/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
+++ b/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
@@ -101,11 +101,12 @@ namespace {
 
     // Return true if a character belongs to the ASCII subset as defined in
     // GLSL ES 1.0 spec section 3.1.
+    // We make exceptions for " ' `.
     bool validateCharacter(unsigned char c)
     {
         // Printing characters are valid except " $ ` @ \ ' DEL.
         if (c >= 32 && c <= 126
-            && c != '"' && c != '$' && c != '`' && c != '@' && c != '\\' && c != '\'')
+            && c != '$' && c != '@' && c != '\\')
             return true;
         // Horizontal tab, line feed, vertical tab, form feed, carriage return
         // are also valid.

-- 
WebKit Debian packaging