diff -r 000000000000 -r 6474c204b198 xpcom/ds/nsStaticAtom.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xpcom/ds/nsStaticAtom.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,47 @@
+/* -*- Mode: C++; tab-width: 4; 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/. */
+
+#ifndef nsStaticAtom_h__
+#define nsStaticAtom_h__
+
+#include "nsIAtom.h"
+#include "nsStringBuffer.h"
+#include "prlog.h"
+
+typedef char16_t nsStaticAtomStringType;
+
+#define NS_STATIC_ATOM(buffer_name, atom_ptr)  { (nsStringBuffer*) &buffer_name, atom_ptr }
+#define NS_STATIC_ATOM_BUFFER(buffer_name, str_data) static nsFakeStringBuffer< sizeof(str_data) > buffer_name = { 1, sizeof(str_data) * sizeof(nsStaticAtomStringType), MOZ_UTF16(str_data) };
+
+/**
+ * Holds data used to initialize large number of atoms during startup. Use
+ * the above macros to initialize these structs. They should never be accessed
+ * directly other than from AtomTable.cpp
+ */
+struct nsStaticAtom {
+    nsStringBuffer* mStringBuffer;
+    nsIAtom ** mAtom;
+};
+
+/**
+ * This is a struct with the same binary layout as a nsStringBuffer.
+ */
+template <uint32_t size>
+struct nsFakeStringBuffer {
+    int32_t mRefCnt;
+    uint32_t mSize;
+    nsStaticAtomStringType mStringData[size];
+};
+
+// Register an array of static atoms with the atom table
+template<uint32_t N>
+nsresult
+NS_RegisterStaticAtoms(const nsStaticAtom (&atoms)[N])
+{
+    extern nsresult RegisterStaticAtoms(const nsStaticAtom*, uint32_t aAtomCount);
+    return RegisterStaticAtoms(atoms, N);
+}
+
+#endif