From 45edccd252eda215d430cb818cb898f85a1c9f5d Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Tue, 13 Nov 2012 00:26:55 -0800
Subject: [PATCH] Bug 810618.  Make sure we don't allow layout statics to go
 away while we're still trying to use them.  r=khuey

---
 dom/bindings/CallbackFunction.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dom/bindings/CallbackFunction.h b/dom/bindings/CallbackFunction.h
index 3263b357489f..6bdedd840c12 100644
--- a/dom/bindings/CallbackFunction.h
+++ b/dom/bindings/CallbackFunction.h
@@ -27,6 +27,7 @@
 #include "nsWrapperCache.h"
 #include "nsJSEnvironment.h"
 #include "xpcpublic.h"
+#include "nsLayoutStatics.h"
 
 namespace mozilla {
 namespace dom {
@@ -63,6 +64,8 @@ public:
     // Set mCallable before we hold, on the off chance that a GC could somehow
     // happen in there... (which would be pretty odd, granted).
     mCallable = aCallable;
+    // Make sure we'll be able to drop as needed
+    nsLayoutStatics::AddRef();
     NS_HOLD_JS_OBJECTS(this, CallbackFunction);
     *aInited = true;
   }
@@ -90,6 +93,7 @@ protected:
     if (mCallable) {
       NS_DROP_JS_OBJECTS(this, CallbackFunction);
       mCallable = nullptr;
+      nsLayoutStatics::Release();
     }
   }