npotb: fix non-libxul/dynamic build, add in JS request begin/end to c3d

extensions/canvas3d/src/Makefile.in

@@ -99,7 +99,11 @@ CPPSRCS		= nsCanvas3DModule.cpp \
 
 DEFINES += -DXPCOM_GLUE -DXPCOM_GLUE_USE_NSPR -DGLEW_MX -DGLEW_STATIC
 
+ifdef MOZ_ENABLE_LIBXUL
 EXTRA_DSO_LIBS += js3250 xpcom xul
+else
+EXTRA_DSO_LIBS += js3250 xpcom thebes
+endif
 
 # Hack for getting an extension built against static vs. dynamic versions of firefox
 ##ifeq (,$(BUILD_STATIC_LIBS))

extensions/canvas3d/src/nsCanvasRenderingContextGL.h

@@ -281,10 +281,16 @@ public:
         if (NS_FAILED(error))
             return;
 
+        JS_BeginRequest(ctx);
+
         ncc->GetArgc(&argc);
         ncc->GetArgvPtr(&argv);
     }
 
+    ~NativeJSContext() {
+        JS_EndRequest(ctx);
+    }
+
     PRBool AddGCRoot (void *aPtr, const char *aName) {
         return JS_AddNamedRootRT(gScriptRuntime, aPtr, aName);
     }