Rename nsIAtom as nsAtom.

Bug 1400459 devirtualized nsIAtom so that it is no longer a subclass of
nsISupports. This means that nsAtom is now a better name for it than
nsIAtom.

1 files changed, 5 insertions, 5 deletions

diff --git a/components/style/gecko/regen_atoms.py b/components/style/gecko/regen_atoms.py
index f47f036a592..7ee1ccab308 100755
--- a/components/style/gecko/regen_atoms.py
+++ b/components/style/gecko/regen_atoms.py
@@ -42,14 +42,14 @@ class GkAtomSource:
     PATTERN = re.compile('^(GK_ATOM)\((.+),\s*"(.*)"\)')
     FILE = "include/nsGkAtomList.h"
     CLASS = "nsGkAtoms"
-    TYPE = "nsIAtom"
+    TYPE = "nsAtom"
 
 
 class CSSPseudoElementsAtomSource:
     PATTERN = re.compile('^(CSS_PSEUDO_ELEMENT)\((.+),\s*"(.*)",')
     FILE = "include/nsCSSPseudoElementList.h"
     CLASS = "nsCSSPseudoElements"
-    # NB: nsICSSPseudoElement is effectively the same as a nsIAtom, but we need
+    # NB: nsICSSPseudoElement is effectively the same as a nsAtom, but we need
     # this for MSVC name mangling.
     TYPE = "nsICSSPseudoElement"
 
@@ -163,14 +163,14 @@ class FileAvoidWrite(BytesIO):
             self.close()
 
 
-IMPORTS = ("\nuse gecko_bindings::structs::nsIAtom;"
+IMPORTS = ("\nuse gecko_bindings::structs::nsAtom;"
            "\nuse string_cache::Atom;\n\n")
 
 ATOM_TEMPLATE = ("            #[link_name = \"{link_name}\"]\n"
                  "            pub static {name}: *mut {type};")
 
 UNSAFE_STATIC = ("#[inline(always)]\n"
-                 "pub unsafe fn atom_from_static(ptr: *mut nsIAtom) -> Atom {\n"
+                 "pub unsafe fn atom_from_static(ptr: *mut nsAtom) -> Atom {\n"
                  "    Atom::from_static(ptr)\n"
                  "}\n\n")
 
@@ -220,7 +220,7 @@ def write_atom_macro(atoms, file_name):
         f.write(IMPORTS)
 
         for source in SOURCES:
-            if source.TYPE != "nsIAtom":
+            if source.TYPE != "nsAtom":
                 f.write("pub enum {} {{}}\n\n".format(source.TYPE))
 
         f.write(UNSAFE_STATIC)