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

kbr at google.com kbr at google.com
Wed Dec 22 13:09:48 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit e8d17689ab144a4a39596de5c7d2831bba4e007e
Author: kbr at google.com <kbr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 7 23:56:28 2010 +0000

    2010-09-07  Kenneth Russell  <kbr at google.com>
    
            Reviewed by James Robinson.
    
            Fix OpenGL error reporting in WebGL layout test utilities
            https://bugs.webkit.org/show_bug.cgi?id=45336
    
            * fast/canvas/webgl/resources/webgl-test.js:
            (getGLErrorAsString):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66934 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b5dfa97..d79024f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-07  Kenneth Russell  <kbr at google.com>
+
+        Reviewed by James Robinson.
+
+        Fix OpenGL error reporting in WebGL layout test utilities
+        https://bugs.webkit.org/show_bug.cgi?id=45336
+
+        * fast/canvas/webgl/resources/webgl-test.js:
+        (getGLErrorAsString):
+
 2010-09-07  Tony Chang  <tony at chromium.org>
 
         Unreviewed, updating chromium linux test expectations.
diff --git a/LayoutTests/fast/canvas/webgl/resources/webgl-test.js b/LayoutTests/fast/canvas/webgl/resources/webgl-test.js
index 30fba41..dcabbdd 100644
--- a/LayoutTests/fast/canvas/webgl/resources/webgl-test.js
+++ b/LayoutTests/fast/canvas/webgl/resources/webgl-test.js
@@ -109,7 +109,7 @@ function getGLErrorAsString(ctx, err) {
       return name;
     }
   }
-  return err.toString();
+  return "0x" + err.toString(16);
 }
 
 function shouldGenerateGLError(ctx, glError, evalStr) {

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list