diff -r 000000000000 -r 6474c204b198 gfx/src/nsThebesGfxFactory.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gfx/src/nsThebesGfxFactory.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,63 @@
+/* -*- Mode: C++; tab-width: 20; 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 "gfxPlatform.h"                // for gfxPlatform
+#include "mozilla/Assertions.h"         // for MOZ_ASSERT_HELPER2
+#include "mozilla/Attributes.h"         // for MOZ_FINAL
+#include "mozilla/Module.h"             // for Module, Module::CIDEntry, etc
+#include "mozilla/ModuleUtils.h"
+#include "mozilla/mozalloc.h"           // for operator new
+#include "nsCOMPtr.h"                   // for nsCOMPtr
+#include "nsError.h"                    // for NS_ERROR_NO_AGGREGATION, etc
+#include "nsGfxCIID.h"                  // for NS_FONT_ENUMERATOR_CID, etc
+#include "nsID.h"                       // for NS_DEFINE_NAMED_CID, etc
+#include "nsIScriptableRegion.h"        // for nsIScriptableRegion
+#include "nsISupports.h"                // for NS_DECL_ISUPPORTS, etc
+#include "nsScriptableRegion.h"         // for nsScriptableRegion
+#include "nsThebesFontEnumerator.h"     // for nsThebesFontEnumerator
+
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsThebesFontEnumerator)
+
+static nsresult
+nsScriptableRegionConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult)
+{
+  if (!aResult) {
+    return NS_ERROR_NULL_POINTER;
+  }
+  *aResult = nullptr;
+  if (aOuter) {
+    return NS_ERROR_NO_AGGREGATION;
+  }
+
+  nsCOMPtr<nsIScriptableRegion> scriptableRgn = new nsScriptableRegion();
+  return scriptableRgn->QueryInterface(aIID, aResult);
+}
+
+NS_DEFINE_NAMED_CID(NS_FONT_ENUMERATOR_CID);
+NS_DEFINE_NAMED_CID(NS_SCRIPTABLE_REGION_CID);
+
+static const mozilla::Module::CIDEntry kThebesCIDs[] = {
+    { &kNS_FONT_ENUMERATOR_CID, false, nullptr, nsThebesFontEnumeratorConstructor },
+    { &kNS_SCRIPTABLE_REGION_CID, false, nullptr, nsScriptableRegionConstructor },
+    { nullptr }
+};
+
+static const mozilla::Module::ContractIDEntry kThebesContracts[] = {
+    { "@mozilla.org/gfx/fontenumerator;1", &kNS_FONT_ENUMERATOR_CID },
+    { "@mozilla.org/gfx/region;1", &kNS_SCRIPTABLE_REGION_CID },
+    { nullptr }
+};
+
+static const mozilla::Module kThebesModule = {
+    mozilla::Module::kVersion,
+    kThebesCIDs,
+    kThebesContracts,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr
+};
+
+NSMODULE_DEFN(nsGfxModule) = &kThebesModule;