Bug 662114 - Don't use DummyFrameGuard directly to avoid Windows DLL-linkage warnings. r=luke

--HG--
extra : rebase_source : 8ef14ff1cecaa7f426adc55b3a1ad205f00d0b8c

js/src/jswrapper.cpp

@@ -359,17 +359,22 @@ TransparentObjectWrapper(JSContext *cx, JSObject *obj, JSObject *wrappedProto, J
 
 ForceFrame::ForceFrame(JSContext *cx, JSObject *target)
     : context(cx),
-      target(target)
+      target(target),
+      frame(NULL)
 {
 }
 
 ForceFrame::~ForceFrame()
 {
+    context->delete_(frame);
 }
 
 bool
 ForceFrame::enter()
 {
+    frame = context->new_<DummyFrameGuard>();
+    if (!frame)
+       return false;
     LeaveTrace(context);
 
     JS_ASSERT(context->compartment == target->compartment());
@@ -377,7 +382,7 @@ ForceFrame::enter()
     JSObject *scopeChain = target->getGlobal();
     JS_ASSERT(scopeChain->isNative());
 
-    return context->stack.pushDummyFrame(context, *scopeChain, &frame);
+    return context->stack.pushDummyFrame(context, *scopeChain, frame);
 }
 
 AutoCompartment::AutoCompartment(JSContext *cx, JSObject *target)

js/src/jswrapper.h

@@ -164,7 +164,7 @@ class JS_FRIEND_API(ForceFrame)
     JSContext * const context;
     JSObject * const target;
   private:
-    DummyFrameGuard frame;
+    DummyFrameGuard *frame;
 
   public:
     ForceFrame(JSContext *cx, JSObject *target);