Bug 323910: Merge atom lists in gklayout

r/sr=jst

content/base/src/Makefile.in

@@ -79,6 +79,8 @@ EXPORTS		= \
 		nsAtomListUtils.h \
 		nsAttrName.h \
 		nsContentList.h \
+		nsGkAtomList.h \
+		nsGkAtoms.h \
 		nsNodeInfoManager.h \
 		nsPropertyTable.h \
 		nsStubDocumentObserver.h \
@@ -112,6 +114,7 @@ CPPSRCS		= \
 		nsGenericDOMDataNode.cpp \
 		nsGenericDOMNodeList.cpp \
 		nsGenericElement.cpp \
+		nsGkAtoms.cpp \
 		nsHTMLContentSerializer.cpp \
 		nsImageLoadingContent.cpp \
 		nsMappedAttributes.cpp \

content/base/src/nsContentList.cpp

@@ -330,7 +330,7 @@ nsContentList::nsContentList(nsIDocument *aDocument,
     mFuncMayDependOnAttr(PR_FALSE)
 {
   NS_ASSERTION(mDeep || mRootContent, "Must have root content for non-deep list!");
-  if (nsLayoutAtoms::wildcard == mMatchAtom) {
+  if (nsLayoutAtoms::_asterix == mMatchAtom) {
     mMatchAll = PR_TRUE;
   }
   else {

content/base/src/nsContentUtils.cpp

@@ -1735,7 +1735,7 @@ nsContentUtils::LookupNamespaceURI(nsIContent* aNamespaceResolver,
     NS_ENSURE_TRUE(name, NS_ERROR_OUT_OF_MEMORY);
   }
   else {
-    name = nsLayoutAtoms::xmlnsNameSpace;
+    name = nsLayoutAtoms::xmlns;
   }
   // Trace up the content parent chain looking for the namespace
   // declaration that declares aNamespacePrefix.
@@ -1790,9 +1790,9 @@ nsContentUtils::GetNodeInfoFromQName(const nsAString& aNamespaceURI,
   // "http://www.w3.org/2000/xmlns/", or if the namespaceURI is
   // "http://www.w3.org/2000/xmlns/" and neither the qualifiedName nor its
   // prefix is "xmlns".
-  PRBool xmlPrefix = prefix == nsLayoutAtoms::xmlNameSpace;
+  PRBool xmlPrefix = prefix == nsLayoutAtoms::xml;
-  PRBool xmlns = (*aNodeInfo)->Equals(nsLayoutAtoms::xmlnsNameSpace, nil) ||
+  PRBool xmlns = (*aNodeInfo)->Equals(nsLayoutAtoms::xmlns, nil) ||
-                 prefix == nsLayoutAtoms::xmlnsNameSpace;
+                 prefix == nsLayoutAtoms::xmlns;
 
   return (prefix && DOMStringIsNull(aNamespaceURI)) ||
          (xmlPrefix && nsID != kNameSpaceID_XML) ||

content/base/src/nsGenericElement.cpp

@@ -478,7 +478,7 @@ nsNode3Tearoff::LookupPrefix(const nsAString& aNamespaceURI,
                                aNamespaceURI, eCaseMatters)) {
         // If the localName is "xmlns", the prefix we output should be
         // null.
-        if (name->LocalName() != nsLayoutAtoms::xmlnsNameSpace) {
+        if (name->LocalName() != nsLayoutAtoms::xmlns) {
           name->LocalName()->ToString(aPrefix);
         }
 
@@ -4131,7 +4131,7 @@ nsGenericElement::SetAttrAndNotify(PRInt32 aNamespaceID,
   }
   
   if (aNamespaceID == kNameSpaceID_XMLEvents && 
-      aName == nsHTMLAtoms::_event && mNodeInfo->GetDocument()) {
+      aName == nsHTMLAtoms::event && mNodeInfo->GetDocument()) {
     mNodeInfo->GetDocument()->AddXMLEventsContent(this);
   }
 

content/base/src/nsGkAtoms.cpp

@@ -15,8 +15,8 @@
  * The Original Code is mozilla.org code.
  *
  * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
+ * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 1998
+ * Portions created by the Initial Developer are Copyright (C) 2006
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
@@ -34,23 +34,22 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "nsHTMLAtoms.h"
+#include "nsGkAtoms.h"
 #include "nsStaticAtom.h"
-#include "nsMemory.h"
 
 // define storage for all atoms
-#define HTML_ATOM(_name, _value) nsIAtom* nsHTMLAtoms::_name;
+#define GK_ATOM(_name, _value) nsIAtom* nsGkAtoms::_name;
-#include "nsHTMLAtomList.h"
+#include "nsGkAtomList.h"
-#undef HTML_ATOM
+#undef GK_ATOM
 
-static const nsStaticAtom HTMLAtoms_info[] = {
+static const nsStaticAtom GkAtoms_info[] = {
-#define HTML_ATOM(name_, value_) { value_, &nsHTMLAtoms::name_ },
+#define GK_ATOM(name_, value_) { value_, &nsGkAtoms::name_ },
-#include "nsHTMLAtomList.h"
+#include "nsGkAtomList.h"
-#undef HTML_ATOM
+#undef GK_ATOM
 };
 
-void nsHTMLAtoms::AddRefAtoms()
+void nsGkAtoms::AddRefAtoms()
 {
-  NS_RegisterStaticAtoms(HTMLAtoms_info, NS_ARRAY_LENGTH(HTMLAtoms_info));
+  NS_RegisterStaticAtoms(GkAtoms_info, NS_ARRAY_LENGTH(GkAtoms_info));
 }
 

content/base/src/nsGkAtoms.h

@@ -15,12 +15,11 @@
  * The Original Code is mozilla.org code.
  *
  * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
+ * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 1998
+ * Portions created by the Initial Developer are Copyright (C) 2006
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *   Original Author: David W. Hyatt (hyatt@netscape.com)
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either of the GNU General Public License Version 2 or later (the "GPL"),
@@ -35,25 +34,32 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
+#ifndef nsGkAtoms_h___
+#define nsGkAtoms_h___
 
-#include "nsXBLAtoms.h"
+#include "nsIAtom.h"
-#include "nsStaticAtom.h"
-#include "nsMemory.h"
 
-// define storage for all atoms
+/**
-#define XBL_ATOM(_name, _value) nsIAtom* nsXBLAtoms::_name;
+ * This class wraps up the creation (and destruction) of the standard
-#include "nsXBLAtomList.h"
+ * set of atoms used by gklayout. This objects are created when gklayout
-#undef XBL_ATOM
+ * is loaded and they destroyed when gklayout is unloaded.
+ */
 
+class nsGkAtoms {
+public:
 
-static const nsStaticAtom XBLAtoms_info[] = {
+  static void AddRefAtoms();
-#define XBL_ATOM(name_, value_) { value_, &nsXBLAtoms::name_ },
+
-#include "nsXBLAtomList.h"
+  /* Declare all atoms
-#undef XBL_ATOM
+
+     The atom names and values are stored in nsGkAtomList.h and
+     are brought to you by the magic of C preprocessing
+
+     Add new atoms to nsGkAtomList and all support logic will be auto-generated
+   */
+#define GK_ATOM(_name, _value) static nsIAtom* _name;
+#include "nsGkAtomList.h"
+#undef GK_ATOM
 };
 
-void nsXBLAtoms::AddRefAtoms() {
+#endif /* nsGkAtoms_h___ */
-  NS_RegisterStaticAtoms(XBLAtoms_info,
-                         NS_ARRAY_LENGTH(XBLAtoms_info));
-}
-

content/base/src/nsPlainTextSerializer.cpp

@@ -1792,7 +1792,7 @@ PRBool
 nsPlainTextSerializer::IsCurrentNodeConverted(const nsIParserNode* aNode)
 {
   nsAutoString value;
-  nsresult rv = GetAttributeValue(aNode, nsHTMLAtoms::kClass, value);
+  nsresult rv = GetAttributeValue(aNode, nsHTMLAtoms::_class, value);
   return (NS_SUCCEEDED(rv) &&
           (value.EqualsIgnoreCase("moz-txt", 7) ||
            value.EqualsIgnoreCase("\"moz-txt", 8)));

content/base/src/nsScriptLoader.cpp

@@ -292,7 +292,7 @@ nsScriptLoader::IsScriptEventHandler(nsIScriptElement *aScriptElement)
 
   nsAutoString forAttr, eventAttr;
   if (!contElement->GetAttr(kNameSpaceID_None, nsHTMLAtoms::_for, forAttr) ||
-      !contElement->GetAttr(kNameSpaceID_None, nsHTMLAtoms::_event, eventAttr)) {
+      !contElement->GetAttr(kNameSpaceID_None, nsHTMLAtoms::event, eventAttr)) {
     return PR_FALSE;
   }
 

content/base/src/nsXMLContentSerializer.cpp

@@ -600,7 +600,7 @@ nsXMLContentSerializer::AppendElementStart(nsIDOMElement *aElement,
         // XXXbz what if we have both "xmlns" in the null namespace and "xmlns"
         // in the xmlns namespace?
         (namespaceID == kNameSpaceID_None &&
-         attrName == nsLayoutAtoms::xmlnsNameSpace)) {
+         attrName == nsLayoutAtoms::xmlns)) {
       content->GetAttr(namespaceID, attrName, uriStr);
 
       if (!name->GetPrefix()) {

content/base/src/nsXMLNameSpaceMap.cpp

@@ -58,9 +58,9 @@ nsXMLNameSpaceMap::Create()
   nsXMLNameSpaceMap *map = new nsXMLNameSpaceMap();
   NS_ENSURE_TRUE(map, nsnull);
 
-  nsresult rv = map->AddPrefix(nsLayoutAtoms::xmlnsNameSpace,
+  nsresult rv = map->AddPrefix(nsLayoutAtoms::xmlns,
                                kNameSpaceID_XMLNS);
-  rv |= map->AddPrefix(nsLayoutAtoms::xmlNameSpace, kNameSpaceID_XML);
+  rv |= map->AddPrefix(nsLayoutAtoms::xml, kNameSpaceID_XML);
 
   if (NS_FAILED(rv)) {
     delete map;

content/events/src/nsXMLEventsElement.cpp

@@ -74,7 +74,7 @@ nsXMLEventsElement::SetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, nsIAtom* aPref
 {
   if (mNodeInfo->Equals(nsHTMLAtoms::listener) && 
       mNodeInfo->GetDocument() && aNameSpaceID == kNameSpaceID_None && 
-      aName == nsHTMLAtoms::_event)
+      aName == nsHTMLAtoms::event)
     mNodeInfo->GetDocument()->AddXMLEventsContent(this);
   return nsXMLElement::SetAttr(aNameSpaceID, aName, aPrefix, aValue,
                                    aNotify);

content/events/src/nsXMLEventsManager.cpp

@@ -63,7 +63,7 @@ PRBool nsXMLEventsListener::InitXMLEventsListener(nsIDocument * aDocument,
   else
     nameSpaceID = kNameSpaceID_XMLEvents;
   nsAutoString eventType;
-  aContent->GetAttr(nameSpaceID, nsHTMLAtoms::_event, eventType);
+  aContent->GetAttr(nameSpaceID, nsHTMLAtoms::event, eventType);
   if (eventType.IsEmpty())
     return PR_FALSE;
   nsAutoString handlerURIStr;
@@ -361,7 +361,7 @@ nsXMLEventsManager::AttributeChanged(nsIDocument* aDocument,
                                      PRInt32 aModType)
 {
   if (aNameSpaceID == kNameSpaceID_XMLEvents &&
-      (aAttribute == nsHTMLAtoms::_event ||
+      (aAttribute == nsHTMLAtoms::event ||
        aAttribute == nsHTMLAtoms::handler ||
        aAttribute == nsHTMLAtoms::target ||
        aAttribute == nsHTMLAtoms::observer ||

content/html/content/src/Makefile.in

@@ -75,7 +75,6 @@ REQUIRES	= xpcom \
 		  $(NULL)
 
 EXPORTS		= \
-		nsHTMLAtomList.h \
 		nsHTMLAtoms.h \
 		nsImageMapUtils.h \
 		$(NULL)
@@ -84,7 +83,6 @@ CPPSRCS		= \
 		nsGenericHTMLElement.cpp \
 		nsGenericDOMHTMLCollection.cpp \
 		nsFormSubmission.cpp \
-		nsHTMLAtoms.cpp \
 		nsImageMapUtils.cpp \
 		nsHTMLAnchorElement.cpp \
 		nsHTMLAppletElement.cpp \

content/html/content/src/nsGenericHTMLElement.cpp

@@ -489,14 +489,14 @@ nsGenericHTMLElement::SetDir(const nsAString& aDir)
 nsresult
 nsGenericHTMLElement::GetClassName(nsAString& aClassName)
 {
-  GetAttr(kNameSpaceID_None, nsHTMLAtoms::kClass, aClassName);
+  GetAttr(kNameSpaceID_None, nsHTMLAtoms::_class, aClassName);
   return NS_OK;
 }
 
 nsresult
 nsGenericHTMLElement::SetClassName(const nsAString& aClassName)
 {
-  SetAttr(kNameSpaceID_None, nsHTMLAtoms::kClass, aClassName, PR_TRUE);
+  SetAttr(kNameSpaceID_None, nsHTMLAtoms::_class, aClassName, PR_TRUE);
   return NS_OK;
 }
 
@@ -1779,7 +1779,7 @@ nsGenericHTMLElement::UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aAttribute,
 const nsAttrValue*
 nsGenericHTMLElement::GetClasses() const
 {
-  return mAttrsAndChildren.GetAttr(nsHTMLAtoms::kClass);
+  return mAttrsAndChildren.GetAttr(nsHTMLAtoms::_class);
 }
 
 nsIAtom *
@@ -1791,7 +1791,7 @@ nsGenericHTMLElement::GetIDAttributeName() const
 nsIAtom *
 nsGenericHTMLElement::GetClassAttributeName() const
 {
-  return nsHTMLAtoms::kClass;
+  return nsHTMLAtoms::_class;
 }
 
 nsresult
@@ -2027,7 +2027,7 @@ nsGenericHTMLElement::ParseAttribute(PRInt32 aNamespaceID,
                           aValue, aResult);
       return PR_TRUE;
     }
-    if (aAttribute == nsHTMLAtoms::kClass) {
+    if (aAttribute == nsHTMLAtoms::_class) {
       aResult.ParseAtomArray(aValue);
 
       return PR_TRUE;

content/html/content/src/nsHTMLAtomList.h

@@ -1,312 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Brian Ryner <bryner@brianryner.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/******
-
-  This file contains the list of all HTML atoms 
-  See nsHTMLAtoms.h for access to the atoms
-
-  It is designed to be used as inline input to nsHTMLAtoms.cpp *only*
-  through the magic of C preprocessing.
-
-  All entires must be enclosed in the macro HTML_ATOM which will have cruel
-  and unusual things done to it
-
-  The first argument to HTML_ATOM is the C++ name of the atom
-  The second argument it HTML_ATOM is the string value of the atom
-
- ******/
-
-// OUTPUT_CLASS=nsHTMLAtoms
-// MACRO_NAME=HTML_ATOM
-#ifdef WINCE
-#undef small
-#endif 
-
-HTML_ATOM(_baseHref, NS_HTML_BASE_HREF)
-HTML_ATOM(_baseTarget, NS_HTML_BASE_TARGET)
-HTML_ATOM(a, "a")
-HTML_ATOM(abbr, "abbr")
-HTML_ATOM(above, "above")
-HTML_ATOM(accept, "accept")
-HTML_ATOM(acceptcharset, "accept-charset")
-HTML_ATOM(accesskey, "accesskey")
-HTML_ATOM(action, "action")
-HTML_ATOM(align, "align")
-HTML_ATOM(alink, "alink")
-HTML_ATOM(alt, "alt")
-HTML_ATOM(applet, "applet")
-HTML_ATOM(archive, "archive")
-HTML_ATOM(area, "area")
-HTML_ATOM(autocheck, "autocheck")
-HTML_ATOM(axis, "axis")
-HTML_ATOM(background, "background")
-HTML_ATOM(base, "base")
-HTML_ATOM(basefont, "basefont")
-HTML_ATOM(below, "below")
-HTML_ATOM(bdo, "bdo")
-HTML_ATOM(bgcolor, "bgcolor")
-HTML_ATOM(big, "big")
-HTML_ATOM(blockquote, "blockquote")
-HTML_ATOM(body, "body")
-HTML_ATOM(border, "border")
-HTML_ATOM(bordercolor, "bordercolor")
-HTML_ATOM(bottommargin, "bottommargin")
-HTML_ATOM(bottompadding, "bottompadding")
-HTML_ATOM(br, "br")
-HTML_ATOM(b, "b")
-HTML_ATOM(button, "button")
-HTML_ATOM(canvas, "canvas")
-HTML_ATOM(caption, "caption")
-HTML_ATOM(cellpadding, "cellpadding")
-HTML_ATOM(cellspacing, "cellspacing")
-HTML_ATOM(ch, "ch")
-HTML_ATOM(_char, "char")
-HTML_ATOM(charoff, "charoff")
-HTML_ATOM(charset, "charset")
-HTML_ATOM(checked, "checked")
-HTML_ATOM(cite, "cite")
-HTML_ATOM(kClass, "class")
-HTML_ATOM(classid, "classid")
-HTML_ATOM(clear, "clear")
-HTML_ATOM(clip, "clip")
-HTML_ATOM(code, "code")
-HTML_ATOM(codebase, "codebase")
-HTML_ATOM(codetype, "codetype")
-HTML_ATOM(color, "color")
-HTML_ATOM(col, "col")
-HTML_ATOM(colgroup, "colgroup")
-HTML_ATOM(cols, "cols")
-HTML_ATOM(colspan, "colspan")
-HTML_ATOM(combobox, "combobox")
-HTML_ATOM(compact, "compact")
-HTML_ATOM(content, "content")
-HTML_ATOM(contentLocation, "content-location")
-HTML_ATOM(coords, "coords")
-HTML_ATOM(dd, "dd")
-HTML_ATOM(defaultAction, "defaultAction") //XML Events
-HTML_ATOM(defaultchecked, "defaultchecked")
-HTML_ATOM(defaultselected, "defaultselected")
-HTML_ATOM(defaultvalue, "defaultvalue")
-HTML_ATOM(declare, "declare")
-HTML_ATOM(defer, "defer")
-HTML_ATOM(del, "del")
-HTML_ATOM(dir, "dir")
-HTML_ATOM(div, "div")
-HTML_ATOM(disabled, "disabled")
-HTML_ATOM(dl, "dl")
-HTML_ATOM(dt, "dt")
-HTML_ATOM(datetime, "datetime")
-HTML_ATOM(data, "data")
-HTML_ATOM(dfn, "dfn")
-HTML_ATOM(em, "em")
-HTML_ATOM(embed, "embed")
-HTML_ATOM(encoding, "encoding")
-HTML_ATOM(enctype, "enctype")
-HTML_ATOM(_event, "event")
-HTML_ATOM(face, "face")
-HTML_ATOM(fieldset, "fieldset")
-HTML_ATOM(font, "font")
-HTML_ATOM(fontWeight, "font-weight")
-HTML_ATOM(_for, "for")
-HTML_ATOM(form, "form")
-HTML_ATOM(frame, "frame")
-HTML_ATOM(frameborder, "frameborder")
-HTML_ATOM(frameset, "frameset")
-HTML_ATOM(gutter, "gutter")
-HTML_ATOM(h1, "h1")
-HTML_ATOM(h2, "h2")
-HTML_ATOM(h3, "h3")
-HTML_ATOM(h4, "h4")
-HTML_ATOM(h5, "h5")
-HTML_ATOM(h6, "h6")
-HTML_ATOM(handler, "handler") //XML Events
-HTML_ATOM(head, "head")
-HTML_ATOM(headerContentDisposition, "content-disposition")
-HTML_ATOM(headerContentLanguage, "content-language")
-HTML_ATOM(headerContentScriptType, "content-script-type")
-HTML_ATOM(headerContentStyleType, "content-style-type")
-HTML_ATOM(headerContentType, "content-type")
-HTML_ATOM(headerDefaultStyle, "default-style")
-HTML_ATOM(headerWindowTarget, "window-target")
-HTML_ATOM(headers, "headers")
-HTML_ATOM(height, "height")
-HTML_ATOM(hidden, "hidden")
-HTML_ATOM(hr, "hr")
-HTML_ATOM(href, "href")
-HTML_ATOM(hreflang, "hreflang")
-HTML_ATOM(hspace, "hspace")
-HTML_ATOM(html, "html")
-HTML_ATOM(httpEquiv, "http-equiv")
-HTML_ATOM(i, "i")
-HTML_ATOM(id, "id")
-HTML_ATOM(iframe, "iframe")
-HTML_ATOM(ilayer, "ilayer")
-HTML_ATOM(img, "img")
-HTML_ATOM(index, "index")
-HTML_ATOM(input, "input")
-HTML_ATOM(ins, "ins")
-HTML_ATOM(isindex, "isindex")
-HTML_ATOM(ismap, "ismap")
-HTML_ATOM(label, "label")
-HTML_ATOM(lang, "lang")
-HTML_ATOM(layer, "layer")
-HTML_ATOM(layout, "layout")
-HTML_ATOM(li, "li")
-HTML_ATOM(link, "link")
-HTML_ATOM(listener, "listener") //XML Events
-HTML_ATOM(left, "left")
-HTML_ATOM(leftmargin, "leftmargin")
-HTML_ATOM(leftpadding, "leftpadding")
-HTML_ATOM(legend, "legend")
-HTML_ATOM(length, "length")
-HTML_ATOM(longdesc, "longdesc")
-HTML_ATOM(lowsrc, "lowsrc")
-HTML_ATOM(map, "map")
-HTML_ATOM(marginheight, "marginheight")
-HTML_ATOM(marginwidth, "marginwidth")
-HTML_ATOM(marquee, "marquee")
-HTML_ATOM(maxlength, "maxlength")
-HTML_ATOM(mayscript, "mayscript")
-HTML_ATOM(media, "media")
-HTML_ATOM(menu, "menu")
-HTML_ATOM(meta, "meta")
-HTML_ATOM(method, "method")
-HTML_ATOM(msthemecompatible, "msthemecompatible")
-HTML_ATOM(multicol, "multicol")
-HTML_ATOM(multiple, "multiple")
-HTML_ATOM(name, "name")
-HTML_ATOM(noembed, "noembed")
-HTML_ATOM(noframes, "noframes")
-HTML_ATOM(nohref, "nohref")
-HTML_ATOM(noresize, "noresize")
-HTML_ATOM(noscript, "noscript")
-HTML_ATOM(noshade, "noshade")
-HTML_ATOM(nowrap, "nowrap")
-HTML_ATOM(object, "object")
-HTML_ATOM(observer, "observer") //XML Events
-HTML_ATOM(ol, "ol")
-HTML_ATOM(optgroup, "optgroup")
-HTML_ATOM(option, "option")
-HTML_ATOM(overflow, "overflow")
-HTML_ATOM(p, "p")
-HTML_ATOM(pagex, "pagex")
-HTML_ATOM(pagey, "pagey")
-HTML_ATOM(param, "param")
-HTML_ATOM(phase, "phase") //XML Events
-HTML_ATOM(plaintext, "plaintext")
-HTML_ATOM(pointSize, "point-size")
-HTML_ATOM(pre, "pre")
-HTML_ATOM(profile, "profile")
-HTML_ATOM(prompt, "prompt")
-HTML_ATOM(propagate, "propagate") //XML Events
-HTML_ATOM(q, "q")
-HTML_ATOM(readonly, "readonly")
-HTML_ATOM(refresh, "refresh")
-HTML_ATOM(rel, "rel")
-HTML_ATOM(repeat, "repeat")
-HTML_ATOM(rev, "rev")
-HTML_ATOM(rightmargin, "rightmargin")
-HTML_ATOM(rightpadding, "rightpadding")
-HTML_ATOM(rows, "rows")
-HTML_ATOM(rowspan, "rowspan")
-HTML_ATOM(rules, "rules")
-HTML_ATOM(s, "s")
-HTML_ATOM(scheme, "scheme")
-HTML_ATOM(scope, "scope")
-HTML_ATOM(script, "script")
-HTML_ATOM(scrolling, "scrolling")
-HTML_ATOM(select, "select")
-HTML_ATOM(selected, "selected")
-HTML_ATOM(selectedindex, "selectedindex")
-HTML_ATOM(setcookie, "set-cookie")
-HTML_ATOM(shape, "shape")
-HTML_ATOM(simple, "simple")
-HTML_ATOM(size, "size")
-HTML_ATOM(small, "small")
-HTML_ATOM(spacer, "spacer")
-HTML_ATOM(span, "span")
-HTML_ATOM(src, "src")
-HTML_ATOM(standby, "standby")
-HTML_ATOM(start, "start")
-HTML_ATOM(strike, "strike")
-HTML_ATOM(strong, "strong")
-HTML_ATOM(style, "style")
-HTML_ATOM(summary, "summary")
-HTML_ATOM(tabindex, "tabindex")
-HTML_ATOM(table, "table")
-HTML_ATOM(target, "target")
-HTML_ATOM(tbody, "tbody")
-HTML_ATOM(td, "td")
-HTML_ATOM(tfoot, "tfoot")
-HTML_ATOM(thead, "thead")
-HTML_ATOM(text, "text")
-HTML_ATOM(textarea, "textarea")
-HTML_ATOM(th, "th")
-HTML_ATOM(title, "title")
-HTML_ATOM(top, "top")
-HTML_ATOM(topmargin, "topmargin")
-HTML_ATOM(toppadding, "toppadding")
-HTML_ATOM(tr, "tr")
-HTML_ATOM(tt, "tt")
-HTML_ATOM(type, "type")
-HTML_ATOM(u, "u")
-HTML_ATOM(ul, "ul")
-HTML_ATOM(usemap, "usemap")
-HTML_ATOM(valign, "valign")
-HTML_ATOM(value, "value")
-HTML_ATOM(valuetype, "valuetype")
-HTML_ATOM(variable, "variable")
-HTML_ATOM(vcard_name, "vcard_name")
-HTML_ATOM(version, "version")
-HTML_ATOM(visibility, "visibility")
-HTML_ATOM(vlink, "vlink")
-HTML_ATOM(vspace, "vspace")
-HTML_ATOM(wbr, "wbr")
-HTML_ATOM(width, "width")
-HTML_ATOM(wrap, "wrap")
-HTML_ATOM(wrappedFramePseudo, ":-moz-wrapped-frame")
-HTML_ATOM(xmp, "xmp")
-HTML_ATOM(zindex, "zindex")
-HTML_ATOM(z_index, "z-index")
-
-#ifdef DEBUG
-HTML_ATOM(iform, "IForm")
-HTML_ATOM(form_control_list, "FormControlList")
-#endif
-

content/html/content/src/nsHTMLAtoms.h

@@ -37,32 +37,7 @@
 #ifndef nsHTMLAtoms_h___
 #define nsHTMLAtoms_h___
 
-#include "nsIAtom.h"
+#include "nsGkAtoms.h"
-
+typedef class nsGkAtoms nsHTMLAtoms;
-#define NS_HTML_BASE_HREF   "_base_href"
-#define NS_HTML_BASE_TARGET "_base_target"
-
-/**
- * This class wraps up the creation (and destruction) of the standard
- * set of html atoms used during normal html handling. This objects
- * are created when the first html content object is created and they
- * are destroyed when the last html content object is destroyed.
- */
-class nsHTMLAtoms {
-public:
-
-  static void AddRefAtoms();
-
-  /* Declare all atoms
-
-     The atom names and values are stored in nsHTMLAtomList.h and
-     are brought to you by the magic of C preprocessing
-
-     Add new atoms to nsHTMLAtomList and all support logic will be auto-generated
-   */
-#define HTML_ATOM(_name, _value) static nsIAtom* _name;
-#include "nsHTMLAtomList.h"
-#undef HTML_ATOM
-};
 
 #endif /* nsHTMLAtoms_h___ */

content/html/content/src/nsHTMLScriptElement.cpp

@@ -535,7 +535,7 @@ NS_IMPL_BOOL_ATTR(nsHTMLScriptElement, Defer, defer)
 NS_IMPL_URI_ATTR(nsHTMLScriptElement, Src, src)
 NS_IMPL_STRING_ATTR(nsHTMLScriptElement, Type, type)
 NS_IMPL_STRING_ATTR(nsHTMLScriptElement, HtmlFor, _for)
-NS_IMPL_STRING_ATTR(nsHTMLScriptElement, Event, _event)
+NS_IMPL_STRING_ATTR(nsHTMLScriptElement, Event, event)
 
 nsresult
 nsHTMLScriptElement::GetInnerHTML(nsAString& aInnerHTML)
@@ -707,7 +707,7 @@ nsHTMLScriptElement::MaybeProcessScript()
 
     if (mScriptEventHandler) {
       nsAutoString event_val;
-      GetAttr(kNameSpaceID_None, nsHTMLAtoms::_event, event_val);
+      GetAttr(kNameSpaceID_None, nsHTMLAtoms::event, event_val);
       mScriptEventHandler->ParseEventString(event_val);
     }
   }

content/svg/content/src/Makefile.in

@@ -80,7 +80,6 @@ CPPSRCS		= \
 		nsSVGAnimatedPreserveAspectRatio.cpp \
 		nsSVGAnimatedString.cpp \
 		nsSVGAnimatedTransformList.cpp \
-		nsSVGAtoms.cpp \
 		nsSVGCircleElement.cpp \
 		nsSVGClassValue.cpp \
 		nsSVGClipPathElement.cpp \
@@ -160,7 +159,6 @@ EXPORTS =  			\
 	nsSVGRect.h                \
 	nsSVGPoint.h               \
 	nsSVGMatrix.h              \
-	nsSVGAtomList.h            \
 	nsSVGAtoms.h               \
 	nsISVGPathFlatten.h        \
 	$(NULL)

content/svg/content/src/nsSVGAtomList.h

@@ -1,287 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/******
-
-  This file contains the list of all SVG nsIAtoms and their values
-  
-  It is designed to be used as inline input to nsSVGAtoms.cpp *only*
-  through the magic of C preprocessing.
-
-  All entires must be enclosed in the macro SVG_ATOM which will have cruel
-  and unusual things done to it
-
-  It is recommended (but not strictly necessary) to keep all entries
-  in alphabetical order
-
-  The first argument to SVG_ATOM is the C++ identifier of the atom
-  The second argument is the string value of the atom
-
- ******/
-
-// tags
-SVG_ATOM(circle, "circle")
-SVG_ATOM(clipPath, "clipPath")
-SVG_ATOM(defs, "defs")
-SVG_ATOM(desc, "desc")
-SVG_ATOM(ellipse, "ellipse")
-SVG_ATOM(feBlend, "feBlend")
-SVG_ATOM(feColorMatrix, "feColorMatrix")
-SVG_ATOM(feComponentTransfer, "feComponentTransfer")
-SVG_ATOM(feComposite, "feComposite")
-SVG_ATOM(feConvolveMatrix, "feConvolveMatrix")
-SVG_ATOM(feDiffuseLighting, "feDiffuseLighting")
-SVG_ATOM(feDisplacementMap, "feDisplacementMap")
-SVG_ATOM(feFlood, "feFlood")
-SVG_ATOM(feFuncR, "feFuncR")
-SVG_ATOM(feFuncG, "feFuncG")
-SVG_ATOM(feFuncB, "feFuncB")
-SVG_ATOM(feFuncA, "feFuncA")
-SVG_ATOM(feGaussianBlur, "feGaussianBlur")
-SVG_ATOM(feImage, "feImage")
-SVG_ATOM(feMerge, "feMerge")
-SVG_ATOM(feMergeNode, "feMergeNode")
-SVG_ATOM(feMorphology, "feMorphology")
-SVG_ATOM(feOffset, "feOffset")
-SVG_ATOM(feSpecularLighting, "feSpecularLighting")
-SVG_ATOM(feTile, "feTile")
-SVG_ATOM(feTurbulence, "feTurbulence")
-SVG_ATOM(filter, "filter")
-#ifdef MOZ_SVG_FOREIGNOBJECT
-SVG_ATOM(foreignObject, "foreignObject")
-#endif
-SVG_ATOM(g, "g")
-SVG_ATOM(generic, "generic")
-SVG_ATOM(image, "image")
-SVG_ATOM(line, "line")
-SVG_ATOM(linearGradient, "linearGradient")
-SVG_ATOM(marker, "marker")
-SVG_ATOM(metadata, "metadata")
-SVG_ATOM(path, "path")
-SVG_ATOM(pattern, "pattern")
-SVG_ATOM(polygon, "polygon")
-SVG_ATOM(polyline, "polyline")
-SVG_ATOM(radialGradient, "radialGradient")
-SVG_ATOM(rect, "rect")
-SVG_ATOM(script, "script")
-SVG_ATOM(stop, "stop")
-SVG_ATOM(svg, "svg")
-SVG_ATOM(svgSwitch, "switch") // switch is a C++ keyword, hence svgSwitch
-SVG_ATOM(symbol, "symbol")
-SVG_ATOM(text, "text")
-SVG_ATOM(textPath, "textPath")
-SVG_ATOM(title, "title")
-SVG_ATOM(tref, "tref")
-SVG_ATOM(tspan, "tspan")
-SVG_ATOM(use, "use")
-
-  
-// properties and attributes
-SVG_ATOM(alignment_baseline, "alignment-baseline")
-SVG_ATOM(align, "align")
-SVG_ATOM(amplitude, "amplitude")
-SVG_ATOM(_auto, "auto")
-SVG_ATOM(baseline_shift, "baseline-shift")
-SVG_ATOM(_class, "class")
-SVG_ATOM(clip, "clip")
-SVG_ATOM(clip_path, "clip-path")
-SVG_ATOM(clip_rule, "clip-rule")
-SVG_ATOM(clipPathUnits, "clipPathUnits")
-SVG_ATOM(color, "color")
-SVG_ATOM(cursor, "cursor")
-SVG_ATOM(cx, "cx")
-SVG_ATOM(cy, "cy")
-SVG_ATOM(d, "d")
-SVG_ATOM(direction, "direction")
-SVG_ATOM(discrete, "discrete")
-SVG_ATOM(display, "display")
-SVG_ATOM(dominant_baseline, "dominant-baseline")
-SVG_ATOM(dx, "dx")
-SVG_ATOM(dy, "dy")
-SVG_ATOM(exact, "exact")
-SVG_ATOM(exponent, "exponent")
-SVG_ATOM(fill, "fill")
-SVG_ATOM(fill_opacity, "fill-opacity")
-SVG_ATOM(fill_rule, "fill-rule")
-// defined above - SVG_ATOM(filter, "filter")
-SVG_ATOM(filterRes, "filterRes")
-SVG_ATOM(filterUnits, "filterUnits")
-SVG_ATOM(font_family, "font-family")
-SVG_ATOM(font_size, "font-size")
-SVG_ATOM(font_size_adjust, "font-size-adjust")
-SVG_ATOM(font_stretch, "font-stretch")
-SVG_ATOM(font_style, "font-style")
-SVG_ATOM(font_variant, "font-variant")
-SVG_ATOM(font_weight, "font-weight")
-SVG_ATOM(fx, "fx")
-SVG_ATOM(fy, "fy")
-SVG_ATOM(gamma, "gamma")
-SVG_ATOM(glyph_orientation_horizontal, "glyph-orientation-horizontal")
-SVG_ATOM(glyph_orientation_vertical, "glyph-orientation-vertical")
-SVG_ATOM(gradientUnits, "gradientUnits")
-SVG_ATOM(gradientTransform, "gradientTransform")
-SVG_ATOM(height, "height")
-SVG_ATOM(href, "href")
-SVG_ATOM(id, "id")
-SVG_ATOM(identity, "identity")
-SVG_ATOM(image_rendering, "image-rendering")
-SVG_ATOM(intercept, "intercept")
-SVG_ATOM(kerning, "kerning")
-SVG_ATOM(letter_spacing, "letter-spacing")
-SVG_ATOM(linear, "linear")
-// defined above - SVG_ATOM(marker, "marker")
-SVG_ATOM(marker_end, "marker-end")
-SVG_ATOM(marker_mid, "marker-mid")
-SVG_ATOM(marker_start, "marker-start")
-SVG_ATOM(markerHeight, "markerHeight")
-SVG_ATOM(markerUnits, "markerUnits")
-SVG_ATOM(markerWidth, "markerWidth")
-SVG_ATOM(mask, "mask")
-SVG_ATOM(media, "media")
-SVG_ATOM(method, "method")
-SVG_ATOM(offset, "offset")
-SVG_ATOM(onabort, "onabort")
-SVG_ATOM(onclick, "onclick")
-SVG_ATOM(onerror, "onerror")
-SVG_ATOM(onload, "onload")
-SVG_ATOM(onmousedown, "onmousedown")
-SVG_ATOM(onmouseup, "onmouseup")
-SVG_ATOM(onmouseover, "onmouseover")
-SVG_ATOM(onmousemove, "onmousemove")
-SVG_ATOM(onmouseout, "onmouseout")
-SVG_ATOM(onresize, "onresize")
-SVG_ATOM(onscroll, "onscroll")
-SVG_ATOM(onunload, "onunload")
-SVG_ATOM(onzoom, "onzoom")
-SVG_ATOM(opacity, "opacity")
-SVG_ATOM(orient, "orient")
-SVG_ATOM(overflow, "overflow")
-SVG_ATOM(pathLength, "pathLength")
-SVG_ATOM(patternContentUnits, "patternContentUnits")
-SVG_ATOM(patternTransform, "patternTransform")
-SVG_ATOM(patternUnits, "patternUnits")
-SVG_ATOM(pointer_events, "pointer-events")
-SVG_ATOM(points, "points")
-SVG_ATOM(preserveAspectRatio, "preserveAspectRatio")
-SVG_ATOM(primitiveUnits, "primitiveUnits")
-SVG_ATOM(r, "r")
-SVG_ATOM(refX, "refX")
-SVG_ATOM(refY, "refY")
-SVG_ATOM(requiredExtensions, "requiredExtensions")
-SVG_ATOM(requiredFeatures, "requiredFeatures")
-SVG_ATOM(result, "result")
-SVG_ATOM(rx, "rx")
-SVG_ATOM(ry, "ry")
-SVG_ATOM(shape_rendering, "shape-rendering")
-SVG_ATOM(slope, "slope")
-SVG_ATOM(space, "space")
-SVG_ATOM(spacing, "spacing")
-SVG_ATOM(spreadMethod, "spreadMethod")
-SVG_ATOM(stdDeviation, "stdDeviation")
-SVG_ATOM(startOffset, "startOffset")
-SVG_ATOM(stop_color, "stop-color")
-SVG_ATOM(stop_opacity, "stop-opacity")
-SVG_ATOM(stretch, "stretch")
-SVG_ATOM(stroke, "stroke")
-SVG_ATOM(stroke_dasharray, "stroke-dasharray")
-SVG_ATOM(stroke_dashoffset, "stroke-dashoffset")
-SVG_ATOM(stroke_linecap, "stroke-linecap")
-SVG_ATOM(stroke_linejoin, "stroke-linejoin")
-SVG_ATOM(stroke_miterlimit, "stroke-miterlimit")
-SVG_ATOM(stroke_opacity, "stroke-opacity")
-SVG_ATOM(stroke_width, "stroke-width")
-SVG_ATOM(strokeWidth, "strokeWidth")
-SVG_ATOM(style, "style")
-SVG_ATOM(systemLanguage, "systemLanguage")
-SVG_ATOM(table, "table")
-SVG_ATOM(tableValues, "tableValues")
-SVG_ATOM(text_anchor, "text-anchor")
-SVG_ATOM(text_decoration, "text-decoration")
-SVG_ATOM(text_rendering, "text-rendering")
-// SVG_ATOM(title, "title") <-- already exists for the 'title' element
-SVG_ATOM(transform, "transform")
-SVG_ATOM(type, "type")
-SVG_ATOM(unicode_bidi, "unicode-bidi")
-SVG_ATOM(viewBox, "viewBox")
-SVG_ATOM(visibility, "visibility")
-SVG_ATOM(width, "width")
-SVG_ATOM(word_spacing, "word-spacing")
-SVG_ATOM(x, "x")
-SVG_ATOM(x1, "x1")
-SVG_ATOM(x2, "x2")
-SVG_ATOM(y, "y")
-SVG_ATOM(y1, "y1")
-SVG_ATOM(y2, "y2")
-SVG_ATOM(zoomAndPan, "zoomAndPan")
-  
-// transformation keywords
-SVG_ATOM(matrix, "matrix")
-SVG_ATOM(rotate, "rotate")
-SVG_ATOM(scale, "scale")
-SVG_ATOM(skewX, "skewX")
-SVG_ATOM(skewY, "skewY")
-SVG_ATOM(translate, "translate")
-
-// length units
-SVG_ATOM(cm, "cm")
-SVG_ATOM(ems, "em")
-SVG_ATOM(exs, "ex")
-SVG_ATOM(in, "in")
-SVG_ATOM(mm, "mm")
-SVG_ATOM(pc, "pc")
-SVG_ATOM(percentage, "%")
-SVG_ATOM(pt, "pt")
-SVG_ATOM(px, "px")
-
-// Spread Methods
-SVG_ATOM(pad, "pad")
-SVG_ATOM(reflect, "reflect")
-SVG_ATOM(repeat, "repeat")
-
-// Gradient/Marker/ClipPath/Pattern Units
-SVG_ATOM(userSpaceOnUse, "userSpaceOnUse")
-SVG_ATOM(objectBoundingBox, "objectBoundingBox")
-
-// Zoom and Pan options
-SVG_ATOM(disable, "disable")
-SVG_ATOM(magnify, "magnify")
-
-// angle units
-SVG_ATOM(deg, "deg")
-SVG_ATOM(grad, "grad")
-SVG_ATOM(rad, "rad")

content/svg/content/src/nsSVGAtoms.cpp

@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsSVGAtoms.h"
-#include "nsStaticAtom.h"
-#include "nsMemory.h"
-
-// define storage for all atoms
-#define SVG_ATOM(_name, _value) nsIAtom* nsSVGAtoms::_name;
-#include "nsSVGAtomList.h"
-#undef SVG_ATOM
-
-static const nsStaticAtom SVGAtoms_info[] = {
-#define SVG_ATOM(name_, value_) { value_, &nsSVGAtoms::name_ },
-#include "nsSVGAtomList.h"
-#undef SVG_ATOM
-};
-
-void nsSVGAtoms::AddRefAtoms() {
-
-  NS_RegisterStaticAtoms(SVGAtoms_info, NS_ARRAY_LENGTH(SVGAtoms_info));
-}
-

content/svg/content/src/nsSVGAtoms.h

@@ -38,32 +38,8 @@
 #ifndef nsSVGAtoms_h___
 #define nsSVGAtoms_h___
 
-#include "prtypes.h"
+#include "nsGkAtoms.h"
-#include "nsIAtom.h"
+typedef class nsGkAtoms nsSVGAtoms;
-
-/**
- * This class wraps up the creation and destruction of the standard
- * set of SVG atoms used during normal SVG handling. This object
- * is created when the first SVG content object is created, and
- * destroyed when the last such content object is destroyed.
- */
-class nsSVGAtoms {
-public:
-
-  static void AddRefAtoms();
-
-  /* Declare all atoms
-
-     The atom names and values are stored in nsCSSAtomList.h and
-     are brought to you by the magic of C preprocessing
-
-     Add new atoms to nsCSSAtomList and all support logic will be auto-generated
-   */
-#define SVG_ATOM(_name, _value) static nsIAtom* _name;
-#include "nsSVGAtomList.h"
-#undef SVG_ATOM
-
-};
 
 #endif /* nsSVGAtoms_h___ */
 

content/svg/content/src/nsSVGElement.cpp

@@ -363,7 +363,7 @@ nsSVGElement::sFontSpecificationMap[] = {
   { &nsSVGAtoms::font_stretch },
   { &nsSVGAtoms::font_style },
   { &nsSVGAtoms::font_variant },
-  { &nsSVGAtoms::font_weight },  
+  { &nsSVGAtoms::fontWeight },  
   { nsnull }
 };
 

content/svg/content/src/nsSVGLength.cpp

@@ -356,10 +356,10 @@ nsSVGLength::GetValueAsString(nsAString & aValueAsString)
       UnitAtom = nsSVGAtoms::pc;
       break;
     case SVG_LENGTHTYPE_EMS:
-      UnitAtom = nsSVGAtoms::ems;
+      UnitAtom = nsSVGAtoms::em;
       break;
     case SVG_LENGTHTYPE_EXS:
-      UnitAtom = nsSVGAtoms::exs;
+      UnitAtom = nsSVGAtoms::ex;
       break;
     case SVG_LENGTHTYPE_PERCENTAGE:
       UnitAtom = nsSVGAtoms::percentage;
@@ -410,9 +410,9 @@ nsSVGLength::SetValueAsString(const nsAString & aValueAsString)
           unitType = SVG_LENGTHTYPE_PT;
         else if (unitAtom == nsSVGAtoms::pc)
           unitType = SVG_LENGTHTYPE_PC;
-        else if (unitAtom == nsSVGAtoms::ems)
+        else if (unitAtom == nsSVGAtoms::em)
           unitType = SVG_LENGTHTYPE_EMS;
-        else if (unitAtom == nsSVGAtoms::exs)
+        else if (unitAtom == nsSVGAtoms::ex)
           unitType = SVG_LENGTHTYPE_EXS;
         else if (unitAtom == nsSVGAtoms::percentage)
           unitType = SVG_LENGTHTYPE_PERCENTAGE;

content/xbl/src/Makefile.in

@@ -70,12 +70,10 @@ REQUIRES	= xpcom \
 		  $(NULL)
 
 EXPORTS		= \
-		nsXBLAtomList.h \
 		nsXBLAtoms.h \
 		$(NULL)
 
 CPPSRCS		= \
-    nsXBLAtoms.cpp \
     nsXBLBinding.cpp \
     nsXBLPrototypeBinding.cpp \
     nsXBLPrototypeResources.cpp \

content/xbl/src/nsXBLAtomList.h

@@ -1,147 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Original Author: David W. Hyatt (hyatt@netscape.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/******
-
-  This file contains the list of all XBL nsIAtoms and their values
-  
-  It is designed to be used as inline input to nsXBLAtoms.cpp *only*
-  through the magic of C preprocessing.
-
-  All entires must be enclosed in the macro XBL_ATOM which will have cruel
-  and unusual things done to it
-
-  It is recommended (but not strictly necessary) to keep all entries
-  in alphabetical order
-
-  The first argument to XBL_ATOM is the C++ identifier of the atom
-  The second argument is the string value of the atom
-
- ******/
-
-// OUTPUT_CLASS=nsXBLAtoms
-// MACRO_NAME=XBL_ATOM
-
-XBL_ATOM(binding, "binding")
-XBL_ATOM(bindings, "bindings")
-XBL_ATOM(handlers, "handlers")
-XBL_ATOM(handler, "handler")
-XBL_ATOM(resources, "resources")
-XBL_ATOM(image, "image")
-XBL_ATOM(stylesheet, "stylesheet")
-XBL_ATOM(implementation, "implementation")
-XBL_ATOM(implements, "implements")
-XBL_ATOM(method, "method")
-XBL_ATOM(property, "property")
-XBL_ATOM(field, "field")
-XBL_ATOM(event, "event")
-XBL_ATOM(phase, "phase")
-XBL_ATOM(action, "action")
-XBL_ATOM(command, "command")
-XBL_ATOM(modifiers, "modifiers")
-XBL_ATOM(clickcount, "clickcount")
-XBL_ATOM(charcode, "charcode")
-XBL_ATOM(keycode, "keycode")
-XBL_ATOM(key, "key")
-XBL_ATOM(onget, "onget")
-XBL_ATOM(onset, "onset")
-XBL_ATOM(name, "name")
-XBL_ATOM(getter, "getter")
-XBL_ATOM(setter, "setter")
-XBL_ATOM(body, "body")
-XBL_ATOM(readonly, "readonly")
-XBL_ATOM(parameter, "parameter")
-XBL_ATOM(children, "children")
-XBL_ATOM(extends, "extends")
-XBL_ATOM(display, "display")
-XBL_ATOM(inherits, "inherits")
-XBL_ATOM(includes, "includes")
-XBL_ATOM(excludes, "excludes")
-XBL_ATOM(content, "content")
-XBL_ATOM(constructor, "constructor")
-XBL_ATOM(destructor, "destructor")
-XBL_ATOM(inheritstyle, "inheritstyle")
-XBL_ATOM(button, "button")
-XBL_ATOM(group, "group")
-XBL_ATOM(preventdefault, "preventdefault")
-XBL_ATOM(contextmenu, "contextmenu")
-XBL_ATOM(dragenter, "dragenter")
-XBL_ATOM(dragover, "dragover")
-XBL_ATOM(dragexit, "dragexit")
-XBL_ATOM(dragdrop, "dragdrop")
-XBL_ATOM(dragevent, "dragevent")
-XBL_ATOM(draggesture, "draggesture")
-XBL_ATOM(focus, "focus")
-XBL_ATOM(blur, "blur")
-XBL_ATOM(input, "input")
-XBL_ATOM(select, "select")
-XBL_ATOM(change, "change")
-XBL_ATOM(submit, "submit")
-XBL_ATOM(reset, "reset")
-XBL_ATOM(keyup, "keyup")
-XBL_ATOM(keydown, "keydown")
-XBL_ATOM(keypress, "keypress")
-XBL_ATOM(abort, "abort")
-XBL_ATOM(error, "error")
-XBL_ATOM(load, "load")
-XBL_ATOM(unload, "unload")
-XBL_ATOM(mousedown, "mousedown")
-XBL_ATOM(mouseup, "mouseup")
-XBL_ATOM(click, "click")
-XBL_ATOM(dblclick, "dblclick")
-XBL_ATOM(mouseover, "mouseover")
-XBL_ATOM(mouseout, "mouseout")
-XBL_ATOM(mousemove, "mousemove")
-XBL_ATOM(DOMNodeRemoved, "DOMNodeRemoved")
-XBL_ATOM(DOMNodeInserted, "DOMNodeInserted")
-XBL_ATOM(DOMNodeRemovedFromDocument, "DOMNodeRemovedFromDocument")
-XBL_ATOM(DOMNodeInsertedIntoDocument, "DOMNodeInsertedInfoDocument")
-XBL_ATOM(DOMSubtreeModified, "DOMSubtreeModified")
-XBL_ATOM(DOMAttrModified, "DOMAttrModified")
-XBL_ATOM(DOMCharacterDataModified, "DOMCharacterDataModified")
-XBL_ATOM(overflow, "overflow")
-XBL_ATOM(underflow, "underflow")
-XBL_ATOM(overflowchanged, "overflowchanged")
-XBL_ATOM(popupshown, "popupshown")
-XBL_ATOM(popupshowing, "popupshowing")
-XBL_ATOM(popuphidden, "popuphidden")
-XBL_ATOM(popuphiding, "popuphiding")
-XBL_ATOM(close, "close")
-XBL_ATOM(commandupdate, "commandupdate")
-XBL_ATOM(broadcast, "broadcast")
-XBL_ATOM(allowuntrusted, "allowuntrusted")

content/xbl/src/nsXBLAtoms.h

@@ -38,30 +38,7 @@
 #ifndef nsXBLAtoms_h___
 #define nsXBLAtoms_h___
 
-#include "nsIAtom.h"
+#include "nsGkAtoms.h"
-
+typedef class nsGkAtoms nsXBLAtoms;
-/**
- * This class wraps up the creation and destruction of the standard
- * set of XBL atoms used during normal XBL handling. This object
- * is created when the first XBL content object is created, and
- * destroyed when the last such content object is destroyed.
- */
-class nsXBLAtoms {
-public:
-
-  static void AddRefAtoms();
-
-  /* Declare all atoms
-
-     The atom names and values are stored in nsCSSAtomList.h and
-     are brought to you by the magic of C preprocessing
-
-     Add new atoms to nsCSSAtomList and all support logic will be auto-generated
-   */
-#define XBL_ATOM(_name, _value) static nsIAtom* _name;
-#include "nsXBLAtomList.h"
-#undef XBL_ATOM
-
-};
 
 #endif /* nsXBLAtoms_h___ */

content/xbl/src/nsXBLBinding.cpp

@@ -497,7 +497,7 @@ nsXBLBinding::GenerateAnonymousContent()
         nsIAtom *localName = ni->NameAtom();
         if (ni->NamespaceID() != kNameSpaceID_XUL ||
             (localName != nsXULAtoms::observes &&
-             localName != nsXULAtoms::templateAtom)) {
+             localName != nsXULAtoms::_template)) {
           hasContent = PR_FALSE;
           break;
         }
@@ -573,7 +573,7 @@ nsXBLBinding::GenerateAnonymousContent()
                 nsIAtom *localName = ni->NameAtom();
                 if (ni->NamespaceID() != kNameSpaceID_XUL ||
                     (localName != nsXULAtoms::observes &&
-                     localName != nsXULAtoms::templateAtom)) {
+                     localName != nsXULAtoms::_template)) {
                   // Kill all anonymous content.
                   mContent = nsnull;
                   bindingManager->SetContentListFor(mBoundElement, nsnull);

content/xslt/src/base/Makefile.in

@@ -67,14 +67,14 @@ endif
 
 CPPSRCS	= txDouble.cpp \
 	txList.cpp \
-	txAtoms.cpp \
 	txExpandedNameMap.cpp \
 	txNamespaceMap.cpp \
 	txURIUtils.cpp
 
 ifdef MOZ_XSLT_STANDALONE
 CPPSRCS += txSimpleErrorObserver.cpp \
-	txStringUtils.cpp
+	txStringUtils.cpp \
+	txAtoms.cpp
 endif
 
 # we don't want the shared lib, but we want to force the creation of a

content/xslt/src/base/txAtoms.cpp

@@ -1,102 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is TransforMiiX XSLT processor code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Peter Van der Beken <peterv@propagandism.org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "txAtoms.h"
-#include "nsStaticAtom.h"
-#include "nsMemory.h"
-
-// define storage for all atoms
-#define TX_ATOM(_name, _value) nsIAtom* txXMLAtoms::_name;
-XML_ATOMS
-#undef TX_ATOM
-
-#define TX_ATOM(_name, _value) nsIAtom* txXPathAtoms::_name;
-#include "txXPathAtomList.h"
-#undef TX_ATOM
-
-#define TX_ATOM(_name, _value) nsIAtom* txXSLTAtoms::_name;
-#include "txXSLTAtomList.h"
-#undef TX_ATOM
-
-#define TX_ATOM(_name, _value) nsIAtom* txHTMLAtoms::_name;
-#include "txHTMLAtomList.h"
-#undef TX_ATOM
-
-static const nsStaticAtom XMLAtoms_info[] = {
-#define TX_ATOM(name_, value_) { value_, &txXMLAtoms::name_ },
-XML_ATOMS
-#undef TX_ATOM
-};
-
-static const nsStaticAtom XPathAtoms_info[] = {
-#define TX_ATOM(name_, value_) { value_, &txXPathAtoms::name_ },
-#include "txXPathAtomList.h"
-#undef TX_ATOM
-};
-
-static const nsStaticAtom XSLTAtoms_info[] = {
-#define TX_ATOM(name_, value_) { value_, &txXSLTAtoms::name_ },
-#include "txXSLTAtomList.h"
-#undef TX_ATOM
-};
-
-static const nsStaticAtom HTMLAtoms_info[] = {
-#define TX_ATOM(name_, value_) { value_, &txHTMLAtoms::name_ },
-#include "txHTMLAtomList.h"
-#undef TX_ATOM
-};
-
-void txXMLAtoms::init()
-{
-    NS_RegisterStaticAtoms(XMLAtoms_info, NS_ARRAY_LENGTH(XMLAtoms_info));
-}
-
-void txXPathAtoms::init()
-{
-    NS_RegisterStaticAtoms(XPathAtoms_info, NS_ARRAY_LENGTH(XPathAtoms_info));
-}
-
-void txXSLTAtoms::init()
-{
-    NS_RegisterStaticAtoms(XSLTAtoms_info, NS_ARRAY_LENGTH(XSLTAtoms_info));
-}
-
-void txHTMLAtoms::init()
-{
-    NS_RegisterStaticAtoms(HTMLAtoms_info, NS_ARRAY_LENGTH(HTMLAtoms_info));
-}

content/xslt/src/base/txAtoms.h

@@ -39,6 +39,16 @@
 #ifndef TRANSFRMX_ATOMS_H
 #define TRANSFRMX_ATOMS_H
 
+#ifndef TX_EXE
+
+#include "nsGkAtoms.h"
+typedef class nsGkAtoms txXPathAtoms;
+typedef class nsGkAtoms txXMLAtoms;
+typedef class nsGkAtoms txXSLTAtoms;
+typedef class nsGkAtoms txHTMLAtoms;
+
+#else
+
 class nsIAtom;
 
 /*
@@ -50,14 +60,10 @@ class nsIAtom;
  * be auto-generated.
  */
 
-#ifdef TX_EXE
 #define DOM_ATOMS                               \
 TX_ATOM(comment, "#comment")                    \
 TX_ATOM(document, "#document")                  \
 TX_ATOM(text, "#text")
-#else
-#define DOM_ATOMS
-#endif
 
 #define XML_ATOMS             \
 TX_ATOM(_empty, "")           \
@@ -103,3 +109,5 @@ public:
 #undef TX_ATOM
 
 #endif
+
+#endif

content/xslt/src/xpath/nsXFormsXPathEvaluator.cpp

@@ -208,7 +208,7 @@ nsXFormsXPathEvaluator::XFormsParseContextImpl::resolveFunctionCall(
     else if (aName == txXPathAtoms::daysFromDate) {
       aFnCall = new XFormsFunctionCall(XFormsFunctionCall::DAYSFROMDATE);
     }
-    else if (aName == txXPathAtoms::ifFunc) {
+    else if (aName == txXPathAtoms::_if) {
       aFnCall = new XFormsFunctionCall(XFormsFunctionCall::IF);
     }
     else if (aName == txXPathAtoms::index) {

content/xslt/src/xpath/txXFormsFunctionCall.cpp

@@ -544,7 +544,7 @@ XFormsFunctionCall::getNameAtom(nsIAtom** aAtom)
     }
     case IF:
     {
-      *aAtom = txXPathAtoms::ifFunc;
+      *aAtom = txXPathAtoms::_if;
       break;
     }
     case INDEX:

content/xslt/src/xpath/txXPathAtomList.h

@@ -1,111 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is TransforMiiX XSLT processor code.
- *
- * The Initial Developer of the Original Code is
- * Jonas Sicking.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Jonas Sicking <sicking@bigfoot.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// OUTPUT_CLASS=txXPathAtoms
-// MACRO_NAME=TX_ATOM
-
-TX_ATOM(_and, "and")
-TX_ATOM(_asterix, "*")
-TX_ATOM(boolean, "boolean")
-TX_ATOM(ceiling, "ceiling")
-TX_ATOM(comment, "comment")
-TX_ATOM(concat, "concat")
-TX_ATOM(contains, "contains")
-TX_ATOM(count, "count")
-TX_ATOM(div, "div")
-TX_ATOM(_false, "false")
-TX_ATOM(floor, "floor")
-TX_ATOM(id, "id")
-TX_ATOM(lang, "lang")
-TX_ATOM(last, "last")
-TX_ATOM(localName, "local-name")
-TX_ATOM(mod, "mod")
-TX_ATOM(name, "name")
-TX_ATOM(namespaceUri, "namespace-uri")
-TX_ATOM(node, "node")
-TX_ATOM(normalizeSpace, "normalize-space")
-TX_ATOM(_not, "not")
-TX_ATOM(number, "number")
-TX_ATOM(_or, "or")
-TX_ATOM(position, "position")
-TX_ATOM(processingInstruction, "processing-instruction")
-TX_ATOM(round, "round")
-TX_ATOM(startsWith, "starts-with")
-TX_ATOM(string, "string")
-TX_ATOM(stringLength, "string-length")
-TX_ATOM(substring, "substring")
-TX_ATOM(substringAfter, "substring-after")
-TX_ATOM(substringBefore, "substring-before")
-TX_ATOM(sum, "sum")
-TX_ATOM(text, "text")
-TX_ATOM(translate, "translate")
-TX_ATOM(_true, "true")
-
-// XPath Axes
-TX_ATOM(ancestor, "ancestor")
-TX_ATOM(ancestorOrSelf, "ancestor-or-self")
-TX_ATOM(attribute, "attribute")
-TX_ATOM(child, "child")
-TX_ATOM(descendant, "descendant")
-TX_ATOM(descendantOrSelf, "descendant-or-self")
-TX_ATOM(following, "following")
-TX_ATOM(followingSibling, "following-sibling")
-TX_ATOM(_namespace, "namespace")
-TX_ATOM(parent, "parent")
-TX_ATOM(preceding, "preceding")
-TX_ATOM(precedingSibling, "preceding-sibling")
-TX_ATOM(self, "self")
-
-
-#ifndef DISABLE_XFORMS_HOOKS // Dummy variable, nobody sets me!
-// XForms XPath Extensions
-TX_ATOM(avg, "avg")
-TX_ATOM(booleanFromString, "boolean-from-string")
-TX_ATOM(countNonEmpty, "count-non-empty")
-TX_ATOM(daysFromDate, "days-from-date")
-TX_ATOM(ifFunc, "if")
-TX_ATOM(index, "index")
-TX_ATOM(instance, "instance")
-TX_ATOM(min, "min")
-TX_ATOM(max, "max")
-TX_ATOM(months, "months")
-TX_ATOM(now, "now")
-TX_ATOM(property, "property")
-TX_ATOM(seconds, "seconds")
-TX_ATOM(secondsFromDateTime, "seconds-from-dateTime")
-#endif

content/xslt/src/xslt/txHTMLAtomList.h

@@ -1,97 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is TransforMiiX XSLT processor code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Peter Van der Beken <peterv@propagandism.org>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// OUTPUT_CLASS=txHTMLAtoms
-// MACRO_NAME=TX_ATOM
-
-TX_ATOM(area, "area")
-TX_ATOM(base, "base")
-TX_ATOM(basefont, "basefont")
-TX_ATOM(br, "br")
-TX_ATOM(button, "button")
-TX_ATOM(checked, "checked")
-TX_ATOM(col, "col")
-TX_ATOM(compact, "compact")
-TX_ATOM(content, "content")
-TX_ATOM(declare, "declare")
-TX_ATOM(defer, "defer")
-TX_ATOM(dir, "dir")
-TX_ATOM(disabled, "disabled")
-TX_ATOM(dl, "dl")
-TX_ATOM(frame, "frame")
-TX_ATOM(headerDefaultStyle, "default-style")
-TX_ATOM(head, "head")
-TX_ATOM(hr, "hr")
-TX_ATOM(href, "href")
-TX_ATOM(httpEquiv, "http-equiv")
-TX_ATOM(img, "img")
-TX_ATOM(input, "input")
-TX_ATOM(isindex, "isindex")
-TX_ATOM(ismap, "ismap")
-TX_ATOM(li, "li")
-TX_ATOM(link, "link")
-TX_ATOM(media, "media")
-TX_ATOM(menu, "menu")
-TX_ATOM(meta, "meta")
-TX_ATOM(multiple, "multiple")
-TX_ATOM(noresize, "noresize")
-TX_ATOM(noshade, "noshade")
-TX_ATOM(nowrap, "nowrap")
-TX_ATOM(object, "object")
-TX_ATOM(ol, "ol")
-TX_ATOM(optgroup, "optgroup")
-TX_ATOM(option, "option")
-TX_ATOM(p, "p")
-TX_ATOM(param, "param")
-TX_ATOM(readonly, "readonly")
-TX_ATOM(refresh, "refresh")
-TX_ATOM(script, "script")
-TX_ATOM(select, "select")
-TX_ATOM(selected, "selected")
-TX_ATOM(src, "src")
-TX_ATOM(style, "style")
-TX_ATOM(table, "table")
-TX_ATOM(target, "target")
-TX_ATOM(tbody, "tbody")
-TX_ATOM(td, "td")
-TX_ATOM(textarea, "textarea")
-TX_ATOM(th, "th")
-TX_ATOM(title, "title")
-TX_ATOM(tr, "tr")
-TX_ATOM(type, "type")
-TX_ATOM(ul, "ul")

content/xslt/src/xslt/txXSLTAtomList.h

@@ -1,151 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is TransforMiiX XSLT processor code.
- *
- * The Initial Developer of the Original Code is
- * Jonas Sicking.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Jonas Sicking <sicking@bigfoot.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// OUTPUT_CLASS=txXSLTAtoms
-// MACRO_NAME=TX_ATOM
-
-// XSLT elements
-TX_ATOM(applyImports, "apply-imports")
-TX_ATOM(applyTemplates, "apply-templates")
-TX_ATOM(attribute, "attribute")
-TX_ATOM(attributeSet, "attribute-set")
-TX_ATOM(callTemplate, "call-template")
-TX_ATOM(choose, "choose")
-TX_ATOM(comment, "comment")
-TX_ATOM(copy, "copy")
-TX_ATOM(copyOf, "copy-of")
-TX_ATOM(decimalFormat, "decimal-format")
-TX_ATOM(element, "element")
-TX_ATOM(fallback, "fallback")
-TX_ATOM(forEach, "for-each")
-TX_ATOM(_if, "if")
-TX_ATOM(import, "import")
-TX_ATOM(include, "include")
-TX_ATOM(key, "key")
-TX_ATOM(message, "message")
-TX_ATOM(namespaceAlias, "namespace-alias")
-TX_ATOM(number, "number")
-TX_ATOM(otherwise, "otherwise")
-TX_ATOM(output, "output")
-TX_ATOM(param, "param")
-TX_ATOM(preserveSpace, "preserve-space")
-TX_ATOM(processingInstruction, "processing-instruction")
-TX_ATOM(sort, "sort")
-TX_ATOM(stripSpace, "strip-space")
-TX_ATOM(stylesheet, "stylesheet")
-TX_ATOM(_template, "template")
-TX_ATOM(text, "text")
-TX_ATOM(transform, "transform")
-TX_ATOM(valueOf, "value-of")
-TX_ATOM(variable, "variable")
-TX_ATOM(when, "when")
-TX_ATOM(withParam, "with-param")
-
-// XSLT attributes
-TX_ATOM(caseOrder, "case-order")
-TX_ATOM(cdataSectionElements, "cdata-section-elements")
-TX_ATOM(count, "count")
-TX_ATOM(dataType, "data-type")
-TX_ATOM(decimalSeparator, "decimal-separator")
-TX_ATOM(digit, "digit")
-TX_ATOM(disableOutputEscaping, "disable-output-escaping")
-TX_ATOM(doctypePublic, "doctype-public")
-TX_ATOM(doctypeSystem, "doctype-system")
-TX_ATOM(elements, "elements")
-TX_ATOM(encoding, "encoding")
-TX_ATOM(extensionElementPrefixes, "extension-element-prefixes")
-TX_ATOM(format, "format")
-TX_ATOM(from, "from")
-TX_ATOM(groupingSeparator, "grouping-separator")
-TX_ATOM(groupingSize, "grouping-size")
-TX_ATOM(href, "href")
-TX_ATOM(indent, "indent")
-TX_ATOM(infinity, "infinity")
-TX_ATOM(lang, "lang")
-TX_ATOM(level, "level")
-TX_ATOM(match, "match")
-TX_ATOM(method, "method")
-TX_ATOM(mediaType, "media-type")
-TX_ATOM(minusSign, "minus-sign")
-TX_ATOM(mode, "mode")
-TX_ATOM(name, "name")
-TX_ATOM(_namespace, "namespace")
-TX_ATOM(NaN, "NaN")
-TX_ATOM(omitXmlDeclaration, "omit-xml-declaration")
-TX_ATOM(order, "order")
-TX_ATOM(patternSeparator, "pattern-separator")
-TX_ATOM(perMille, "per-mille")
-TX_ATOM(percent, "percent")
-TX_ATOM(priority, "priority")
-TX_ATOM(select, "select")
-TX_ATOM(standalone, "standalone")
-TX_ATOM(test, "test")
-TX_ATOM(terminate, "terminate")
-TX_ATOM(use, "use")
-TX_ATOM(useAttributeSets, "use-attribute-sets")
-TX_ATOM(value, "value")
-TX_ATOM(version, "version")
-TX_ATOM(zeroDigit, "zero-digit")
-
-// XSLT functions
-TX_ATOM(current, "current")
-TX_ATOM(document, "document")
-TX_ATOM(elementAvailable, "element-available")
-TX_ATOM(formatNumber, "format-number")
-TX_ATOM(functionAvailable, "function-available")
-TX_ATOM(generateId, "generate-id")
-TX_ATOM(unparsedEntityUri, "unparsed-entity-uri")
-TX_ATOM(systemProperty, "system-property")
-
-// XSLT properties
-TX_ATOM(vendor, "vendor")
-TX_ATOM(vendorUrl, "vendor-url")
-
-// XSLT attribute values
-TX_ATOM(any, "any")
-TX_ATOM(ascending, "ascending")
-TX_ATOM(descending, "descending")
-TX_ATOM(html, "html")
-TX_ATOM(lowerFirst, "lower-first")
-TX_ATOM(multiple, "multiple")
-TX_ATOM(no, "no")
-TX_ATOM(single, "single")
-TX_ATOM(upperFirst, "upper-first")
-TX_ATOM(xml, "xml")
-TX_ATOM(yes, "yes")
-TX_ATOM(_poundDefault, "#default")

content/xslt/src/xslt/txXSLTProcessor.cpp

@@ -62,12 +62,12 @@ txXSLTProcessor::init()
     if (NS_FAILED(txHTMLOutput::init())) {
         return MB_FALSE;
     }
-#endif
 
     txXMLAtoms::init();
     txXPathAtoms::init();
     txXSLTAtoms::init();
     txHTMLAtoms::init();
+#endif
     
     if (!txHandlerTable::init())
         return MB_FALSE;

content/xtf/src/nsXTFElementWrapper.cpp

@@ -59,7 +59,7 @@ nsXTFElementWrapper::nsXTFElementWrapper(nsINodeInfo* aNodeInfo)
     : nsXTFElementWrapperBase(aNodeInfo),
       mNotificationMask(0),
       mIntrinsicState(0),
-      mTmpAttrName(nsLayoutAtoms::wildcard) // XXX this is a hack, but names
+      mTmpAttrName(nsLayoutAtoms::_asterix) // XXX this is a hack, but names
                                             // have to have a value
 {
 }

content/xul/content/src/Makefile.in

@@ -43,8 +43,11 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xul
+
+ifdef MOZ_XUL
 LIBRARY_NAME	= gkconxulcon_s
 LIBXUL_LIBRARY	= 1
+endif
 
 REQUIRES	= xpcom \
 		  string \
@@ -70,14 +73,9 @@ REQUIRES	= xpcom \
 		  $(NULL)
 
 EXPORTS		= \
-		nsXULAtomList.h \
 		nsXULAtoms.h \
 		$(NULL)
 
-CPPSRCS		= \
-		nsXULAtoms.cpp \
-		$(NULL)
-
 ifdef MOZ_XUL
 CPPSRCS		+= \
 		nsXULElement.cpp \

content/xul/content/src/nsXULAtomList.h

@@ -1,312 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Original Author: David W. Hyatt (hyatt@netscape.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/******
-
-  This file contains the list of all XUL nsIAtoms and their values
-  
-  It is designed to be used as inline input to nsXULAtoms.cpp *only*
-  through the magic of C preprocessing.
-
-  All entires must be enclosed in the macro XUL_ATOM which will have cruel
-  and unusual things done to it
-
-  It is recommended (but not strictly necessary) to keep all entries
-  in alphabetical order
-
-  The first argument to XUL_ATOM is the C++ identifier of the atom
-  The second argument is the string value of the atom
-
- ******/
-
-// OUTPUT_CLASS=nsXULAtoms
-// MACRO_NAME=XUL_ATOM
-
-XUL_ATOM(_template, "template")
-XUL_ATOM(_empty, "")
-XUL_ATOM(_false, "false")
-XUL_ATOM(_star, "*")
-XUL_ATOM(_true, "true")
-XUL_ATOM(acceltext, "acceltext") // Text to use for the accelerator
-XUL_ATOM(accesskey, "accesskey") // The shortcut key for a menu or menu item
-XUL_ATOM(action, "action")
-XUL_ATOM(align, "align")
-XUL_ATOM(allowevents, "allowevents") // Lets events be handled on the cell contents or in menus.
-XUL_ATOM(allownegativeassertions, "allownegativeassertions")
-XUL_ATOM(always, "always")
-XUL_ATOM(attribute, "attribute")
-XUL_ATOM(autorepeatbutton, "autorepeatbutton")
-XUL_ATOM(baseline, "baseline")
-XUL_ATOM(binding, "binding")
-XUL_ATOM(bindings, "bindings")
-XUL_ATOM(blankrow, "blankrow")
-XUL_ATOM(bottom, "bottom")
-XUL_ATOM(box, "box")
-XUL_ATOM(broadcaster, "broadcaster") // A broadcaster
-XUL_ATOM(broadcasterset, "broadcasterset")
-XUL_ATOM(browser, "browser")
-XUL_ATOM(bulletinboard, "bulletinboard")
-XUL_ATOM(button, "button")
-XUL_ATOM(canvas, "canvas")
-XUL_ATOM(center, "center")
-XUL_ATOM(checkbox, "checkbox")
-XUL_ATOM(checked, "checked")
-XUL_ATOM(child, "child")
-XUL_ATOM(clazz, "class")
-XUL_ATOM(closed, "closed")
-XUL_ATOM(coalesceduplicatearcs, "coalesceduplicatearcs")
-XUL_ATOM(collapse, "collapse")
-XUL_ATOM(collapsed, "collapsed")
-XUL_ATOM(column, "column")
-XUL_ATOM(columns, "columns")
-XUL_ATOM(command, "command")
-XUL_ATOM(commands, "commands")
-XUL_ATOM(commandset, "commandset")
-XUL_ATOM(commandupdater, "commandupdater")
-XUL_ATOM(conditions, "conditions")
-XUL_ATOM(container, "container")
-XUL_ATOM(containment, "containment")
-XUL_ATOM(content, "content")
-XUL_ATOM(context, "context")
-XUL_ATOM(contextmenu, "contextmenu")
-XUL_ATOM(control, "control")
-XUL_ATOM(crop, "crop")
-XUL_ATOM(curpos, "curpos")
-XUL_ATOM(current, "current")
-XUL_ATOM(cycler, "cycler")
-XUL_ATOM(datasources, "datasources")
-XUL_ATOM(debug, "debug")
-XUL_ATOM(deck, "deck")
-XUL_ATOM(defaultz, "default")
-XUL_ATOM(description, "description")
-XUL_ATOM(dialog, "dialog")
-XUL_ATOM(dir, "dir")
-XUL_ATOM(disabled, "disabled")
-XUL_ATOM(dragSession, "dragSession")
-XUL_ATOM(dropAfter, "dropAfter")
-XUL_ATOM(dropBefore, "dropBefore")
-XUL_ATOM(dropOn, "dropOn")
-XUL_ATOM(editable, "editable")
-XUL_ATOM(editor, "editor")
-XUL_ATOM(element, "element")
-XUL_ATOM(empty, "empty")
-XUL_ATOM(end, "end")
-XUL_ATOM(equalsize, "equalsize")
-XUL_ATOM(even, "even")
-XUL_ATOM(events, "events")
-XUL_ATOM(fixed, "fixed")
-XUL_ATOM(flags, "flags")
-XUL_ATOM(flex, "flex")
-XUL_ATOM(flexgroup, "flexgroup")
-XUL_ATOM(focus, "focus")
-XUL_ATOM(fontpicker, "fontpicker")
-XUL_ATOM(grid, "grid")
-XUL_ATOM(gripper, "gripper")
-XUL_ATOM(grippy, "grippy")
-XUL_ATOM(hbox, "hbox")
-XUL_ATOM(height, "height")
-XUL_ATOM(hidden, "hidden")
-XUL_ATOM(hidechrome, "hidechrome")
-XUL_ATOM(horizontal, "horizontal")
-XUL_ATOM(id, "id")
-XUL_ATOM(iframe, "iframe")
-XUL_ATOM(ignorekeys, "ignorekeys") // Alignment for popups
-XUL_ATOM(image, "image")
-XUL_ATOM(increment, "increment")
-XUL_ATOM(index, "index")
-XUL_ATOM(infer, "infer")
-XUL_ATOM(insertafter, "insertafter")
-XUL_ATOM(insertbefore, "insertbefore")
-XUL_ATOM(instanceOf, "instanceOf")
-XUL_ATOM(iscontainer, "iscontainer")
-XUL_ATOM(isempty, "isempty")
-XUL_ATOM(key, "key") // The key element / attribute
-XUL_ATOM(keycode, "keycode") // The keycode attribute
-XUL_ATOM(keyset, "keyset")
-XUL_ATOM(keytext, "keytext") // The keytext attribute
-XUL_ATOM(label, "label")
-XUL_ATOM(leaf,"leaf")
-XUL_ATOM(left, "left")
-XUL_ATOM(listbox, "listbox")
-XUL_ATOM(listboxbody, "listboxbody")
-XUL_ATOM(listcell, "listcell")
-XUL_ATOM(listcol, "listcol")
-XUL_ATOM(listcols, "listcols")
-XUL_ATOM(listhead, "listhead")
-XUL_ATOM(listheader, "listheader")
-XUL_ATOM(listitem, "listitem")
-XUL_ATOM(listrows, "listrows")
-XUL_ATOM(ltr, "ltr")
-XUL_ATOM(maxheight, "maxheight")
-XUL_ATOM(maxpos, "maxpos")
-XUL_ATOM(maxwidth, "maxwidth")
-XUL_ATOM(member, "member")
-XUL_ATOM(menu, "menu") // Represents an XP menu
-XUL_ATOM(menuactive, "_moz-menuactive") // Whether or not a menu is active (without necessarily being open)
-XUL_ATOM(menubar, "menubar") // An XP menu bar.
-XUL_ATOM(menubutton, "menubutton")
-XUL_ATOM(menugenerated, "menugenerated") // Internal
-XUL_ATOM(menuitem, "menuitem") // Represents an XP menu item
-XUL_ATOM(menulist, "menulist")
-XUL_ATOM(menupopup, "menupopup") // The XP menu's children.
-XUL_ATOM(menutobedisplayed, "menutobedisplayed") // The menu is about to be displayed at the next sync w/ frame
-XUL_ATOM(middle, "middle")
-XUL_ATOM(minheight, "minheight")
-XUL_ATOM(minwidth, "minwidth")
-XUL_ATOM(mode, "mode")
-XUL_ATOM(modifiers, "modifiers") // The modifiers attribute
-XUL_ATOM(mousethrough, "mousethrough")
-XUL_ATOM(nativescrollbar, "nativescrollbar")
-XUL_ATOM(never, "never")
-XUL_ATOM(object, "object")
-XUL_ATOM(observes, "observes") // The observes element
-XUL_ATOM(odd, "odd")
-XUL_ATOM(open, "open") // Whether or not a menu, tree, etc. is open
-XUL_ATOM(ordinal, "ordinal")
-XUL_ATOM(orient, "orient")
-XUL_ATOM(overlay, "overlay")
-XUL_ATOM(pack, "pack")
-XUL_ATOM(page, "page")
-XUL_ATOM(pageincrement, "pageincrement")
-XUL_ATOM(palettename, "palettename")
-XUL_ATOM(parent, "parent")
-XUL_ATOM(parsetype, "parsetype")
-XUL_ATOM(persist, "persist")
-XUL_ATOM(popup, "popup") // The popup for a context menu, popup menu, or tooltip
-XUL_ATOM(popupalign, "popupalign") // Alignment for popups
-XUL_ATOM(popupanchor, "popupanchor") // Anchor for popups
-XUL_ATOM(popupgroup, "popupgroup") // Contains popup menus, context menus, and tooltips
-XUL_ATOM(popupset, "popupset")
-XUL_ATOM(position, "position")
-XUL_ATOM(predicate, "predicate")
-XUL_ATOM(primary, "primary")
-XUL_ATOM(progressNormal, "progressNormal")
-XUL_ATOM(progressUndetermined, "progressUndetermined")
-XUL_ATOM(progressmeter, "progressmeter")
-XUL_ATOM(properties, "properties")
-XUL_ATOM(property, "property")
-XUL_ATOM(radio, "radio")
-XUL_ATOM(radiogroup, "radiogroup")
-XUL_ATOM(ref, "ref")
-XUL_ATOM(removeelement, "removeelement")
-XUL_ATOM(resizeafter, "resizeafter")
-XUL_ATOM(resizebefore, "resizebefore")
-XUL_ATOM(resizer, "resizer")
-XUL_ATOM(resource, "resource")
-XUL_ATOM(reverse, "reverse")
-XUL_ATOM(right, "right")
-XUL_ATOM(row, "row")
-XUL_ATOM(rows, "rows")
-XUL_ATOM(rtl, "rtl")
-XUL_ATOM(rule, "rule")
-XUL_ATOM(screenX, "screenX")
-XUL_ATOM(screenY, "screenY")
-XUL_ATOM(scrollbar, "scrollbar")
-XUL_ATOM(scrollbarbutton, "scrollbarbutton")
-XUL_ATOM(scrollbox, "scrollbox")
-XUL_ATOM(scrollcorner, "scrollcorner")
-XUL_ATOM(selected, "selected")
-XUL_ATOM(selectedIndex, "selectedIndex")
-XUL_ATOM(seltype, "seltype")
-XUL_ATOM(sizemode, "sizemode") // when set, measure strings to determine preferred width
-XUL_ATOM(sizetopopup, "sizetopopup") // Whether or not menus size to their popup children (used by menulists)
-XUL_ATOM(slider, "slider")
-XUL_ATOM(smooth, "smooth")
-XUL_ATOM(sort, "sort")
-XUL_ATOM(sortActive, "sortActive")
-XUL_ATOM(sortDirection, "sortDirection")
-XUL_ATOM(sortLocked, "sortLocked")
-XUL_ATOM(sortResource, "sortResource")
-XUL_ATOM(sortResource2, "sortResource2")
-XUL_ATOM(sortSeparators, "sortSeparators")
-XUL_ATOM(sortStaticsLast, "sortStaticsLast")
-XUL_ATOM(sorted, "sorted")
-XUL_ATOM(spinner, "spinner")
-XUL_ATOM(splitter, "splitter")
-XUL_ATOM(spring, "spring")
-XUL_ATOM(stack, "stack")
-XUL_ATOM(start, "start")
-XUL_ATOM(state, "state")
-XUL_ATOM(statedatasource,"statedatasource")
-XUL_ATOM(staticHint, "staticHint")
-XUL_ATOM(statustext, "statustext")
-XUL_ATOM(stretch, "stretch")
-XUL_ATOM(style, "style")
-XUL_ATOM(subject, "subject")
-XUL_ATOM(tab, "tab")
-XUL_ATOM(tabbox, "tabbox")
-XUL_ATOM(tabpanel, "tabpanel")
-XUL_ATOM(tabpanels, "tabpanels")
-XUL_ATOM(tag, "tag")
-XUL_ATOM(targets, "targets")
-XUL_ATOM(templateAtom, "template") // A XUL template
-XUL_ATOM(text, "text")
-XUL_ATOM(textarea, "textarea")
-XUL_ATOM(textbox, "textbox")
-XUL_ATOM(textnode, "textnode")
-XUL_ATOM(thumb, "thumb")
-XUL_ATOM(titlebar, "titlebar")
-XUL_ATOM(titletip, "titletip")
-XUL_ATOM(toggled, "toggled")
-XUL_ATOM(toolbar, "toolbar")
-XUL_ATOM(toolbarbutton, "toolbarbutton")
-XUL_ATOM(toolbaritem, "toolbaritem")
-XUL_ATOM(toolbox, "toolbox")
-XUL_ATOM(tooltip, "tooltip")
-XUL_ATOM(tooltiptext, "tooltiptext")
-XUL_ATOM(top, "top")
-XUL_ATOM(tree, "tree")
-XUL_ATOM(treecell, "treecell")
-XUL_ATOM(treechildren, "treechildren")
-XUL_ATOM(treecol, "treecol")
-XUL_ATOM(treecols, "treecols")
-XUL_ATOM(treeitem, "treeitem")
-XUL_ATOM(treerow, "treerow")
-XUL_ATOM(treeseparator, "treeseparator")
-XUL_ATOM(triple, "triple")
-XUL_ATOM(type, "type")
-XUL_ATOM(uri, "uri")
-XUL_ATOM(validate, "validate")
-XUL_ATOM(value, "value")
-XUL_ATOM(vbox, "vbox")
-XUL_ATOM(vertical, "vertical")
-XUL_ATOM(widget, "widget")
-XUL_ATOM(width, "width")
-XUL_ATOM(window, "window")
-XUL_ATOM(wizard, "wizard")
-XUL_ATOM(xulcontentsgenerated, "xulcontentsgenerated")

content/xul/content/src/nsXULAtoms.cpp

@@ -1,60 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Original Author: David W. Hyatt (hyatt@netscape.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsXULAtoms.h"
-#include "nsStaticAtom.h"
-#include "nsMemory.h"
-
-// define storage for all atoms
-#define XUL_ATOM(_name, _value) nsIAtom* nsXULAtoms::_name;
-#include "nsXULAtomList.h"
-#undef XUL_ATOM
-
-
-static const nsStaticAtom XULAtoms_info[] = {
-#define XUL_ATOM(name_, value_) { value_, &nsXULAtoms::name_ },
-#include "nsXULAtomList.h"
-#undef XUL_ATOM
-};
-
-void nsXULAtoms::AddRefAtoms()
-{
-  NS_RegisterStaticAtoms(XULAtoms_info,
-                         NS_ARRAY_LENGTH(XULAtoms_info));
-}
-

content/xul/content/src/nsXULAtoms.h

@@ -38,30 +38,7 @@
 #ifndef nsXULAtoms_h___
 #define nsXULAtoms_h___
 
-#include "nsIAtom.h"
+#include "nsGkAtoms.h"
-
+typedef class nsGkAtoms nsXULAtoms;
-/**
- * This class wraps up the creation and destruction of the standard
- * set of xul atoms used during normal xul handling. This object
- * is created when the first xul content object is created, and
- * destroyed when the last such content object is destroyed.
- */
-class nsXULAtoms {
-public:
-
-  static void AddRefAtoms();
-
-  /* Declare all atoms
-
-     The atom names and values are stored in nsCSSAtomList.h and
-     are brought to you by the magic of C preprocessing
-
-     Add new atoms to nsCSSAtomList and all support logic will be auto-generated
-   */
-#define XUL_ATOM(_name, _value) static nsIAtom* _name;
-#include "nsXULAtomList.h"
-#undef XUL_ATOM
-
-};
 
 #endif /* nsXULAtoms_h___ */

content/xul/content/src/nsXULElement.cpp

@@ -1217,7 +1217,7 @@ nsXULElement::ParseAttribute(PRInt32 aNamespaceID,
             return PR_TRUE;
         }
 
-        if (aAttribute == nsXULAtoms::clazz) {
+        if (aAttribute == nsXULAtoms::_class) {
             aResult.ParseAtomArray(aValue);
             return PR_TRUE;
         }
@@ -2102,7 +2102,7 @@ nsXULElement::GetID() const
 const nsAttrValue*
 nsXULElement::GetClasses() const
 {
-    return FindLocalOrProtoAttr(kNameSpaceID_None, nsXULAtoms::clazz);
+    return FindLocalOrProtoAttr(kNameSpaceID_None, nsXULAtoms::_class);
 }
 
 NS_IMETHODIMP
@@ -2193,7 +2193,7 @@ nsXULElement::GetIDAttributeName() const
 nsIAtom *
 nsXULElement::GetClassAttributeName() const
 {
-    return nsXULAtoms::clazz;
+    return nsXULAtoms::_class;
 }
 
 // Controllers Methods
@@ -2284,7 +2284,7 @@ nsXULElement::GetBoxObject(nsIBoxObject** aResult)
 
 
 NS_IMPL_XUL_STRING_ATTR(Id, id)
-NS_IMPL_XUL_STRING_ATTR(ClassName, clazz)
+NS_IMPL_XUL_STRING_ATTR(ClassName, _class)
 NS_IMPL_XUL_STRING_ATTR(Align, align)
 NS_IMPL_XUL_STRING_ATTR(Dir, dir)
 NS_IMPL_XUL_STRING_ATTR(Flex, flex)
@@ -2910,7 +2910,7 @@ nsXULPrototypeElement::SetAttrAt(PRUint32 aPos, const nsAString& aValue,
 
         return NS_OK;
     }
-    else if (mAttributes[aPos].mName.Equals(nsXULAtoms::clazz)) {
+    else if (mAttributes[aPos].mName.Equals(nsXULAtoms::_class)) {
         // Compute the element's class list
         mAttributes[aPos].mValue.ParseAtomArray(aValue);
         

content/xul/document/src/nsXULDocument.cpp

@@ -1038,7 +1038,7 @@ nsXULDocument::AttributeChanged(nsIContent* aElement, PRInt32 aNameSpaceID,
                     NS_STATIC_CAST(BroadcastListener*, entry->mListeners[i]);
 
                 if ((bl->mAttribute == aAttribute) ||
-                    (bl->mAttribute == nsXULAtoms::_star)) {
+                    (bl->mAttribute == nsXULAtoms::_asterix)) {
                     nsCOMPtr<nsIContent> listener
                         = do_QueryInterface(bl->mListener);
 

content/xul/templates/src/nsXULContentBuilder.cpp

@@ -1004,7 +1004,7 @@ nsXULContentBuilder::IsDirectlyContainedBy(nsIContent* aChild, nsIContent* aPare
         // <template> or <rule> element in the simple syntax, or the
         // <action> element in the extended syntax.
         ni = tmpl->NodeInfo();
-    } while (!ni->Equals(nsXULAtoms::templateAtom, kNameSpaceID_XUL) &&
+    } while (!ni->Equals(nsXULAtoms::_template, kNameSpaceID_XUL) &&
              !ni->Equals(nsXULAtoms::rule, kNameSpaceID_XUL) &&
              !ni->Equals(nsXULAtoms::action, kNameSpaceID_XUL));
 
@@ -1361,7 +1361,7 @@ nsXULContentBuilder::RemoveGeneratedContent(nsIContent* aElement)
             // to even check this subtree.
             // XXX should this check |child| rather than |element|? Otherwise
             //     it should be moved outside the inner loop. Bug 297290.
-            if (element->NodeInfo()->Equals(nsXULAtoms::templateAtom,
+            if (element->NodeInfo()->Equals(nsXULAtoms::_template,
                                             kNameSpaceID_XUL) ||
                 !element->IsContentOfType(nsIContent::eELEMENT))
                 continue;

content/xul/templates/src/nsXULSortService.cpp

@@ -300,7 +300,7 @@ XULSortServiceImpl::FindSortableContainer(nsIContent *aRoot,
   nsIAtom *tag = aRoot->Tag();
 
   if (aRoot->IsContentOfType(nsIContent::eXUL)) {
-    if (tag == nsXULAtoms::templateAtom) // ignore content within templates
+    if (tag == nsXULAtoms::_template) // ignore content within templates
       return NS_OK;    
 
     if (tag == nsXULAtoms::listbox ||
@@ -1420,7 +1420,7 @@ XULSortServiceImpl::InsertContainerNode(nsIRDFCompositeDataSource *db, nsRDFSort
         child = container->GetChildAt(childLoop);
         if (!child) break;
 
-        child->GetAttr(kNameSpaceID_None, nsXULAtoms::templateAtom, valueStr);
+        child->GetAttr(kNameSpaceID_None, nsXULAtoms::_template, valueStr);
         if (!valueStr.IsEmpty())
           break;
         else

content/xul/templates/src/nsXULTemplateBuilder.cpp

@@ -1440,7 +1440,7 @@ nsXULTemplateBuilder::GetTemplateRoot(nsIContent** aResult)
     //   </window>
     //
     nsAutoString templateID;
-    mRoot->GetAttr(kNameSpaceID_None, nsXULAtoms::templateAtom, templateID);
+    mRoot->GetAttr(kNameSpaceID_None, nsXULAtoms::_template, templateID);
 
     if (!templateID.IsEmpty()) {
         nsCOMPtr<nsIDOMDocument> domDoc = do_QueryInterface(mRoot->GetDocument());

layout/base/Makefile.in

@@ -102,7 +102,6 @@ EXPORTS		= \
 		nsIPercentHeightObserver.h  \
 		nsIPresShell.h \
 		nsIReflowCallback.h \
-		nsLayoutAtomList.h \
 		nsLayoutAtoms.h \
 		nsLayoutErrors.h \
 		nsLayoutUtils.h \
@@ -126,7 +125,6 @@ CPPSRCS		= \
 		nsFrameTraversal.cpp \
 		nsGenConList.cpp \
 		nsImageLoader.cpp \
-		nsLayoutAtoms.cpp \
 		nsLayoutDebugger.cpp \
 		nsLayoutHistoryState.cpp \
 		nsLayoutUtils.cpp \

layout/base/nsCSSFrameConstructor.cpp

@@ -3498,7 +3498,7 @@ IsSpecialContent(nsIContent*     aContent,
       aTag == nsMathMLAtoms::maction_ ||
       aTag == nsMathMLAtoms::mrow_   ||
       aTag == nsMathMLAtoms::merror_ ||
-      aTag == nsMathMLAtoms::none_   ||
+      aTag == nsMathMLAtoms::none   ||
       aTag == nsMathMLAtoms::mprescripts_;
 #endif
   return PR_FALSE;
@@ -6460,7 +6460,7 @@ nsCSSFrameConstructor::ConstructXULFrame(nsFrameConstructorState& aState,
 
         if (aTag == nsXULAtoms::tooltip) {
           nsAutoString defaultTooltip;
-          aContent->GetAttr(kNameSpaceID_None, nsXULAtoms::defaultz, defaultTooltip);
+          aContent->GetAttr(kNameSpaceID_None, nsXULAtoms::_default, defaultTooltip);
           if (defaultTooltip.LowerCaseEqualsLiteral("true")) {
             // Locate the root frame and tell it about the tooltip.
             nsIFrame* rootFrame = aState.mFrameManager->GetRootFrame();
@@ -7284,7 +7284,7 @@ nsCSSFrameConstructor::ConstructMathMLFrame(nsFrameConstructorState& aState,
     newFrame = NS_NewMathMLmactionFrame(mPresShell);
   else if (aTag == nsMathMLAtoms::mrow_   ||
            aTag == nsMathMLAtoms::merror_ ||
-           aTag == nsMathMLAtoms::none_   ||
+           aTag == nsMathMLAtoms::none    ||
            aTag == nsMathMLAtoms::mprescripts_ )
     newFrame = NS_NewMathMLmrowFrame(mPresShell);
   // CONSTRUCTION of MTABLE elements

layout/base/nsLayoutAtomList.h

@@ -1,315 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1999
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/******
-
-  This file contains the list of all layout nsIAtoms and their values
-  
-  It is designed to be used as inline input to nsLayoutAtoms.cpp *only*
-  through the magic of C preprocessing.
-
-  All entires must be enclosed in the macro LAYOUT_ATOM which will have cruel
-  and unusual things done to it
-
-  It is recommended (but not strictly necessary) to keep all entries
-  in alphabetical order
-
-  The first argument to LAYOUT_ATOM is the C++ identifier of the atom
-  The second argument is the string value of the atom
-
- ******/
-
-// OUTPUT_CLASS=nsLayoutAtoms
-// MACRO_NAME=LAYOUT_ATOM
-
-  // Alphabetical list of media type atoms
-LAYOUT_ATOM(all, "all")  // Media atoms must be lower case
-LAYOUT_ATOM(aural, "aural")
-LAYOUT_ATOM(braille, "braille")
-LAYOUT_ATOM(embossed, "embossed")
-LAYOUT_ATOM(handheld, "handheld")
-LAYOUT_ATOM(print, "print")
-LAYOUT_ATOM(projection, "projection")
-LAYOUT_ATOM(screen, "screen")
-LAYOUT_ATOM(tty, "tty")
-LAYOUT_ATOM(tv, "tv")
-
-  // Alphabetical list of standard name space prefixes
-LAYOUT_ATOM(xmlNameSpace, "xml")
-LAYOUT_ATOM(xmlnsNameSpace, "xmlns")
-
-  // Alphabetical list of frame additional child list names
-LAYOUT_ATOM(absoluteList, "Absolute-list")
-LAYOUT_ATOM(bulletList, "Bullet-list")
-LAYOUT_ATOM(captionList, "Caption-list")
-LAYOUT_ATOM(colGroupList, "ColGroup-list")
-LAYOUT_ATOM(editorDisplayList, "EditorDisplay-List")
-LAYOUT_ATOM(fixedList, "Fixed-list")
-LAYOUT_ATOM(floatList, "Float-list")
-LAYOUT_ATOM(overflowList, "Overflow-list")
-LAYOUT_ATOM(overflowOutOfFlowList, "OverflowOutOfFlow-list")
-LAYOUT_ATOM(popupList, "Popup-list")
-
-LAYOUT_ATOM(commentTagName, "#comment")
-LAYOUT_ATOM(textTagName, "#text")
-LAYOUT_ATOM(cdataTagName, "#cdata-section")
-LAYOUT_ATOM(processingInstructionTagName, "#processing-instruction")
-LAYOUT_ATOM(documentFragmentNodeName, "#document-fragment")
-LAYOUT_ATOM(documentTypeNodeName, "#document-type")
-
-  // Alphabetical list of frame types
-LAYOUT_ATOM(areaFrame, "AreaFrame")
-LAYOUT_ATOM(bcTableCellFrame, "BCTableCellFrame") // table cell in border collapsing model
-LAYOUT_ATOM(blockFrame, "BlockFrame")
-LAYOUT_ATOM(boxFrame, "BoxFrame")
-LAYOUT_ATOM(brFrame, "BRFrame")
-LAYOUT_ATOM(bulletFrame, "BulletFrame")
-LAYOUT_ATOM(columnSetFrame, "ColumnSetFrame")
-LAYOUT_ATOM(fieldSetFrame, "FieldSetFrame")
-LAYOUT_ATOM(frameSetFrame, "FrameSetFrame")
-LAYOUT_ATOM(gfxButtonControlFrame, "gfxButtonControlFrame")
-LAYOUT_ATOM(HTMLCanvasFrame, "HTMLCanvasFrame")
-LAYOUT_ATOM(subDocumentFrame, "subDocumentFrame")
-LAYOUT_ATOM(imageBoxFrame, "ImageBoxFrame")
-LAYOUT_ATOM(imageFrame, "ImageFrame")
-LAYOUT_ATOM(imageControlFrame, "ImageControlFrame")
-LAYOUT_ATOM(inlineFrame, "InlineFrame")
-LAYOUT_ATOM(legendFrame, "LegendFrame")
-LAYOUT_ATOM(letterFrame, "LetterFrame")
-LAYOUT_ATOM(lineFrame, "LineFrame")
-LAYOUT_ATOM(listControlFrame,"ListControlFrame")
-LAYOUT_ATOM(objectFrame, "ObjectFrame")
-LAYOUT_ATOM(pageFrame, "PageFrame")
-LAYOUT_ATOM(pageBreakFrame, "PageBreakFrame")
-LAYOUT_ATOM(pageContentFrame, "PageContentFrame")
-LAYOUT_ATOM(placeholderFrame, "PlaceholderFrame")
-LAYOUT_ATOM(positionedInlineFrame, "PositionedInlineFrame")
-LAYOUT_ATOM(canvasFrame, "CanvasFrame")
-LAYOUT_ATOM(rootFrame, "RootFrame")
-LAYOUT_ATOM(scrollFrame, "ScrollFrame")
-LAYOUT_ATOM(sequenceFrame, "SequenceFrame")
-LAYOUT_ATOM(tableCaptionFrame, "TableCaptionFrame")
-LAYOUT_ATOM(tableCellFrame, "TableCellFrame")
-LAYOUT_ATOM(tableColFrame, "TableColFrame")
-LAYOUT_ATOM(tableColGroupFrame, "TableColGroupFrame")
-LAYOUT_ATOM(tableFrame, "TableFrame")
-LAYOUT_ATOM(tableOuterFrame, "TableOuterFrame")
-LAYOUT_ATOM(tableRowGroupFrame, "TableRowGroupFrame")
-LAYOUT_ATOM(tableRowFrame, "TableRowFrame")
-LAYOUT_ATOM(textInputFrame,"TextInputFrame")
-LAYOUT_ATOM(textFrame, "TextFrame")
-LAYOUT_ATOM(viewportFrame, "ViewportFrame")
-
-  // Alphabetical list of frame property names
-LAYOUT_ATOM(boxMetricsProperty, "BoxMetricsProperty") // nsBoxLayoutMetrics*
-LAYOUT_ATOM(changeListProperty, "ChangeListProperty") // void*
-LAYOUT_ATOM(collapseOffsetProperty, "CollapseOffsetProperty")  // nsPoint*
-LAYOUT_ATOM(computedOffsetProperty, "ComputedOffsetProperty")  // nsPoint*
-LAYOUT_ATOM(IBSplitSpecialPrevSibling, "IBSplitSpecialPrevSibling")// nsIFrame*
-LAYOUT_ATOM(IBSplitSpecialSibling, "IBSplitSpecialSibling")    // nsIFrame*
-LAYOUT_ATOM(lineCursorProperty, "LineCursorProperty") // nsLineBox*
-LAYOUT_ATOM(maxElementWidthProperty, "MaxElementWidthProperty")  // nscoord*
-LAYOUT_ATOM(overflowAreaProperty, "OverflowArea")              // nsRect*
-LAYOUT_ATOM(overflowProperty, "OverflowProperty")              // list of nsIFrame*
-LAYOUT_ATOM(overflowLinesProperty, "OverflowLinesProperty")    // list of nsLineBox*
-LAYOUT_ATOM(overflowOutOfFlowsProperty, "OverflowOutOfFlowsProperty")      // nsFrameList*
-LAYOUT_ATOM(overflowPlaceholdersProperty, "OverflowPlaceholdersProperty")  // nsFrameList*
-LAYOUT_ATOM(rowUnpaginatedHeightProperty, "RowUnpaginatedHeightProperty")  // nscoord*
-LAYOUT_ATOM(spaceManagerProperty, "SpaceManagerProperty")      // the space manager for a block
-LAYOUT_ATOM(tableBCProperty, "TableBCProperty")                // table border collapsing info (e.g. damage area, table border widths)
-LAYOUT_ATOM(viewProperty, "ViewProperty")                      
-
-  // Alphabetical list of event handler names
-LAYOUT_ATOM(onabort, "onabort")
-LAYOUT_ATOM(onbeforeunload, "onbeforeunload")
-LAYOUT_ATOM(onblur, "onblur")
-LAYOUT_ATOM(onbroadcast, "onbroadcast")
-LAYOUT_ATOM(onchange, "onchange")
-LAYOUT_ATOM(onclick, "onclick")
-LAYOUT_ATOM(onclose, "onclose")
-LAYOUT_ATOM(oncommand, "oncommand")
-LAYOUT_ATOM(oncommandupdate, "oncommandupdate")
-LAYOUT_ATOM(oncontextmenu, "oncontextmenu")
-LAYOUT_ATOM(onDOMActivate, "onDOMActivate")
-LAYOUT_ATOM(onDOMFocusIn, "onDOMFocusIn")
-LAYOUT_ATOM(onDOMFocusOut, "onDOMFocusOut")
-LAYOUT_ATOM(ondblclick, "ondblclick")
-LAYOUT_ATOM(ondragdrop, "ondragdrop")
-LAYOUT_ATOM(ondragenter, "ondragenter")
-LAYOUT_ATOM(ondragexit, "ondragexit")
-LAYOUT_ATOM(ondraggesture, "ondraggesture")
-LAYOUT_ATOM(ondragover, "ondragover")
-LAYOUT_ATOM(onerror, "onerror")
-LAYOUT_ATOM(onfocus, "onfocus")
-LAYOUT_ATOM(oninput, "oninput")
-LAYOUT_ATOM(onkeydown, "onkeydown")
-LAYOUT_ATOM(onkeypress, "onkeypress")
-LAYOUT_ATOM(onkeyup, "onkeyup")
-LAYOUT_ATOM(oncompositionstart, "oncompositionstart")
-LAYOUT_ATOM(oncompositionend, "oncompositionend")
-LAYOUT_ATOM(onload, "onload")
-LAYOUT_ATOM(onmousedown, "onmousedown")
-LAYOUT_ATOM(onmousemove, "onmousemove")
-LAYOUT_ATOM(onmouseout, "onmouseout")
-LAYOUT_ATOM(onmouseover, "onmouseover")
-LAYOUT_ATOM(onmouseup, "onmouseup")
-LAYOUT_ATOM(onpaint, "onpaint")
-LAYOUT_ATOM(onpopuphidden, "onpopuphidden")
-LAYOUT_ATOM(onpopuphiding, "onpopuphiding")
-LAYOUT_ATOM(onpopupshowing, "onpopupshowing")
-LAYOUT_ATOM(onpopupshown, "onpopupshown")
-LAYOUT_ATOM(onreset, "onreset")
-LAYOUT_ATOM(onresize, "onresize")
-LAYOUT_ATOM(onscroll, "onscroll")
-LAYOUT_ATOM(onselect, "onselect")
-LAYOUT_ATOM(onsubmit, "onsubmit")
-LAYOUT_ATOM(ontext, "ontext")
-LAYOUT_ATOM(onunload, "onunload")
-
-// scrolling
-LAYOUT_ATOM(onoverflow, "onoverflow")
-LAYOUT_ATOM(onunderflow, "onunderflow")
-LAYOUT_ATOM(onoverflowchanged, "onoverflowchanged")
-
-// mutation events
-LAYOUT_ATOM(onDOMSubtreeModified, "onDOMSubtreeModified")
-LAYOUT_ATOM(onDOMNodeInserted, "onDOMNodeInserted")
-LAYOUT_ATOM(onDOMNodeRemoved, "onDOMNodeRemoved")
-LAYOUT_ATOM(onDOMNodeRemovedFromDocument, "onDOMNodeRemovedFromDocument")
-LAYOUT_ATOM(onDOMNodeInsertedIntoDocument, "onDOMNodeInsertedIntoDocument")
-LAYOUT_ATOM(onDOMAttrModified, "onDOMAttrModified")
-LAYOUT_ATOM(onDOMCharacterDataModified, "onDOMCharacterDataModified")
-
-// pagetransition events
-LAYOUT_ATOM(onpageshow, "onpageshow")
-LAYOUT_ATOM(onpagehide, "onpagehide")
-
-#ifdef MOZ_SVG
-// Note: the attribute name for the 'SVGLoad' event is actually 'onload' etc.
-LAYOUT_ATOM(onSVGLoad, "onSVGLoad")
-LAYOUT_ATOM(onSVGUnload, "onSVGUnload")
-LAYOUT_ATOM(onSVGAbort, "onSVGAbort")
-LAYOUT_ATOM(onSVGError, "onSVGError")
-LAYOUT_ATOM(onSVGResize, "onSVGResize")
-LAYOUT_ATOM(onSVGScroll, "onSVGScroll")
-LAYOUT_ATOM(onSVGZoom, "onSVGZoom")
-#endif // MOZ_SVG
-
-  // Alphabetical list of languages for lang-specific transforms
-LAYOUT_ATOM(Japanese, "ja")
-LAYOUT_ATOM(Chinese, "zh-CN")
-LAYOUT_ATOM(Taiwanese, "zh-TW")
-LAYOUT_ATOM(HongKongChinese, "zh-HK")
-LAYOUT_ATOM(Unicode, "x-unicode")
-
-  // other
-LAYOUT_ATOM(wildcard, "*")
-LAYOUT_ATOM(mozdirty, "_moz_dirty")
-LAYOUT_ATOM(stylesheet, "stylesheet")
-LAYOUT_ATOM(transform, "transform")
-LAYOUT_ATOM(show, "show")
-LAYOUT_ATOM(actuate, "actuate")
-
-LAYOUT_ATOM(autoAtom, "auto")
-LAYOUT_ATOM(none, "none")
-LAYOUT_ATOM(normal, "normal")
-LAYOUT_ATOM(transparent, "transparent")
-
-LAYOUT_ATOM(directionalFrame, "DirectionalFrame")
-LAYOUT_ATOM(baseLevel, "BaseLevel")                            // PRUint8
-LAYOUT_ATOM(embeddingLevel, "EmbeddingLevel")                  // PRUint8
-LAYOUT_ATOM(endsInDiacritic, "EndsInDiacritic")                // PRUint32
-LAYOUT_ATOM(nextBidi, "NextBidi")                              // nsIFrame*
-LAYOUT_ATOM(charType, "charType")                              // PRUint8
-
-LAYOUT_ATOM(capture, "capture")
-LAYOUT_ATOM(stop, "stop")
-LAYOUT_ATOM(cancel, "cancel")
-LAYOUT_ATOM(onLoad, "onLoad")
-LAYOUT_ATOM(always, "always")
-LAYOUT_ATOM(collapsed, "collapsed")
-
-#ifdef MOZ_SVG
-  // Alphabetical list of SVG frame types
-LAYOUT_ATOM(svgCircleFrame,"SVGCircleFrame")
-LAYOUT_ATOM(svgClipPathFrame,"SVGClipPathFrame")
-LAYOUT_ATOM(svgDefsFrame,"SVGDefsFrame")
-LAYOUT_ATOM(svgEllipseFrame,"SVGEllipseFrame")
-LAYOUT_ATOM(svgFilterFrame,"SVGFilterFrame")
-#ifdef MOZ_SVG_FOREIGNOBJECT
-LAYOUT_ATOM(svgForeignObjectFrame,"SVGForeignObjectFrame")
-#endif
-LAYOUT_ATOM(svgGenericContainerFrame,"SVGGenericContainerFrame")
-LAYOUT_ATOM(svgGFrame,"SVGGFrame")
-LAYOUT_ATOM(svgGlyphFrame,"SVGGlyphFrame")
-LAYOUT_ATOM(svgGradientFrame,"SVGGradientFrame")
-LAYOUT_ATOM(svgImageFrame,"SVGImageFrame")
-LAYOUT_ATOM(svgInnerSVGFrame,"SVGInnerSVGFrame")
-LAYOUT_ATOM(svgLinearGradientFrame,"SVGLinearGradientFrame")
-LAYOUT_ATOM(svgLineFrame,"SVGLineFrame")
-LAYOUT_ATOM(svgMarkerFrame,"SVGMarkerFrame")
-LAYOUT_ATOM(svgOuterSVGFrame,"SVGOuterSVGFrame")
-LAYOUT_ATOM(svgPathFrame,"SVGPathFrame")
-LAYOUT_ATOM(svgPathGeometryFrame,"SVGPathGeometryFrame")
-LAYOUT_ATOM(svgPatternFrame,"SVGPatternFrame")
-LAYOUT_ATOM(svgPolylineFrame,"SVGPolylineFrame")
-LAYOUT_ATOM(svgPolygonFrame,"SVGPolygonFrame")
-LAYOUT_ATOM(svgRadialGradientFrame,"SVGRadialGradientFrame")
-LAYOUT_ATOM(svgRectFrame,"SVGRectFrame")
-LAYOUT_ATOM(svgStopFrame,"SVGStopFrame")
-LAYOUT_ATOM(svgTextFrame,"SVGTextFrame")
-LAYOUT_ATOM(svgTextPathFrame,"SVGTextPathFrame")
-LAYOUT_ATOM(svgTSpanFrame,"SVGTSpanFrame")
-LAYOUT_ATOM(svgUseFrame,"SVGUseFrame")
-#endif // MOZ_SVG
-
-#ifdef DEBUG
-  // Alphabetical list of atoms used by debugging code
-LAYOUT_ATOM(cellMap, "TableCellMap")
-LAYOUT_ATOM(imageMap, "ImageMap")
-LAYOUT_ATOM(lineBoxBig, "LineBox:inline,big")
-LAYOUT_ATOM(lineBoxBlockBig, "LineBox:block,big")
-LAYOUT_ATOM(lineBoxBlockSmall, "LineBox:block,small")
-LAYOUT_ATOM(lineBoxFloats, "LineBoxFloats")
-LAYOUT_ATOM(lineBoxSmall, "LineBox:inline,small")
-LAYOUT_ATOM(spaceManager, "SpaceManager")
-LAYOUT_ATOM(tableColCache, "TableColumnCache")
-LAYOUT_ATOM(tableStrategy, "TableLayoutStrategy")
-LAYOUT_ATOM(textRun, "TextRun")
-LAYOUT_ATOM(xml_document_entities, "XMLDocumentEntities")
-LAYOUT_ATOM(xml_document_notations, "XMLDocumentNotations")
-#endif

layout/base/nsLayoutAtoms.cpp

@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-#include "nsLayoutAtoms.h"
-#include "nsStaticAtom.h"
-#include "nsMemory.h"
-
-// define storage for all atoms
-#define LAYOUT_ATOM(_name, _value) nsIAtom* nsLayoutAtoms::_name;
-#include "nsLayoutAtomList.h"
-#undef LAYOUT_ATOM
-
-
-static const nsStaticAtom LayoutAtoms_info[] = {
-#define LAYOUT_ATOM(name_, value_) { value_, &nsLayoutAtoms::name_ },
-#include "nsLayoutAtomList.h"
-#undef LAYOUT_ATOM
-};
-
-void nsLayoutAtoms::AddRefAtoms()
-{
-  NS_RegisterStaticAtoms(LayoutAtoms_info,
-                         NS_ARRAY_LENGTH(LayoutAtoms_info));
-}
-

layout/base/nsLayoutAtoms.h

@@ -37,31 +37,8 @@
 #ifndef nsLayoutAtoms_h___
 #define nsLayoutAtoms_h___
 
-#include "nsIAtom.h"
+#include "nsGkAtoms.h"
-
+typedef class nsGkAtoms nsLayoutAtoms;
-/**
- * This class wraps up the creation (and destruction) of the standard
- * set of atoms used during layout processing. These objects
- * are created when the first presentation context is created and they
- * are destroyed when the last presentation context object is destroyed.
- */
-
-class nsLayoutAtoms {
-public:
-
-  static void AddRefAtoms();
-
-  /* Declare all atoms
-
-     The atom names and values are stored in nsLayoutAtomList.h and
-     are brought to you by the magic of C preprocessing
-
-     Add new atoms to nsLayoutAtomList and all support logic will be auto-generated
-   */
-#define LAYOUT_ATOM(_name, _value) static nsIAtom* _name;
-#include "nsLayoutAtomList.h"
-#undef LAYOUT_ATOM
-};
 
 static inline PRBool IS_TABLE_CELL(nsIAtom* frameType) {
   return nsLayoutAtoms::tableCellFrame == frameType ||

layout/build/Makefile.in

@@ -136,7 +136,6 @@ SHARED_LIBRARY_LIBS = \
 		$(DIST)/lib/$(LIB_PREFIX)txxpath_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)txxslt_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)gkconxbl_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/$(LIB_PREFIX)gkconxulcon_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)gkconxuldoc_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)gkview_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)jsdombase_s.$(LIB_SUFFIX) \
@@ -154,6 +153,7 @@ ifdef MOZ_XUL
 SHARED_LIBRARY_LIBS += \
 		$(DIST)/lib/$(LIB_PREFIX)gkxultree_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)gkxulgrid_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)gkconxulcon_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)gkconxultmpl_s.$(LIB_SUFFIX) \
 		$(NULL)
 endif

layout/build/nsLayoutModule.cpp

@@ -308,10 +308,7 @@ Initialize(nsIModule* aSelf)
   nsCSSKeywords::AddRefTable();
   nsCSSProps::AddRefTable();
   nsColorNames::AddRefTable();
-  nsHTMLAtoms::AddRefAtoms();
+  nsGkAtoms::AddRefAtoms();
-  nsXBLAtoms::AddRefAtoms();
-  nsLayoutAtoms::AddRefAtoms();
-  nsXULAtoms::AddRefAtoms();
 
 #ifdef MOZ_XUL
   rv = nsXULContentUtils::Init();
@@ -326,13 +323,11 @@ Initialize(nsIModule* aSelf)
 
 #ifdef MOZ_MATHML
   nsMathMLOperators::AddRefTable();
-  nsMathMLAtoms::AddRefAtoms();
 #endif
 
 #ifdef MOZ_SVG
   if (nsSVGUtils::SVGEnabled())
     nsContentDLF::RegisterSVG();
-  nsSVGAtoms::AddRefAtoms();
 #ifdef MOZ_SVG_RENDERER_LIBART
   NS_InitSVGRendererLibartGlobals();
 #endif

layout/forms/nsTextControlFrame.cpp

@@ -1865,7 +1865,7 @@ nsTextControlFrame::CreateAnonymousContent(nsPresContext* aPresContext,
 
   // Set the necessary style attributes on the text control.
 
-  rv = divContent->SetAttr(kNameSpaceID_None, nsHTMLAtoms::kClass,
+  rv = divContent->SetAttr(kNameSpaceID_None, nsHTMLAtoms::_class,
                            NS_LITERAL_STRING("anonymous-div"), PR_FALSE);
 
   if (!IsSingleLineTextControl()) {

layout/mathml/base/src/nsMathMLContainerFrame.cpp

@@ -942,12 +942,12 @@ nsMathMLContainerFrame::AttributeChanged(PRInt32         aNameSpaceID,
                                          PRInt32         aModType)
 {
   if (aAttribute == nsMathMLAtoms::mathcolor_      ||
-      aAttribute == nsMathMLAtoms::color_          ||
+      aAttribute == nsMathMLAtoms::color           ||
       aAttribute == nsMathMLAtoms::mathsize_       ||
       aAttribute == nsMathMLAtoms::fontsize_       ||
       aAttribute == nsMathMLAtoms::fontfamily_     ||
       aAttribute == nsMathMLAtoms::mathbackground_ ||
-      aAttribute == nsMathMLAtoms::background_) {
+      aAttribute == nsMathMLAtoms::background) {
     MapAttributesIntoCSS(GetPresContext(), this);
   }
 

layout/mathml/base/src/nsMathMLFrame.cpp

@@ -586,12 +586,12 @@ nsMathMLFrame::MapAttributesIntoCSS(nsPresContext* aPresContext,
   static const nsCSSMapping
   kCSSMappingTable[] = {
     {kMathMLversion2, nsMathMLAtoms::mathcolor_,      "color:"},
-    {kMathMLversion1, nsMathMLAtoms::color_,          "color:"},
+    {kMathMLversion1, nsMathMLAtoms::color,           "color:"},
     {kMathMLversion2, nsMathMLAtoms::mathsize_,       "font-size:"},
     {kMathMLversion1, nsMathMLAtoms::fontsize_,       "font-size:"},
     {kMathMLversion1, nsMathMLAtoms::fontfamily_,     "font-family:"},
     {kMathMLversion2, nsMathMLAtoms::mathbackground_, "background-color:"},
-    {kMathMLversion1, nsMathMLAtoms::background_,     "background-color:"},
+    {kMathMLversion1, nsMathMLAtoms::background,      "background-color:"},
     {0, nsnull, nsnull}
   };
 

layout/mathml/base/src/nsMathMLmfencedFrame.cpp

@@ -136,7 +136,7 @@ nsMathMLmfencedFrame::CreateFencesAndSeparators(nsPresContext* aPresContext)
 
   //////////////  
   // see if the opening fence is there ...
-  if (!GetAttribute(mContent, mPresentationData.mstyle, nsMathMLAtoms::open_,
+  if (!GetAttribute(mContent, mPresentationData.mstyle, nsMathMLAtoms::open,
                     value)) {
     value = PRUnichar('('); // default as per the MathML REC
   }
@@ -155,7 +155,7 @@ nsMathMLmfencedFrame::CreateFencesAndSeparators(nsPresContext* aPresContext)
   //////////////
   // see if the closing fence is there ...
   if(!GetAttribute(mContent, mPresentationData.mstyle,
-                    nsMathMLAtoms::close_, value)) {
+                    nsMathMLAtoms::close, value)) {
     value = PRUnichar(')'); // default as per the MathML REC
   }
   else {

layout/mathml/base/src/nsMathMLmoFrame.cpp

@@ -388,7 +388,7 @@ nsMathMLmoFrame::ProcessOperatorData()
 
     // find our form
     form = NS_MATHML_OPERATOR_FORM_INFIX;
-    GetAttribute(mContent, mPresentationData.mstyle, nsMathMLAtoms::form_,
+    GetAttribute(mContent, mPresentationData.mstyle, nsMathMLAtoms::form,
                  value);
     if (!value.IsEmpty()) {
       if (value.EqualsLiteral("prefix"))

layout/mathml/base/src/nsMathMLmpaddedFrame.cpp

@@ -116,14 +116,14 @@ nsMathMLmpaddedFrame::ProcessAttributes()
 
   // width
   mWidthSign = NS_MATHML_SIGN_INVALID;
-  GetAttribute(mContent, nsnull, nsMathMLAtoms::width_, value);
+  GetAttribute(mContent, nsnull, nsMathMLAtoms::width, value);
   if (!value.IsEmpty()) {
     ParseAttribute(value, mWidthSign, mWidth, mWidthPseudoUnit);
   }
 
   // height
   mHeightSign = NS_MATHML_SIGN_INVALID;
-  GetAttribute(mContent, nsnull, nsMathMLAtoms::height_, value);
+  GetAttribute(mContent, nsnull, nsMathMLAtoms::height, value);
   if (!value.IsEmpty()) {
     ParseAttribute(value, mHeightSign, mHeight, mHeightPseudoUnit);
   }

layout/mathml/base/src/nsMathMLmspaceFrame.cpp

@@ -82,7 +82,7 @@ nsMathMLmspaceFrame::ProcessAttributes(nsPresContext* aPresContext)
 
   // width 
   mWidth = 0;
-  GetAttribute(mContent, mPresentationData.mstyle, nsMathMLAtoms::width_,
+  GetAttribute(mContent, mPresentationData.mstyle, nsMathMLAtoms::width,
                value);
   if (!value.IsEmpty()) {
     if ((ParseNumericValue(value, cssValue) ||
@@ -94,7 +94,7 @@ nsMathMLmspaceFrame::ProcessAttributes(nsPresContext* aPresContext)
 
   // height
   mHeight = 0;
-  GetAttribute(mContent, mPresentationData.mstyle, nsMathMLAtoms::height_,
+  GetAttribute(mContent, mPresentationData.mstyle, nsMathMLAtoms::height,
                value);
   if (!value.IsEmpty()) {
     if ((ParseNumericValue(value, cssValue) ||

layout/mathml/base/src/nsMathMLmstyleFrame.cpp

@@ -197,12 +197,12 @@ nsMathMLmstyleFrame::AttributeChanged(PRInt32         aNameSpaceID,
                                       PRInt32         aModType)
 {
   if (aAttribute == nsMathMLAtoms::mathcolor_      ||
-      aAttribute == nsMathMLAtoms::color_          ||
+      aAttribute == nsMathMLAtoms::color           ||
       aAttribute == nsMathMLAtoms::mathsize_       ||
       aAttribute == nsMathMLAtoms::fontsize_       ||
       aAttribute == nsMathMLAtoms::fontfamily_     ||
       aAttribute == nsMathMLAtoms::mathbackground_ ||
-      aAttribute == nsMathMLAtoms::background_) {
+      aAttribute == nsMathMLAtoms::background) {
     MapAttributesIntoCSS(GetPresContext(), this);
     return ReflowDirtyChild(GetPresContext()->PresShell(), nsnull);
   }

layout/mathml/base/src/nsMathMLmtableFrame.cpp

@@ -484,7 +484,7 @@ nsMathMLmtableOuterFrame::Reflow(nsPresContext*          aPresContext,
   // XXX should we also check <mstyle> ?
   PRInt32 rowIndex = 0;
   eAlign tableAlign = eAlign_axis;
-  GetAttribute(mContent, nsnull, nsMathMLAtoms::align_, value);
+  GetAttribute(mContent, nsnull, nsMathMLAtoms::align, value);
   if (!value.IsEmpty()) {
     ParseAlignAttribute(value, tableAlign, rowIndex);
   }
@@ -597,7 +597,7 @@ nsMathMLmtdFrame::GetRowSpan()
 {
   PRInt32 rowspan = 1;
   nsAutoString value;
-  mContent->GetAttr(kNameSpaceID_None, nsMathMLAtoms::rowspan_, value);
+  mContent->GetAttr(kNameSpaceID_None, nsMathMLAtoms::rowspan, value);
   if (!value.IsEmpty()) {
     PRInt32 error;
     rowspan = value.ToInteger(&error);

layout/mathml/content/src/Makefile.in

@@ -58,7 +58,6 @@ REQUIRES	= xpcom \
 include $(topsrcdir)/config/config.mk
 
 CPPSRCS =				\
-	nsMathMLAtoms.cpp  \
         nsMathMLOperators.cpp \
 	$(NULL)
 

layout/mathml/content/src/nsMathMLAtomList.h

@@ -1,276 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla MathML Project.
- *
- * The Initial Developer of the Original Code is
- * The University Of Queensland.
- * Portions created by the Initial Developer are Copyright (C) 1999
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Roger B. Sidje <rbs@maths.uq.edu.au>
- *   (Following the model of the Gecko team)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/******
-
-  This file contains the list of all MathML nsIAtoms and their values
-
-  It is designed to be used as inline input to nsMathMLAtoms.cpp *only*
-  through the magic of C preprocessing.
-
-  All entires must be enclosed in the macro MATHML_ATOM which will have cruel
-  and unusual things done to it
-
-  It is recommended (but not strictly necessary) to keep all entries
-  in alphabetical order
-
-  The first argument to MATHML_ATOM is the C++ identifier of the atom
-  The second argument is the string value of the atom
-
- ******/
-
-MATHML_ATOM(MOZfontsize, "-moz-math-font-size") // different from fontsize_
-MATHML_ATOM(MOZfontstyle, "-moz-math-font-style") // different from fontstyle_
-MATHML_ATOM(MOZrowline, "-moz-math-rowline") // different from rowlines_
-MATHML_ATOM(MOZcolumnline, "-moz-math-columnline") // different from columnlines_
-MATHML_ATOM(MOZfirstrow, "-moz-math-firstrow")
-MATHML_ATOM(MOZlastrow, "-moz-math-lastrow")
-MATHML_ATOM(MOZfirstcolumn, "-moz-math-firstcolumn")
-MATHML_ATOM(MOZlastcolumn, "-moz-math-lastcolumn")
-
-MATHML_ATOM(ordinaryMathMLFrame, "OrdinaryMathMLFrame")
-MATHML_ATOM(operatorOrdinaryMathMLFrame, "OperatorOrdinaryMathMLFrame")
-MATHML_ATOM(operatorInvisibleMathMLFrame, "OperatorInvisibleMathMLFrame")
-MATHML_ATOM(operatorUserDefinedMathMLFrame, "OperatorUserDefinedMathMLFrame")
-MATHML_ATOM(innerMathMLFrame, "InnerMathMLFrame") // 'inner' in TeX
-MATHML_ATOM(italicIdentifierMathMLFrame, "ItalicIdentifierMathMLFrame")
-MATHML_ATOM(uprightIdentifierMathMLFrame, "UprightIdentifierMathMLFrame")
-
-
-MATHML_ATOM(abs_, "abs")
-MATHML_ATOM(accent_, "accent")
-MATHML_ATOM(accentunder_, "accentunder")
-MATHML_ATOM(actiontype_, "actiontype")
-MATHML_ATOM(align_, "align")
-MATHML_ATOM(alignmentscope_, "alignmentscope")
-MATHML_ATOM(alt_, "alt")
-MATHML_ATOM(and_, "and")
-MATHML_ATOM(annotation_, "annotation")
-MATHML_ATOM(apply_, "apply")
-MATHML_ATOM(arccos_, "arccos")
-MATHML_ATOM(arcsin_, "arcsin")
-MATHML_ATOM(arctan_, "arctan")
-MATHML_ATOM(background_, "background")
-MATHML_ATOM(bevelled_, "bevelled")
-MATHML_ATOM(bvar_, "bvar")
-MATHML_ATOM(ci_, "ci")
-MATHML_ATOM(close_, "close")
-MATHML_ATOM(cn_, "cn")
-MATHML_ATOM(color_, "color")
-MATHML_ATOM(columnalign_, "columnalign")
-MATHML_ATOM(columnlines_, "columnlines")
-MATHML_ATOM(columnspacing_, "columnspacing")
-MATHML_ATOM(columnspan_, "columnspan")
-MATHML_ATOM(columnwidth_, "columnwidth")
-MATHML_ATOM(compose_, "compose")
-MATHML_ATOM(condition_, "condition")
-MATHML_ATOM(conjugate_, "conjugate")
-MATHML_ATOM(cos_, "cos")
-MATHML_ATOM(cosh_, "cosh")
-MATHML_ATOM(cot_, "cot")
-MATHML_ATOM(coth_, "coth")
-MATHML_ATOM(csc_, "csc")
-MATHML_ATOM(csch_, "csch")
-MATHML_ATOM(declare_, "declare")
-MATHML_ATOM(degree_, "degree")
-MATHML_ATOM(denomalign_, "denomalign")
-MATHML_ATOM(depth_, "depth")
-MATHML_ATOM(determinant_, "determinant")
-MATHML_ATOM(diff_, "diff")
-MATHML_ATOM(displaystyle_, "displaystyle")
-MATHML_ATOM(divide_, "divide")
-MATHML_ATOM(edge_, "edge")
-MATHML_ATOM(eq_, "eq")
-MATHML_ATOM(equalcolumns_, "equalcolumns")
-MATHML_ATOM(equalrows_, "equalrows")
-MATHML_ATOM(exists_, "exists")
-MATHML_ATOM(exp_, "exp")
-MATHML_ATOM(factorial_, "factorial")
-MATHML_ATOM(fence_, "fence")
-MATHML_ATOM(fn_, "fn")
-MATHML_ATOM(fontfamily_, "fontfamily")
-MATHML_ATOM(fontsize_, "fontsize")
-MATHML_ATOM(fontstyle_, "fontstyle")
-MATHML_ATOM(fontweight_, "fontweight")
-MATHML_ATOM(forall_, "forall")
-MATHML_ATOM(form_, "form")
-MATHML_ATOM(frame_, "frame")
-MATHML_ATOM(framespacing_, "framespacing")
-MATHML_ATOM(geq_, "geq")
-MATHML_ATOM(groupalign_, "groupalign")
-MATHML_ATOM(gt_, "gt")
-MATHML_ATOM(height_, "height")
-MATHML_ATOM(ident_, "ident")
-MATHML_ATOM(implies_, "implies")
-MATHML_ATOM(in_, "in")
-MATHML_ATOM(index_, "index")
-MATHML_ATOM(int_, "int")
-MATHML_ATOM(intersect_, "intersect")
-MATHML_ATOM(interval_, "interval")
-MATHML_ATOM(inverse_, "inverse")
-MATHML_ATOM(lambda_, "lambda")
-MATHML_ATOM(largeop_, "largeop")
-MATHML_ATOM(leq_, "leq")
-MATHML_ATOM(limit_, "limit")
-MATHML_ATOM(linebreak_, "linebreak")
-MATHML_ATOM(linethickness_, "linethickness")
-MATHML_ATOM(list_, "list")
-MATHML_ATOM(ln_, "ln")
-MATHML_ATOM(log_, "log")
-MATHML_ATOM(logbase_, "logbase")
-MATHML_ATOM(lowlimit_, "lowlimit")
-MATHML_ATOM(lquote_, "lquote")
-MATHML_ATOM(lspace_, "lspace")
-MATHML_ATOM(lt_, "lt")
-MATHML_ATOM(maction_, "maction")
-MATHML_ATOM(maligngroup_, "maligngroup")
-MATHML_ATOM(malignmark_, "malignmark")
-MATHML_ATOM(math,"math") // the only one without an underscore
-MATHML_ATOM(mathbackground_, "mathbackground")
-MATHML_ATOM(mathcolor_, "mathcolor")
-MATHML_ATOM(mathsize_, "mathsize")
-MATHML_ATOM(mathvariant_, "mathvariant")
-MATHML_ATOM(matrix_, "matrix")
-MATHML_ATOM(matrixrow_, "matrixrow")
-MATHML_ATOM(max_, "max")
-MATHML_ATOM(maxsize_, "maxsize")
-MATHML_ATOM(mean_, "mean")
-MATHML_ATOM(median_, "median")
-MATHML_ATOM(mediummathspace_, "mediummathspace")
-MATHML_ATOM(menclose_, "menclose")
-MATHML_ATOM(merror_, "merror")
-MATHML_ATOM(mfenced_, "mfenced")
-MATHML_ATOM(mfrac_, "mfrac")
-MATHML_ATOM(mi_, "mi")
-MATHML_ATOM(min_, "min")
-MATHML_ATOM(minlabelspacing_, "minlabelspacing")
-MATHML_ATOM(minsize_, "minsize")
-MATHML_ATOM(minus_, "minus")
-MATHML_ATOM(mlabeledtr_, "mlabeledtr")
-MATHML_ATOM(mmultiscripts_, "mmultiscripts")
-MATHML_ATOM(mn_, "mn")
-MATHML_ATOM(mo_, "mo")
-MATHML_ATOM(mode_, "mode")
-MATHML_ATOM(moment_, "moment")
-MATHML_ATOM(movablelimits_, "movablelimits")
-MATHML_ATOM(mover_, "mover")
-MATHML_ATOM(mpadded_, "mpadded")
-MATHML_ATOM(mphantom_, "mphantom")
-MATHML_ATOM(mprescripts_, "mprescripts")
-MATHML_ATOM(mroot_, "mroot")
-MATHML_ATOM(mrow_, "mrow")
-MATHML_ATOM(ms_, "ms")
-MATHML_ATOM(mspace_, "mspace")
-MATHML_ATOM(msqrt_, "msqrt")
-MATHML_ATOM(mstyle_, "mstyle")
-MATHML_ATOM(msub_, "msub")
-MATHML_ATOM(msubsup_, "msubsup")
-MATHML_ATOM(msup_, "msup")
-MATHML_ATOM(mtable_, "mtable")
-MATHML_ATOM(mtd_, "mtd")
-MATHML_ATOM(mtext_, "mtext")
-MATHML_ATOM(mtr_, "mtr")
-MATHML_ATOM(munder_, "munder")
-MATHML_ATOM(munderover_, "munderover")
-MATHML_ATOM(name_, "name")
-MATHML_ATOM(neq_, "neq")
-MATHML_ATOM(none_, "none")
-MATHML_ATOM(not_, "not")
-MATHML_ATOM(notation_, "notation")
-MATHML_ATOM(notin_, "notin")
-MATHML_ATOM(notprsubset_, "notprsubset")
-MATHML_ATOM(notsubset_, "notsubset")
-MATHML_ATOM(numalign_, "numalign")
-MATHML_ATOM(open_, "open")
-MATHML_ATOM(or_, "or")
-MATHML_ATOM(other_, "other")
-MATHML_ATOM(partialdiff_, "partialdiff")
-MATHML_ATOM(plus_, "plus")
-MATHML_ATOM(power_, "power")
-MATHML_ATOM(product_, "product")
-MATHML_ATOM(prsubset_, "prsubset")
-MATHML_ATOM(quotient_, "quotient")
-MATHML_ATOM(reln_, "reln")
-MATHML_ATOM(rem_, "rem")
-MATHML_ATOM(root_, "root")
-MATHML_ATOM(rowalign_, "rowalign")
-MATHML_ATOM(rowlines_, "rowlines")
-MATHML_ATOM(rowspacing_, "rowspacing")
-MATHML_ATOM(rowspan_, "rowspan")
-MATHML_ATOM(rquote_, "rquote")
-MATHML_ATOM(rspace_, "rspace")
-MATHML_ATOM(scriptlevel_, "scriptlevel")
-MATHML_ATOM(scriptminsize_, "scriptminsize")
-MATHML_ATOM(scriptsizemultiplier_, "scriptsizemultiplier")
-MATHML_ATOM(sdev_, "sdev")
-MATHML_ATOM(sec_, "sec")
-MATHML_ATOM(sech_, "sech")
-MATHML_ATOM(select_, "select")
-MATHML_ATOM(selection_, "selection")
-MATHML_ATOM(semantics_, "semantics")
-MATHML_ATOM(sep_, "sep")
-MATHML_ATOM(separator_, "separator")
-MATHML_ATOM(separators_, "separators")
-MATHML_ATOM(set_, "set")
-MATHML_ATOM(setdiff_, "setdiff")
-MATHML_ATOM(side_, "side")
-MATHML_ATOM(sin_, "sin")
-MATHML_ATOM(sinh_, "sinh")
-MATHML_ATOM(stretchy_, "stretchy")
-MATHML_ATOM(subscriptshift_, "subscriptshift")
-MATHML_ATOM(superscriptshift_, "superscriptshift")
-MATHML_ATOM(subset_, "subset")
-MATHML_ATOM(sum_, "sum")
-MATHML_ATOM(symmetric_, "symmetric")
-MATHML_ATOM(tan_, "tan")
-MATHML_ATOM(tanh_, "tanh")
-MATHML_ATOM(tendsto_, "tendsto")
-MATHML_ATOM(thickmathspace_, "thickmathspace")
-MATHML_ATOM(thinmathspace_, "thinmathspace")
-MATHML_ATOM(times_, "times")
-MATHML_ATOM(transpose_, "transpose")
-MATHML_ATOM(union_, "union")
-MATHML_ATOM(uplimit_, "uplimit")
-MATHML_ATOM(var_, "var")
-MATHML_ATOM(vector_, "vector")
-MATHML_ATOM(verythickmathspace_, "verythickmathspace")
-MATHML_ATOM(verythinmathspace_, "verythinmathspace")
-MATHML_ATOM(veryverythickmathspace_, "veryverythickmathspace")
-MATHML_ATOM(veryverythinmathspace_, "veryverythinmathspace")
-MATHML_ATOM(width_, "width")
-MATHML_ATOM(xor_, "xor")

layout/mathml/content/src/nsMathMLAtoms.cpp

@@ -1,58 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla MathML Project.
- *
- * The Initial Developer of the Original Code is
- * The University Of Queensland.
- * Portions created by the Initial Developer are Copyright (C) 1999
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Roger B. Sidje <rbs@maths.uq.edu.au>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsMathMLAtoms.h"
-#include "nsStaticAtom.h"
-#include "nsMemory.h"
-
-// define storage for all atoms
-#define MATHML_ATOM(_name, _value) nsIAtom* nsMathMLAtoms::_name;
-#include "nsMathMLAtomList.h"
-#undef MATHML_ATOM
-
-
-static const nsStaticAtom MathMLAtoms_info[] = {
-#define MATHML_ATOM(name_, value_) { value_, &nsMathMLAtoms::name_ },
-#include "nsMathMLAtomList.h"
-#undef MATHML_ATOM
-};
-
-void nsMathMLAtoms::AddRefAtoms() {
-    NS_RegisterStaticAtoms(MathMLAtoms_info,
-                           NS_ARRAY_LENGTH(MathMLAtoms_info));
-}
-

layout/mathml/content/src/nsMathMLAtoms.h

@@ -39,31 +39,7 @@
 #ifndef nsMathMLAtoms_h___
 #define nsMathMLAtoms_h___
 
-#include "nsIAtom.h"
+#include "nsGkAtoms.h"
-
+typedef class nsGkAtoms nsMathMLAtoms;
-/**
- * This class wraps up the creation and destruction of the standard
- * set of MathML atoms used during normal MathML handling. This object
- * is created when the first MathML content object is created, and
- * destroyed when the last such content object is destroyed.
- */
-class nsMathMLAtoms {
-public:
-
-  static void AddRefAtoms();
-
-  /* Declare all atoms
-
-     The atom names and values are stored in nsMathMLAtomList.h and
-     are brought to you by the magic of C preprocessing
-
-     Add new atoms to nsMathMLAtomList and all support logic will be auto-generated
-     after a clobber-build within this directory
-   */
-#define MATHML_ATOM(_name, _value) static nsIAtom* _name;
-#include "nsMathMLAtomList.h"
-#undef MATHML_ATOM
-
-};
 
 #endif /* nsMathMLAtoms_h___ */

layout/style/nsComputedDOMStyle.cpp

@@ -541,7 +541,7 @@ nsComputedDOMStyle::GetColumnCount(nsIFrame *aFrame,
 
   if (column) {
     if (column->mColumnCount == NS_STYLE_COLUMN_COUNT_AUTO) {
-      val->SetIdent(nsLayoutAtoms::autoAtom);
+      val->SetIdent(nsLayoutAtoms::_auto);
     } else {
       val->SetNumber(column->mColumnCount);
     }
@@ -568,7 +568,7 @@ nsComputedDOMStyle::GetColumnWidth(nsIFrame *aFrame,
       case eStyleUnit_Auto:
         // XXX fix this. When we actually have a column frame, I think
         // we should return the computed column width.
-        val->SetIdent(nsLayoutAtoms::autoAtom);
+        val->SetIdent(nsLayoutAtoms::_auto);
         break;
       default:
         NS_ERROR("Unexpected column width unit");
@@ -1180,7 +1180,7 @@ nsComputedDOMStyle::GetTableLayout(nsIFrame *aFrame,
                                  nsCSSProps::kTableLayoutKTable);
     val->SetIdent(tableLayout);
   } else {
-    val->SetIdent(nsLayoutAtoms::autoAtom);
+    val->SetIdent(nsLayoutAtoms::_auto);
   }
 
   return CallQueryInterface(val, aValue);
@@ -1401,7 +1401,7 @@ nsComputedDOMStyle::GetMarkerOffset(nsIFrame *aFrame,
         val->SetTwips(content->mMarkerOffset.GetCoordValue());
         break;
       case eStyleUnit_Auto:
-        val->SetIdent(nsLayoutAtoms::autoAtom);
+        val->SetIdent(nsLayoutAtoms::_auto);
         break;
       case eStyleUnit_Null: // XXX doesn't seem like a valid unit per CSS2?
         val->SetIdent(nsLayoutAtoms::none);
@@ -1487,7 +1487,7 @@ nsComputedDOMStyle::GetOutlineStyle(nsIFrame *aFrame,
         val->SetIdent(nsLayoutAtoms::none);
         break;
       case NS_STYLE_BORDER_STYLE_AUTO:
-        val->SetIdent(nsLayoutAtoms::autoAtom);
+        val->SetIdent(nsLayoutAtoms::_auto);
         break;
       default:
         const nsAFlatCString& style =
@@ -1640,7 +1640,7 @@ nsComputedDOMStyle::GetZIndex(nsIFrame *aFrame,
         NS_ERROR("Unexpected z-index unit");
         // fall through
       case eStyleUnit_Auto:
-        val->SetIdent(nsLayoutAtoms::autoAtom);
+        val->SetIdent(nsLayoutAtoms::_auto);
         break;
     }
   }
@@ -1735,7 +1735,7 @@ nsComputedDOMStyle::GetImageRegion(nsIFrame *aFrame,
   nsROCSSPrimitiveValue *leftVal = nsnull;
   if (list) {
     if (list->mImageRegion.width <= 0 || list->mImageRegion.height <= 0) {
-      val->SetIdent(nsLayoutAtoms::autoAtom);
+      val->SetIdent(nsLayoutAtoms::_auto);
     } else {
       // create the cssvalues for the sides, stick them in the rect object
       topVal = GetROCSSPrimitiveValue();
@@ -2176,7 +2176,7 @@ nsComputedDOMStyle::GetCursor(nsIFrame *aFrame,
     }
 
     if (ui->mCursor == NS_STYLE_CURSOR_AUTO) {
-      val->SetIdent(nsLayoutAtoms::autoAtom);
+      val->SetIdent(nsLayoutAtoms::_auto);
     } else {
       const nsAFlatCString& cursor =
         nsCSSProps::ValueToKeyword(ui->mCursor,
@@ -2582,7 +2582,7 @@ nsComputedDOMStyle::GetClip(nsIFrame *aFrame,
                                 NS_STYLE_CLIP_RIGHT_AUTO |
                                 NS_STYLE_CLIP_BOTTOM_AUTO |
                                 NS_STYLE_CLIP_LEFT_AUTO)) {
-      val->SetIdent(nsLayoutAtoms::autoAtom);
+      val->SetIdent(nsLayoutAtoms::_auto);
     } else {
       // create the cssvalues for the sides, stick them in the rect object
       topVal = GetROCSSPrimitiveValue();
@@ -2594,25 +2594,25 @@ nsComputedDOMStyle::GetClip(nsIFrame *aFrame,
                                                   bottomVal, leftVal);
         if (domRect) {
           if (display->mClipFlags & NS_STYLE_CLIP_TOP_AUTO) {
-            topVal->SetIdent(nsLayoutAtoms::autoAtom);
+            topVal->SetIdent(nsLayoutAtoms::_auto);
           } else {
             topVal->SetTwips(display->mClip.y);
           }
         
           if (display->mClipFlags & NS_STYLE_CLIP_RIGHT_AUTO) {
-            rightVal->SetIdent(nsLayoutAtoms::autoAtom);
+            rightVal->SetIdent(nsLayoutAtoms::_auto);
           } else {
             rightVal->SetTwips(display->mClip.width + display->mClip.x);
           }
         
           if (display->mClipFlags & NS_STYLE_CLIP_BOTTOM_AUTO) {
-            bottomVal->SetIdent(nsLayoutAtoms::autoAtom);
+            bottomVal->SetIdent(nsLayoutAtoms::_auto);
           } else {
             bottomVal->SetTwips(display->mClip.height + display->mClip.y);
           }
           
           if (display->mClipFlags & NS_STYLE_CLIP_LEFT_AUTO) {
-            leftVal->SetIdent(nsLayoutAtoms::autoAtom);
+            leftVal->SetIdent(nsLayoutAtoms::_auto);
           } else {
             leftVal->SetTwips(display->mClip.x);
           }
@@ -2657,7 +2657,7 @@ nsComputedDOMStyle::GetOverflow(nsIFrame *aFrame,
                                    nsCSSProps::kOverflowKTable);
       val->SetIdent(overflow);
     } else {
-      val->SetIdent(nsLayoutAtoms::autoAtom);
+      val->SetIdent(nsLayoutAtoms::_auto);
     }
   } // XXX else what?
 
@@ -2680,7 +2680,7 @@ nsComputedDOMStyle::GetOverflowX(nsIFrame *aFrame,
                                  nsCSSProps::kOverflowSubKTable);
     val->SetIdent(overflow);
   } else {
-    val->SetIdent(nsLayoutAtoms::autoAtom);
+    val->SetIdent(nsLayoutAtoms::_auto);
   }
 
   return CallQueryInterface(val, aValue);
@@ -2702,7 +2702,7 @@ nsComputedDOMStyle::GetOverflowY(nsIFrame *aFrame,
                                  nsCSSProps::kOverflowSubKTable);
     val->SetIdent(overflow);
   } else {
-    val->SetIdent(nsLayoutAtoms::autoAtom);
+    val->SetIdent(nsLayoutAtoms::_auto);
   }
 
   return CallQueryInterface(val, aValue);
@@ -2764,7 +2764,7 @@ nsComputedDOMStyle::GetHeight(nsIFrame *aFrame,
           val->SetPercent(positionData->mHeight.GetPercentValue());
           break;
         case eStyleUnit_Auto:
-          val->SetIdent(nsLayoutAtoms::autoAtom);
+          val->SetIdent(nsLayoutAtoms::_auto);
           break;
         default:
           NS_ERROR("Unexpected height unit");
@@ -2832,7 +2832,7 @@ nsComputedDOMStyle::GetWidth(nsIFrame *aFrame,
           val->SetPercent(positionData->mWidth.GetPercentValue());
           break;
         case eStyleUnit_Auto:
-          val->SetIdent(nsLayoutAtoms::autoAtom);
+          val->SetIdent(nsLayoutAtoms::_auto);
           break;
         default:
           NS_ERROR("Unexpected width unit");
@@ -3262,7 +3262,7 @@ nsComputedDOMStyle::GetStaticOffset(PRUint8 aSide, nsIFrame* aFrame,
 
         break;
       case eStyleUnit_Auto:
-        val->SetIdent(nsLayoutAtoms::autoAtom);
+        val->SetIdent(nsLayoutAtoms::_auto);
 
         break;
       default:

layout/xul/base/src/nsDocElementBoxFrame.cpp

@@ -134,7 +134,7 @@ nsDocElementBoxFrame::CreateAnonymousContent(nsPresContext* aPresContext,
   rv = NS_NewXULElement(getter_AddRefs(content), nodeInfo);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  content->SetAttr(nsnull, nsXULAtoms::defaultz, NS_LITERAL_STRING("true"), PR_FALSE);
+  content->SetAttr(nsnull, nsXULAtoms::_default, NS_LITERAL_STRING("true"), PR_FALSE);
   aAnonymousItems.AppendElement(content);
   
   return NS_OK;

layout/xul/base/src/tree/src/nsTreeBoxObject.cpp

@@ -134,7 +134,7 @@ static void FindBodyElement(nsIContent* aParent, nsIContent** aResult)
       break;
     }
     else if (content->IsContentOfType(nsIContent::eELEMENT) &&
-             !ni->Equals(nsXULAtoms::templateAtom, kNameSpaceID_XUL)) {
+             !ni->Equals(nsXULAtoms::_template, kNameSpaceID_XUL)) {
       FindBodyElement(content, aResult);
       if (*aResult)
         break;