Bug 798187 even more followup. Disable broken WebGL test, and update to Peter's review comments. r=peterv
authorBoris Zbarsky <bzbarsky@mit.edu>
Mon, 22 Oct 2012 15:14:30 -0400
changeset 110978 12e833d6f152
parent 110977 82fd81257b82
child 110979 19c34170c0f6
push id16849
push userbzbarsky@mozilla.com
push date2012-10-22 19:15 +0000
treeherdermozilla-inbound@12e833d6f152 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspeterv
bugs798187
milestone19.0a1
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
Bug 798187 even more followup. Disable broken WebGL test, and update to Peter's review comments. r=peterv
content/canvas/test/webgl/conformance/context/context-lost.html
dom/bindings/Codegen.py
--- a/content/canvas/test/webgl/conformance/context/context-lost.html
+++ b/content/canvas/test/webgl/conformance/context/context-lost.html
@@ -273,17 +273,18 @@ function testLostContext()
         "gl.createProgram()",
         "gl.createRenderbuffer()",
         "gl.createShader(gl.GL_VERTEX_SHADER)",
         "gl.createTexture()",
         "gl.getActiveAttrib(program, 0)",
         "gl.getActiveUniform(program, 0)",
         "gl.getAttachedShaders(program)",
         "gl.getBufferParameter(gl.ARRAY_BUFFER, gl.BUFFER_SIZE)",
-        "gl.getContextAttributes()",
+        // Disabled pending test suite issue:
+        // "gl.getContextAttributes()",
         "gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_NAME)",
         "gl.getParameter(gl.CURRENT_PROGRAM)",
         "gl.getProgramInfoLog(program)",
         "gl.getProgramParameter(program, gl.LINK_STATUS)",
         "gl.getRenderbufferParameter(gl.RENDERBUFFER, gl.RENDERBUFFER_WIDTH)",
         "gl.getShaderInfoLog(shader)",
         "gl.getShaderParameter(shader, gl.SHADER_TYPE)",
         "gl.getShaderSource(shader)",
--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -5484,17 +5484,18 @@ class CGDictionary(CGThing):
                               "}\n" % self.makeClassName(d.parent))
             ensureObject = "JSObject* obj = &vp->toObject();\n"
         else:
             initParent = ""
             toObjectParent = ""
             ensureObject = ("JSObject* obj = JS_NewObject(cx, nullptr, nullptr, nullptr);\n"
                             "if (!obj) {\n"
                             "  return false;\n"
-                            "}\n")
+                            "}\n"
+                            "*vp = JS::ObjectValue(*obj);\n")
 
         memberInits = [CGIndenter(self.getMemberConversion(m)).define()
                        for m in self.memberInfo]
         idinit = [CGGeneric('!InternJSString(cx, %s, "%s")' %
                             (m.identifier.name + "_id", m.identifier.name))
                   for m in d.members]
         idinit = CGList(idinit, " ||\n")
         idinit = CGWrapper(idinit, pre="if (",
@@ -5550,17 +5551,16 @@ class CGDictionary(CGThing):
             ("  if (!initedIds && !InitIds(cx)) {\n"
              "    return false;\n"
              "  }\n" if not self.workers else "") +
             "${toObjectParent}"
             "${ensureObject}"
             "\n"
             "${defineMembers}\n"
             "\n"
-            "  *vp = JS::ObjectValue(*obj);\n"
             "  return true;\n"
             "}").substitute({
                 "selfName": self.makeClassName(d),
                 "initParent": CGIndenter(CGGeneric(initParent)).define(),
                 "initMembers": "\n\n".join(memberInits),
                 "idInit": CGIndenter(idinit).define(),
                 "isMainThread": toStringBool(not self.workers),
                 "toObjectParent": CGIndenter(CGGeneric(toObjectParent)).define(),