b=551771; glboolean args to WebGL calls broken on trace (qsgen octet args); r=jorendorff
authorVladimir Vukicevic <vladimir@pobox.com>
Fri, 28 May 2010 12:59:28 -0700
changeset 42908 c6009202e1e1f0eeaf9f91a82ed8331d8760d109
parent 42907 9fc485016d40233cf94f277d9ba8066938e2e862
child 42909 d011ef0c4bcd2d54b60c4fffd19cf711badb9d9b
push id13511
push uservladimir@mozilla.com
push dateFri, 28 May 2010 20:00:55 +0000
treeherdermozilla-central@c6009202e1e1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjorendorff
bugs551771
milestone1.9.3a5pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
b=551771; glboolean args to WebGL calls broken on trace (qsgen octet args); r=jorendorff
dom/interfaces/canvas/nsICanvasRenderingContextWebGL.idl
js/src/xpconnect/src/qsgen.py
--- a/dom/interfaces/canvas/nsICanvasRenderingContextWebGL.idl
+++ b/dom/interfaces/canvas/nsICanvasRenderingContextWebGL.idl
@@ -39,17 +39,17 @@
 #include "nsISupports.idl"
 
 interface nsIDOMElement;
 interface nsIDOMHTMLCanvasElement;
 
 // XXX should we comment out these typedefs in the C++ header?
 
 typedef unsigned long  GLenum;
-typedef octet  GLboolean;
+typedef boolean        GLboolean;
 typedef unsigned long  GLbitfield;
 typedef short          GLshort;
 typedef long           GLint;
 typedef long           GLsizei;
 typedef octet          GLubyte;
 typedef unsigned short GLushort;
 typedef unsigned long  GLuint;
 typedef float          GLfloat;
--- a/js/src/xpconnect/src/qsgen.py
+++ b/js/src/xpconnect/src/qsgen.py
@@ -998,16 +998,18 @@ traceReturnTypeMap = {
     'long':
         ["int32 ", "INT32", "0"],
     'unsigned long':
         ["uint32 ", "UINT32", "0"],
     'float':
         ["jsdouble ", "DOUBLE", "0"],
     'double':
         ["jsdouble ", "DOUBLE", "0"],
+    'octet':
+        ["uint32 ", "UINT32", "0"]
     }
 
 # This list extends the above list, but includes types that
 # are valid for arguments only, namely strings.  It also
 # includes the default jsval type.
 traceTypeMap = {
     '[astring]':
         ["JSString *", "STRING", "nsnull"],