diff -r 000000000000 -r 6474c204b198 xpcom/glue/nsCycleCollectionParticipant.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xpcom/glue/nsCycleCollectionParticipant.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,114 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsCycleCollectionParticipant.h"
+#include "nsCOMPtr.h"
+#include "jsapi.h"
+
+#ifdef MOZILLA_INTERNAL_API
+#include "nsString.h"
+#else
+#include "nsStringAPI.h"
+#endif
+
+void
+nsScriptObjectTracer::NoteJSChild(void *aScriptThing, const char *name,
+                                  void *aClosure)
+{
+  nsCycleCollectionTraversalCallback *cb =
+    static_cast<nsCycleCollectionTraversalCallback*>(aClosure);
+  NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(*cb, name);
+  cb->NoteJSChild(aScriptThing);
+}
+
+NS_IMETHODIMP_(void)
+nsXPCOMCycleCollectionParticipant::Root(void *p)
+{
+    nsISupports *s = static_cast<nsISupports*>(p);
+    NS_ADDREF(s);
+}
+
+NS_IMETHODIMP_(void)
+nsXPCOMCycleCollectionParticipant::Unroot(void *p)
+{
+    nsISupports *s = static_cast<nsISupports*>(p);
+    NS_RELEASE(s);
+}
+
+// We define a default trace function because some participants don't need
+// to trace anything, so it is okay for them not to define one.
+NS_IMETHODIMP_(void)
+nsXPCOMCycleCollectionParticipant::Trace(void *p, const TraceCallbacks &cb,
+                                         void *closure)
+{
+}
+
+bool
+nsXPCOMCycleCollectionParticipant::CheckForRightISupports(nsISupports *s)
+{
+    nsISupports* foo;
+    s->QueryInterface(NS_GET_IID(nsCycleCollectionISupports),
+                      reinterpret_cast<void**>(&foo));
+    return s == foo;
+}
+
+void
+CycleCollectionNoteEdgeNameImpl(nsCycleCollectionTraversalCallback& aCallback,
+                                const char* aName,
+                                uint32_t aFlags)
+{
+  nsAutoCString arrayEdgeName(aName);
+  if (aFlags & CycleCollectionEdgeNameArrayFlag) {
+    arrayEdgeName.AppendLiteral("[i]");
+  }
+  aCallback.NoteNextEdgeName(arrayEdgeName.get());
+}
+
+void
+TraceCallbackFunc::Trace(JS::Heap<JS::Value>* p, const char* name, void* closure) const
+{
+  if (p->isMarkable()) {
+    mCallback(p->toGCThing(), name, closure);
+  }
+}
+
+void
+TraceCallbackFunc::Trace(JS::Heap<jsid>* p, const char* name, void* closure) const
+{
+  void *thing = JSID_TO_GCTHING(*p);
+  if (thing) {
+    mCallback(thing, name, closure);
+  }
+}
+
+void
+TraceCallbackFunc::Trace(JS::Heap<JSObject*>* p, const char* name, void* closure) const
+{
+  mCallback(*p, name, closure);
+}
+
+void
+TraceCallbackFunc::Trace(JS::TenuredHeap<JSObject*>* p, const char* name, void* closure) const
+{
+  mCallback(*p, name, closure);
+}
+
+void
+TraceCallbackFunc::Trace(JS::Heap<JSFunction*>* p, const char* name, void* closure) const
+{
+  mCallback(*p, name, closure);
+}
+
+void
+TraceCallbackFunc::Trace(JS::Heap<JSString*>* p, const char* name, void* closure) const
+{
+  mCallback(*p, name, closure);
+}
+
+void
+TraceCallbackFunc::Trace(JS::Heap<JSScript*>* p, const char* name, void* closure) const
+{
+  mCallback(p->get(), name, closure);
+}