diff --git a/mozilla/content/base/src/nsRuleNode.cpp b/mozilla/content/base/src/nsRuleNode.cpp
index c15d2886eb3..e72b02a3826 100644
--- a/mozilla/content/base/src/nsRuleNode.cpp
+++ b/mozilla/content/base/src/nsRuleNode.cpp
@@ -48,7 +48,7 @@
 #include "nsIFontMetrics.h"
 #include "nsIDocShellTreeItem.h"
 #include "nsStyleUtil.h"
-#include "nsCSSAtoms.h"
+#include "nsCSSPseudoElements.h"
 #include "nsThemeConstants.h"
 #include "nsITheme.h"
 #include "pldhash.h"
@@ -2730,8 +2730,8 @@ nsRuleNode::ComputeDisplayData(nsStyleStruct* aStartStruct,
 
   nsCOMPtr<nsIAtom> pseudoTag;
   aContext->GetPseudoType(*getter_AddRefs(pseudoTag));
-  PRBool generatedContent = (pseudoTag == nsCSSAtoms::beforePseudo || 
-                             pseudoTag == nsCSSAtoms::afterPseudo);
+  PRBool generatedContent = (pseudoTag == nsCSSPseudoElements::before || 
+                             pseudoTag == nsCSSPseudoElements::after);
 
   if (parentContext && 
       ((aRuleDetail != eRuleFullReset &&
diff --git a/mozilla/content/base/src/nsStyleSet.cpp b/mozilla/content/base/src/nsStyleSet.cpp
index 3d14f8620d7..db51bbb524d 100644
--- a/mozilla/content/base/src/nsStyleSet.cpp
+++ b/mozilla/content/base/src/nsStyleSet.cpp
@@ -49,7 +49,7 @@
 #include "nsIContent.h"
 #include "nsIDocument.h"
 #include "nsIStyleFrameConstruction.h"
-#include "nsLayoutAtoms.h"
+#include "nsCSSAnonBoxes.h"
 #include "nsTimer.h"
 #include "nsICSSStyleSheet.h"
 #include "nsNetUtil.h"
@@ -58,7 +58,6 @@
 #include "nsRuleWalker.h"
 #include "nsIHTMLDocument.h"
 #include "nsIDOMHTMLBodyElement.h"
-#include "nsHTMLAtoms.h"
 #include "nsHashtable.h"
 
 #ifdef MOZ_PERF_METRICS
@@ -1143,7 +1142,7 @@ nsIStyleContext* StyleSetImpl::ResolveStyleForNonElement(
         mOverrideRuleProcessors) {
       EnsureRuleWalker(aPresContext);
       result = GetContext(aPresContext, aParentContext,
-                          nsHTMLAtoms::mozNonElementPseudo);
+                          nsCSSAnonBoxes::mozNonElement);
       NS_ASSERTION(mRuleWalker->AtRoot(), "rule walker must be at root");
     }
   }
diff --git a/mozilla/content/build/nsContentModule.cpp b/mozilla/content/build/nsContentModule.cpp
index 2a56a3bd7c2..c496fa7dc1b 100644
--- a/mozilla/content/build/nsContentModule.cpp
+++ b/mozilla/content/build/nsContentModule.cpp
@@ -36,11 +36,13 @@
  * the terms of any one of the NPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "nsXBLAtoms.h"     // to addref/release table
-#include "nsCSSAtoms.h"     // to addref/release table
-#include "nsCSSKeywords.h"  // to addref/release table
-#include "nsCSSProps.h"     // to addref/release table
-#include "nsColorNames.h"   // to addref/release table
+#include "nsXBLAtoms.h"                 // to addref/release table
+#include "nsCSSPseudoElements.h"        // to addref/release table
+#include "nsCSSPseudoClasses.h"         // to addref/release table
+#include "nsCSSAnonBoxes.h"             // to addref/release table
+#include "nsCSSKeywords.h"              // to addref/release table
+#include "nsCSSProps.h"                 // to addref/release table
+#include "nsColorNames.h"               // to addref/release table
 #include "nsContentCID.h"
 #include "nsContentHTTPStartup.h"
 #include "nsContentDLF.h"
@@ -189,7 +191,9 @@ Initialize(nsIModule* aSelf)
   gInitialized = PR_TRUE;
     
   // Register all of our atoms once
-  nsCSSAtoms::AddRefAtoms();
+  nsCSSAnonBoxes::AddRefAtoms();
+  nsCSSPseudoClasses::AddRefAtoms();
+  nsCSSPseudoElements::AddRefAtoms();
   nsCSSKeywords::AddRefTable();
   nsCSSProps::AddRefTable();
   nsColorNames::AddRefTable();
@@ -244,7 +248,9 @@ Shutdown(nsIModule* aSelf)
   nsColorNames::ReleaseTable();
   nsCSSProps::ReleaseTable();
   nsCSSKeywords::ReleaseTable();
-  nsCSSAtoms::ReleaseAtoms();
+  nsCSSAnonBoxes::ReleaseAtoms();
+  nsCSSPseudoClasses::ReleaseAtoms();
+  nsCSSPseudoElements::ReleaseAtoms();
   nsHTMLAtoms::ReleaseAtoms();
   nsXBLAtoms::ReleaseAtoms();
   nsLayoutAtoms::ReleaseAtoms();
diff --git a/mozilla/content/events/src/nsEventStateManager.cpp b/mozilla/content/events/src/nsEventStateManager.cpp
index d5a0985869c..dde7647e2a8 100644
--- a/mozilla/content/events/src/nsEventStateManager.cpp
+++ b/mozilla/content/events/src/nsEventStateManager.cpp
@@ -112,7 +112,6 @@
 #include "nsLayoutCID.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsUnicharUtils.h"
-#include "nsCSSAtoms.h"
 #include "nsContentUtils.h"
 
 #if defined (XP_MAC) || defined(XP_MACOSX)
diff --git a/mozilla/content/html/content/src/nsHTMLAtomList.h b/mozilla/content/html/content/src/nsHTMLAtomList.h
index 0c64e08c5f7..da65106c5c8 100644
--- a/mozilla/content/html/content/src/nsHTMLAtomList.h
+++ b/mozilla/content/html/content/src/nsHTMLAtomList.h
@@ -52,19 +52,6 @@
 
  ******/
 
-HTML_ATOM(mozAnonymousBlock, ":-moz-anonymous-block")
-HTML_ATOM(mozAnonymousPositionedBlock, ":-moz-anonymous-positioned-block")
-HTML_ATOM(mozFirstLineFixup, ":-moz-first-line-fixup")
-HTML_ATOM(mozLineFrame, ":-moz-line-frame")
-HTML_ATOM(mozListBulletPseudo, ":-moz-list-bullet")
-HTML_ATOM(mozListNumberPseudo, ":-moz-list-number")
-HTML_ATOM(mozNonElementPseudo, ":-moz-non-element")
-HTML_ATOM(mozSingleLineTextControlFrame, ":-moz-singleline-textcontrol-frame")
-HTML_ATOM(mozFocusInnerPseudo, ":-moz-focus-inner")
-HTML_ATOM(mozFocusOuterPseudo, ":-moz-focus-outer")
-HTML_ATOM(mozDisplayComboboxControlFrame, ":-moz-display-comboboxcontrol-frame")
-HTML_ATOM(mozSelectionPseudo, ":-moz-selection")
-
 HTML_ATOM(_baseHref, NS_HTML_BASE_HREF)
 HTML_ATOM(_baseTarget, NS_HTML_BASE_TARGET)
 HTML_ATOM(a, "a")
@@ -97,9 +84,7 @@ HTML_ATOM(bottompadding, "bottompadding")
 HTML_ATOM(br, "br")
 HTML_ATOM(b, "b")
 HTML_ATOM(button, "button")
-HTML_ATOM(buttonContentPseudo, ":-moz-button-content")
 HTML_ATOM(caption, "caption")
-HTML_ATOM(cellContentPseudo, ":-moz-cell-content")
 HTML_ATOM(cellpadding, "cellpadding")
 HTML_ATOM(cellspacing, "cellspacing")
 HTML_ATOM(ch, "ch")
@@ -134,7 +119,6 @@ HTML_ATOM(dir, "dir")
 HTML_ATOM(div, "div")
 HTML_ATOM(disabled, "disabled")
 HTML_ATOM(dl, "dl")
-HTML_ATOM(dropDownListPseudo, ":-moz-dropdown-list")
 HTML_ATOM(dt, "dt")
    
 HTML_ATOM(datetime, "datetime")
@@ -147,9 +131,6 @@ HTML_ATOM(enctype, "enctype")
 HTML_ATOM(_event, "event")
 HTML_ATOM(face, "face")
 HTML_ATOM(fieldset, "fieldset")
-HTML_ATOM(fieldsetContentPseudo, ":-moz-fieldset-content")
-HTML_ATOM(firstLetterPseudo, ":first-letter")
-HTML_ATOM(firstLinePseudo, ":first-line")
 HTML_ATOM(font, "font")
 HTML_ATOM(fontWeight, "font-weight")
 HTML_ATOM(_for, "for")
@@ -157,7 +138,6 @@ HTML_ATOM(form, "form")
 HTML_ATOM(frame, "frame")
 HTML_ATOM(frameborder, "frameborder")
 HTML_ATOM(frameset, "frameset")
-HTML_ATOM(framesetBlankPseudo, ":-moz-frameset-blank")
 HTML_ATOM(gutter, "gutter")
 HTML_ATOM(h1, "h1")
 HTML_ATOM(h2, "h2")
@@ -175,7 +155,6 @@ HTML_ATOM(headerWindowTarget, "window-target")
 HTML_ATOM(headers, "headers")
 HTML_ATOM(height, "height")
 HTML_ATOM(hidden, "hidden")
-HTML_ATOM(horizontalFramesetBorderPseudo, ":-moz-hframeset-border")
 HTML_ATOM(hr, "hr")
 HTML_ATOM(href, "href")
 HTML_ATOM(hreflang, "hreflang")
@@ -238,8 +217,6 @@ HTML_ATOM(pointSize, "point-size")
 HTML_ATOM(pre, "pre")
 HTML_ATOM(profile, "profile")
 HTML_ATOM(prompt, "prompt")
-HTML_ATOM(radioPseudo, ":-moz-radio")
-HTML_ATOM(checkPseudo, ":-moz-checkbox")
 HTML_ATOM(readonly, "readonly")
 HTML_ATOM(refresh, "refresh")
 HTML_ATOM(rel, "rel")
@@ -273,13 +250,6 @@ HTML_ATOM(summary, "summary")
 HTML_ATOM(suppress, "suppress")
 HTML_ATOM(tabindex, "tabindex")
 HTML_ATOM(table, "table")
-HTML_ATOM(tablePseudo, ":-moz-table")
-HTML_ATOM(tableCellPseudo, ":-moz-table-cell")
-HTML_ATOM(tableColGroupPseudo, ":-moz-table-column-group")
-HTML_ATOM(tableColPseudo, ":-moz-table-column")
-HTML_ATOM(tableOuterPseudo, ":-moz-table-outer")
-HTML_ATOM(tableRowGroupPseudo, ":-moz-table-row-group")
-HTML_ATOM(tableRowPseudo, ":-moz-table-row")
 HTML_ATOM(tabstop, "tabstop")
 HTML_ATOM(target, "target")
 HTML_ATOM(tbody, "tbody")
@@ -305,7 +275,6 @@ HTML_ATOM(valuetype, "valuetype")
 HTML_ATOM(variable, "variable")
 HTML_ATOM(vcard_name, "vcard_name")
 HTML_ATOM(version, "version")
-HTML_ATOM(verticalFramesetBorderPseudo, ":-moz-vframeset-border")
 HTML_ATOM(visibility, "visibility")
 HTML_ATOM(vlink, "vlink")
 HTML_ATOM(vspace, "vspace")
diff --git a/mozilla/content/html/content/src/nsHTMLInputElement.cpp b/mozilla/content/html/content/src/nsHTMLInputElement.cpp
index d5fda1c4f83..7369bc0f2f0 100644
--- a/mozilla/content/html/content/src/nsHTMLInputElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLInputElement.cpp
@@ -91,7 +91,6 @@
 #include "nsMutationEvent.h"
 
 #include "nsRuleNode.h"
-#include "nsCSSAtoms.h"
 
 // input type=radio
 #include "nsIRadioControlFrame.h"
diff --git a/mozilla/content/html/style/src/nsCSSParser.cpp b/mozilla/content/html/style/src/nsCSSParser.cpp
index 4ce1045e890..acb90904c1c 100644
--- a/mozilla/content/html/style/src/nsCSSParser.cpp
+++ b/mozilla/content/html/style/src/nsCSSParser.cpp
@@ -63,7 +63,8 @@
 #include "nsISupportsArray.h"
 #include "nsColor.h"
 #include "nsStyleConsts.h"
-#include "nsCSSAtoms.h"
+#include "nsLayoutAtoms.h"
+#include "nsCSSPseudoClasses.h"
 #include "nsINameSpaceManager.h"
 #include "nsINameSpace.h"
 #include "nsThemeConstants.h"
@@ -1563,28 +1564,6 @@ PRBool CSSParserImpl::ParseSelectorList(PRInt32& aErrorCode,
   return PR_FALSE;
 }
 
-static PRBool IsPseudoClass(const nsIAtom* aAtom)
-{
-  return PRBool((nsCSSAtoms::activePseudo == aAtom) || 
-                (nsCSSAtoms::anyLinkPseudo == aAtom) ||
-                (nsCSSAtoms::checkedPseudo == aAtom) ||
-                (nsCSSAtoms::disabledPseudo == aAtom) ||
-                (nsCSSAtoms::dragOverPseudo == aAtom) ||
-                (nsCSSAtoms::enabledPseudo == aAtom) ||
-                (nsCSSAtoms::emptyPseudo == aAtom) ||
-                (nsCSSAtoms::firstChildPseudo == aAtom) ||
-                (nsCSSAtoms::firstNodePseudo == aAtom) ||
-                (nsCSSAtoms::focusPseudo == aAtom) ||
-                (nsCSSAtoms::hoverPseudo == aAtom) ||
-                (nsCSSAtoms::langPseudo == aAtom) ||
-                (nsCSSAtoms::lastChildPseudo == aAtom) ||
-                (nsCSSAtoms::lastNodePseudo == aAtom) ||
-                (nsCSSAtoms::linkPseudo == aAtom) ||
-                (nsCSSAtoms::rootPseudo == aAtom) ||
-                (nsCSSAtoms::xblBoundElementPseudo == aAtom) ||
-                (nsCSSAtoms::visitedPseudo == aAtom));
-}
-
 static PRBool IsSinglePseudoClass(const nsCSSSelector& aSelector)
 {
   return PRBool((aSelector.mNameSpace == kNameSpaceID_Unknown) && 
@@ -1637,7 +1616,7 @@ PRBool CSSParserImpl::ParseSelectorGroup(PRInt32& aErrorCode,
     nsAtomStringList* prevList = nsnull;
     nsAtomStringList* pseudoClassList = listSel->mPseudoClassList;
     while (nsnull != pseudoClassList) {
-      if (! IsPseudoClass(pseudoClassList->mAtom)) {
+      if (! nsCSSPseudoClasses::IsPseudoClass(pseudoClassList->mAtom)) {
         havePseudoElement = PR_TRUE;
         if (IsSinglePseudoClass(*listSel)) {  // convert to pseudo element selector
           nsIAtom* pseudoElement = pseudoClassList->mAtom;  // steal ref count
@@ -2209,9 +2188,9 @@ void CSSParserImpl::ParsePseudoSelector(PRInt32&  aDataMask,
           (!aIsNegated && IsTreePseudoElement(mToken.mIdent)) ||
 #endif
           // the negation pseudo-class is a function
-          (nsCSSAtoms::notPseudo == pseudo) ||
+          (nsCSSPseudoClasses::notPseudo == pseudo) ||
           // as is the lang pseudo-class
-          (nsCSSAtoms::langPseudo == pseudo))) {
+          (nsCSSPseudoClasses::lang == pseudo))) {
       REPORT_UNEXPECTED_TOKEN(NS_LITERAL_STRING("Expected identifier for pseudo-class selector not found"));
       UngetToken();
       aParsingStatus = SELECTOR_PARSING_STOPPED_ERROR;
@@ -2219,7 +2198,7 @@ void CSSParserImpl::ParsePseudoSelector(PRInt32&  aDataMask,
     }
   }
 
-  if (nsCSSAtoms::notPseudo == pseudo) {
+  if (nsCSSPseudoClasses::notPseudo == pseudo) {
     if (aIsNegated) { // :not() can't be itself negated
       REPORT_UNEXPECTED_TOKEN(NS_LITERAL_STRING("Negation pseudo-class can't be negated"));
       aParsingStatus = SELECTOR_PARSING_STOPPED_ERROR;
@@ -2231,9 +2210,9 @@ void CSSParserImpl::ParsePseudoSelector(PRInt32&  aDataMask,
       return;
     }
   }    
-  else if (IsPseudoClass(pseudo)) {
+  else if (nsCSSPseudoClasses::IsPseudoClass(pseudo)) {
     aDataMask |= SEL_MASK_PCLASS;
-    if (nsCSSAtoms::langPseudo == pseudo) {
+    if (nsCSSPseudoClasses::lang == pseudo) {
       ParseLangSelector(aSelector, aParsingStatus, aErrorCode);
     }
     // XXX are there more pseudo classes which accept arguments ?
@@ -2384,7 +2363,7 @@ void CSSParserImpl::ParseLangSelector(nsCSSSelector& aSelector,
     }
 
     // Add the pseudo with the language parameter
-    aSelector.AddPseudoClass(nsCSSAtoms::langPseudo, mToken.mIdent.get());
+    aSelector.AddPseudoClass(nsCSSPseudoClasses::lang, mToken.mIdent.get());
 
     // close the parenthesis
     if (!ExpectSymbol(aErrorCode, ')', PR_TRUE)) {
diff --git a/mozilla/content/html/style/src/nsCSSStyleSheet.cpp b/mozilla/content/html/style/src/nsCSSStyleSheet.cpp
index cdf329aa25c..973b229a047 100644
--- a/mozilla/content/html/style/src/nsCSSStyleSheet.cpp
+++ b/mozilla/content/html/style/src/nsCSSStyleSheet.cpp
@@ -90,7 +90,7 @@
 #include "nsICSSLoader.h"
 #include "nsICSSLoaderObserver.h"
 #include "nsRuleWalker.h"
-#include "nsCSSAtoms.h"
+#include "nsCSSPseudoClasses.h"
 #include "nsINameSpaceManager.h"
 #include "nsINameSpace.h"
 #include "nsITextContent.h"
@@ -2315,7 +2315,7 @@ CSSStyleSheetImpl::CheckRuleForAttributes(nsICSSRule *aRule)
         // Search for the :lang() pseudo class.  If it is there add
         // the lang attribute to the relevant attribute list.
         for (nsAtomStringList* p = iter->mPseudoClassList; p; p = p->mNext) {
-          if (p->mAtom == nsCSSAtoms::langPseudo) {
+          if (p->mAtom == nsCSSPseudoClasses::lang) {
             DependentAtomKey langKey(nsHTMLAtoms::lang);
             mInner->mRelevantAttributes.Put(&langKey, nsHTMLAtoms::lang);
             break;
@@ -3512,18 +3512,18 @@ static PRBool ValueIncludes(const nsString& aValueList, const nsString& aValue,
 
 inline PRBool IsEventPseudo(nsIAtom* aAtom)
 {
-  return PRBool ((nsCSSAtoms::activePseudo == aAtom)   || 
-                 (nsCSSAtoms::dragOverPseudo == aAtom) || 
-                 (nsCSSAtoms::focusPseudo == aAtom)    || 
-                 (nsCSSAtoms::hoverPseudo == aAtom)); 
+  return PRBool ((nsCSSPseudoClasses::active == aAtom)   || 
+                 (nsCSSPseudoClasses::mozDragOver == aAtom) || 
+                 (nsCSSPseudoClasses::focus == aAtom)    || 
+                 (nsCSSPseudoClasses::hover == aAtom)); 
                  // XXX selected, enabled, disabled, selection?
 }
 
 inline PRBool IsLinkPseudo(nsIAtom* aAtom)
 {
-  return PRBool ((nsCSSAtoms::linkPseudo == aAtom) || 
-                 (nsCSSAtoms::visitedPseudo == aAtom) ||
-                 (nsCSSAtoms::anyLinkPseudo == aAtom));
+  return PRBool ((nsCSSPseudoClasses::link == aAtom) || 
+                 (nsCSSPseudoClasses::visited == aAtom) ||
+                 (nsCSSPseudoClasses::mozAnyLink == aAtom));
 }
 
 // Return whether we should apply a "global" (i.e., universal-tag)
@@ -3647,8 +3647,8 @@ static PRBool SelectorMatches(RuleProcessorData &data,
     nsAtomStringList* pseudoClass = aSelector->mPseudoClassList;
 
     while (result && (nsnull != pseudoClass)) {
-      if ((nsCSSAtoms::firstChildPseudo == pseudoClass->mAtom) ||
-          (nsCSSAtoms::firstNodePseudo == pseudoClass->mAtom) ) {
+      if ((nsCSSPseudoClasses::firstChild == pseudoClass->mAtom) ||
+          (nsCSSPseudoClasses::firstNode == pseudoClass->mAtom) ) {
         nsIContent* firstChild = nsnull;
         nsIContent* parent = data.mParentContent;
         if (parent) {
@@ -3656,7 +3656,7 @@ static PRBool SelectorMatches(RuleProcessorData &data,
           do {
             parent->ChildAt(++index, firstChild);
             if (firstChild) { // stop at first non-comment and non-whitespace node (and non-text node for firstChild)
-              if (IsSignificantChild(firstChild, (nsCSSAtoms::firstNodePseudo == pseudoClass->mAtom))) {
+              if (IsSignificantChild(firstChild, (nsCSSPseudoClasses::firstNode == pseudoClass->mAtom))) {
                 break;
               }
               NS_RELEASE(firstChild);
@@ -3669,8 +3669,8 @@ static PRBool SelectorMatches(RuleProcessorData &data,
         result = PRBool(localTrue == (data.mContent == firstChild));
         NS_IF_RELEASE(firstChild);
       }
-      else if ((nsCSSAtoms::lastChildPseudo == pseudoClass->mAtom) ||
-               (nsCSSAtoms::lastNodePseudo == pseudoClass->mAtom)) {
+      else if ((nsCSSPseudoClasses::lastChild == pseudoClass->mAtom) ||
+               (nsCSSPseudoClasses::lastNode == pseudoClass->mAtom)) {
         nsIContent* lastChild = nsnull;
         nsIContent* parent = data.mParentContent;
         if (parent) {
@@ -3679,7 +3679,7 @@ static PRBool SelectorMatches(RuleProcessorData &data,
           do {
             parent->ChildAt(--index, lastChild);
             if (lastChild) { // stop at first non-comment and non-whitespace node (and non-text node for lastChild)
-              if (IsSignificantChild(lastChild, (nsCSSAtoms::lastNodePseudo == pseudoClass->mAtom))) {
+              if (IsSignificantChild(lastChild, (nsCSSPseudoClasses::lastNode == pseudoClass->mAtom))) {
                 break;
               }
               NS_RELEASE(lastChild);
@@ -3692,7 +3692,7 @@ static PRBool SelectorMatches(RuleProcessorData &data,
         result = PRBool(localTrue == (data.mContent == lastChild));
         NS_IF_RELEASE(lastChild);
       }
-      else if (nsCSSAtoms::emptyPseudo == pseudoClass->mAtom) {
+      else if (nsCSSPseudoClasses::empty == pseudoClass->mAtom) {
         nsIContent* child = nsnull;
         nsIContent* element = data.mContent;
         PRInt32 index = -1;
@@ -3711,7 +3711,7 @@ static PRBool SelectorMatches(RuleProcessorData &data,
         result = PRBool(localTrue == (child == nsnull));
         NS_IF_RELEASE(child);
       }
-      else if (nsCSSAtoms::rootPseudo == pseudoClass->mAtom) {
+      else if (nsCSSPseudoClasses::root == pseudoClass->mAtom) {
         if (data.mParentContent) {
           result = localFalse;
         }
@@ -3719,11 +3719,11 @@ static PRBool SelectorMatches(RuleProcessorData &data,
           result = localTrue;
         }
       }
-      else if (nsCSSAtoms::xblBoundElementPseudo == pseudoClass->mAtom) {
+      else if (nsCSSPseudoClasses::mozBoundElement == pseudoClass->mAtom) {
         result = (data.mScopedRoot && data.mScopedRoot == data.mContent)
                    ? localTrue : localFalse;
       }
-      else if (nsCSSAtoms::langPseudo == pseudoClass->mAtom) {
+      else if (nsCSSPseudoClasses::lang == pseudoClass->mAtom) {
         NS_ASSERTION(nsnull != pseudoClass->mString, "null lang parameter");
         result = localFalse;
         if (pseudoClass->mString && *pseudoClass->mString) {
@@ -3775,8 +3775,8 @@ static PRBool SelectorMatches(RuleProcessorData &data,
             !aSelector->mTag && !aSelector->mClassList &&
             !aSelector->mIDList && !aSelector->mAttrList &&
             // :hover or :active
-            (nsCSSAtoms::activePseudo == pseudoClass->mAtom ||
-             nsCSSAtoms::hoverPseudo == pseudoClass->mAtom) &&
+            (nsCSSPseudoClasses::active == pseudoClass->mAtom ||
+             nsCSSPseudoClasses::hover == pseudoClass->mAtom) &&
             // important for |IsQuirkEventSensitive|:
             data.mIsHTMLContent && !data.mIsHTMLLink &&
             !IsQuirkEventSensitive(data.mContentTag)) {
@@ -3786,19 +3786,19 @@ static PRBool SelectorMatches(RuleProcessorData &data,
           // quirk should apply only to ":hover" (if to anything at all).
           result = localFalse;
         } else {
-          if (nsCSSAtoms::activePseudo == pseudoClass->mAtom) {
+          if (nsCSSPseudoClasses::active == pseudoClass->mAtom) {
             result = (aStateMask & NS_EVENT_STATE_ACTIVE) ||
                      (localTrue == (0 != (data.mEventState & NS_EVENT_STATE_ACTIVE)));
           }
-          else if (nsCSSAtoms::focusPseudo == pseudoClass->mAtom) {
+          else if (nsCSSPseudoClasses::focus == pseudoClass->mAtom) {
             result = (aStateMask & NS_EVENT_STATE_FOCUS) ||
                      (localTrue == (0 != (data.mEventState & NS_EVENT_STATE_FOCUS)));
           }
-          else if (nsCSSAtoms::hoverPseudo == pseudoClass->mAtom) {
+          else if (nsCSSPseudoClasses::hover == pseudoClass->mAtom) {
             result = (aStateMask & NS_EVENT_STATE_HOVER) ||
                      (localTrue == (0 != (data.mEventState & NS_EVENT_STATE_HOVER)));
           }
-          else if (nsCSSAtoms::dragOverPseudo == pseudoClass->mAtom) {
+          else if (nsCSSPseudoClasses::mozDragOver == pseudoClass->mAtom) {
             result = (aStateMask & NS_EVENT_STATE_DRAGOVER) ||
                      (localTrue == (0 != (data.mEventState & NS_EVENT_STATE_DRAGOVER)));
           }
@@ -3807,13 +3807,13 @@ static PRBool SelectorMatches(RuleProcessorData &data,
       else if (IsLinkPseudo(pseudoClass->mAtom)) {
         if (data.mIsHTMLLink || data.mIsSimpleXLink) {
           if (result) {
-            if (nsCSSAtoms::anyLinkPseudo == pseudoClass->mAtom) {
+            if (nsCSSPseudoClasses::mozAnyLink == pseudoClass->mAtom) {
               result = localTrue;
             }
-            else if (nsCSSAtoms::linkPseudo == pseudoClass->mAtom) {
+            else if (nsCSSPseudoClasses::link == pseudoClass->mAtom) {
               result = PRBool(localTrue == (eLinkState_Unvisited == data.mLinkState));
             }
-            else if (nsCSSAtoms::visitedPseudo == pseudoClass->mAtom) {
+            else if (nsCSSPseudoClasses::visited == pseudoClass->mAtom) {
               result = PRBool(localTrue == (eLinkState_Visited == data.mLinkState));
             }
           }
@@ -3822,7 +3822,7 @@ static PRBool SelectorMatches(RuleProcessorData &data,
           result = localFalse;  // not a link
         }
       }
-      else if (nsCSSAtoms::checkedPseudo == pseudoClass->mAtom) {
+      else if (nsCSSPseudoClasses::checked == pseudoClass->mAtom) {
         // This pseudoclass matches the selected state on the following elements:
         //  <option>
         //  <input type=checkbox>
@@ -4398,11 +4398,11 @@ PRBool IsStateSelector(nsCSSSelector& aSelector)
 {
   nsAtomStringList* pseudoClass = aSelector.mPseudoClassList;
   while (pseudoClass) {
-    if ((pseudoClass->mAtom == nsCSSAtoms::activePseudo) ||
-        (pseudoClass->mAtom == nsCSSAtoms::checkedPseudo) ||
-        (pseudoClass->mAtom == nsCSSAtoms::dragOverPseudo) || 
-        (pseudoClass->mAtom == nsCSSAtoms::focusPseudo) || 
-        (pseudoClass->mAtom == nsCSSAtoms::hoverPseudo)) {
+    if ((pseudoClass->mAtom == nsCSSPseudoClasses::active) ||
+        (pseudoClass->mAtom == nsCSSPseudoClasses::checked) ||
+        (pseudoClass->mAtom == nsCSSPseudoClasses::mozDragOver) || 
+        (pseudoClass->mAtom == nsCSSPseudoClasses::focus) || 
+        (pseudoClass->mAtom == nsCSSPseudoClasses::hover)) {
       return PR_TRUE;
     }
     pseudoClass = pseudoClass->mNext;
diff --git a/mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp b/mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp
index 2a26809a7a9..f60df20c683 100644
--- a/mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp
+++ b/mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp
@@ -43,7 +43,7 @@
 #include "nsIAtom.h"
 #include "nsIURL.h"
 #include "nsISupportsArray.h"
-#include "nsHTMLAtoms.h"
+#include "nsCSSPseudoElements.h"
 #include "nsIHTMLContent.h"
 #include "nsIStyleRule.h"
 #include "nsIFrame.h"
@@ -318,7 +318,7 @@ HTMLCSSStyleSheetImpl::RulesMatching(PseudoRuleProcessorData* aData,
     return NS_OK;
 
   nsIAtom* pseudoTag = aData->mPseudoTag;
-  if (pseudoTag == nsHTMLAtoms::firstLinePseudo) {
+  if (pseudoTag == nsCSSPseudoElements::firstLine) {
     if (!mFirstLineRule) {
       mFirstLineRule = new CSSFirstLineRule(this);
       if (!mFirstLineRule)
@@ -327,7 +327,7 @@ HTMLCSSStyleSheetImpl::RulesMatching(PseudoRuleProcessorData* aData,
     }
     aData->mRuleWalker->Forward(mFirstLineRule);
   }
-  else if (pseudoTag == nsHTMLAtoms::firstLetterPseudo) {
+  else if (pseudoTag == nsCSSPseudoElements::firstLetter) {
     if (!mFirstLetterRule) {
       mFirstLetterRule = new CSSFirstLetterRule(this);
       if (!mFirstLetterRule)
diff --git a/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp b/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp
index cb08bea676b..a986ea1fe86 100644
--- a/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp
+++ b/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp
@@ -56,6 +56,7 @@
 #include "nsLayoutCID.h"
 #include "nsIDOMHTMLDocument.h"
 #include "nsIDOMHTMLElement.h"
+#include "nsCSSAnonBoxes.h"
 
 #include "nsRuleWalker.h"
 
@@ -1049,7 +1050,7 @@ HTMLStyleSheetImpl::RulesMatching(PseudoRuleProcessorData* aData,
                                   nsIAtom* aMedium)
 {
   nsIAtom* pseudoTag = aData->mPseudoTag;
-  if (pseudoTag == nsHTMLAtoms::tableColPseudo) {
+  if (pseudoTag == nsCSSAnonBoxes::tableCol) {
     nsRuleWalker *ruleWalker = aData->mRuleWalker;
     if (ruleWalker) {
       ruleWalker->Forward(mTableColRule);
diff --git a/mozilla/content/macbuild/contentshared.xml b/mozilla/content/macbuild/contentshared.xml
index d10003b9506..9cc6773163c 100644
--- a/mozilla/content/macbuild/contentshared.xml
+++ b/mozilla/content/macbuild/contentshared.xml
@@ -892,7 +892,21 @@
             <FILELIST>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
-                    <PATH>nsCSSAtoms.cpp</PATH>
+                    <PATH>nsCSSAnonBoxes.cpp</PATH>
+                    <PATHFORMAT>MacOS</PATHFORMAT>
+                    <FILEKIND>Text</FILEKIND>
+                    <FILEFLAGS></FILEFLAGS>
+                </FILE>
+                <FILE>
+                    <PATHTYPE>Name</PATHTYPE>
+                    <PATH>nsCSSPseudoClasses.cpp</PATH>
+                    <PATHFORMAT>MacOS</PATHFORMAT>
+                    <FILEKIND>Text</FILEKIND>
+                    <FILEFLAGS></FILEFLAGS>
+                </FILE>
+                <FILE>
+                    <PATHTYPE>Name</PATHTYPE>
+                    <PATH>nsCSSPseudoElements.cpp</PATH>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Text</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
@@ -992,7 +1006,17 @@
             <LINKORDER>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
-                    <PATH>nsCSSAtoms.cpp</PATH>
+                    <PATH>nsCSSPseudoClasses.cpp</PATH>
+                    <PATHFORMAT>MacOS</PATHFORMAT>
+                </FILEREF>
+                <FILEREF>
+                    <PATHTYPE>Name</PATHTYPE>
+                    <PATH>nsCSSPseudoElements.cpp</PATH>
+                    <PATHFORMAT>MacOS</PATHFORMAT>
+                </FILEREF>
+                <FILEREF>
+                    <PATHTYPE>Name</PATHTYPE>
+                    <PATH>nsCSSAnonBoxes.cpp</PATH>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
@@ -1901,7 +1925,21 @@
             <FILELIST>
                 <FILE>
                     <PATHTYPE>Name</PATHTYPE>
-                    <PATH>nsCSSAtoms.cpp</PATH>
+                    <PATH>nsCSSAnonBoxes.cpp</PATH>
+                    <PATHFORMAT>MacOS</PATHFORMAT>
+                    <FILEKIND>Text</FILEKIND>
+                    <FILEFLAGS></FILEFLAGS>
+                </FILE>
+                <FILE>
+                    <PATHTYPE>Name</PATHTYPE>
+                    <PATH>nsCSSPseudoClasses.cpp</PATH>
+                    <PATHFORMAT>MacOS</PATHFORMAT>
+                    <FILEKIND>Text</FILEKIND>
+                    <FILEFLAGS></FILEFLAGS>
+                </FILE>
+                <FILE>
+                    <PATHTYPE>Name</PATHTYPE>
+                    <PATH>nsCSSPseudoElements.cpp</PATH>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                     <FILEKIND>Text</FILEKIND>
                     <FILEFLAGS></FILEFLAGS>
@@ -2001,7 +2039,17 @@
             <LINKORDER>
                 <FILEREF>
                     <PATHTYPE>Name</PATHTYPE>
-                    <PATH>nsCSSAtoms.cpp</PATH>
+                    <PATH>nsCSSAnonBoxes.cpp</PATH>
+                    <PATHFORMAT>MacOS</PATHFORMAT>
+                </FILEREF>
+                <FILEREF>
+                    <PATHTYPE>Name</PATHTYPE>
+                    <PATH>nsCSSPseudoClasses.cpp</PATH>
+                    <PATHFORMAT>MacOS</PATHFORMAT>
+                </FILEREF>
+                <FILEREF>
+                    <PATHTYPE>Name</PATHTYPE>
+                    <PATH>nsCSSPseudoElements.cpp</PATH>
                     <PATHFORMAT>MacOS</PATHFORMAT>
                 </FILEREF>
                 <FILEREF>
@@ -2083,7 +2131,19 @@
             <FILEREF>
                 <TARGETNAME>contentsharedDebug.o</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>
-                <PATH>nsCSSAtoms.cpp</PATH>
+                <PATH>nsCSSAnonBoxes.cpp</PATH>
+                <PATHFORMAT>MacOS</PATHFORMAT>
+            </FILEREF>
+            <FILEREF>
+                <TARGETNAME>contentsharedDebug.o</TARGETNAME>
+                <PATHTYPE>Name</PATHTYPE>
+                <PATH>nsCSSPseudoClasses.cpp</PATH>
+                <PATHFORMAT>MacOS</PATHFORMAT>
+            </FILEREF>
+            <FILEREF>
+                <TARGETNAME>contentsharedDebug.o</TARGETNAME>
+                <PATHTYPE>Name</PATHTYPE>
+                <PATH>nsCSSPseudoElements.cpp</PATH>
                 <PATHFORMAT>MacOS</PATHFORMAT>
             </FILEREF>
             <FILEREF>
diff --git a/mozilla/content/shared/public/MANIFEST b/mozilla/content/shared/public/MANIFEST
index c35ec5fabc5..3496ec6e674 100644
--- a/mozilla/content/shared/public/MANIFEST
+++ b/mozilla/content/shared/public/MANIFEST
@@ -3,8 +3,12 @@
 #
 nsBidiUtils.h
 nsChangeHint.h
-nsCSSAtomList.h
-nsCSSAtoms.h
+nsCSSAnonBoxList.h
+nsCSSAnonBoxes.h
+nsCSSPseudoClassList.h
+nsCSSPseudoClasses.h
+nsCSSPseudoElementList.h
+nsCSSPseudoElements.h
 nsCSSKeywordList.h
 nsCSSKeywords.h
 nsCSSPropList.h
diff --git a/mozilla/content/shared/public/Makefile.in b/mozilla/content/shared/public/Makefile.in
index c73376d4afe..d2e078b13a5 100644
--- a/mozilla/content/shared/public/Makefile.in
+++ b/mozilla/content/shared/public/Makefile.in
@@ -30,8 +30,12 @@ MODULE		= content
 
 EXPORTS		= \
 nsChangeHint.h \
-nsCSSAtomList.h \
-nsCSSAtoms.h \
+nsCSSAnonBoxList.h \
+nsCSSAnonBoxes.h \
+nsCSSPseudoClassList.h \
+nsCSSPseudoClasses.h \
+nsCSSPseudoElementList.h \
+nsCSSPseudoElements.h \
 nsCSSKeywordList.h \
 nsCSSKeywords.h \
 nsCSSPropList.h \
diff --git a/mozilla/content/shared/public/nsCSSAnonBoxList.h b/mozilla/content/shared/public/nsCSSAnonBoxList.h
new file mode 100644
index 00000000000..a36ba4738f7
--- /dev/null
+++ b/mozilla/content/shared/public/nsCSSAnonBoxList.h
@@ -0,0 +1,102 @@
+/* -*- 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 atom lists for CSS pseudos.
+ *
+ * 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):
+ *   L. David Baron <dbaron@fas.harvard.edu>
+ *
+ * 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 ***** */
+
+/*
+ * This file contains the list of nsIAtoms and their values for CSS
+ * pseudo-element-ish things used internally for anonymous boxes.  It is
+ * designed to be used as inline input to nsCSSAnonBoxes.cpp *only*
+ * through the magic of C preprocessing.  All entries must be enclosed
+ * in the macro CSS_ANON_BOX which will have cruel and unusual things
+ * done to it.  The entries should be kept in some sort of logical
+ * order.  The first argument to CSS_ANON_BOX is the C++ identifier of
+ * the atom.  The second argument is the string value of the atom.
+ */
+
+CSS_ANON_BOX(mozNonElement, ":-moz-non-element")
+
+CSS_ANON_BOX(mozAnonymousBlock, ":-moz-anonymous-block")
+CSS_ANON_BOX(mozAnonymousPositionedBlock, ":-moz-anonymous-positioned-block")
+CSS_ANON_BOX(mozGCWrapperBlock, ":-moz-gc-wrapper-block")
+CSS_ANON_BOX(mozGCWrapperInline, ":-moz-gc-wrapper-inline")
+
+CSS_ANON_BOX(mozFirstLineFixup, ":-moz-first-line-fixup")
+CSS_ANON_BOX(mozLineFrame, ":-moz-line-frame")
+
+CSS_ANON_BOX(buttonContent, ":-moz-button-content")
+CSS_ANON_BOX(mozButtonLabel, ":-moz-buttonlabel")
+CSS_ANON_BOX(cellContent, ":-moz-cell-content")
+CSS_ANON_BOX(dropDownList, ":-moz-dropdown-list")
+CSS_ANON_BOX(fieldsetContent, ":-moz-fieldset-content")
+CSS_ANON_BOX(framesetBlank, ":-moz-frameset-blank")
+CSS_ANON_BOX(radio, ":-moz-radio")
+CSS_ANON_BOX(check, ":-moz-checkbox")
+CSS_ANON_BOX(mozSingleLineTextControlFrame, ":-moz-singleline-textcontrol-frame")
+CSS_ANON_BOX(mozDisplayComboboxControlFrame, ":-moz-display-comboboxcontrol-frame")
+CSS_ANON_BOX(dummyOption, ":-moz-dummy-option")
+
+CSS_ANON_BOX(table, ":-moz-table")
+CSS_ANON_BOX(tableCell, ":-moz-table-cell")
+CSS_ANON_BOX(tableColGroup, ":-moz-table-column-group")
+CSS_ANON_BOX(tableCol, ":-moz-table-column")
+CSS_ANON_BOX(tableOuter, ":-moz-table-outer")
+CSS_ANON_BOX(tableRowGroup, ":-moz-table-row-group")
+CSS_ANON_BOX(tableRow, ":-moz-table-row")
+
+CSS_ANON_BOX(canvas, ":-moz-canvas")
+CSS_ANON_BOX(pageBreak, ":-moz-pagebreak")
+CSS_ANON_BOX(page, ":-moz-page")
+CSS_ANON_BOX(pageContent, ":-moz-pagecontent")
+CSS_ANON_BOX(pageSequence, ":-moz-page-sequence")
+CSS_ANON_BOX(scrolledContent, ":-moz-scrolled-content")
+CSS_ANON_BOX(viewport, ":-moz-viewport")
+CSS_ANON_BOX(viewportScroll, ":-moz-viewport-scroll")
+CSS_ANON_BOX(selectScrolledContent, ":-moz-select-scrolled-content")
+
+#ifdef INCLUDE_XUL
+CSS_ANON_BOX(moztreerow, ":-moz-tree-row")
+CSS_ANON_BOX(moztreecell, ":-moz-tree-cell")
+CSS_ANON_BOX(moztreecolumn, ":-moz-tree-column")
+CSS_ANON_BOX(moztreecelltext, ":-moz-tree-cell-text")
+CSS_ANON_BOX(moztreetwisty, ":-moz-tree-twisty")
+CSS_ANON_BOX(moztreeindentation, ":-moz-tree-indentation")
+CSS_ANON_BOX(moztreeline, ":-moz-tree-line")
+CSS_ANON_BOX(moztreeimage, ":-moz-tree-image")
+CSS_ANON_BOX(moztreeseparator, ":-moz-tree-separator")
+CSS_ANON_BOX(moztreedropfeedback, ":-moz-tree-drop-feedback")
+CSS_ANON_BOX(moztreeprogressmeter, ":-moz-tree-progressmeter")
+#endif
diff --git a/mozilla/content/shared/public/nsCSSAtoms.h b/mozilla/content/shared/public/nsCSSAnonBoxes.h
similarity index 55%
rename from mozilla/content/shared/public/nsCSSAtoms.h
rename to mozilla/content/shared/public/nsCSSAnonBoxes.h
index 5658442f0e5..713a538b4cd 100644
--- a/mozilla/content/shared/public/nsCSSAtoms.h
+++ b/mozilla/content/shared/public/nsCSSAnonBoxes.h
@@ -1,18 +1,18 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
- * The contents of this file are subject to the Netscape 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/NPL/
+ * 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 Original Code is atom lists for CSS pseudos.
  *
  * The Initial Developer of the Original Code is 
  * Netscape Communications Corporation.
@@ -20,7 +20,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *
+ *   L. David Baron <dbaron@fas.harvard.edu>
  *
  * 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
@@ -28,41 +28,33 @@
  * 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 NPL, indicate your
+ * 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 NPL, the GPL or the LGPL.
+ * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#ifndef nsCSSAtoms_h___
-#define nsCSSAtoms_h___
+#ifndef nsCSSAnonBoxes_h___
+#define nsCSSAnonBoxes_h___
 
 #include "nsIAtom.h"
 
-/**
- * This class wraps up the creation (and destruction) of the standard
- * set of CSS atoms used during normal CSS handling. These objects
- * are created when the first CSS style sheet is created and they
- * are destroyed when the last CSS style sheet is destroyed.
- */
-class nsCSSAtoms {
+// Empty class derived from nsIAtom so that function signatures can
+// require an atom from this atom list.
+class nsICSSAnonBoxPseudo : public nsIAtom {};
+
+class nsCSSAnonBoxes {
 public:
 
   static void AddRefAtoms();
   static void ReleaseAtoms();
 
+  static PRBool IsAnonBox(nsIAtom *aAtom);
 
-  /* 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 CSS_ATOM(_name, _value) static nsIAtom* _name;
-#include "nsCSSAtomList.h"
-#undef CSS_ATOM
+#define CSS_ANON_BOX(_name, _value) static nsICSSAnonBoxPseudo* _name;
+#include "nsCSSAnonBoxList.h"
+#undef CSS_ANON_BOX
 };
 
-#endif /* nsCSSAtoms_h___ */
+#endif /* nsCSSAnonBoxes_h___ */
diff --git a/mozilla/content/shared/public/nsCSSAtomList.h b/mozilla/content/shared/public/nsCSSAtomList.h
deleted file mode 100644
index c8bf0e1d3f2..00000000000
--- a/mozilla/content/shared/public/nsCSSAtomList.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 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 NPL, 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 NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/******
-
-  This file contains the list of all CSS nsIAtomsand their values
-  
-  It is designed to be used as inline input to nsCSSAtoms.cpp *only*
-  through the magic of C preprocessing.
-
-  All entires must be enclosed in the macro CSS_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 CSS_ATOM is the C++ identifier of the atom
-  The second argument is the string value of the atom
-
- ******/
-
-
-CSS_ATOM(activePseudo, ":active")
-CSS_ATOM(afterPseudo, ":after")
-CSS_ATOM(anyLinkPseudo, ":-moz-any-link")    // what matches :link or :visited
-
-CSS_ATOM(beforePseudo, ":before")
-
-CSS_ATOM(buttonLabelPseudo, ":-moz-buttonlabel")
-
-CSS_ATOM(checkedPseudo, ":checked")
-
-CSS_ATOM(disabledPseudo, ":disabled")
-CSS_ATOM(dragOverPseudo, ":-moz-drag-over")
-
-CSS_ATOM(emptyPseudo, ":empty")
-
-CSS_ATOM(enabledPseudo, ":enabled")
-
-CSS_ATOM(firstChildPseudo, ":first-child")
-CSS_ATOM(firstNodePseudo, ":first-node")
-CSS_ATOM(lastChildPseudo, ":last-child")
-CSS_ATOM(lastNodePseudo, ":last-node")
-CSS_ATOM(focusPseudo, ":focus")
-
-CSS_ATOM(hoverPseudo, ":hover")
-
-CSS_ATOM(langPseudo, ":lang")
-CSS_ATOM(linkPseudo, ":link")
-
-CSS_ATOM(mozGCWrapperBlock, ":-moz-gc-wrapper-block")
-CSS_ATOM(mozGCWrapperInline, ":-moz-gc-wrapper-inline")
-
-CSS_ATOM(notPseudo, ":not")
-
-CSS_ATOM(rootPseudo, ":root")
-
-CSS_ATOM(xblBoundElementPseudo, ":-moz-bound-element")
-
-CSS_ATOM(visitedPseudo, ":visited")
diff --git a/mozilla/content/shared/public/nsCSSPseudoClassList.h b/mozilla/content/shared/public/nsCSSPseudoClassList.h
new file mode 100644
index 00000000000..6dc2afb5703
--- /dev/null
+++ b/mozilla/content/shared/public/nsCSSPseudoClassList.h
@@ -0,0 +1,72 @@
+/* -*- 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 atom lists for CSS pseudos.
+ *
+ * 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):
+ *   L. David Baron <dbaron@fas.harvard.edu>
+ *
+ * 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 ***** */
+
+/*
+ * This file contains the list of nsIAtoms and their values for CSS
+ * pseudo-classes.  It is designed to be used as inline input to
+ * nsCSSPseudoClasses.cpp *only* through the magic of C preprocessing.
+ * All entries must be enclosed in the macro CSS_PSEUDO_CLASS which will
+ * have cruel and unusual things done to it.  The entries should be kept
+ * in some sort of logical order.  The first argument to
+ * CSS_PSEUDO_CLASS is the C++ identifier of the atom.  The second
+ * argument is the string value of the atom.
+ */
+
+CSS_PSEUDO_CLASS(empty, ":empty")
+CSS_PSEUDO_CLASS(lang, ":lang")
+CSS_PSEUDO_CLASS(notPseudo, ":not")
+CSS_PSEUDO_CLASS(mozBoundElement, ":-moz-bound-element")
+CSS_PSEUDO_CLASS(root, ":root")
+
+CSS_PSEUDO_CLASS(link, ":link")
+CSS_PSEUDO_CLASS(mozAnyLink, ":-moz-any-link") // what matches :link or :visited
+CSS_PSEUDO_CLASS(visited, ":visited")
+
+CSS_PSEUDO_CLASS(active, ":active")
+CSS_PSEUDO_CLASS(checked, ":checked")
+CSS_PSEUDO_CLASS(disabled, ":disabled")
+CSS_PSEUDO_CLASS(enabled, ":enabled")
+CSS_PSEUDO_CLASS(focus, ":focus")
+CSS_PSEUDO_CLASS(hover, ":hover")
+CSS_PSEUDO_CLASS(mozDragOver, ":-moz-drag-over")
+
+CSS_PSEUDO_CLASS(firstChild, ":first-child")
+CSS_PSEUDO_CLASS(firstNode, ":first-node")
+CSS_PSEUDO_CLASS(lastChild, ":last-child")
+CSS_PSEUDO_CLASS(lastNode, ":last-node")
+
diff --git a/mozilla/content/shared/public/nsCSSPseudoClasses.h b/mozilla/content/shared/public/nsCSSPseudoClasses.h
new file mode 100644
index 00000000000..ff275b66092
--- /dev/null
+++ b/mozilla/content/shared/public/nsCSSPseudoClasses.h
@@ -0,0 +1,60 @@
+/* -*- 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 atom lists for CSS pseudos.
+ *
+ * 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):
+ *   L. David Baron <dbaron@fas.harvard.edu>
+ *
+ * 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 ***** */
+#ifndef nsCSSPseudoClasses_h___
+#define nsCSSPseudoClasses_h___
+
+#include "nsIAtom.h"
+
+// Empty class derived from nsIAtom so that function signatures can
+// require an atom from this atom list.
+class nsICSSPseudoClass : public nsIAtom {};
+
+class nsCSSPseudoClasses {
+public:
+
+  static void AddRefAtoms();
+  static void ReleaseAtoms();
+
+  static PRBool IsPseudoClass(nsIAtom *aAtom);
+
+#define CSS_PSEUDO_CLASS(_name, _value) static nsICSSPseudoClass* _name;
+#include "nsCSSPseudoClassList.h"
+#undef CSS_PSEUDO_CLASS
+};
+
+#endif /* nsCSSPseudoClasses_h___ */
diff --git a/mozilla/content/shared/public/nsCSSPseudoElementList.h b/mozilla/content/shared/public/nsCSSPseudoElementList.h
new file mode 100644
index 00000000000..c27c94d78c4
--- /dev/null
+++ b/mozilla/content/shared/public/nsCSSPseudoElementList.h
@@ -0,0 +1,65 @@
+/* -*- 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 atom lists for CSS pseudos.
+ *
+ * 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):
+ *   L. David Baron <dbaron@fas.harvard.edu>
+ *
+ * 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 ***** */
+
+/*
+ * This file contains the list of nsIAtoms and their values for CSS
+ * pseudo-elements.  It is designed to be used as inline input to
+ * nsCSSPseudoElements.cpp *only* through the magic of C preprocessing.
+ * All entries must be enclosed in the macro CSS_PSEUDO_ELEMENT which
+ * will have cruel and unusual things done to it.  The entries should be
+ * kept in some sort of logical order.  The first argument to
+ * CSS_PSEUDO_ELEMENT is the C++ identifier of the atom.  The second
+ * argument is the string value of the atom.
+ */
+
+CSS_PSEUDO_ELEMENT(after, ":after")
+CSS_PSEUDO_ELEMENT(before, ":before")
+
+CSS_PSEUDO_ELEMENT(firstLetter, ":first-letter")
+CSS_PSEUDO_ELEMENT(firstLine, ":first-line")
+
+CSS_PSEUDO_ELEMENT(mozSelection, ":-moz-selection")
+
+CSS_PSEUDO_ELEMENT(mozFocusInner, ":-moz-focus-inner")
+CSS_PSEUDO_ELEMENT(mozFocusOuter, ":-moz-focus-outer")
+
+CSS_PSEUDO_ELEMENT(mozListBullet, ":-moz-list-bullet")
+CSS_PSEUDO_ELEMENT(mozListNumber, ":-moz-list-number")
+
+CSS_PSEUDO_ELEMENT(horizontalFramesetBorder, ":-moz-hframeset-border")
+CSS_PSEUDO_ELEMENT(verticalFramesetBorder, ":-moz-vframeset-border")
diff --git a/mozilla/content/shared/public/nsCSSPseudoElements.h b/mozilla/content/shared/public/nsCSSPseudoElements.h
new file mode 100644
index 00000000000..39bbedf3840
--- /dev/null
+++ b/mozilla/content/shared/public/nsCSSPseudoElements.h
@@ -0,0 +1,60 @@
+/* -*- 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 atom lists for CSS pseudos.
+ *
+ * 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):
+ *   L. David Baron <dbaron@fas.harvard.edu>
+ *
+ * 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 ***** */
+#ifndef nsCSSPseudoElements_h___
+#define nsCSSPseudoElements_h___
+
+#include "nsIAtom.h"
+
+// Empty class derived from nsIAtom so that function signatures can
+// require an atom from this atom list.
+class nsICSSPseudoElement : public nsIAtom {};
+
+class nsCSSPseudoElements {
+public:
+
+  static void AddRefAtoms();
+  static void ReleaseAtoms();
+
+  static PRBool IsPseudoElement(nsIAtom *aAtom);
+
+#define CSS_PSEUDO_ELEMENT(_name, _value) static nsICSSPseudoElement* _name;
+#include "nsCSSPseudoElementList.h"
+#undef CSS_PSEUDO_ELEMENT
+};
+
+#endif /* nsCSSPseudoElements_h___ */
diff --git a/mozilla/content/shared/public/nsHTMLAtomList.h b/mozilla/content/shared/public/nsHTMLAtomList.h
index 0c64e08c5f7..da65106c5c8 100644
--- a/mozilla/content/shared/public/nsHTMLAtomList.h
+++ b/mozilla/content/shared/public/nsHTMLAtomList.h
@@ -52,19 +52,6 @@
 
  ******/
 
-HTML_ATOM(mozAnonymousBlock, ":-moz-anonymous-block")
-HTML_ATOM(mozAnonymousPositionedBlock, ":-moz-anonymous-positioned-block")
-HTML_ATOM(mozFirstLineFixup, ":-moz-first-line-fixup")
-HTML_ATOM(mozLineFrame, ":-moz-line-frame")
-HTML_ATOM(mozListBulletPseudo, ":-moz-list-bullet")
-HTML_ATOM(mozListNumberPseudo, ":-moz-list-number")
-HTML_ATOM(mozNonElementPseudo, ":-moz-non-element")
-HTML_ATOM(mozSingleLineTextControlFrame, ":-moz-singleline-textcontrol-frame")
-HTML_ATOM(mozFocusInnerPseudo, ":-moz-focus-inner")
-HTML_ATOM(mozFocusOuterPseudo, ":-moz-focus-outer")
-HTML_ATOM(mozDisplayComboboxControlFrame, ":-moz-display-comboboxcontrol-frame")
-HTML_ATOM(mozSelectionPseudo, ":-moz-selection")
-
 HTML_ATOM(_baseHref, NS_HTML_BASE_HREF)
 HTML_ATOM(_baseTarget, NS_HTML_BASE_TARGET)
 HTML_ATOM(a, "a")
@@ -97,9 +84,7 @@ HTML_ATOM(bottompadding, "bottompadding")
 HTML_ATOM(br, "br")
 HTML_ATOM(b, "b")
 HTML_ATOM(button, "button")
-HTML_ATOM(buttonContentPseudo, ":-moz-button-content")
 HTML_ATOM(caption, "caption")
-HTML_ATOM(cellContentPseudo, ":-moz-cell-content")
 HTML_ATOM(cellpadding, "cellpadding")
 HTML_ATOM(cellspacing, "cellspacing")
 HTML_ATOM(ch, "ch")
@@ -134,7 +119,6 @@ HTML_ATOM(dir, "dir")
 HTML_ATOM(div, "div")
 HTML_ATOM(disabled, "disabled")
 HTML_ATOM(dl, "dl")
-HTML_ATOM(dropDownListPseudo, ":-moz-dropdown-list")
 HTML_ATOM(dt, "dt")
    
 HTML_ATOM(datetime, "datetime")
@@ -147,9 +131,6 @@ HTML_ATOM(enctype, "enctype")
 HTML_ATOM(_event, "event")
 HTML_ATOM(face, "face")
 HTML_ATOM(fieldset, "fieldset")
-HTML_ATOM(fieldsetContentPseudo, ":-moz-fieldset-content")
-HTML_ATOM(firstLetterPseudo, ":first-letter")
-HTML_ATOM(firstLinePseudo, ":first-line")
 HTML_ATOM(font, "font")
 HTML_ATOM(fontWeight, "font-weight")
 HTML_ATOM(_for, "for")
@@ -157,7 +138,6 @@ HTML_ATOM(form, "form")
 HTML_ATOM(frame, "frame")
 HTML_ATOM(frameborder, "frameborder")
 HTML_ATOM(frameset, "frameset")
-HTML_ATOM(framesetBlankPseudo, ":-moz-frameset-blank")
 HTML_ATOM(gutter, "gutter")
 HTML_ATOM(h1, "h1")
 HTML_ATOM(h2, "h2")
@@ -175,7 +155,6 @@ HTML_ATOM(headerWindowTarget, "window-target")
 HTML_ATOM(headers, "headers")
 HTML_ATOM(height, "height")
 HTML_ATOM(hidden, "hidden")
-HTML_ATOM(horizontalFramesetBorderPseudo, ":-moz-hframeset-border")
 HTML_ATOM(hr, "hr")
 HTML_ATOM(href, "href")
 HTML_ATOM(hreflang, "hreflang")
@@ -238,8 +217,6 @@ HTML_ATOM(pointSize, "point-size")
 HTML_ATOM(pre, "pre")
 HTML_ATOM(profile, "profile")
 HTML_ATOM(prompt, "prompt")
-HTML_ATOM(radioPseudo, ":-moz-radio")
-HTML_ATOM(checkPseudo, ":-moz-checkbox")
 HTML_ATOM(readonly, "readonly")
 HTML_ATOM(refresh, "refresh")
 HTML_ATOM(rel, "rel")
@@ -273,13 +250,6 @@ HTML_ATOM(summary, "summary")
 HTML_ATOM(suppress, "suppress")
 HTML_ATOM(tabindex, "tabindex")
 HTML_ATOM(table, "table")
-HTML_ATOM(tablePseudo, ":-moz-table")
-HTML_ATOM(tableCellPseudo, ":-moz-table-cell")
-HTML_ATOM(tableColGroupPseudo, ":-moz-table-column-group")
-HTML_ATOM(tableColPseudo, ":-moz-table-column")
-HTML_ATOM(tableOuterPseudo, ":-moz-table-outer")
-HTML_ATOM(tableRowGroupPseudo, ":-moz-table-row-group")
-HTML_ATOM(tableRowPseudo, ":-moz-table-row")
 HTML_ATOM(tabstop, "tabstop")
 HTML_ATOM(target, "target")
 HTML_ATOM(tbody, "tbody")
@@ -305,7 +275,6 @@ HTML_ATOM(valuetype, "valuetype")
 HTML_ATOM(variable, "variable")
 HTML_ATOM(vcard_name, "vcard_name")
 HTML_ATOM(version, "version")
-HTML_ATOM(verticalFramesetBorderPseudo, ":-moz-vframeset-border")
 HTML_ATOM(visibility, "visibility")
 HTML_ATOM(vlink, "vlink")
 HTML_ATOM(vspace, "vspace")
diff --git a/mozilla/content/shared/public/nsLayoutAtomList.h b/mozilla/content/shared/public/nsLayoutAtomList.h
index 3ff67b7b4a6..782e03ac21b 100644
--- a/mozilla/content/shared/public/nsLayoutAtomList.h
+++ b/mozilla/content/shared/public/nsLayoutAtomList.h
@@ -83,20 +83,9 @@ LAYOUT_ATOM(floaterList, "Floater-list")
 LAYOUT_ATOM(overflowList, "Overflow-list")
 LAYOUT_ATOM(popupList, "Popup-list")
 
-  // Alphabetical list of pseudo tag names for non-element content
-LAYOUT_ATOM(canvasPseudo, ":-moz-canvas")
 LAYOUT_ATOM(commentTagName, "__moz_comment")
-LAYOUT_ATOM(dummyOptionPseudo, ":-moz-dummy-option")
 LAYOUT_ATOM(textTagName, "__moz_text")
-LAYOUT_ATOM(pageBreakPseudo, ":-moz-pagebreak")
-LAYOUT_ATOM(pagePseudo, ":-moz-page")
-LAYOUT_ATOM(pageContentPseudo, ":-moz-pagecontent")
-LAYOUT_ATOM(pageSequencePseudo, ":-moz-page-sequence")
 LAYOUT_ATOM(processingInstructionTagName, "__moz_pi")
-LAYOUT_ATOM(scrolledContentPseudo, ":-moz-scrolled-content")
-LAYOUT_ATOM(viewportPseudo, ":-moz-viewport")
-LAYOUT_ATOM(viewportScrollPseudo, ":-moz-viewport-scroll")
-LAYOUT_ATOM(selectScrolledContentPseudo, ":-moz-select-scrolled-content")
 
   // Alphabetical list of frame types
 LAYOUT_ATOM(areaFrame, "AreaFrame")
diff --git a/mozilla/content/shared/public/nsXULAtomList.h b/mozilla/content/shared/public/nsXULAtomList.h
index 913fb293ba3..b01286795d8 100644
--- a/mozilla/content/shared/public/nsXULAtomList.h
+++ b/mozilla/content/shared/public/nsXULAtomList.h
@@ -105,18 +105,6 @@ XUL_ATOM(progressNormal, "progressNormal")
 XUL_ATOM(progressUndetermined, "progressUndetermined")
 XUL_ATOM(progressNone, "progressNone")
 
-XUL_ATOM(moztreerow, ":-moz-tree-row")
-XUL_ATOM(moztreecell, ":-moz-tree-cell")
-XUL_ATOM(moztreecolumn, ":-moz-tree-column")
-XUL_ATOM(moztreecelltext, ":-moz-tree-cell-text")
-XUL_ATOM(moztreetwisty, ":-moz-tree-twisty")
-XUL_ATOM(moztreeindentation, ":-moz-tree-indentation")
-XUL_ATOM(moztreeline, ":-moz-tree-line")
-XUL_ATOM(moztreeimage, ":-moz-tree-image")
-XUL_ATOM(moztreeseparator, ":-moz-tree-separator")
-XUL_ATOM(moztreedropfeedback, ":-moz-tree-drop-feedback")
-XUL_ATOM(moztreeprogressmeter, ":-moz-tree-progressmeter")
-
 XUL_ATOM(menubar, "menubar") // An XP menu bar.
 XUL_ATOM(menu, "menu") // Represents an XP menu
 XUL_ATOM(menuitem, "menuitem") // Represents an XP menu item
@@ -213,7 +201,6 @@ XUL_ATOM(ddNoDropBetweenRows, "dd-nodropbetweenrows")
 XUL_ATOM(container, "container")
 XUL_ATOM(leaf,"leaf")
 XUL_ATOM(ddDragDropArea, "dragdroparea")
-XUL_ATOM(ddDropMarker, ":-moz-drop-marker")
 
 XUL_ATOM(widget, "widget")
 XUL_ATOM(window, "window")
diff --git a/mozilla/content/shared/src/Makefile.in b/mozilla/content/shared/src/Makefile.in
index f393623ceb9..2203ec2541f 100644
--- a/mozilla/content/shared/src/Makefile.in
+++ b/mozilla/content/shared/src/Makefile.in
@@ -43,7 +43,9 @@ REQUIRES	= xpcom \
 		  $(NULL)
 
 CPPSRCS		= \
-		nsCSSAtoms.cpp \
+		nsCSSAnonBoxes.cpp \
+		nsCSSPseudoClasses.cpp \
+		nsCSSPseudoElements.cpp \
 		nsCSSKeywords.cpp \
 		nsCSSProps.cpp \
 		nsHTMLAtoms.cpp \
diff --git a/mozilla/content/shared/src/nsCSSAtoms.cpp b/mozilla/content/shared/src/nsCSSAnonBoxes.cpp
similarity index 56%
rename from mozilla/content/shared/src/nsCSSAtoms.cpp
rename to mozilla/content/shared/src/nsCSSAnonBoxes.cpp
index d9ef7923e15..f7ead8fb1fa 100644
--- a/mozilla/content/shared/src/nsCSSAtoms.cpp
+++ b/mozilla/content/shared/src/nsCSSAnonBoxes.cpp
@@ -1,18 +1,18 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
- * The contents of this file are subject to the Netscape 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/NPL/
+ * 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 Original Code is atom lists for CSS pseudos.
  *
  * The Initial Developer of the Original Code is 
  * Netscape Communications Corporation.
@@ -20,7 +20,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *
+ *   L. David Baron <dbaron@fas.harvard.edu>
  *
  * 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
@@ -28,41 +28,51 @@
  * 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 NPL, indicate your
+ * 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 NPL, the GPL or the LGPL.
+ * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-#include "nsCSSAtoms.h"
+#include "nsCSSAnonBoxes.h"
 
 // define storage for all atoms
-#define CSS_ATOM(_name, _value) nsIAtom* nsCSSAtoms::_name;
-#include "nsCSSAtomList.h"
-#undef CSS_ATOM
-
+#define CSS_ANON_BOX(_name, _value) \
+  nsICSSAnonBoxPseudo* nsCSSAnonBoxes::_name;
+#include "nsCSSAnonBoxList.h"
+#undef CSS_ANON_BOX
 
 static nsrefcnt gRefCnt;
 
-void nsCSSAtoms::AddRefAtoms()
+void nsCSSAnonBoxes::AddRefAtoms()
 {
   if (0 == gRefCnt++) {
     // create atoms
-#define CSS_ATOM(_name, _value) _name = NS_NewPermanentAtom(_value);
-#include "nsCSSAtomList.h"
-#undef CSS_ATOM
+#define CSS_ANON_BOX(_name, _value) \
+    _name = NS_STATIC_CAST(nsICSSAnonBoxPseudo*, NS_NewPermanentAtom(_value));
+#include "nsCSSAnonBoxList.h"
+#undef CSS_ANON_BOX
   }
 }
 
-void nsCSSAtoms::ReleaseAtoms()
+void nsCSSAnonBoxes::ReleaseAtoms()
 {
   NS_PRECONDITION(gRefCnt != 0, "bad release atoms");
   if (--gRefCnt == 0) {
     // release atoms
-#define CSS_ATOM(_name, _value) NS_RELEASE(_name);
-#include "nsCSSAtomList.h"
-#undef CSS_ATOM
+#define CSS_ANON_BOX(_name, _value) NS_RELEASE(_name);
+#include "nsCSSAnonBoxList.h"
+#undef CSS_ANON_BOX
   }
 }
 
+PRBool nsCSSAnonBoxes::IsAnonBox(nsIAtom *aAtom)
+{
+  return
+#define CSS_ANON_BOX(_name, _value) (aAtom == _name) ||
+#include "nsCSSAnonBoxList.h"
+#undef CSS_ANON_BOX
+        PR_FALSE;
+}
+
diff --git a/mozilla/content/shared/src/nsCSSPseudoClasses.cpp b/mozilla/content/shared/src/nsCSSPseudoClasses.cpp
new file mode 100644
index 00000000000..cf8c6d8d26d
--- /dev/null
+++ b/mozilla/content/shared/src/nsCSSPseudoClasses.cpp
@@ -0,0 +1,78 @@
+/* -*- 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 atom lists for CSS pseudos.
+ *
+ * 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):
+ *   L. David Baron <dbaron@fas.harvard.edu>
+ *
+ * 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 "nsCSSPseudoClasses.h"
+
+// define storage for all atoms
+#define CSS_PSEUDO_CLASS(_name, _value) \
+  nsICSSPseudoClass* nsCSSPseudoClasses::_name;
+#include "nsCSSPseudoClassList.h"
+#undef CSS_PSEUDO_CLASS
+
+static nsrefcnt gRefCnt;
+
+void nsCSSPseudoClasses::AddRefAtoms()
+{
+  if (0 == gRefCnt++) {
+    // create atoms
+#define CSS_PSEUDO_CLASS(_name, _value) \
+    _name = NS_STATIC_CAST(nsICSSPseudoClass*, NS_NewPermanentAtom(_value));
+#include "nsCSSPseudoClassList.h"
+#undef CSS_PSEUDO_CLASS
+  }
+}
+
+void nsCSSPseudoClasses::ReleaseAtoms()
+{
+  NS_PRECONDITION(gRefCnt != 0, "bad release atoms");
+  if (--gRefCnt == 0) {
+    // release atoms
+#define CSS_PSEUDO_CLASS(_name, _value) NS_RELEASE(_name);
+#include "nsCSSPseudoClassList.h"
+#undef CSS_PSEUDO_CLASS
+  }
+}
+
+PRBool nsCSSPseudoClasses::IsPseudoClass(nsIAtom *aAtom)
+{
+  return
+#define CSS_PSEUDO_CLASS(_name, _value) (aAtom == _name) ||
+#include "nsCSSPseudoClassList.h"
+#undef CSS_PSEUDO_CLASS
+        PR_FALSE;
+}
+
diff --git a/mozilla/content/shared/src/nsCSSPseudoElements.cpp b/mozilla/content/shared/src/nsCSSPseudoElements.cpp
new file mode 100644
index 00000000000..1eab9743abe
--- /dev/null
+++ b/mozilla/content/shared/src/nsCSSPseudoElements.cpp
@@ -0,0 +1,78 @@
+/* -*- 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 atom lists for CSS pseudos.
+ *
+ * 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):
+ *   L. David Baron <dbaron@fas.harvard.edu>
+ *
+ * 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 "nsCSSPseudoElements.h"
+
+// define storage for all atoms
+#define CSS_PSEUDO_ELEMENT(_name, _value) \
+  nsICSSPseudoElement* nsCSSPseudoElements::_name;
+#include "nsCSSPseudoElementList.h"
+#undef CSS_PSEUDO_ELEMENT
+
+static nsrefcnt gRefCnt;
+
+void nsCSSPseudoElements::AddRefAtoms()
+{
+  if (0 == gRefCnt++) {
+    // create atoms
+#define CSS_PSEUDO_ELEMENT(_name, _value) \
+    _name = NS_STATIC_CAST(nsICSSPseudoElement*, NS_NewPermanentAtom(_value));
+#include "nsCSSPseudoElementList.h"
+#undef CSS_PSEUDO_ELEMENT
+  }
+}
+
+void nsCSSPseudoElements::ReleaseAtoms()
+{
+  NS_PRECONDITION(gRefCnt != 0, "bad release atoms");
+  if (--gRefCnt == 0) {
+    // release atoms
+#define CSS_PSEUDO_ELEMENT(_name, _value) NS_RELEASE(_name);
+#include "nsCSSPseudoElementList.h"
+#undef CSS_PSEUDO_ELEMENT
+  }
+}
+
+PRBool nsCSSPseudoElements::IsPseudoElement(nsIAtom *aAtom)
+{
+  return
+#define CSS_PSEUDO_ELEMENT(_name, _value) (aAtom == _name) ||
+#include "nsCSSPseudoElementList.h"
+#undef CSS_PSEUDO_ELEMENT
+        PR_FALSE;
+}
+
diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp
index a4a4e25d102..7b864bc6f7c 100644
--- a/mozilla/layout/base/nsCSSFrameConstructor.cpp
+++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp
@@ -83,7 +83,8 @@
 #include "nsTableRowGroupFrame.h"
 #include "nsStyleChangeList.h"
 #include "nsIFormControl.h"
-#include "nsCSSAtoms.h"
+#include "nsCSSAnonBoxes.h"
+#include "nsCSSPseudoElements.h"
 #include "nsIDeviceContext.h"
 #include "nsTextFragment.h"
 #include "nsISupportsArray.h"
@@ -1584,10 +1585,10 @@ nsCSSFrameConstructor::CreateGeneratedContentFrame(nsIPresShell*        aPresShe
             nsIAtom *wrapperPseudo;
             if (display->IsBlockLevel()) {
               NS_NewBlockFrame(aPresShell, aWrapperFrame);
-              wrapperPseudo = nsCSSAtoms::mozGCWrapperBlock;
+              wrapperPseudo = nsCSSAnonBoxes::mozGCWrapperBlock;
             } else {
               NS_NewInlineFrame(aPresShell, aWrapperFrame);
-              wrapperPseudo = nsCSSAtoms::mozGCWrapperInline;
+              wrapperPseudo = nsCSSAnonBoxes::mozGCWrapperInline;
             }        
             nsCOMPtr<nsIStyleContext> parentSC = aStyleContext->GetParent(); 
             nsCOMPtr<nsIStyleContext> wrapperSC;
@@ -1978,7 +1979,8 @@ nsCSSFrameConstructor::CreatePseudoTableFrame(nsIPresShell*            aPresShel
   parentFrame->GetContent(getter_AddRefs(parentContent));   
 
   // create the SC for the inner table which will be the parent of the outer table's SC
-  aPresContext->ResolvePseudoStyleContextFor(parentContent, nsHTMLAtoms::tablePseudo, 
+  aPresContext->ResolvePseudoStyleContextFor(parentContent,
+                                             nsCSSAnonBoxes::table,
                                              parentStyle,
                                              getter_AddRefs(childStyle));
 
@@ -2027,7 +2029,8 @@ nsCSSFrameConstructor::CreatePseudoRowGroupFrame(nsIPresShell*            aPresS
   parentFrame->GetStyleContext(getter_AddRefs(parentStyle)); 
   parentFrame->GetContent(getter_AddRefs(parentContent));   
 
-  aPresContext->ResolvePseudoStyleContextFor(parentContent, nsHTMLAtoms::tableRowGroupPseudo, 
+  aPresContext->ResolvePseudoStyleContextFor(parentContent,
+                                             nsCSSAnonBoxes::tableRowGroup, 
                                              parentStyle,
                                              getter_AddRefs(childStyle));
 
@@ -2072,7 +2075,8 @@ nsCSSFrameConstructor::CreatePseudoColGroupFrame(nsIPresShell*            aPresS
   parentFrame->GetStyleContext(getter_AddRefs(parentStyle)); 
   parentFrame->GetContent(getter_AddRefs(parentContent));   
 
-  aPresContext->ResolvePseudoStyleContextFor(parentContent, nsHTMLAtoms::tableColGroupPseudo, 
+  aPresContext->ResolvePseudoStyleContextFor(parentContent,
+                                             nsCSSAnonBoxes::tableColGroup, 
                                              parentStyle,
                                              getter_AddRefs(childStyle));
 
@@ -2115,7 +2119,8 @@ nsCSSFrameConstructor::CreatePseudoRowFrame(nsIPresShell*            aPresShell,
   parentFrame->GetStyleContext(getter_AddRefs(parentStyle)); 
   parentFrame->GetContent(getter_AddRefs(parentContent));   
 
-  aPresContext->ResolvePseudoStyleContextFor(parentContent, nsHTMLAtoms::tableRowPseudo, 
+  aPresContext->ResolvePseudoStyleContextFor(parentContent,
+                                             nsCSSAnonBoxes::tableRow, 
                                              parentStyle,
                                              getter_AddRefs(childStyle));
 
@@ -2159,7 +2164,8 @@ nsCSSFrameConstructor::CreatePseudoCellFrame(nsIPresShell*            aPresShell
   parentFrame->GetStyleContext(getter_AddRefs(parentStyle)); 
   parentFrame->GetContent(getter_AddRefs(parentContent));   
 
-  aPresContext->ResolvePseudoStyleContextFor(parentContent, nsHTMLAtoms::tableCellPseudo, 
+  aPresContext->ResolvePseudoStyleContextFor(parentContent,
+                                             nsCSSAnonBoxes::tableCell, 
                                              parentStyle,
                                              getter_AddRefs(childStyle));
 
@@ -2532,7 +2538,8 @@ nsCSSFrameConstructor::ConstructTableFrame(nsIPresShell*            aPresShell,
 
   // create the pseudo SC for the outer table as a child of the inner SC
   nsCOMPtr<nsIStyleContext> outerStyleContext;
-  aPresContext->ResolvePseudoStyleContextFor(aContent, nsHTMLAtoms::tableOuterPseudo,
+  aPresContext->ResolvePseudoStyleContextFor(aContent,
+                                             nsCSSAnonBoxes::tableOuter,
                                              aStyleContext,
                                              getter_AddRefs(outerStyleContext));
   
@@ -2918,7 +2925,8 @@ nsCSSFrameConstructor::ConstructTableCellFrame(nsIPresShell*            aPresShe
   
   // Resolve pseudo style and initialize the body cell frame
   nsCOMPtr<nsIStyleContext> innerPseudoStyle;
-  aPresContext->ResolvePseudoStyleContextFor(aContent, nsHTMLAtoms::cellContentPseudo,
+  aPresContext->ResolvePseudoStyleContextFor(aContent,
+                                             nsCSSAnonBoxes::cellContent,
                                              aStyleContext,
                                              getter_AddRefs(innerPseudoStyle));
   InitAndRestoreFrame(aPresContext, aState, aContent, 
@@ -3424,7 +3432,7 @@ nsCSSFrameConstructor::ConstructDocElementFrame(nsIPresShell*        aPresShell,
                               aDocElement,
                               styleContext,
                               aParentFrame,
-                              nsLayoutAtoms::scrolledContentPseudo,
+                              nsCSSAnonBoxes::scrolledContent,
                               mDocument,
                               PR_FALSE,
                               scrollFrame,
@@ -3628,7 +3636,7 @@ nsCSSFrameConstructor::ConstructRootFrame(nsIPresShell*        aPresShell,
   nsIFrame*                 viewportFrame = nsnull;
   nsCOMPtr<nsIStyleContext> viewportPseudoStyle;
 
-  aPresContext->ResolvePseudoStyleContextFor(nsnull, nsLayoutAtoms::viewportPseudo,
+  aPresContext->ResolvePseudoStyleContextFor(nsnull, nsCSSAnonBoxes::viewport,
                                            nsnull,
                                            getter_AddRefs(viewportPseudoStyle));
 
@@ -3682,12 +3690,12 @@ nsCSSFrameConstructor::ConstructRootFrame(nsIPresShell*        aPresShell,
           NS_NewCanvasFrame(aPresShell, &rootFrame);
         }
 
-        rootPseudo = nsLayoutAtoms::canvasPseudo;
+        rootPseudo = nsCSSAnonBoxes::canvas;
         mDocElementContainingBlock = rootFrame;
     } else {
         // Create a page sequence frame
         NS_NewSimplePageSequenceFrame(aPresShell, &rootFrame);
-        rootPseudo = nsLayoutAtoms::pageSequencePseudo;
+        rootPseudo = nsCSSAnonBoxes::pageSequence;
     }
 
 
@@ -3851,7 +3859,7 @@ nsCSSFrameConstructor::ConstructRootFrame(nsIPresShell*        aPresShell,
       // resolve a context for the scrollframe
       nsCOMPtr<nsIStyleContext>  styleContext;
       aPresContext->ResolvePseudoStyleContextFor(nsnull,
-                                                 nsLayoutAtoms::viewportScrollPseudo,
+                                                 nsCSSAnonBoxes::viewportScroll,
                                                  viewportPseudoStyle,
                                                  getter_AddRefs(styleContext));
 
@@ -3901,7 +3909,7 @@ nsCSSFrameConstructor::ConstructRootFrame(nsIPresShell*        aPresShell,
       // create a style context for the scrollport of the viewport
       nsCOMPtr<nsIStyleContext> scrollPseudoStyle;
       aPresContext->ResolvePseudoStyleContextFor(nsnull,
-                                                nsLayoutAtoms::scrolledContentPseudo,
+                                                nsCSSAnonBoxes::scrolledContent,
                                                 viewportPseudoStyle,
                                                 getter_AddRefs(scrollPseudoStyle));
 
@@ -3967,7 +3975,8 @@ nsCSSFrameConstructor::ConstructRootFrame(nsIPresShell*        aPresShell,
     // the pages easier and faster.
     nsCOMPtr<nsIStyleContext> pagePseudoStyle;
 
-    aPresContext->ResolvePseudoStyleContextFor(nsnull, nsLayoutAtoms::pagePseudo,
+    aPresContext->ResolvePseudoStyleContextFor(nsnull,
+                                               nsCSSAnonBoxes::page,
                                                rootPseudoStyle,
                                                getter_AddRefs(pagePseudoStyle));
 
@@ -3979,7 +3988,8 @@ nsCSSFrameConstructor::ConstructRootFrame(nsIPresShell*        aPresShell,
     NS_NewPageContentFrame(aPresShell, &pageContentFrame);
 
     nsCOMPtr<nsIStyleContext> pageContentPseudoStyle;
-    aPresContext->ResolvePseudoStyleContextFor(nsnull, nsLayoutAtoms::pageContentPseudo,
+    aPresContext->ResolvePseudoStyleContextFor(nsnull,
+                                               nsCSSAnonBoxes::pageContent,
                                                pagePseudoStyle,
                                                getter_AddRefs(pageContentPseudoStyle));
 
@@ -4115,7 +4125,7 @@ nsCSSFrameConstructor::ConstructRadioControlFrame(nsIPresShell*        aPresShel
 
   nsCOMPtr<nsIStyleContext> radioStyle;
   aPresContext->ResolvePseudoStyleContextFor(aContent,
-                                             nsHTMLAtoms::radioPseudo,
+                                             nsCSSAnonBoxes::radio,
                                              aStyleContext,
                                              getter_AddRefs(radioStyle));
   nsIRadioControlFrame* radio = nsnull;
@@ -4145,7 +4155,7 @@ nsCSSFrameConstructor::ConstructCheckboxControlFrame(nsIPresShell*    aPresShell
   }
 
   nsCOMPtr<nsIStyleContext> checkboxStyle;
-  aPresContext->ResolvePseudoStyleContextFor(aContent, nsHTMLAtoms::checkPseudo, 
+  aPresContext->ResolvePseudoStyleContextFor(aContent, nsCSSAnonBoxes::check, 
                                              aStyleContext, getter_AddRefs(checkboxStyle));
   nsICheckboxControlFrame* checkbox = nsnull;
   if (aNewFrame != nsnull && 
@@ -4318,7 +4328,7 @@ nsCSSFrameConstructor::ConstructSelectFrame(nsIPresShell*        aPresShell,
         // Resolve psuedo element style for the dropdown list 
       nsCOMPtr<nsIStyleContext> listStyle;
       rv = aPresContext->ResolvePseudoStyleContextFor(aContent, 
-                                              nsHTMLAtoms::dropDownListPseudo, 
+                                              nsCSSAnonBoxes::dropDownList, 
                                               aStyleContext,
                                               getter_AddRefs(listStyle));
 
@@ -4447,7 +4457,7 @@ nsCSSFrameConstructor::InitializeSelectFrame(nsIPresShell*        aPresShell,
 
   
     aPresContext->ResolvePseudoStyleContextFor(aContent,
-                                  nsLayoutAtoms::scrolledContentPseudo,
+                                  nsCSSAnonBoxes::scrolledContent,
                                   aStyleContext,
                                   getter_AddRefs(scrolledPseudoStyle));
 
@@ -4574,7 +4584,7 @@ nsCSSFrameConstructor::ConstructFieldSetFrame(nsIPresShell*            aPresShel
 
   // Resolve style and initialize the frame
   nsIStyleContext* styleContext;
-  aPresContext->ResolvePseudoStyleContextFor(aContent, nsHTMLAtoms::fieldsetContentPseudo,
+  aPresContext->ResolvePseudoStyleContextFor(aContent, nsCSSAnonBoxes::fieldsetContent,
                                              aStyleContext, &styleContext);
   InitAndRestoreFrame(aPresContext, aState, aContent, 
                       newFrame, styleContext, nsnull, areaFrame);
@@ -5091,13 +5101,15 @@ nsCSSFrameConstructor::ConstructHTMLFrame(nsIPresShell*            aPresShell,
       nsIFrame *wrapperFrame = nsnull, *beforeFrame, *afterFrame;
       if (!CreateGeneratedContentFrame(aPresShell, aPresContext,
                                        aState, aParentFrame, aContent,
-                                       aStyleContext, nsCSSAtoms::beforePseudo,
+                                       aStyleContext,
+                                       nsCSSPseudoElements::before,
                                        &wrapperFrame, &beforeFrame)) {
         beforeFrame = nsnull;
       }
       if (!CreateGeneratedContentFrame(aPresShell, aPresContext,
                                       aState, aParentFrame, aContent,
-                                      aStyleContext, nsCSSAtoms::afterPseudo,
+                                      aStyleContext,
+                                      nsCSSPseudoElements::after,
                                       &wrapperFrame, &afterFrame)) {
         afterFrame = nsnull;
       }
@@ -6008,7 +6020,7 @@ nsCSSFrameConstructor::BeginBuildingScrollFrame(nsIPresShell* aPresShell,
     // we used the style that was passed in. So resolve another one.
     nsCOMPtr<nsIStyleContext> scrollPseudoStyle;
     aPresContext->ResolvePseudoStyleContextFor(aContent,
-                                              nsLayoutAtoms::scrolledContentPseudo,
+                                              nsCSSAnonBoxes::scrolledContent,
                                               contentStyle,
                                               getter_AddRefs(scrollPseudoStyle));
 
@@ -6160,7 +6172,7 @@ nsCSSFrameConstructor::BuildScrollFrame       (nsIPresShell* aPresShell,
                      aContent,
                      aContentStyle,
                      aParentFrame,
-                     nsLayoutAtoms::scrolledContentPseudo,
+                     nsCSSAnonBoxes::scrolledContent,
                      mDocument,
                      PR_FALSE,
                      aNewFrame,
@@ -6960,7 +6972,7 @@ nsCSSFrameConstructor::ConstructMathMLFrame(nsIPresShell*            aPresShell,
       if (NS_FAILED(rv)) return rv;
       nsCOMPtr<nsIStyleContext> blockContext;
       aPresContext->ResolvePseudoStyleContextFor(aContent,
-                                                 nsHTMLAtoms::mozAnonymousBlock,
+                                                 nsCSSAnonBoxes::mozAnonymousBlock,
                                                  mrowContext,
                                                  getter_AddRefs(blockContext));
       InitAndRestoreFrame(aPresContext, aState, aContent, newFrame,
@@ -7244,7 +7256,8 @@ nsCSSFrameConstructor::ConstructPageBreakFrame(nsIPresShell*            aPresShe
                                                nsFrameItems&            aFrameItems)
 {
   nsCOMPtr<nsIStyleContext> pseudoStyle;
-  aPresContext->ResolvePseudoStyleContextFor(nsnull, nsLayoutAtoms::pageBreakPseudo,
+  aPresContext->ResolvePseudoStyleContextFor(nsnull,
+                                             nsCSSAnonBoxes::pageBreak,
                                              aStyleContext,
                                              getter_AddRefs(pseudoStyle));
   nsIFrame* pageBreakFrame;
@@ -7816,7 +7829,8 @@ nsCSSFrameConstructor::AppendFrames(nsIPresContext*  aPresContext,
   nsIFrame* lastChild = frames.LastChild();
 
   // See if the parent has an :after pseudo-element
-  if (lastChild && IsGeneratedContentFor(aContainer, lastChild, nsCSSAtoms::afterPseudo)) {
+  if (lastChild && IsGeneratedContentFor(aContainer, lastChild,
+                                         nsCSSPseudoElements::after)) {
     // Insert the frames before the :after pseudo-element.
     return aFrameManager->InsertFrames(aPresContext, *aPresShell, aParentFrame,
                                        nsnull, frames.GetPrevSiblingFor(lastChild),
@@ -8719,7 +8733,7 @@ nsCSSFrameConstructor::AddDummyFrameToSelect(nsIPresContext*  aPresContext,
         if (CreateGeneratedContentFrame(aPresShell, aPresContext, aState,
                                         aParentFrame, aContainer,
                                         styleContext,
-                                        nsLayoutAtoms::dummyOptionPseudo,
+                                        nsCSSAnonBoxes::dummyOption,
                                         nsnull, &generatedFrame)) {
           // Add the generated frame to the child list
           if (aChildItems) {
@@ -9261,7 +9275,8 @@ nsCSSFrameConstructor::ContentInserted(nsIPresContext*        aPresContext,
         nsIFrame* firstChild;
         parentFrame->FirstChild(aPresContext, nsnull, &firstChild);
 
-        if (firstChild && IsGeneratedContentFor(aContainer, firstChild, nsCSSAtoms::beforePseudo)) {
+        if (firstChild && IsGeneratedContentFor(aContainer, firstChild,
+                                                nsCSSPseudoElements::before)) {
           // Insert the new frames after the :before pseudo-element
           prevSibling = firstChild;
         }
@@ -11445,7 +11460,8 @@ nsCSSFrameConstructor::CreateContinuingFrame(nsIPresShell*   aPresShell,
       NS_NewPageContentFrame(aPresShell, &pageContentFrame);
 
       nsCOMPtr<nsIStyleContext> pageContentPseudoStyle;
-      aPresContext->ResolvePseudoStyleContextFor(nsnull, nsLayoutAtoms::pageContentPseudo,
+      aPresContext->ResolvePseudoStyleContextFor(nsnull,
+                                                 nsCSSAnonBoxes::pageContent,
                                                  styleContext,
                                                  getter_AddRefs(pageContentPseudoStyle));
 
@@ -11672,7 +11688,8 @@ nsCSSFrameConstructor::FindFrameWithContent(nsIPresContext*  aPresContext,
             // next sibling.
 
             if (aContent->IsContentOfType(nsIContent::eELEMENT) &&
-                IsGeneratedContentFor(aContent, kidFrame, nsCSSAtoms::beforePseudo)) {
+                IsGeneratedContentFor(aContent, kidFrame,
+                                      nsCSSPseudoElements::before)) {
               kidFrame->GetNextSibling(&kidFrame);
 #ifdef DEBUG
               NS_ASSERTION(kidFrame, ":before with no next sibling");
@@ -11685,7 +11702,7 @@ nsCSSFrameConstructor::FindFrameWithContent(nsIPresContext*  aPresContext,
 
                 NS_ASSERTION(nextSiblingContent.get() == aContent &&
                              !IsGeneratedContentFor(aContent, kidFrame,
-                                                    nsCSSAtoms::afterPseudo),
+                                                    nsCSSPseudoElements::after),
                              ":before frame not followed by primary frame");
               }
 #endif
@@ -12089,7 +12106,7 @@ nsCSSFrameConstructor::GetFirstLetterStyle(nsIPresContext* aPresContext,
   nsIStyleContext* fls = nsnull;
   if (aContent) {
     aPresContext->ResolvePseudoStyleContextFor(aContent,
-                                               nsHTMLAtoms::firstLetterPseudo,
+                                               nsCSSPseudoElements::firstLetter,
                                                aStyleContext, &fls);
   }
   return fls;
@@ -12103,7 +12120,7 @@ nsCSSFrameConstructor::GetFirstLineStyle(nsIPresContext* aPresContext,
   nsIStyleContext* fls = nsnull;
   if (aContent) {
     aPresContext->ResolvePseudoStyleContextFor(aContent,
-                                               nsHTMLAtoms::firstLinePseudo,
+                                               nsCSSPseudoElements::firstLetter,
                                                aStyleContext, &fls);
   }
   return fls;
@@ -12117,7 +12134,7 @@ nsCSSFrameConstructor::HaveFirstLetterStyle(nsIPresContext* aPresContext,
                                             nsIStyleContext* aStyleContext)
 {
   return HasPseudoStyle(aPresContext, aContent, aStyleContext,
-                        nsHTMLAtoms::firstLetterPseudo);
+                        nsCSSPseudoElements::firstLetter);
 }
 
 PRBool
@@ -12126,7 +12143,7 @@ nsCSSFrameConstructor::HaveFirstLineStyle(nsIPresContext* aPresContext,
                                           nsIStyleContext* aStyleContext)
 {
   return HasPseudoStyle(aPresContext, aContent, aStyleContext,
-                        nsHTMLAtoms::firstLinePseudo);
+                        nsCSSPseudoElements::firstLetter);
 }
 
 void
@@ -12169,7 +12186,7 @@ nsCSSFrameConstructor::ProcessChildren(nsIPresShell*            aPresShell,
     // Probe for generated content before
     nsIFrame* generatedFrame;
     if (CreateGeneratedContentFrame(aPresShell, aPresContext, aState, aFrame, aContent,
-                                    styleContext, nsCSSAtoms::beforePseudo,
+                                    styleContext, nsCSSPseudoElements::before,
                                     nsnull, &generatedFrame)) {
       // Add the generated frame to the child list
       aFrameItems.AddChild(generatedFrame);
@@ -12211,7 +12228,7 @@ nsCSSFrameConstructor::ProcessChildren(nsIPresShell*            aPresShell,
     // Probe for generated content after
     nsIFrame* generatedFrame;
     if (CreateGeneratedContentFrame(aPresShell, aPresContext, aState, aFrame, aContent,
-                                    styleContext, nsCSSAtoms::afterPseudo,
+                                    styleContext, nsCSSPseudoElements::after,
                                     nsnull, &generatedFrame)) {
       // Add the generated frame to the child list
       aFrameItems.AddChild(generatedFrame);
@@ -13362,7 +13379,7 @@ nsCSSFrameConstructor::ProcessBlockChildren(nsIPresShell* aPresShell,
     nsIFrame* generatedFrame;
     aFrame->GetStyleContext(getter_AddRefs(styleContext));
     if (CreateGeneratedContentFrame(aPresShell, aPresContext, aState, aFrame, aContent,
-                                    styleContext, nsCSSAtoms::beforePseudo,
+                                    styleContext, nsCSSPseudoElements::before,
                                     nsnull, &generatedFrame)) {
       // Add the generated frame to the child list
       aFrameItems.AddChild(generatedFrame);
@@ -13391,7 +13408,7 @@ nsCSSFrameConstructor::ProcessBlockChildren(nsIPresShell* aPresShell,
     // Probe for generated content after
     nsIFrame* generatedFrame;
     if (CreateGeneratedContentFrame(aPresShell, aPresContext, aState, aFrame, aContent,
-                                    styleContext, nsCSSAtoms::afterPseudo,
+                                    styleContext, nsCSSPseudoElements::after,
                                     nsnull, &generatedFrame)) {
       // Add the generated frame to the child list
       aFrameItems.AddChild(generatedFrame);
@@ -13541,11 +13558,11 @@ nsCSSFrameConstructor::ConstructInline(nsIPresShell*            aPresShell,
   nsIAtom* blockStyle;
   if (aIsPositioned) {
     NS_NewRelativeItemWrapperFrame(aPresShell, &blockFrame);
-    blockStyle = nsHTMLAtoms::mozAnonymousPositionedBlock;
+    blockStyle = nsCSSAnonBoxes::mozAnonymousPositionedBlock;
   }
   else {
     NS_NewBlockFrame(aPresShell, &blockFrame);
-    blockStyle = nsHTMLAtoms::mozAnonymousBlock;
+    blockStyle = nsCSSAnonBoxes::mozAnonymousBlock;
   }
 
   nsCOMPtr<nsIStyleContext> blockSC;
@@ -13665,7 +13682,7 @@ nsCSSFrameConstructor::ProcessInlineChildren(nsIPresShell* aPresShell,
     nsIFrame* generatedFrame;
     aFrame->GetStyleContext(getter_AddRefs(styleContext));
     if (CreateGeneratedContentFrame(aPresShell, aPresContext, aState, aFrame, aContent,
-                                    styleContext, nsCSSAtoms::beforePseudo,
+                                    styleContext, nsCSSPseudoElements::before,
                                     nsnull, &generatedFrame)) {
       // Add the generated frame to the child list
       aFrameItems.AddChild(generatedFrame);
@@ -13712,7 +13729,7 @@ nsCSSFrameConstructor::ProcessInlineChildren(nsIPresShell* aPresShell,
     // Probe for generated content after
     nsIFrame* generatedFrame;
     if (CreateGeneratedContentFrame(aPresShell, aPresContext, aState, aFrame, aContent,
-                                    styleContext, nsCSSAtoms::afterPseudo,
+                                    styleContext, nsCSSPseudoElements::after,
                                     nsnull, &generatedFrame)) {
       // Add the generated frame to the child list
       aFrameItems.AddChild(generatedFrame);
@@ -14035,7 +14052,7 @@ nsCSSFrameConstructor::SplitToContainingBlock(nsIPresContext* aPresContext,
 
   nsCOMPtr<nsIStyleContext> blockSC;
   aPresContext->ResolvePseudoStyleContextFor(content,
-                                             nsHTMLAtoms::mozAnonymousBlock,
+                                             nsCSSAnonBoxes::mozAnonymousBlock,
                                              styleContext,
                                              getter_AddRefs(blockSC));
 
diff --git a/mozilla/layout/base/nsFrameManager.cpp b/mozilla/layout/base/nsFrameManager.cpp
index f3e3c9453a4..d0e0d3e3a66 100644
--- a/mozilla/layout/base/nsFrameManager.cpp
+++ b/mozilla/layout/base/nsFrameManager.cpp
@@ -44,6 +44,7 @@
 #include "pldhash.h"
 #include "nsPlaceholderFrame.h"
 #include "nsLayoutAtoms.h"
+#include "nsCSSAnonBoxes.h"
 #include "nsHTMLAtoms.h"
 #ifdef NS_DEBUG
 #include "nsISupportsArray.h"
@@ -1731,7 +1732,7 @@ FrameManager::ReResolveStyleContext(nsIPresContext* aPresContext,
     
     // do primary context
     nsIStyleContext* newContext = nsnull;
-    if (pseudoTag == nsHTMLAtoms::mozNonElementPseudo) {
+    if (pseudoTag == nsCSSAnonBoxes::mozNonElement) {
       NS_ASSERTION(localContent,
                    "non pseudo-element frame without content node");
       aPresContext->ResolveStyleContextForNonElement(parentContext,
@@ -1787,7 +1788,7 @@ FrameManager::ReResolveStyleContext(nsIPresContext* aPresContext,
         }
       }
       else {
-        if (pseudoTag && pseudoTag != nsHTMLAtoms::mozNonElementPseudo &&
+        if (pseudoTag && pseudoTag != nsCSSAnonBoxes::mozNonElement &&
             aAttribute &&
             (!(aMinChange &
                (nsChangeHint_ReflowFrame | nsChangeHint_ReconstructFrame
@@ -1814,7 +1815,7 @@ FrameManager::ReResolveStyleContext(nsIPresContext* aPresContext,
           nsIStyleContext* newExtraContext = nsnull;
           oldExtraContext->GetPseudoType(pseudoTag);
           NS_ASSERTION(pseudoTag &&
-                       pseudoTag != nsHTMLAtoms::mozNonElementPseudo,
+                       pseudoTag != nsCSSAnonBoxes::mozNonElement,
                        "extra style context is not pseudo element");
           result = aPresContext->ResolvePseudoStyleContextFor(content, pseudoTag, newContext,
                                                               &newExtraContext);
@@ -1831,7 +1832,7 @@ FrameManager::ReResolveStyleContext(nsIPresContext* aPresContext,
 #if 0
               // XXXldb |oldContext| is null by this point, so this will
               // never do anything.
-              if (pseudoTag && pseudoTag != nsHTMLAtoms::mozNonElementPseudo &&
+              if (pseudoTag && pseudoTag != nsCSSAnonBoxes::mozNonElement &&
                   aAttribute && (aMinChange < NS_STYLE_HINT_REFLOW) &&
                   HasAttributeContent(oldContext, aAttrNameSpaceID, aAttribute)) {
                 aChangeList.AppendChange(aFrame, content, NS_STYLE_HINT_REFLOW);
@@ -1859,7 +1860,7 @@ FrameManager::ReResolveStyleContext(nsIPresContext* aPresContext,
                                                newContext, 
                                                &undisplayedContext);
         }
-        else if (pseudoTag == nsHTMLAtoms::mozNonElementPseudo) {
+        else if (pseudoTag == nsCSSAnonBoxes::mozNonElement) {
           aPresContext->ResolveStyleContextForNonElement(newContext, 
                                                          &undisplayedContext);
         }
diff --git a/mozilla/layout/base/nsLayoutAtomList.h b/mozilla/layout/base/nsLayoutAtomList.h
index 3ff67b7b4a6..782e03ac21b 100644
--- a/mozilla/layout/base/nsLayoutAtomList.h
+++ b/mozilla/layout/base/nsLayoutAtomList.h
@@ -83,20 +83,9 @@ LAYOUT_ATOM(floaterList, "Floater-list")
 LAYOUT_ATOM(overflowList, "Overflow-list")
 LAYOUT_ATOM(popupList, "Popup-list")
 
-  // Alphabetical list of pseudo tag names for non-element content
-LAYOUT_ATOM(canvasPseudo, ":-moz-canvas")
 LAYOUT_ATOM(commentTagName, "__moz_comment")
-LAYOUT_ATOM(dummyOptionPseudo, ":-moz-dummy-option")
 LAYOUT_ATOM(textTagName, "__moz_text")
-LAYOUT_ATOM(pageBreakPseudo, ":-moz-pagebreak")
-LAYOUT_ATOM(pagePseudo, ":-moz-page")
-LAYOUT_ATOM(pageContentPseudo, ":-moz-pagecontent")
-LAYOUT_ATOM(pageSequencePseudo, ":-moz-page-sequence")
 LAYOUT_ATOM(processingInstructionTagName, "__moz_pi")
-LAYOUT_ATOM(scrolledContentPseudo, ":-moz-scrolled-content")
-LAYOUT_ATOM(viewportPseudo, ":-moz-viewport")
-LAYOUT_ATOM(viewportScrollPseudo, ":-moz-viewport-scroll")
-LAYOUT_ATOM(selectScrolledContentPseudo, ":-moz-select-scrolled-content")
 
   // Alphabetical list of frame types
 LAYOUT_ATOM(areaFrame, "AreaFrame")
diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp
index c77267039b7..23afd08f820 100644
--- a/mozilla/layout/base/nsPresShell.cpp
+++ b/mozilla/layout/base/nsPresShell.cpp
@@ -76,6 +76,7 @@
 #include "nsIDOMNodeList.h"
 #include "nsIDOMElement.h"
 #include "nsHTMLAtoms.h"
+#include "nsCSSPseudoElements.h"
 #include "nsCOMPtr.h"
 #include "nsReadableUtils.h"
 #include "nsUnicharUtils.h"
@@ -102,7 +103,6 @@
 #include "nsTimer.h"
 #include "nsWeakPtr.h"
 #include "plarena.h"
-#include "nsCSSAtoms.h"
 #include "nsIObserverService.h" // for reflow observation
 #include "nsIDocShell.h"        // for reflow observation
 #include "nsIDOMRange.h"
@@ -4719,7 +4719,8 @@ PresShell::GetGeneratedContentIterator(nsIContent*          aContent,
       nsCOMPtr<nsIStyleContext> pseudoStyleContext;
       
       primaryFrame->GetStyleContext(getter_AddRefs(styleContext));
-      mPresContext->ProbePseudoStyleContextFor(aContent, nsCSSAtoms::afterPseudo,
+      mPresContext->ProbePseudoStyleContextFor(aContent,
+                                               nsCSSPseudoElements::after,
                                                styleContext,
                                                getter_AddRefs(pseudoStyleContext));
       if (pseudoStyleContext) {
diff --git a/mozilla/layout/build/nsLayoutModule.cpp b/mozilla/layout/build/nsLayoutModule.cpp
index b05313c44d4..cdf04f6ca07 100644
--- a/mozilla/layout/build/nsLayoutModule.cpp
+++ b/mozilla/layout/build/nsLayoutModule.cpp
@@ -53,13 +53,15 @@
 #include "nsIPrintPreviewContext.h"
 #include "nsTextTransformer.h"
 
-#include "nsXBLAtoms.h"     // to addref/release table
-#include "nsHTMLAtoms.h"    // to addref/release table
-#include "nsLayoutAtoms.h"  // to addref/release table
-#include "nsCSSKeywords.h"  // to addref/release table
-#include "nsCSSProps.h"     // to addref/release table
-#include "nsCSSAtoms.h"     // to addref/release table
-#include "nsColorNames.h"   // to addref/release table
+#include "nsXBLAtoms.h"                 // to addref/release table
+#include "nsHTMLAtoms.h"                // to addref/release table
+#include "nsLayoutAtoms.h"              // to addref/release table
+#include "nsCSSKeywords.h"              // to addref/release table
+#include "nsCSSProps.h"                 // to addref/release table
+#include "nsCSSAnonBoxes.h"             // to addref/release table
+#include "nsCSSPseudoClasses.h"         // to addref/release table
+#include "nsCSSPseudoElements.h"        // to addref/release table
+#include "nsColorNames.h"               // to addref/release table
 #include "nsCSSFrameConstructor.h"
 #include "nsSpaceManager.h"
 #include "nsISelectionImageService.h"
@@ -98,7 +100,9 @@ Initialize(nsIModule* self)
   gInitialized = PR_TRUE;
     
   // Register all of our atoms once
-  nsCSSAtoms::AddRefAtoms();
+  nsCSSAnonBoxes::AddRefAtoms();
+  nsCSSPseudoClasses::AddRefAtoms();
+  nsCSSPseudoElements::AddRefAtoms();
   nsCSSKeywords::AddRefTable();
   nsCSSProps::AddRefTable();
   nsColorNames::AddRefTable();
@@ -144,7 +148,9 @@ Shutdown(nsIModule* self)
   nsColorNames::ReleaseTable();
   nsCSSProps::ReleaseTable();
   nsCSSKeywords::ReleaseTable();
-  nsCSSAtoms::ReleaseAtoms();
+  nsCSSAnonBoxes::ReleaseAtoms();
+  nsCSSPseudoClasses::ReleaseAtoms();
+  nsCSSPseudoElements::ReleaseAtoms();
   nsHTMLAtoms::ReleaseAtoms();
   nsXBLAtoms::ReleaseAtoms();
   nsLayoutAtoms::ReleaseAtoms();
diff --git a/mozilla/layout/forms/nsButtonFrameRenderer.cpp b/mozilla/layout/forms/nsButtonFrameRenderer.cpp
index 9f8cf2d928c..65a3299a88c 100644
--- a/mozilla/layout/forms/nsButtonFrameRenderer.cpp
+++ b/mozilla/layout/forms/nsButtonFrameRenderer.cpp
@@ -41,6 +41,7 @@
 #include "nsIView.h"
 #include "nsIViewManager.h"
 #include "nsHTMLAtoms.h"
+#include "nsCSSPseudoElements.h"
 #include "nsINameSpaceManager.h"
 
 #define ACTIVE   "active"
@@ -328,11 +329,11 @@ nsButtonFrameRenderer::ReResolveStyles(nsIPresContext* aPresContext)
 
 
   // style for the inner such as a dotted line (Windows)
-  aPresContext->ProbePseudoStyleContextFor(content, nsHTMLAtoms::mozFocusInnerPseudo, context,
+  aPresContext->ProbePseudoStyleContextFor(content, nsCSSPseudoElements::mozFocusInner, context,
                                           getter_AddRefs(mInnerFocusStyle));
 
   // style for outer focus like a ridged border (MAC).
-  aPresContext->ProbePseudoStyleContextFor(content, nsHTMLAtoms::mozFocusOuterPseudo, context,
+  aPresContext->ProbePseudoStyleContextFor(content, nsCSSPseudoElements::mozFocusOuter, context,
                                           getter_AddRefs(mOuterFocusStyle));
 
 }
diff --git a/mozilla/layout/forms/nsComboboxControlFrame.cpp b/mozilla/layout/forms/nsComboboxControlFrame.cpp
index 1043f65623a..f34900dbd0e 100644
--- a/mozilla/layout/forms/nsComboboxControlFrame.cpp
+++ b/mozilla/layout/forms/nsComboboxControlFrame.cpp
@@ -43,6 +43,7 @@
 #include "nsFormControlFrame.h"
 #include "nsIHTMLContent.h"
 #include "nsHTMLAtoms.h"
+#include "nsCSSAnonBoxes.h"
 #include "nsHTMLParts.h"
 #include "nsIFormControl.h"
 #include "nsINameSpaceManager.h"
@@ -2169,7 +2170,7 @@ nsComboboxControlFrame::CreateDisplayFrame(nsIPresContext* aPresContext)
   // create the style context for the anonymous frame
   nsCOMPtr<nsIStyleContext> styleContext;
   rv = aPresContext->ResolvePseudoStyleContextFor(mContent, 
-                                                  nsHTMLAtoms::mozDisplayComboboxControlFrame,
+                                                  nsCSSAnonBoxes::mozDisplayComboboxControlFrame,
                                                   mStyleContext,
                                                   getter_AddRefs(styleContext));
   if (NS_FAILED(rv)) { return rv; }
@@ -2309,7 +2310,7 @@ nsComboboxControlFrame::CreateFrameFor(nsIPresContext*   aPresContext,
     // create the style context for the anonymous block frame
     nsCOMPtr<nsIStyleContext> styleContext;
     rv = aPresContext->ResolvePseudoStyleContextFor(mContent, 
-                                                    nsHTMLAtoms::mozDisplayComboboxControlFrame,
+                                                    nsCSSAnonBoxes::mozDisplayComboboxControlFrame,
                                                     mStyleContext,
                                                     getter_AddRefs(styleContext));
     if (NS_FAILED(rv)) { return rv; }
diff --git a/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp b/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp
index 3c6729816b3..711cd8d15ba 100644
--- a/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp
+++ b/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp
@@ -52,6 +52,7 @@
 #include "nsCSSRendering.h"
 #include "nsISupports.h"
 #include "nsHTMLAtoms.h"
+#include "nsCSSAnonBoxes.h"
 #include "nsIImage.h"
 #include "nsStyleConsts.h"
 #include "nsIHTMLContent.h"
@@ -146,7 +147,8 @@ nsHTMLButtonControlFrame::Init(nsIPresContext*  aPresContext,
 
   // Resolve style and initialize the frame
   nsIStyleContext* styleContext;
-  aPresContext->ResolvePseudoStyleContextFor(mContent, nsHTMLAtoms::buttonContentPseudo,
+  aPresContext->ResolvePseudoStyleContextFor(mContent,
+                                            nsCSSAnonBoxes::buttonContent,
                                             mStyleContext,
                                             &styleContext);
   mFrames.FirstChild()->Init(aPresContext, mContent, this, styleContext, nsnull);
diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp
index 2e63eba7024..cd6f2a00205 100644
--- a/mozilla/layout/generic/nsBlockFrame.cpp
+++ b/mozilla/layout/generic/nsBlockFrame.cpp
@@ -59,6 +59,7 @@
 #include "nsIFontMetrics.h"
 #include "nsHTMLParts.h"
 #include "nsHTMLAtoms.h"
+#include "nsCSSPseudoElements.h"
 #include "nsHTMLValue.h"
 #include "nsIDOMEvent.h"
 #include "nsIHTMLContent.h"
@@ -6383,7 +6384,7 @@ nsBlockFrame::GetFirstLetterStyle(nsIPresContext* aPresContext)
 
   nsIStyleContext* fls;
   aPresContext->ProbePseudoStyleContextFor(mContent,
-                                           nsHTMLAtoms::firstLetterPseudo,
+                                           nsCSSPseudoElements::firstLetter,
                                            mStyleContext, &fls);
   return fls;
 }
@@ -6437,10 +6438,10 @@ nsBlockFrame::SetInitialChildList(nsIPresContext* aPresContext,
         case NS_STYLE_LIST_STYLE_DISC:
         case NS_STYLE_LIST_STYLE_CIRCLE:
         case NS_STYLE_LIST_STYLE_SQUARE:
-          pseudoElement = nsHTMLAtoms::mozListBulletPseudo;
+          pseudoElement = nsCSSPseudoElements::mozListBullet;
           break;
         default:
-          pseudoElement = nsHTMLAtoms::mozListNumberPseudo;
+          pseudoElement = nsCSSPseudoElements::mozListNumber;
           break;
       }
       nsIStyleContext* kidSC;
diff --git a/mozilla/layout/generic/nsContainerFrame.cpp b/mozilla/layout/generic/nsContainerFrame.cpp
index 22067d4d3d9..54428438ed8 100644
--- a/mozilla/layout/generic/nsContainerFrame.cpp
+++ b/mozilla/layout/generic/nsContainerFrame.cpp
@@ -54,6 +54,7 @@
 #include "nsIPresShell.h"
 #include "nsCOMPtr.h"
 #include "nsLayoutAtoms.h"
+#include "nsCSSAnonBoxes.h"
 #include "nsIViewManager.h"
 #include "nsIWidget.h"
 #include "nsGfxCIID.h"
@@ -854,7 +855,7 @@ nsContainerFrame::FrameNeedsView(nsIPresContext* aPresContext,
 
   nsCOMPtr<nsIAtom>  pseudoTag;
   aStyleContext->GetPseudoType(*getter_AddRefs(pseudoTag));
-  if (pseudoTag == nsLayoutAtoms::scrolledContentPseudo) {
+  if (pseudoTag == nsCSSAnonBoxes::scrolledContent) {
     return PR_TRUE;
   }
 
diff --git a/mozilla/layout/generic/nsFrameSetFrame.cpp b/mozilla/layout/generic/nsFrameSetFrame.cpp
index a88c8da794c..47057c417ec 100644
--- a/mozilla/layout/generic/nsFrameSetFrame.cpp
+++ b/mozilla/layout/generic/nsFrameSetFrame.cpp
@@ -52,6 +52,8 @@
 #include "nsIServiceManager.h"
 #include "nsIDOMMutationEvent.h"
 #include "nsINameSpaceManager.h"
+#include "nsCSSPseudoElements.h"
+#include "nsCSSAnonBoxes.h"
 
 // masks for mEdgeVisibility
 #define LEFT_VIS   0x0001
@@ -452,9 +454,9 @@ nsHTMLFramesetFrame::Init(nsIPresContext*  aPresContext,
     // should just have null content, if we support that
     nsHTMLFramesetBlankFrame* blankFrame = new (shell.get()) nsHTMLFramesetBlankFrame;
     nsCOMPtr<nsIStyleContext> pseudoStyleContext;
-    aPresContext->ResolvePseudoStyleContextFor(mContent, nsHTMLAtoms::framesetBlankPseudo,
-                                               mStyleContext,
-                                               getter_AddRefs(pseudoStyleContext));
+    aPresContext->ResolvePseudoStyleContextFor(nsnull,
+                            nsCSSAnonBoxes::framesetBlank, mStyleContext,
+                            getter_AddRefs(pseudoStyleContext));
     if(blankFrame)
       blankFrame->Init(aPresContext, mContent, this, pseudoStyleContext, nsnull);
    
@@ -1079,7 +1081,7 @@ nsHTMLFramesetFrame::Reflow(nsIPresContext*          aPresContext,
       if (firstTime) { // create horizontal border
         borderFrame = new (shell.get()) nsHTMLFramesetBorderFrame(borderWidth, PR_FALSE, PR_FALSE);
         nsIStyleContext* pseudoStyleContext;
-        aPresContext->ResolvePseudoStyleContextFor(mContent, nsHTMLAtoms::horizontalFramesetBorderPseudo,
+        aPresContext->ResolvePseudoStyleContextFor(mContent, nsCSSPseudoElements::horizontalFramesetBorder,
                                                    mStyleContext,
                                                    &pseudoStyleContext);
         borderFrame->Init(aPresContext, mContent, this, pseudoStyleContext, nsnull);
@@ -1107,7 +1109,7 @@ nsHTMLFramesetFrame::Reflow(nsIPresContext*          aPresContext,
           if (firstTime) { // create vertical border
             borderFrame = new (shell.get()) nsHTMLFramesetBorderFrame(borderWidth, PR_TRUE, PR_FALSE);
             nsIStyleContext* pseudoStyleContext;
-            aPresContext->ResolvePseudoStyleContextFor(mContent, nsHTMLAtoms::verticalFramesetBorderPseudo,
+            aPresContext->ResolvePseudoStyleContextFor(mContent, nsCSSPseudoElements::verticalFramesetBorder,
                                                        mStyleContext,
                                                        &pseudoStyleContext);
             borderFrame->Init(aPresContext, mContent, this, pseudoStyleContext, nsnull);
diff --git a/mozilla/layout/generic/nsHTMLContainerFrame.cpp b/mozilla/layout/generic/nsHTMLContainerFrame.cpp
index b1f9226d302..649f73d8f8a 100644
--- a/mozilla/layout/generic/nsHTMLContainerFrame.cpp
+++ b/mozilla/layout/generic/nsHTMLContainerFrame.cpp
@@ -43,6 +43,7 @@
 #include "nsCSSRendering.h"
 #include "nsIContent.h"
 #include "nsLayoutAtoms.h"
+#include "nsCSSAnonBoxes.h"
 #include "nsIWidget.h"
 #include "nsILinkHandler.h"
 #include "nsHTMLValue.h"
diff --git a/mozilla/layout/generic/nsInlineFrame.cpp b/mozilla/layout/generic/nsInlineFrame.cpp
index ec3e2295b54..ca3e38f21c3 100644
--- a/mozilla/layout/generic/nsInlineFrame.cpp
+++ b/mozilla/layout/generic/nsInlineFrame.cpp
@@ -46,6 +46,7 @@
 #include "nsIFontMetrics.h"
 #include "nsAbsoluteContainingBlock.h"
 #include "nsLayoutAtoms.h"
+#include "nsCSSAnonBoxes.h"
 #include "nsReflowPath.h"
 #ifdef ACCESSIBILITY
 #include "nsIServiceManager.h"
@@ -1074,10 +1075,8 @@ nsFirstLineFrame::Reflow(nsIPresContext* aPresContext,
         // we behave as if an anonymous (unstyled) span was the child
         // of the parent frame.
         nsIStyleContext* newSC;
-        aPresContext->ResolvePseudoStyleContextFor(mContent,
-                                                   nsHTMLAtoms::mozLineFrame,
-                                                   parentContext,
-                                                   &newSC);
+        aPresContext->ResolvePseudoStyleContextFor(nsnull,
+                      nsCSSAnonBoxes::mozLineFrame, parentContext, &newSC);
         if (newSC) {
           // Switch to the new style context.
           SetStyleContext(aPresContext, newSC);
diff --git a/mozilla/layout/generic/nsTextFrame.cpp b/mozilla/layout/generic/nsTextFrame.cpp
index 2f48e614eb5..6caf4cae6fd 100644
--- a/mozilla/layout/generic/nsTextFrame.cpp
+++ b/mozilla/layout/generic/nsTextFrame.cpp
@@ -66,7 +66,7 @@
 #include "nsIDeviceContext.h"
 #include "nsIFocusTracker.h"
 #include "nsICaret.h"
-#include "nsHTMLAtoms.h"
+#include "nsCSSPseudoElements.h"
 #include "nsILineBreaker.h"
 #include "nsIWordBreaker.h"
 
@@ -1060,7 +1060,7 @@ DrawSelectionIterator::DrawSelectionIterator(nsIContent *aContent,
       nsCOMPtr<nsIContent> parentContent;
       aContent->GetParent(*getter_AddRefs(parentContent));
       aPresContext->ProbePseudoStyleContextFor(parentContent,
-  					     nsHTMLAtoms::mozSelectionPseudo,
+  					     nsCSSPseudoElements::mozSelection,
   					     aStyleContext, &sc);
       if (nsnull != sc) {
         mSelectionPseudoStyle = PR_TRUE;
diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp
index 2e63eba7024..cd6f2a00205 100644
--- a/mozilla/layout/html/base/src/nsBlockFrame.cpp
+++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp
@@ -59,6 +59,7 @@
 #include "nsIFontMetrics.h"
 #include "nsHTMLParts.h"
 #include "nsHTMLAtoms.h"
+#include "nsCSSPseudoElements.h"
 #include "nsHTMLValue.h"
 #include "nsIDOMEvent.h"
 #include "nsIHTMLContent.h"
@@ -6383,7 +6384,7 @@ nsBlockFrame::GetFirstLetterStyle(nsIPresContext* aPresContext)
 
   nsIStyleContext* fls;
   aPresContext->ProbePseudoStyleContextFor(mContent,
-                                           nsHTMLAtoms::firstLetterPseudo,
+                                           nsCSSPseudoElements::firstLetter,
                                            mStyleContext, &fls);
   return fls;
 }
@@ -6437,10 +6438,10 @@ nsBlockFrame::SetInitialChildList(nsIPresContext* aPresContext,
         case NS_STYLE_LIST_STYLE_DISC:
         case NS_STYLE_LIST_STYLE_CIRCLE:
         case NS_STYLE_LIST_STYLE_SQUARE:
-          pseudoElement = nsHTMLAtoms::mozListBulletPseudo;
+          pseudoElement = nsCSSPseudoElements::mozListBullet;
           break;
         default:
-          pseudoElement = nsHTMLAtoms::mozListNumberPseudo;
+          pseudoElement = nsCSSPseudoElements::mozListNumber;
           break;
       }
       nsIStyleContext* kidSC;
diff --git a/mozilla/layout/html/base/src/nsContainerFrame.cpp b/mozilla/layout/html/base/src/nsContainerFrame.cpp
index 22067d4d3d9..54428438ed8 100644
--- a/mozilla/layout/html/base/src/nsContainerFrame.cpp
+++ b/mozilla/layout/html/base/src/nsContainerFrame.cpp
@@ -54,6 +54,7 @@
 #include "nsIPresShell.h"
 #include "nsCOMPtr.h"
 #include "nsLayoutAtoms.h"
+#include "nsCSSAnonBoxes.h"
 #include "nsIViewManager.h"
 #include "nsIWidget.h"
 #include "nsGfxCIID.h"
@@ -854,7 +855,7 @@ nsContainerFrame::FrameNeedsView(nsIPresContext* aPresContext,
 
   nsCOMPtr<nsIAtom>  pseudoTag;
   aStyleContext->GetPseudoType(*getter_AddRefs(pseudoTag));
-  if (pseudoTag == nsLayoutAtoms::scrolledContentPseudo) {
+  if (pseudoTag == nsCSSAnonBoxes::scrolledContent) {
     return PR_TRUE;
   }
 
diff --git a/mozilla/layout/html/base/src/nsFrameManager.cpp b/mozilla/layout/html/base/src/nsFrameManager.cpp
index f3e3c9453a4..d0e0d3e3a66 100644
--- a/mozilla/layout/html/base/src/nsFrameManager.cpp
+++ b/mozilla/layout/html/base/src/nsFrameManager.cpp
@@ -44,6 +44,7 @@
 #include "pldhash.h"
 #include "nsPlaceholderFrame.h"
 #include "nsLayoutAtoms.h"
+#include "nsCSSAnonBoxes.h"
 #include "nsHTMLAtoms.h"
 #ifdef NS_DEBUG
 #include "nsISupportsArray.h"
@@ -1731,7 +1732,7 @@ FrameManager::ReResolveStyleContext(nsIPresContext* aPresContext,
     
     // do primary context
     nsIStyleContext* newContext = nsnull;
-    if (pseudoTag == nsHTMLAtoms::mozNonElementPseudo) {
+    if (pseudoTag == nsCSSAnonBoxes::mozNonElement) {
       NS_ASSERTION(localContent,
                    "non pseudo-element frame without content node");
       aPresContext->ResolveStyleContextForNonElement(parentContext,
@@ -1787,7 +1788,7 @@ FrameManager::ReResolveStyleContext(nsIPresContext* aPresContext,
         }
       }
       else {
-        if (pseudoTag && pseudoTag != nsHTMLAtoms::mozNonElementPseudo &&
+        if (pseudoTag && pseudoTag != nsCSSAnonBoxes::mozNonElement &&
             aAttribute &&
             (!(aMinChange &
                (nsChangeHint_ReflowFrame | nsChangeHint_ReconstructFrame
@@ -1814,7 +1815,7 @@ FrameManager::ReResolveStyleContext(nsIPresContext* aPresContext,
           nsIStyleContext* newExtraContext = nsnull;
           oldExtraContext->GetPseudoType(pseudoTag);
           NS_ASSERTION(pseudoTag &&
-                       pseudoTag != nsHTMLAtoms::mozNonElementPseudo,
+                       pseudoTag != nsCSSAnonBoxes::mozNonElement,
                        "extra style context is not pseudo element");
           result = aPresContext->ResolvePseudoStyleContextFor(content, pseudoTag, newContext,
                                                               &newExtraContext);
@@ -1831,7 +1832,7 @@ FrameManager::ReResolveStyleContext(nsIPresContext* aPresContext,
 #if 0
               // XXXldb |oldContext| is null by this point, so this will
               // never do anything.
-              if (pseudoTag && pseudoTag != nsHTMLAtoms::mozNonElementPseudo &&
+              if (pseudoTag && pseudoTag != nsCSSAnonBoxes::mozNonElement &&
                   aAttribute && (aMinChange < NS_STYLE_HINT_REFLOW) &&
                   HasAttributeContent(oldContext, aAttrNameSpaceID, aAttribute)) {
                 aChangeList.AppendChange(aFrame, content, NS_STYLE_HINT_REFLOW);
@@ -1859,7 +1860,7 @@ FrameManager::ReResolveStyleContext(nsIPresContext* aPresContext,
                                                newContext, 
                                                &undisplayedContext);
         }
-        else if (pseudoTag == nsHTMLAtoms::mozNonElementPseudo) {
+        else if (pseudoTag == nsCSSAnonBoxes::mozNonElement) {
           aPresContext->ResolveStyleContextForNonElement(newContext, 
                                                          &undisplayedContext);
         }
diff --git a/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp b/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp
index b1f9226d302..649f73d8f8a 100644
--- a/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp
+++ b/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp
@@ -43,6 +43,7 @@
 #include "nsCSSRendering.h"
 #include "nsIContent.h"
 #include "nsLayoutAtoms.h"
+#include "nsCSSAnonBoxes.h"
 #include "nsIWidget.h"
 #include "nsILinkHandler.h"
 #include "nsHTMLValue.h"
diff --git a/mozilla/layout/html/base/src/nsInlineFrame.cpp b/mozilla/layout/html/base/src/nsInlineFrame.cpp
index ec3e2295b54..ca3e38f21c3 100644
--- a/mozilla/layout/html/base/src/nsInlineFrame.cpp
+++ b/mozilla/layout/html/base/src/nsInlineFrame.cpp
@@ -46,6 +46,7 @@
 #include "nsIFontMetrics.h"
 #include "nsAbsoluteContainingBlock.h"
 #include "nsLayoutAtoms.h"
+#include "nsCSSAnonBoxes.h"
 #include "nsReflowPath.h"
 #ifdef ACCESSIBILITY
 #include "nsIServiceManager.h"
@@ -1074,10 +1075,8 @@ nsFirstLineFrame::Reflow(nsIPresContext* aPresContext,
         // we behave as if an anonymous (unstyled) span was the child
         // of the parent frame.
         nsIStyleContext* newSC;
-        aPresContext->ResolvePseudoStyleContextFor(mContent,
-                                                   nsHTMLAtoms::mozLineFrame,
-                                                   parentContext,
-                                                   &newSC);
+        aPresContext->ResolvePseudoStyleContextFor(nsnull,
+                      nsCSSAnonBoxes::mozLineFrame, parentContext, &newSC);
         if (newSC) {
           // Switch to the new style context.
           SetStyleContext(aPresContext, newSC);
diff --git a/mozilla/layout/html/base/src/nsPresShell.cpp b/mozilla/layout/html/base/src/nsPresShell.cpp
index c77267039b7..23afd08f820 100644
--- a/mozilla/layout/html/base/src/nsPresShell.cpp
+++ b/mozilla/layout/html/base/src/nsPresShell.cpp
@@ -76,6 +76,7 @@
 #include "nsIDOMNodeList.h"
 #include "nsIDOMElement.h"
 #include "nsHTMLAtoms.h"
+#include "nsCSSPseudoElements.h"
 #include "nsCOMPtr.h"
 #include "nsReadableUtils.h"
 #include "nsUnicharUtils.h"
@@ -102,7 +103,6 @@
 #include "nsTimer.h"
 #include "nsWeakPtr.h"
 #include "plarena.h"
-#include "nsCSSAtoms.h"
 #include "nsIObserverService.h" // for reflow observation
 #include "nsIDocShell.h"        // for reflow observation
 #include "nsIDOMRange.h"
@@ -4719,7 +4719,8 @@ PresShell::GetGeneratedContentIterator(nsIContent*          aContent,
       nsCOMPtr<nsIStyleContext> pseudoStyleContext;
       
       primaryFrame->GetStyleContext(getter_AddRefs(styleContext));
-      mPresContext->ProbePseudoStyleContextFor(aContent, nsCSSAtoms::afterPseudo,
+      mPresContext->ProbePseudoStyleContextFor(aContent,
+                                               nsCSSPseudoElements::after,
                                                styleContext,
                                                getter_AddRefs(pseudoStyleContext));
       if (pseudoStyleContext) {
diff --git a/mozilla/layout/html/base/src/nsTextFrame.cpp b/mozilla/layout/html/base/src/nsTextFrame.cpp
index 2f48e614eb5..6caf4cae6fd 100644
--- a/mozilla/layout/html/base/src/nsTextFrame.cpp
+++ b/mozilla/layout/html/base/src/nsTextFrame.cpp
@@ -66,7 +66,7 @@
 #include "nsIDeviceContext.h"
 #include "nsIFocusTracker.h"
 #include "nsICaret.h"
-#include "nsHTMLAtoms.h"
+#include "nsCSSPseudoElements.h"
 #include "nsILineBreaker.h"
 #include "nsIWordBreaker.h"
 
@@ -1060,7 +1060,7 @@ DrawSelectionIterator::DrawSelectionIterator(nsIContent *aContent,
       nsCOMPtr<nsIContent> parentContent;
       aContent->GetParent(*getter_AddRefs(parentContent));
       aPresContext->ProbePseudoStyleContextFor(parentContent,
-  					     nsHTMLAtoms::mozSelectionPseudo,
+  					     nsCSSPseudoElements::mozSelection,
   					     aStyleContext, &sc);
       if (nsnull != sc) {
         mSelectionPseudoStyle = PR_TRUE;
diff --git a/mozilla/layout/html/document/src/html.css b/mozilla/layout/html/document/src/html.css
index 54faabaa271..3dcca6203c1 100644
--- a/mozilla/layout/html/document/src/html.css
+++ b/mozilla/layout/html/document/src/html.css
@@ -501,10 +501,6 @@ noembed, noscript, param {
   -moz-box-orient: inherit;
 }
 
-*|*:-moz-wrapped-frame {
-  display: inherit;
-}
-
 *|*:-moz-page, *|*:-moz-page-sequence {
   display: block;
   background: transparent;
diff --git a/mozilla/layout/html/document/src/nsFrameSetFrame.cpp b/mozilla/layout/html/document/src/nsFrameSetFrame.cpp
index a88c8da794c..47057c417ec 100644
--- a/mozilla/layout/html/document/src/nsFrameSetFrame.cpp
+++ b/mozilla/layout/html/document/src/nsFrameSetFrame.cpp
@@ -52,6 +52,8 @@
 #include "nsIServiceManager.h"
 #include "nsIDOMMutationEvent.h"
 #include "nsINameSpaceManager.h"
+#include "nsCSSPseudoElements.h"
+#include "nsCSSAnonBoxes.h"
 
 // masks for mEdgeVisibility
 #define LEFT_VIS   0x0001
@@ -452,9 +454,9 @@ nsHTMLFramesetFrame::Init(nsIPresContext*  aPresContext,
     // should just have null content, if we support that
     nsHTMLFramesetBlankFrame* blankFrame = new (shell.get()) nsHTMLFramesetBlankFrame;
     nsCOMPtr<nsIStyleContext> pseudoStyleContext;
-    aPresContext->ResolvePseudoStyleContextFor(mContent, nsHTMLAtoms::framesetBlankPseudo,
-                                               mStyleContext,
-                                               getter_AddRefs(pseudoStyleContext));
+    aPresContext->ResolvePseudoStyleContextFor(nsnull,
+                            nsCSSAnonBoxes::framesetBlank, mStyleContext,
+                            getter_AddRefs(pseudoStyleContext));
     if(blankFrame)
       blankFrame->Init(aPresContext, mContent, this, pseudoStyleContext, nsnull);
    
@@ -1079,7 +1081,7 @@ nsHTMLFramesetFrame::Reflow(nsIPresContext*          aPresContext,
       if (firstTime) { // create horizontal border
         borderFrame = new (shell.get()) nsHTMLFramesetBorderFrame(borderWidth, PR_FALSE, PR_FALSE);
         nsIStyleContext* pseudoStyleContext;
-        aPresContext->ResolvePseudoStyleContextFor(mContent, nsHTMLAtoms::horizontalFramesetBorderPseudo,
+        aPresContext->ResolvePseudoStyleContextFor(mContent, nsCSSPseudoElements::horizontalFramesetBorder,
                                                    mStyleContext,
                                                    &pseudoStyleContext);
         borderFrame->Init(aPresContext, mContent, this, pseudoStyleContext, nsnull);
@@ -1107,7 +1109,7 @@ nsHTMLFramesetFrame::Reflow(nsIPresContext*          aPresContext,
           if (firstTime) { // create vertical border
             borderFrame = new (shell.get()) nsHTMLFramesetBorderFrame(borderWidth, PR_TRUE, PR_FALSE);
             nsIStyleContext* pseudoStyleContext;
-            aPresContext->ResolvePseudoStyleContextFor(mContent, nsHTMLAtoms::verticalFramesetBorderPseudo,
+            aPresContext->ResolvePseudoStyleContextFor(mContent, nsCSSPseudoElements::verticalFramesetBorder,
                                                        mStyleContext,
                                                        &pseudoStyleContext);
             borderFrame->Init(aPresContext, mContent, this, pseudoStyleContext, nsnull);
diff --git a/mozilla/layout/html/forms/src/nsButtonFrameRenderer.cpp b/mozilla/layout/html/forms/src/nsButtonFrameRenderer.cpp
index 9f8cf2d928c..65a3299a88c 100644
--- a/mozilla/layout/html/forms/src/nsButtonFrameRenderer.cpp
+++ b/mozilla/layout/html/forms/src/nsButtonFrameRenderer.cpp
@@ -41,6 +41,7 @@
 #include "nsIView.h"
 #include "nsIViewManager.h"
 #include "nsHTMLAtoms.h"
+#include "nsCSSPseudoElements.h"
 #include "nsINameSpaceManager.h"
 
 #define ACTIVE   "active"
@@ -328,11 +329,11 @@ nsButtonFrameRenderer::ReResolveStyles(nsIPresContext* aPresContext)
 
 
   // style for the inner such as a dotted line (Windows)
-  aPresContext->ProbePseudoStyleContextFor(content, nsHTMLAtoms::mozFocusInnerPseudo, context,
+  aPresContext->ProbePseudoStyleContextFor(content, nsCSSPseudoElements::mozFocusInner, context,
                                           getter_AddRefs(mInnerFocusStyle));
 
   // style for outer focus like a ridged border (MAC).
-  aPresContext->ProbePseudoStyleContextFor(content, nsHTMLAtoms::mozFocusOuterPseudo, context,
+  aPresContext->ProbePseudoStyleContextFor(content, nsCSSPseudoElements::mozFocusOuter, context,
                                           getter_AddRefs(mOuterFocusStyle));
 
 }
diff --git a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp
index 1043f65623a..f34900dbd0e 100644
--- a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp
@@ -43,6 +43,7 @@
 #include "nsFormControlFrame.h"
 #include "nsIHTMLContent.h"
 #include "nsHTMLAtoms.h"
+#include "nsCSSAnonBoxes.h"
 #include "nsHTMLParts.h"
 #include "nsIFormControl.h"
 #include "nsINameSpaceManager.h"
@@ -2169,7 +2170,7 @@ nsComboboxControlFrame::CreateDisplayFrame(nsIPresContext* aPresContext)
   // create the style context for the anonymous frame
   nsCOMPtr<nsIStyleContext> styleContext;
   rv = aPresContext->ResolvePseudoStyleContextFor(mContent, 
-                                                  nsHTMLAtoms::mozDisplayComboboxControlFrame,
+                                                  nsCSSAnonBoxes::mozDisplayComboboxControlFrame,
                                                   mStyleContext,
                                                   getter_AddRefs(styleContext));
   if (NS_FAILED(rv)) { return rv; }
@@ -2309,7 +2310,7 @@ nsComboboxControlFrame::CreateFrameFor(nsIPresContext*   aPresContext,
     // create the style context for the anonymous block frame
     nsCOMPtr<nsIStyleContext> styleContext;
     rv = aPresContext->ResolvePseudoStyleContextFor(mContent, 
-                                                    nsHTMLAtoms::mozDisplayComboboxControlFrame,
+                                                    nsCSSAnonBoxes::mozDisplayComboboxControlFrame,
                                                     mStyleContext,
                                                     getter_AddRefs(styleContext));
     if (NS_FAILED(rv)) { return rv; }
diff --git a/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp b/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp
index 3c6729816b3..711cd8d15ba 100644
--- a/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp
@@ -52,6 +52,7 @@
 #include "nsCSSRendering.h"
 #include "nsISupports.h"
 #include "nsHTMLAtoms.h"
+#include "nsCSSAnonBoxes.h"
 #include "nsIImage.h"
 #include "nsStyleConsts.h"
 #include "nsIHTMLContent.h"
@@ -146,7 +147,8 @@ nsHTMLButtonControlFrame::Init(nsIPresContext*  aPresContext,
 
   // Resolve style and initialize the frame
   nsIStyleContext* styleContext;
-  aPresContext->ResolvePseudoStyleContextFor(mContent, nsHTMLAtoms::buttonContentPseudo,
+  aPresContext->ResolvePseudoStyleContextFor(mContent,
+                                            nsCSSAnonBoxes::buttonContent,
                                             mStyleContext,
                                             &styleContext);
   mFrames.FirstChild()->Init(aPresContext, mContent, this, styleContext, nsnull);
diff --git a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
index a4a4e25d102..7b864bc6f7c 100644
--- a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
+++ b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
@@ -83,7 +83,8 @@
 #include "nsTableRowGroupFrame.h"
 #include "nsStyleChangeList.h"
 #include "nsIFormControl.h"
-#include "nsCSSAtoms.h"
+#include "nsCSSAnonBoxes.h"
+#include "nsCSSPseudoElements.h"
 #include "nsIDeviceContext.h"
 #include "nsTextFragment.h"
 #include "nsISupportsArray.h"
@@ -1584,10 +1585,10 @@ nsCSSFrameConstructor::CreateGeneratedContentFrame(nsIPresShell*        aPresShe
             nsIAtom *wrapperPseudo;
             if (display->IsBlockLevel()) {
               NS_NewBlockFrame(aPresShell, aWrapperFrame);
-              wrapperPseudo = nsCSSAtoms::mozGCWrapperBlock;
+              wrapperPseudo = nsCSSAnonBoxes::mozGCWrapperBlock;
             } else {
               NS_NewInlineFrame(aPresShell, aWrapperFrame);
-              wrapperPseudo = nsCSSAtoms::mozGCWrapperInline;
+              wrapperPseudo = nsCSSAnonBoxes::mozGCWrapperInline;
             }        
             nsCOMPtr<nsIStyleContext> parentSC = aStyleContext->GetParent(); 
             nsCOMPtr<nsIStyleContext> wrapperSC;
@@ -1978,7 +1979,8 @@ nsCSSFrameConstructor::CreatePseudoTableFrame(nsIPresShell*            aPresShel
   parentFrame->GetContent(getter_AddRefs(parentContent));   
 
   // create the SC for the inner table which will be the parent of the outer table's SC
-  aPresContext->ResolvePseudoStyleContextFor(parentContent, nsHTMLAtoms::tablePseudo, 
+  aPresContext->ResolvePseudoStyleContextFor(parentContent,
+                                             nsCSSAnonBoxes::table,
                                              parentStyle,
                                              getter_AddRefs(childStyle));
 
@@ -2027,7 +2029,8 @@ nsCSSFrameConstructor::CreatePseudoRowGroupFrame(nsIPresShell*            aPresS
   parentFrame->GetStyleContext(getter_AddRefs(parentStyle)); 
   parentFrame->GetContent(getter_AddRefs(parentContent));   
 
-  aPresContext->ResolvePseudoStyleContextFor(parentContent, nsHTMLAtoms::tableRowGroupPseudo, 
+  aPresContext->ResolvePseudoStyleContextFor(parentContent,
+                                             nsCSSAnonBoxes::tableRowGroup, 
                                              parentStyle,
                                              getter_AddRefs(childStyle));
 
@@ -2072,7 +2075,8 @@ nsCSSFrameConstructor::CreatePseudoColGroupFrame(nsIPresShell*            aPresS
   parentFrame->GetStyleContext(getter_AddRefs(parentStyle)); 
   parentFrame->GetContent(getter_AddRefs(parentContent));   
 
-  aPresContext->ResolvePseudoStyleContextFor(parentContent, nsHTMLAtoms::tableColGroupPseudo, 
+  aPresContext->ResolvePseudoStyleContextFor(parentContent,
+                                             nsCSSAnonBoxes::tableColGroup, 
                                              parentStyle,
                                              getter_AddRefs(childStyle));
 
@@ -2115,7 +2119,8 @@ nsCSSFrameConstructor::CreatePseudoRowFrame(nsIPresShell*            aPresShell,
   parentFrame->GetStyleContext(getter_AddRefs(parentStyle)); 
   parentFrame->GetContent(getter_AddRefs(parentContent));   
 
-  aPresContext->ResolvePseudoStyleContextFor(parentContent, nsHTMLAtoms::tableRowPseudo, 
+  aPresContext->ResolvePseudoStyleContextFor(parentContent,
+                                             nsCSSAnonBoxes::tableRow, 
                                              parentStyle,
                                              getter_AddRefs(childStyle));
 
@@ -2159,7 +2164,8 @@ nsCSSFrameConstructor::CreatePseudoCellFrame(nsIPresShell*            aPresShell
   parentFrame->GetStyleContext(getter_AddRefs(parentStyle)); 
   parentFrame->GetContent(getter_AddRefs(parentContent));   
 
-  aPresContext->ResolvePseudoStyleContextFor(parentContent, nsHTMLAtoms::tableCellPseudo, 
+  aPresContext->ResolvePseudoStyleContextFor(parentContent,
+                                             nsCSSAnonBoxes::tableCell, 
                                              parentStyle,
                                              getter_AddRefs(childStyle));
 
@@ -2532,7 +2538,8 @@ nsCSSFrameConstructor::ConstructTableFrame(nsIPresShell*            aPresShell,
 
   // create the pseudo SC for the outer table as a child of the inner SC
   nsCOMPtr<nsIStyleContext> outerStyleContext;
-  aPresContext->ResolvePseudoStyleContextFor(aContent, nsHTMLAtoms::tableOuterPseudo,
+  aPresContext->ResolvePseudoStyleContextFor(aContent,
+                                             nsCSSAnonBoxes::tableOuter,
                                              aStyleContext,
                                              getter_AddRefs(outerStyleContext));
   
@@ -2918,7 +2925,8 @@ nsCSSFrameConstructor::ConstructTableCellFrame(nsIPresShell*            aPresShe
   
   // Resolve pseudo style and initialize the body cell frame
   nsCOMPtr<nsIStyleContext> innerPseudoStyle;
-  aPresContext->ResolvePseudoStyleContextFor(aContent, nsHTMLAtoms::cellContentPseudo,
+  aPresContext->ResolvePseudoStyleContextFor(aContent,
+                                             nsCSSAnonBoxes::cellContent,
                                              aStyleContext,
                                              getter_AddRefs(innerPseudoStyle));
   InitAndRestoreFrame(aPresContext, aState, aContent, 
@@ -3424,7 +3432,7 @@ nsCSSFrameConstructor::ConstructDocElementFrame(nsIPresShell*        aPresShell,
                               aDocElement,
                               styleContext,
                               aParentFrame,
-                              nsLayoutAtoms::scrolledContentPseudo,
+                              nsCSSAnonBoxes::scrolledContent,
                               mDocument,
                               PR_FALSE,
                               scrollFrame,
@@ -3628,7 +3636,7 @@ nsCSSFrameConstructor::ConstructRootFrame(nsIPresShell*        aPresShell,
   nsIFrame*                 viewportFrame = nsnull;
   nsCOMPtr<nsIStyleContext> viewportPseudoStyle;
 
-  aPresContext->ResolvePseudoStyleContextFor(nsnull, nsLayoutAtoms::viewportPseudo,
+  aPresContext->ResolvePseudoStyleContextFor(nsnull, nsCSSAnonBoxes::viewport,
                                            nsnull,
                                            getter_AddRefs(viewportPseudoStyle));
 
@@ -3682,12 +3690,12 @@ nsCSSFrameConstructor::ConstructRootFrame(nsIPresShell*        aPresShell,
           NS_NewCanvasFrame(aPresShell, &rootFrame);
         }
 
-        rootPseudo = nsLayoutAtoms::canvasPseudo;
+        rootPseudo = nsCSSAnonBoxes::canvas;
         mDocElementContainingBlock = rootFrame;
     } else {
         // Create a page sequence frame
         NS_NewSimplePageSequenceFrame(aPresShell, &rootFrame);
-        rootPseudo = nsLayoutAtoms::pageSequencePseudo;
+        rootPseudo = nsCSSAnonBoxes::pageSequence;
     }
 
 
@@ -3851,7 +3859,7 @@ nsCSSFrameConstructor::ConstructRootFrame(nsIPresShell*        aPresShell,
       // resolve a context for the scrollframe
       nsCOMPtr<nsIStyleContext>  styleContext;
       aPresContext->ResolvePseudoStyleContextFor(nsnull,
-                                                 nsLayoutAtoms::viewportScrollPseudo,
+                                                 nsCSSAnonBoxes::viewportScroll,
                                                  viewportPseudoStyle,
                                                  getter_AddRefs(styleContext));
 
@@ -3901,7 +3909,7 @@ nsCSSFrameConstructor::ConstructRootFrame(nsIPresShell*        aPresShell,
       // create a style context for the scrollport of the viewport
       nsCOMPtr<nsIStyleContext> scrollPseudoStyle;
       aPresContext->ResolvePseudoStyleContextFor(nsnull,
-                                                nsLayoutAtoms::scrolledContentPseudo,
+                                                nsCSSAnonBoxes::scrolledContent,
                                                 viewportPseudoStyle,
                                                 getter_AddRefs(scrollPseudoStyle));
 
@@ -3967,7 +3975,8 @@ nsCSSFrameConstructor::ConstructRootFrame(nsIPresShell*        aPresShell,
     // the pages easier and faster.
     nsCOMPtr<nsIStyleContext> pagePseudoStyle;
 
-    aPresContext->ResolvePseudoStyleContextFor(nsnull, nsLayoutAtoms::pagePseudo,
+    aPresContext->ResolvePseudoStyleContextFor(nsnull,
+                                               nsCSSAnonBoxes::page,
                                                rootPseudoStyle,
                                                getter_AddRefs(pagePseudoStyle));
 
@@ -3979,7 +3988,8 @@ nsCSSFrameConstructor::ConstructRootFrame(nsIPresShell*        aPresShell,
     NS_NewPageContentFrame(aPresShell, &pageContentFrame);
 
     nsCOMPtr<nsIStyleContext> pageContentPseudoStyle;
-    aPresContext->ResolvePseudoStyleContextFor(nsnull, nsLayoutAtoms::pageContentPseudo,
+    aPresContext->ResolvePseudoStyleContextFor(nsnull,
+                                               nsCSSAnonBoxes::pageContent,
                                                pagePseudoStyle,
                                                getter_AddRefs(pageContentPseudoStyle));
 
@@ -4115,7 +4125,7 @@ nsCSSFrameConstructor::ConstructRadioControlFrame(nsIPresShell*        aPresShel
 
   nsCOMPtr<nsIStyleContext> radioStyle;
   aPresContext->ResolvePseudoStyleContextFor(aContent,
-                                             nsHTMLAtoms::radioPseudo,
+                                             nsCSSAnonBoxes::radio,
                                              aStyleContext,
                                              getter_AddRefs(radioStyle));
   nsIRadioControlFrame* radio = nsnull;
@@ -4145,7 +4155,7 @@ nsCSSFrameConstructor::ConstructCheckboxControlFrame(nsIPresShell*    aPresShell
   }
 
   nsCOMPtr<nsIStyleContext> checkboxStyle;
-  aPresContext->ResolvePseudoStyleContextFor(aContent, nsHTMLAtoms::checkPseudo, 
+  aPresContext->ResolvePseudoStyleContextFor(aContent, nsCSSAnonBoxes::check, 
                                              aStyleContext, getter_AddRefs(checkboxStyle));
   nsICheckboxControlFrame* checkbox = nsnull;
   if (aNewFrame != nsnull && 
@@ -4318,7 +4328,7 @@ nsCSSFrameConstructor::ConstructSelectFrame(nsIPresShell*        aPresShell,
         // Resolve psuedo element style for the dropdown list 
       nsCOMPtr<nsIStyleContext> listStyle;
       rv = aPresContext->ResolvePseudoStyleContextFor(aContent, 
-                                              nsHTMLAtoms::dropDownListPseudo, 
+                                              nsCSSAnonBoxes::dropDownList, 
                                               aStyleContext,
                                               getter_AddRefs(listStyle));
 
@@ -4447,7 +4457,7 @@ nsCSSFrameConstructor::InitializeSelectFrame(nsIPresShell*        aPresShell,
 
   
     aPresContext->ResolvePseudoStyleContextFor(aContent,
-                                  nsLayoutAtoms::scrolledContentPseudo,
+                                  nsCSSAnonBoxes::scrolledContent,
                                   aStyleContext,
                                   getter_AddRefs(scrolledPseudoStyle));
 
@@ -4574,7 +4584,7 @@ nsCSSFrameConstructor::ConstructFieldSetFrame(nsIPresShell*            aPresShel
 
   // Resolve style and initialize the frame
   nsIStyleContext* styleContext;
-  aPresContext->ResolvePseudoStyleContextFor(aContent, nsHTMLAtoms::fieldsetContentPseudo,
+  aPresContext->ResolvePseudoStyleContextFor(aContent, nsCSSAnonBoxes::fieldsetContent,
                                              aStyleContext, &styleContext);
   InitAndRestoreFrame(aPresContext, aState, aContent, 
                       newFrame, styleContext, nsnull, areaFrame);
@@ -5091,13 +5101,15 @@ nsCSSFrameConstructor::ConstructHTMLFrame(nsIPresShell*            aPresShell,
       nsIFrame *wrapperFrame = nsnull, *beforeFrame, *afterFrame;
       if (!CreateGeneratedContentFrame(aPresShell, aPresContext,
                                        aState, aParentFrame, aContent,
-                                       aStyleContext, nsCSSAtoms::beforePseudo,
+                                       aStyleContext,
+                                       nsCSSPseudoElements::before,
                                        &wrapperFrame, &beforeFrame)) {
         beforeFrame = nsnull;
       }
       if (!CreateGeneratedContentFrame(aPresShell, aPresContext,
                                       aState, aParentFrame, aContent,
-                                      aStyleContext, nsCSSAtoms::afterPseudo,
+                                      aStyleContext,
+                                      nsCSSPseudoElements::after,
                                       &wrapperFrame, &afterFrame)) {
         afterFrame = nsnull;
       }
@@ -6008,7 +6020,7 @@ nsCSSFrameConstructor::BeginBuildingScrollFrame(nsIPresShell* aPresShell,
     // we used the style that was passed in. So resolve another one.
     nsCOMPtr<nsIStyleContext> scrollPseudoStyle;
     aPresContext->ResolvePseudoStyleContextFor(aContent,
-                                              nsLayoutAtoms::scrolledContentPseudo,
+                                              nsCSSAnonBoxes::scrolledContent,
                                               contentStyle,
                                               getter_AddRefs(scrollPseudoStyle));
 
@@ -6160,7 +6172,7 @@ nsCSSFrameConstructor::BuildScrollFrame       (nsIPresShell* aPresShell,
                      aContent,
                      aContentStyle,
                      aParentFrame,
-                     nsLayoutAtoms::scrolledContentPseudo,
+                     nsCSSAnonBoxes::scrolledContent,
                      mDocument,
                      PR_FALSE,
                      aNewFrame,
@@ -6960,7 +6972,7 @@ nsCSSFrameConstructor::ConstructMathMLFrame(nsIPresShell*            aPresShell,
       if (NS_FAILED(rv)) return rv;
       nsCOMPtr<nsIStyleContext> blockContext;
       aPresContext->ResolvePseudoStyleContextFor(aContent,
-                                                 nsHTMLAtoms::mozAnonymousBlock,
+                                                 nsCSSAnonBoxes::mozAnonymousBlock,
                                                  mrowContext,
                                                  getter_AddRefs(blockContext));
       InitAndRestoreFrame(aPresContext, aState, aContent, newFrame,
@@ -7244,7 +7256,8 @@ nsCSSFrameConstructor::ConstructPageBreakFrame(nsIPresShell*            aPresShe
                                                nsFrameItems&            aFrameItems)
 {
   nsCOMPtr<nsIStyleContext> pseudoStyle;
-  aPresContext->ResolvePseudoStyleContextFor(nsnull, nsLayoutAtoms::pageBreakPseudo,
+  aPresContext->ResolvePseudoStyleContextFor(nsnull,
+                                             nsCSSAnonBoxes::pageBreak,
                                              aStyleContext,
                                              getter_AddRefs(pseudoStyle));
   nsIFrame* pageBreakFrame;
@@ -7816,7 +7829,8 @@ nsCSSFrameConstructor::AppendFrames(nsIPresContext*  aPresContext,
   nsIFrame* lastChild = frames.LastChild();
 
   // See if the parent has an :after pseudo-element
-  if (lastChild && IsGeneratedContentFor(aContainer, lastChild, nsCSSAtoms::afterPseudo)) {
+  if (lastChild && IsGeneratedContentFor(aContainer, lastChild,
+                                         nsCSSPseudoElements::after)) {
     // Insert the frames before the :after pseudo-element.
     return aFrameManager->InsertFrames(aPresContext, *aPresShell, aParentFrame,
                                        nsnull, frames.GetPrevSiblingFor(lastChild),
@@ -8719,7 +8733,7 @@ nsCSSFrameConstructor::AddDummyFrameToSelect(nsIPresContext*  aPresContext,
         if (CreateGeneratedContentFrame(aPresShell, aPresContext, aState,
                                         aParentFrame, aContainer,
                                         styleContext,
-                                        nsLayoutAtoms::dummyOptionPseudo,
+                                        nsCSSAnonBoxes::dummyOption,
                                         nsnull, &generatedFrame)) {
           // Add the generated frame to the child list
           if (aChildItems) {
@@ -9261,7 +9275,8 @@ nsCSSFrameConstructor::ContentInserted(nsIPresContext*        aPresContext,
         nsIFrame* firstChild;
         parentFrame->FirstChild(aPresContext, nsnull, &firstChild);
 
-        if (firstChild && IsGeneratedContentFor(aContainer, firstChild, nsCSSAtoms::beforePseudo)) {
+        if (firstChild && IsGeneratedContentFor(aContainer, firstChild,
+                                                nsCSSPseudoElements::before)) {
           // Insert the new frames after the :before pseudo-element
           prevSibling = firstChild;
         }
@@ -11445,7 +11460,8 @@ nsCSSFrameConstructor::CreateContinuingFrame(nsIPresShell*   aPresShell,
       NS_NewPageContentFrame(aPresShell, &pageContentFrame);
 
       nsCOMPtr<nsIStyleContext> pageContentPseudoStyle;
-      aPresContext->ResolvePseudoStyleContextFor(nsnull, nsLayoutAtoms::pageContentPseudo,
+      aPresContext->ResolvePseudoStyleContextFor(nsnull,
+                                                 nsCSSAnonBoxes::pageContent,
                                                  styleContext,
                                                  getter_AddRefs(pageContentPseudoStyle));
 
@@ -11672,7 +11688,8 @@ nsCSSFrameConstructor::FindFrameWithContent(nsIPresContext*  aPresContext,
             // next sibling.
 
             if (aContent->IsContentOfType(nsIContent::eELEMENT) &&
-                IsGeneratedContentFor(aContent, kidFrame, nsCSSAtoms::beforePseudo)) {
+                IsGeneratedContentFor(aContent, kidFrame,
+                                      nsCSSPseudoElements::before)) {
               kidFrame->GetNextSibling(&kidFrame);
 #ifdef DEBUG
               NS_ASSERTION(kidFrame, ":before with no next sibling");
@@ -11685,7 +11702,7 @@ nsCSSFrameConstructor::FindFrameWithContent(nsIPresContext*  aPresContext,
 
                 NS_ASSERTION(nextSiblingContent.get() == aContent &&
                              !IsGeneratedContentFor(aContent, kidFrame,
-                                                    nsCSSAtoms::afterPseudo),
+                                                    nsCSSPseudoElements::after),
                              ":before frame not followed by primary frame");
               }
 #endif
@@ -12089,7 +12106,7 @@ nsCSSFrameConstructor::GetFirstLetterStyle(nsIPresContext* aPresContext,
   nsIStyleContext* fls = nsnull;
   if (aContent) {
     aPresContext->ResolvePseudoStyleContextFor(aContent,
-                                               nsHTMLAtoms::firstLetterPseudo,
+                                               nsCSSPseudoElements::firstLetter,
                                                aStyleContext, &fls);
   }
   return fls;
@@ -12103,7 +12120,7 @@ nsCSSFrameConstructor::GetFirstLineStyle(nsIPresContext* aPresContext,
   nsIStyleContext* fls = nsnull;
   if (aContent) {
     aPresContext->ResolvePseudoStyleContextFor(aContent,
-                                               nsHTMLAtoms::firstLinePseudo,
+                                               nsCSSPseudoElements::firstLetter,
                                                aStyleContext, &fls);
   }
   return fls;
@@ -12117,7 +12134,7 @@ nsCSSFrameConstructor::HaveFirstLetterStyle(nsIPresContext* aPresContext,
                                             nsIStyleContext* aStyleContext)
 {
   return HasPseudoStyle(aPresContext, aContent, aStyleContext,
-                        nsHTMLAtoms::firstLetterPseudo);
+                        nsCSSPseudoElements::firstLetter);
 }
 
 PRBool
@@ -12126,7 +12143,7 @@ nsCSSFrameConstructor::HaveFirstLineStyle(nsIPresContext* aPresContext,
                                           nsIStyleContext* aStyleContext)
 {
   return HasPseudoStyle(aPresContext, aContent, aStyleContext,
-                        nsHTMLAtoms::firstLinePseudo);
+                        nsCSSPseudoElements::firstLetter);
 }
 
 void
@@ -12169,7 +12186,7 @@ nsCSSFrameConstructor::ProcessChildren(nsIPresShell*            aPresShell,
     // Probe for generated content before
     nsIFrame* generatedFrame;
     if (CreateGeneratedContentFrame(aPresShell, aPresContext, aState, aFrame, aContent,
-                                    styleContext, nsCSSAtoms::beforePseudo,
+                                    styleContext, nsCSSPseudoElements::before,
                                     nsnull, &generatedFrame)) {
       // Add the generated frame to the child list
       aFrameItems.AddChild(generatedFrame);
@@ -12211,7 +12228,7 @@ nsCSSFrameConstructor::ProcessChildren(nsIPresShell*            aPresShell,
     // Probe for generated content after
     nsIFrame* generatedFrame;
     if (CreateGeneratedContentFrame(aPresShell, aPresContext, aState, aFrame, aContent,
-                                    styleContext, nsCSSAtoms::afterPseudo,
+                                    styleContext, nsCSSPseudoElements::after,
                                     nsnull, &generatedFrame)) {
       // Add the generated frame to the child list
       aFrameItems.AddChild(generatedFrame);
@@ -13362,7 +13379,7 @@ nsCSSFrameConstructor::ProcessBlockChildren(nsIPresShell* aPresShell,
     nsIFrame* generatedFrame;
     aFrame->GetStyleContext(getter_AddRefs(styleContext));
     if (CreateGeneratedContentFrame(aPresShell, aPresContext, aState, aFrame, aContent,
-                                    styleContext, nsCSSAtoms::beforePseudo,
+                                    styleContext, nsCSSPseudoElements::before,
                                     nsnull, &generatedFrame)) {
       // Add the generated frame to the child list
       aFrameItems.AddChild(generatedFrame);
@@ -13391,7 +13408,7 @@ nsCSSFrameConstructor::ProcessBlockChildren(nsIPresShell* aPresShell,
     // Probe for generated content after
     nsIFrame* generatedFrame;
     if (CreateGeneratedContentFrame(aPresShell, aPresContext, aState, aFrame, aContent,
-                                    styleContext, nsCSSAtoms::afterPseudo,
+                                    styleContext, nsCSSPseudoElements::after,
                                     nsnull, &generatedFrame)) {
       // Add the generated frame to the child list
       aFrameItems.AddChild(generatedFrame);
@@ -13541,11 +13558,11 @@ nsCSSFrameConstructor::ConstructInline(nsIPresShell*            aPresShell,
   nsIAtom* blockStyle;
   if (aIsPositioned) {
     NS_NewRelativeItemWrapperFrame(aPresShell, &blockFrame);
-    blockStyle = nsHTMLAtoms::mozAnonymousPositionedBlock;
+    blockStyle = nsCSSAnonBoxes::mozAnonymousPositionedBlock;
   }
   else {
     NS_NewBlockFrame(aPresShell, &blockFrame);
-    blockStyle = nsHTMLAtoms::mozAnonymousBlock;
+    blockStyle = nsCSSAnonBoxes::mozAnonymousBlock;
   }
 
   nsCOMPtr<nsIStyleContext> blockSC;
@@ -13665,7 +13682,7 @@ nsCSSFrameConstructor::ProcessInlineChildren(nsIPresShell* aPresShell,
     nsIFrame* generatedFrame;
     aFrame->GetStyleContext(getter_AddRefs(styleContext));
     if (CreateGeneratedContentFrame(aPresShell, aPresContext, aState, aFrame, aContent,
-                                    styleContext, nsCSSAtoms::beforePseudo,
+                                    styleContext, nsCSSPseudoElements::before,
                                     nsnull, &generatedFrame)) {
       // Add the generated frame to the child list
       aFrameItems.AddChild(generatedFrame);
@@ -13712,7 +13729,7 @@ nsCSSFrameConstructor::ProcessInlineChildren(nsIPresShell* aPresShell,
     // Probe for generated content after
     nsIFrame* generatedFrame;
     if (CreateGeneratedContentFrame(aPresShell, aPresContext, aState, aFrame, aContent,
-                                    styleContext, nsCSSAtoms::afterPseudo,
+                                    styleContext, nsCSSPseudoElements::after,
                                     nsnull, &generatedFrame)) {
       // Add the generated frame to the child list
       aFrameItems.AddChild(generatedFrame);
@@ -14035,7 +14052,7 @@ nsCSSFrameConstructor::SplitToContainingBlock(nsIPresContext* aPresContext,
 
   nsCOMPtr<nsIStyleContext> blockSC;
   aPresContext->ResolvePseudoStyleContextFor(content,
-                                             nsHTMLAtoms::mozAnonymousBlock,
+                                             nsCSSAnonBoxes::mozAnonymousBlock,
                                              styleContext,
                                              getter_AddRefs(blockSC));
 
diff --git a/mozilla/layout/html/table/src/nsTableFrame.cpp b/mozilla/layout/html/table/src/nsTableFrame.cpp
index 641ce693d31..f0421603323 100644
--- a/mozilla/layout/html/table/src/nsTableFrame.cpp
+++ b/mozilla/layout/html/table/src/nsTableFrame.cpp
@@ -61,6 +61,7 @@
 #include "nsVoidArray.h"
 #include "nsIView.h"
 #include "nsHTMLAtoms.h"
+#include "nsCSSAnonBoxes.h"
 #include "nsHTMLReflowCommand.h"
 #include "nsLayoutAtoms.h"
 #include "nsIDeviceContext.h"
@@ -860,7 +861,7 @@ nsTableFrame::CreateAnonymousColGroupFrame(nsIPresContext&     aPresContext,
 
   nsCOMPtr<nsIStyleContext> colGroupStyle;
   aPresContext.ResolvePseudoStyleContextFor(colGroupContent,
-                                            nsHTMLAtoms::tableColGroupPseudo,
+                                            nsCSSAnonBoxes::tableColGroup,
                                             mStyleContext,
                                             getter_AddRefs(colGroupStyle));        
   // Create a col group frame
@@ -978,7 +979,7 @@ nsTableFrame::CreateAnonymousColFrames(nsIPresContext&       aPresContext,
       // all other anonymous cols use a pseudo style context of the col group
       aColGroupFrame.GetContent(getter_AddRefs(iContent));
       aColGroupFrame.GetStyleContext(getter_AddRefs(parentStyleContext));
-      aPresContext.ResolvePseudoStyleContextFor(iContent, nsHTMLAtoms::tableColPseudo,
+      aPresContext.ResolvePseudoStyleContextFor(iContent, nsCSSAnonBoxes::tableCol,
                                                 parentStyleContext, getter_AddRefs(styleContext));
     }
     // ASSERTION to check for bug 54454 sneaking back in...
diff --git a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp
index c912a841f96..061ae9fd565 100644
--- a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp
+++ b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp
@@ -27,7 +27,7 @@
 #include "nsFrame.h"
 #include "nsIPresContext.h"
 #include "nsIPresShell.h"
-#include "nsHTMLAtoms.h"
+#include "nsCSSAnonBoxes.h"
 #include "nsUnitConversion.h"
 #include "nsIStyleContext.h"
 #include "nsStyleConsts.h"
@@ -726,7 +726,8 @@ nsMathMLContainerFrame::WrapForeignFrames(nsIPresContext* aPresContext)
       nsresult rv = NS_NewMathMLForeignFrameWrapper(shell, &wrapper);
       if (NS_FAILED(rv)) return rv;
       nsCOMPtr<nsIStyleContext> newStyleContext;
-      aPresContext->ResolvePseudoStyleContextFor(mContent, nsHTMLAtoms::mozAnonymousBlock,
+      aPresContext->ResolvePseudoStyleContextFor(mContent,
+                                                 nsCSSAnonBoxes::mozAnonymousBlock,
                                                  mStyleContext,
                                                  getter_AddRefs(newStyleContext));
       rv = wrapper->Init(aPresContext, mContent, this, newStyleContext, nsnull);
diff --git a/mozilla/layout/style/html.css b/mozilla/layout/style/html.css
index 54faabaa271..3dcca6203c1 100644
--- a/mozilla/layout/style/html.css
+++ b/mozilla/layout/style/html.css
@@ -501,10 +501,6 @@ noembed, noscript, param {
   -moz-box-orient: inherit;
 }
 
-*|*:-moz-wrapped-frame {
-  display: inherit;
-}
-
 *|*:-moz-page, *|*:-moz-page-sequence {
   display: block;
   background: transparent;
diff --git a/mozilla/layout/style/nsCSSAnonBoxList.h b/mozilla/layout/style/nsCSSAnonBoxList.h
new file mode 100644
index 00000000000..a36ba4738f7
--- /dev/null
+++ b/mozilla/layout/style/nsCSSAnonBoxList.h
@@ -0,0 +1,102 @@
+/* -*- 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 atom lists for CSS pseudos.
+ *
+ * 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):
+ *   L. David Baron <dbaron@fas.harvard.edu>
+ *
+ * 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 ***** */
+
+/*
+ * This file contains the list of nsIAtoms and their values for CSS
+ * pseudo-element-ish things used internally for anonymous boxes.  It is
+ * designed to be used as inline input to nsCSSAnonBoxes.cpp *only*
+ * through the magic of C preprocessing.  All entries must be enclosed
+ * in the macro CSS_ANON_BOX which will have cruel and unusual things
+ * done to it.  The entries should be kept in some sort of logical
+ * order.  The first argument to CSS_ANON_BOX is the C++ identifier of
+ * the atom.  The second argument is the string value of the atom.
+ */
+
+CSS_ANON_BOX(mozNonElement, ":-moz-non-element")
+
+CSS_ANON_BOX(mozAnonymousBlock, ":-moz-anonymous-block")
+CSS_ANON_BOX(mozAnonymousPositionedBlock, ":-moz-anonymous-positioned-block")
+CSS_ANON_BOX(mozGCWrapperBlock, ":-moz-gc-wrapper-block")
+CSS_ANON_BOX(mozGCWrapperInline, ":-moz-gc-wrapper-inline")
+
+CSS_ANON_BOX(mozFirstLineFixup, ":-moz-first-line-fixup")
+CSS_ANON_BOX(mozLineFrame, ":-moz-line-frame")
+
+CSS_ANON_BOX(buttonContent, ":-moz-button-content")
+CSS_ANON_BOX(mozButtonLabel, ":-moz-buttonlabel")
+CSS_ANON_BOX(cellContent, ":-moz-cell-content")
+CSS_ANON_BOX(dropDownList, ":-moz-dropdown-list")
+CSS_ANON_BOX(fieldsetContent, ":-moz-fieldset-content")
+CSS_ANON_BOX(framesetBlank, ":-moz-frameset-blank")
+CSS_ANON_BOX(radio, ":-moz-radio")
+CSS_ANON_BOX(check, ":-moz-checkbox")
+CSS_ANON_BOX(mozSingleLineTextControlFrame, ":-moz-singleline-textcontrol-frame")
+CSS_ANON_BOX(mozDisplayComboboxControlFrame, ":-moz-display-comboboxcontrol-frame")
+CSS_ANON_BOX(dummyOption, ":-moz-dummy-option")
+
+CSS_ANON_BOX(table, ":-moz-table")
+CSS_ANON_BOX(tableCell, ":-moz-table-cell")
+CSS_ANON_BOX(tableColGroup, ":-moz-table-column-group")
+CSS_ANON_BOX(tableCol, ":-moz-table-column")
+CSS_ANON_BOX(tableOuter, ":-moz-table-outer")
+CSS_ANON_BOX(tableRowGroup, ":-moz-table-row-group")
+CSS_ANON_BOX(tableRow, ":-moz-table-row")
+
+CSS_ANON_BOX(canvas, ":-moz-canvas")
+CSS_ANON_BOX(pageBreak, ":-moz-pagebreak")
+CSS_ANON_BOX(page, ":-moz-page")
+CSS_ANON_BOX(pageContent, ":-moz-pagecontent")
+CSS_ANON_BOX(pageSequence, ":-moz-page-sequence")
+CSS_ANON_BOX(scrolledContent, ":-moz-scrolled-content")
+CSS_ANON_BOX(viewport, ":-moz-viewport")
+CSS_ANON_BOX(viewportScroll, ":-moz-viewport-scroll")
+CSS_ANON_BOX(selectScrolledContent, ":-moz-select-scrolled-content")
+
+#ifdef INCLUDE_XUL
+CSS_ANON_BOX(moztreerow, ":-moz-tree-row")
+CSS_ANON_BOX(moztreecell, ":-moz-tree-cell")
+CSS_ANON_BOX(moztreecolumn, ":-moz-tree-column")
+CSS_ANON_BOX(moztreecelltext, ":-moz-tree-cell-text")
+CSS_ANON_BOX(moztreetwisty, ":-moz-tree-twisty")
+CSS_ANON_BOX(moztreeindentation, ":-moz-tree-indentation")
+CSS_ANON_BOX(moztreeline, ":-moz-tree-line")
+CSS_ANON_BOX(moztreeimage, ":-moz-tree-image")
+CSS_ANON_BOX(moztreeseparator, ":-moz-tree-separator")
+CSS_ANON_BOX(moztreedropfeedback, ":-moz-tree-drop-feedback")
+CSS_ANON_BOX(moztreeprogressmeter, ":-moz-tree-progressmeter")
+#endif
diff --git a/mozilla/layout/style/nsCSSAnonBoxes.cpp b/mozilla/layout/style/nsCSSAnonBoxes.cpp
new file mode 100644
index 00000000000..f7ead8fb1fa
--- /dev/null
+++ b/mozilla/layout/style/nsCSSAnonBoxes.cpp
@@ -0,0 +1,78 @@
+/* -*- 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 atom lists for CSS pseudos.
+ *
+ * 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):
+ *   L. David Baron <dbaron@fas.harvard.edu>
+ *
+ * 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 "nsCSSAnonBoxes.h"
+
+// define storage for all atoms
+#define CSS_ANON_BOX(_name, _value) \
+  nsICSSAnonBoxPseudo* nsCSSAnonBoxes::_name;
+#include "nsCSSAnonBoxList.h"
+#undef CSS_ANON_BOX
+
+static nsrefcnt gRefCnt;
+
+void nsCSSAnonBoxes::AddRefAtoms()
+{
+  if (0 == gRefCnt++) {
+    // create atoms
+#define CSS_ANON_BOX(_name, _value) \
+    _name = NS_STATIC_CAST(nsICSSAnonBoxPseudo*, NS_NewPermanentAtom(_value));
+#include "nsCSSAnonBoxList.h"
+#undef CSS_ANON_BOX
+  }
+}
+
+void nsCSSAnonBoxes::ReleaseAtoms()
+{
+  NS_PRECONDITION(gRefCnt != 0, "bad release atoms");
+  if (--gRefCnt == 0) {
+    // release atoms
+#define CSS_ANON_BOX(_name, _value) NS_RELEASE(_name);
+#include "nsCSSAnonBoxList.h"
+#undef CSS_ANON_BOX
+  }
+}
+
+PRBool nsCSSAnonBoxes::IsAnonBox(nsIAtom *aAtom)
+{
+  return
+#define CSS_ANON_BOX(_name, _value) (aAtom == _name) ||
+#include "nsCSSAnonBoxList.h"
+#undef CSS_ANON_BOX
+        PR_FALSE;
+}
+
diff --git a/mozilla/layout/style/nsCSSAnonBoxes.h b/mozilla/layout/style/nsCSSAnonBoxes.h
new file mode 100644
index 00000000000..713a538b4cd
--- /dev/null
+++ b/mozilla/layout/style/nsCSSAnonBoxes.h
@@ -0,0 +1,60 @@
+/* -*- 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 atom lists for CSS pseudos.
+ *
+ * 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):
+ *   L. David Baron <dbaron@fas.harvard.edu>
+ *
+ * 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 ***** */
+#ifndef nsCSSAnonBoxes_h___
+#define nsCSSAnonBoxes_h___
+
+#include "nsIAtom.h"
+
+// Empty class derived from nsIAtom so that function signatures can
+// require an atom from this atom list.
+class nsICSSAnonBoxPseudo : public nsIAtom {};
+
+class nsCSSAnonBoxes {
+public:
+
+  static void AddRefAtoms();
+  static void ReleaseAtoms();
+
+  static PRBool IsAnonBox(nsIAtom *aAtom);
+
+#define CSS_ANON_BOX(_name, _value) static nsICSSAnonBoxPseudo* _name;
+#include "nsCSSAnonBoxList.h"
+#undef CSS_ANON_BOX
+};
+
+#endif /* nsCSSAnonBoxes_h___ */
diff --git a/mozilla/layout/style/nsCSSParser.cpp b/mozilla/layout/style/nsCSSParser.cpp
index 4ce1045e890..acb90904c1c 100644
--- a/mozilla/layout/style/nsCSSParser.cpp
+++ b/mozilla/layout/style/nsCSSParser.cpp
@@ -63,7 +63,8 @@
 #include "nsISupportsArray.h"
 #include "nsColor.h"
 #include "nsStyleConsts.h"
-#include "nsCSSAtoms.h"
+#include "nsLayoutAtoms.h"
+#include "nsCSSPseudoClasses.h"
 #include "nsINameSpaceManager.h"
 #include "nsINameSpace.h"
 #include "nsThemeConstants.h"
@@ -1563,28 +1564,6 @@ PRBool CSSParserImpl::ParseSelectorList(PRInt32& aErrorCode,
   return PR_FALSE;
 }
 
-static PRBool IsPseudoClass(const nsIAtom* aAtom)
-{
-  return PRBool((nsCSSAtoms::activePseudo == aAtom) || 
-                (nsCSSAtoms::anyLinkPseudo == aAtom) ||
-                (nsCSSAtoms::checkedPseudo == aAtom) ||
-                (nsCSSAtoms::disabledPseudo == aAtom) ||
-                (nsCSSAtoms::dragOverPseudo == aAtom) ||
-                (nsCSSAtoms::enabledPseudo == aAtom) ||
-                (nsCSSAtoms::emptyPseudo == aAtom) ||
-                (nsCSSAtoms::firstChildPseudo == aAtom) ||
-                (nsCSSAtoms::firstNodePseudo == aAtom) ||
-                (nsCSSAtoms::focusPseudo == aAtom) ||
-                (nsCSSAtoms::hoverPseudo == aAtom) ||
-                (nsCSSAtoms::langPseudo == aAtom) ||
-                (nsCSSAtoms::lastChildPseudo == aAtom) ||
-                (nsCSSAtoms::lastNodePseudo == aAtom) ||
-                (nsCSSAtoms::linkPseudo == aAtom) ||
-                (nsCSSAtoms::rootPseudo == aAtom) ||
-                (nsCSSAtoms::xblBoundElementPseudo == aAtom) ||
-                (nsCSSAtoms::visitedPseudo == aAtom));
-}
-
 static PRBool IsSinglePseudoClass(const nsCSSSelector& aSelector)
 {
   return PRBool((aSelector.mNameSpace == kNameSpaceID_Unknown) && 
@@ -1637,7 +1616,7 @@ PRBool CSSParserImpl::ParseSelectorGroup(PRInt32& aErrorCode,
     nsAtomStringList* prevList = nsnull;
     nsAtomStringList* pseudoClassList = listSel->mPseudoClassList;
     while (nsnull != pseudoClassList) {
-      if (! IsPseudoClass(pseudoClassList->mAtom)) {
+      if (! nsCSSPseudoClasses::IsPseudoClass(pseudoClassList->mAtom)) {
         havePseudoElement = PR_TRUE;
         if (IsSinglePseudoClass(*listSel)) {  // convert to pseudo element selector
           nsIAtom* pseudoElement = pseudoClassList->mAtom;  // steal ref count
@@ -2209,9 +2188,9 @@ void CSSParserImpl::ParsePseudoSelector(PRInt32&  aDataMask,
           (!aIsNegated && IsTreePseudoElement(mToken.mIdent)) ||
 #endif
           // the negation pseudo-class is a function
-          (nsCSSAtoms::notPseudo == pseudo) ||
+          (nsCSSPseudoClasses::notPseudo == pseudo) ||
           // as is the lang pseudo-class
-          (nsCSSAtoms::langPseudo == pseudo))) {
+          (nsCSSPseudoClasses::lang == pseudo))) {
       REPORT_UNEXPECTED_TOKEN(NS_LITERAL_STRING("Expected identifier for pseudo-class selector not found"));
       UngetToken();
       aParsingStatus = SELECTOR_PARSING_STOPPED_ERROR;
@@ -2219,7 +2198,7 @@ void CSSParserImpl::ParsePseudoSelector(PRInt32&  aDataMask,
     }
   }
 
-  if (nsCSSAtoms::notPseudo == pseudo) {
+  if (nsCSSPseudoClasses::notPseudo == pseudo) {
     if (aIsNegated) { // :not() can't be itself negated
       REPORT_UNEXPECTED_TOKEN(NS_LITERAL_STRING("Negation pseudo-class can't be negated"));
       aParsingStatus = SELECTOR_PARSING_STOPPED_ERROR;
@@ -2231,9 +2210,9 @@ void CSSParserImpl::ParsePseudoSelector(PRInt32&  aDataMask,
       return;
     }
   }    
-  else if (IsPseudoClass(pseudo)) {
+  else if (nsCSSPseudoClasses::IsPseudoClass(pseudo)) {
     aDataMask |= SEL_MASK_PCLASS;
-    if (nsCSSAtoms::langPseudo == pseudo) {
+    if (nsCSSPseudoClasses::lang == pseudo) {
       ParseLangSelector(aSelector, aParsingStatus, aErrorCode);
     }
     // XXX are there more pseudo classes which accept arguments ?
@@ -2384,7 +2363,7 @@ void CSSParserImpl::ParseLangSelector(nsCSSSelector& aSelector,
     }
 
     // Add the pseudo with the language parameter
-    aSelector.AddPseudoClass(nsCSSAtoms::langPseudo, mToken.mIdent.get());
+    aSelector.AddPseudoClass(nsCSSPseudoClasses::lang, mToken.mIdent.get());
 
     // close the parenthesis
     if (!ExpectSymbol(aErrorCode, ')', PR_TRUE)) {
diff --git a/mozilla/layout/style/nsCSSPseudoClassList.h b/mozilla/layout/style/nsCSSPseudoClassList.h
new file mode 100644
index 00000000000..6dc2afb5703
--- /dev/null
+++ b/mozilla/layout/style/nsCSSPseudoClassList.h
@@ -0,0 +1,72 @@
+/* -*- 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 atom lists for CSS pseudos.
+ *
+ * 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):
+ *   L. David Baron <dbaron@fas.harvard.edu>
+ *
+ * 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 ***** */
+
+/*
+ * This file contains the list of nsIAtoms and their values for CSS
+ * pseudo-classes.  It is designed to be used as inline input to
+ * nsCSSPseudoClasses.cpp *only* through the magic of C preprocessing.
+ * All entries must be enclosed in the macro CSS_PSEUDO_CLASS which will
+ * have cruel and unusual things done to it.  The entries should be kept
+ * in some sort of logical order.  The first argument to
+ * CSS_PSEUDO_CLASS is the C++ identifier of the atom.  The second
+ * argument is the string value of the atom.
+ */
+
+CSS_PSEUDO_CLASS(empty, ":empty")
+CSS_PSEUDO_CLASS(lang, ":lang")
+CSS_PSEUDO_CLASS(notPseudo, ":not")
+CSS_PSEUDO_CLASS(mozBoundElement, ":-moz-bound-element")
+CSS_PSEUDO_CLASS(root, ":root")
+
+CSS_PSEUDO_CLASS(link, ":link")
+CSS_PSEUDO_CLASS(mozAnyLink, ":-moz-any-link") // what matches :link or :visited
+CSS_PSEUDO_CLASS(visited, ":visited")
+
+CSS_PSEUDO_CLASS(active, ":active")
+CSS_PSEUDO_CLASS(checked, ":checked")
+CSS_PSEUDO_CLASS(disabled, ":disabled")
+CSS_PSEUDO_CLASS(enabled, ":enabled")
+CSS_PSEUDO_CLASS(focus, ":focus")
+CSS_PSEUDO_CLASS(hover, ":hover")
+CSS_PSEUDO_CLASS(mozDragOver, ":-moz-drag-over")
+
+CSS_PSEUDO_CLASS(firstChild, ":first-child")
+CSS_PSEUDO_CLASS(firstNode, ":first-node")
+CSS_PSEUDO_CLASS(lastChild, ":last-child")
+CSS_PSEUDO_CLASS(lastNode, ":last-node")
+
diff --git a/mozilla/layout/style/nsCSSPseudoClasses.cpp b/mozilla/layout/style/nsCSSPseudoClasses.cpp
new file mode 100644
index 00000000000..cf8c6d8d26d
--- /dev/null
+++ b/mozilla/layout/style/nsCSSPseudoClasses.cpp
@@ -0,0 +1,78 @@
+/* -*- 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 atom lists for CSS pseudos.
+ *
+ * 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):
+ *   L. David Baron <dbaron@fas.harvard.edu>
+ *
+ * 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 "nsCSSPseudoClasses.h"
+
+// define storage for all atoms
+#define CSS_PSEUDO_CLASS(_name, _value) \
+  nsICSSPseudoClass* nsCSSPseudoClasses::_name;
+#include "nsCSSPseudoClassList.h"
+#undef CSS_PSEUDO_CLASS
+
+static nsrefcnt gRefCnt;
+
+void nsCSSPseudoClasses::AddRefAtoms()
+{
+  if (0 == gRefCnt++) {
+    // create atoms
+#define CSS_PSEUDO_CLASS(_name, _value) \
+    _name = NS_STATIC_CAST(nsICSSPseudoClass*, NS_NewPermanentAtom(_value));
+#include "nsCSSPseudoClassList.h"
+#undef CSS_PSEUDO_CLASS
+  }
+}
+
+void nsCSSPseudoClasses::ReleaseAtoms()
+{
+  NS_PRECONDITION(gRefCnt != 0, "bad release atoms");
+  if (--gRefCnt == 0) {
+    // release atoms
+#define CSS_PSEUDO_CLASS(_name, _value) NS_RELEASE(_name);
+#include "nsCSSPseudoClassList.h"
+#undef CSS_PSEUDO_CLASS
+  }
+}
+
+PRBool nsCSSPseudoClasses::IsPseudoClass(nsIAtom *aAtom)
+{
+  return
+#define CSS_PSEUDO_CLASS(_name, _value) (aAtom == _name) ||
+#include "nsCSSPseudoClassList.h"
+#undef CSS_PSEUDO_CLASS
+        PR_FALSE;
+}
+
diff --git a/mozilla/layout/style/nsCSSPseudoClasses.h b/mozilla/layout/style/nsCSSPseudoClasses.h
new file mode 100644
index 00000000000..ff275b66092
--- /dev/null
+++ b/mozilla/layout/style/nsCSSPseudoClasses.h
@@ -0,0 +1,60 @@
+/* -*- 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 atom lists for CSS pseudos.
+ *
+ * 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):
+ *   L. David Baron <dbaron@fas.harvard.edu>
+ *
+ * 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 ***** */
+#ifndef nsCSSPseudoClasses_h___
+#define nsCSSPseudoClasses_h___
+
+#include "nsIAtom.h"
+
+// Empty class derived from nsIAtom so that function signatures can
+// require an atom from this atom list.
+class nsICSSPseudoClass : public nsIAtom {};
+
+class nsCSSPseudoClasses {
+public:
+
+  static void AddRefAtoms();
+  static void ReleaseAtoms();
+
+  static PRBool IsPseudoClass(nsIAtom *aAtom);
+
+#define CSS_PSEUDO_CLASS(_name, _value) static nsICSSPseudoClass* _name;
+#include "nsCSSPseudoClassList.h"
+#undef CSS_PSEUDO_CLASS
+};
+
+#endif /* nsCSSPseudoClasses_h___ */
diff --git a/mozilla/layout/style/nsCSSPseudoElementList.h b/mozilla/layout/style/nsCSSPseudoElementList.h
new file mode 100644
index 00000000000..c27c94d78c4
--- /dev/null
+++ b/mozilla/layout/style/nsCSSPseudoElementList.h
@@ -0,0 +1,65 @@
+/* -*- 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 atom lists for CSS pseudos.
+ *
+ * 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):
+ *   L. David Baron <dbaron@fas.harvard.edu>
+ *
+ * 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 ***** */
+
+/*
+ * This file contains the list of nsIAtoms and their values for CSS
+ * pseudo-elements.  It is designed to be used as inline input to
+ * nsCSSPseudoElements.cpp *only* through the magic of C preprocessing.
+ * All entries must be enclosed in the macro CSS_PSEUDO_ELEMENT which
+ * will have cruel and unusual things done to it.  The entries should be
+ * kept in some sort of logical order.  The first argument to
+ * CSS_PSEUDO_ELEMENT is the C++ identifier of the atom.  The second
+ * argument is the string value of the atom.
+ */
+
+CSS_PSEUDO_ELEMENT(after, ":after")
+CSS_PSEUDO_ELEMENT(before, ":before")
+
+CSS_PSEUDO_ELEMENT(firstLetter, ":first-letter")
+CSS_PSEUDO_ELEMENT(firstLine, ":first-line")
+
+CSS_PSEUDO_ELEMENT(mozSelection, ":-moz-selection")
+
+CSS_PSEUDO_ELEMENT(mozFocusInner, ":-moz-focus-inner")
+CSS_PSEUDO_ELEMENT(mozFocusOuter, ":-moz-focus-outer")
+
+CSS_PSEUDO_ELEMENT(mozListBullet, ":-moz-list-bullet")
+CSS_PSEUDO_ELEMENT(mozListNumber, ":-moz-list-number")
+
+CSS_PSEUDO_ELEMENT(horizontalFramesetBorder, ":-moz-hframeset-border")
+CSS_PSEUDO_ELEMENT(verticalFramesetBorder, ":-moz-vframeset-border")
diff --git a/mozilla/layout/style/nsCSSPseudoElements.cpp b/mozilla/layout/style/nsCSSPseudoElements.cpp
new file mode 100644
index 00000000000..1eab9743abe
--- /dev/null
+++ b/mozilla/layout/style/nsCSSPseudoElements.cpp
@@ -0,0 +1,78 @@
+/* -*- 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 atom lists for CSS pseudos.
+ *
+ * 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):
+ *   L. David Baron <dbaron@fas.harvard.edu>
+ *
+ * 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 "nsCSSPseudoElements.h"
+
+// define storage for all atoms
+#define CSS_PSEUDO_ELEMENT(_name, _value) \
+  nsICSSPseudoElement* nsCSSPseudoElements::_name;
+#include "nsCSSPseudoElementList.h"
+#undef CSS_PSEUDO_ELEMENT
+
+static nsrefcnt gRefCnt;
+
+void nsCSSPseudoElements::AddRefAtoms()
+{
+  if (0 == gRefCnt++) {
+    // create atoms
+#define CSS_PSEUDO_ELEMENT(_name, _value) \
+    _name = NS_STATIC_CAST(nsICSSPseudoElement*, NS_NewPermanentAtom(_value));
+#include "nsCSSPseudoElementList.h"
+#undef CSS_PSEUDO_ELEMENT
+  }
+}
+
+void nsCSSPseudoElements::ReleaseAtoms()
+{
+  NS_PRECONDITION(gRefCnt != 0, "bad release atoms");
+  if (--gRefCnt == 0) {
+    // release atoms
+#define CSS_PSEUDO_ELEMENT(_name, _value) NS_RELEASE(_name);
+#include "nsCSSPseudoElementList.h"
+#undef CSS_PSEUDO_ELEMENT
+  }
+}
+
+PRBool nsCSSPseudoElements::IsPseudoElement(nsIAtom *aAtom)
+{
+  return
+#define CSS_PSEUDO_ELEMENT(_name, _value) (aAtom == _name) ||
+#include "nsCSSPseudoElementList.h"
+#undef CSS_PSEUDO_ELEMENT
+        PR_FALSE;
+}
+
diff --git a/mozilla/layout/style/nsCSSPseudoElements.h b/mozilla/layout/style/nsCSSPseudoElements.h
new file mode 100644
index 00000000000..39bbedf3840
--- /dev/null
+++ b/mozilla/layout/style/nsCSSPseudoElements.h
@@ -0,0 +1,60 @@
+/* -*- 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 atom lists for CSS pseudos.
+ *
+ * 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):
+ *   L. David Baron <dbaron@fas.harvard.edu>
+ *
+ * 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 ***** */
+#ifndef nsCSSPseudoElements_h___
+#define nsCSSPseudoElements_h___
+
+#include "nsIAtom.h"
+
+// Empty class derived from nsIAtom so that function signatures can
+// require an atom from this atom list.
+class nsICSSPseudoElement : public nsIAtom {};
+
+class nsCSSPseudoElements {
+public:
+
+  static void AddRefAtoms();
+  static void ReleaseAtoms();
+
+  static PRBool IsPseudoElement(nsIAtom *aAtom);
+
+#define CSS_PSEUDO_ELEMENT(_name, _value) static nsICSSPseudoElement* _name;
+#include "nsCSSPseudoElementList.h"
+#undef CSS_PSEUDO_ELEMENT
+};
+
+#endif /* nsCSSPseudoElements_h___ */
diff --git a/mozilla/layout/style/nsCSSStyleSheet.cpp b/mozilla/layout/style/nsCSSStyleSheet.cpp
index cdf329aa25c..973b229a047 100644
--- a/mozilla/layout/style/nsCSSStyleSheet.cpp
+++ b/mozilla/layout/style/nsCSSStyleSheet.cpp
@@ -90,7 +90,7 @@
 #include "nsICSSLoader.h"
 #include "nsICSSLoaderObserver.h"
 #include "nsRuleWalker.h"
-#include "nsCSSAtoms.h"
+#include "nsCSSPseudoClasses.h"
 #include "nsINameSpaceManager.h"
 #include "nsINameSpace.h"
 #include "nsITextContent.h"
@@ -2315,7 +2315,7 @@ CSSStyleSheetImpl::CheckRuleForAttributes(nsICSSRule *aRule)
         // Search for the :lang() pseudo class.  If it is there add
         // the lang attribute to the relevant attribute list.
         for (nsAtomStringList* p = iter->mPseudoClassList; p; p = p->mNext) {
-          if (p->mAtom == nsCSSAtoms::langPseudo) {
+          if (p->mAtom == nsCSSPseudoClasses::lang) {
             DependentAtomKey langKey(nsHTMLAtoms::lang);
             mInner->mRelevantAttributes.Put(&langKey, nsHTMLAtoms::lang);
             break;
@@ -3512,18 +3512,18 @@ static PRBool ValueIncludes(const nsString& aValueList, const nsString& aValue,
 
 inline PRBool IsEventPseudo(nsIAtom* aAtom)
 {
-  return PRBool ((nsCSSAtoms::activePseudo == aAtom)   || 
-                 (nsCSSAtoms::dragOverPseudo == aAtom) || 
-                 (nsCSSAtoms::focusPseudo == aAtom)    || 
-                 (nsCSSAtoms::hoverPseudo == aAtom)); 
+  return PRBool ((nsCSSPseudoClasses::active == aAtom)   || 
+                 (nsCSSPseudoClasses::mozDragOver == aAtom) || 
+                 (nsCSSPseudoClasses::focus == aAtom)    || 
+                 (nsCSSPseudoClasses::hover == aAtom)); 
                  // XXX selected, enabled, disabled, selection?
 }
 
 inline PRBool IsLinkPseudo(nsIAtom* aAtom)
 {
-  return PRBool ((nsCSSAtoms::linkPseudo == aAtom) || 
-                 (nsCSSAtoms::visitedPseudo == aAtom) ||
-                 (nsCSSAtoms::anyLinkPseudo == aAtom));
+  return PRBool ((nsCSSPseudoClasses::link == aAtom) || 
+                 (nsCSSPseudoClasses::visited == aAtom) ||
+                 (nsCSSPseudoClasses::mozAnyLink == aAtom));
 }
 
 // Return whether we should apply a "global" (i.e., universal-tag)
@@ -3647,8 +3647,8 @@ static PRBool SelectorMatches(RuleProcessorData &data,
     nsAtomStringList* pseudoClass = aSelector->mPseudoClassList;
 
     while (result && (nsnull != pseudoClass)) {
-      if ((nsCSSAtoms::firstChildPseudo == pseudoClass->mAtom) ||
-          (nsCSSAtoms::firstNodePseudo == pseudoClass->mAtom) ) {
+      if ((nsCSSPseudoClasses::firstChild == pseudoClass->mAtom) ||
+          (nsCSSPseudoClasses::firstNode == pseudoClass->mAtom) ) {
         nsIContent* firstChild = nsnull;
         nsIContent* parent = data.mParentContent;
         if (parent) {
@@ -3656,7 +3656,7 @@ static PRBool SelectorMatches(RuleProcessorData &data,
           do {
             parent->ChildAt(++index, firstChild);
             if (firstChild) { // stop at first non-comment and non-whitespace node (and non-text node for firstChild)
-              if (IsSignificantChild(firstChild, (nsCSSAtoms::firstNodePseudo == pseudoClass->mAtom))) {
+              if (IsSignificantChild(firstChild, (nsCSSPseudoClasses::firstNode == pseudoClass->mAtom))) {
                 break;
               }
               NS_RELEASE(firstChild);
@@ -3669,8 +3669,8 @@ static PRBool SelectorMatches(RuleProcessorData &data,
         result = PRBool(localTrue == (data.mContent == firstChild));
         NS_IF_RELEASE(firstChild);
       }
-      else if ((nsCSSAtoms::lastChildPseudo == pseudoClass->mAtom) ||
-               (nsCSSAtoms::lastNodePseudo == pseudoClass->mAtom)) {
+      else if ((nsCSSPseudoClasses::lastChild == pseudoClass->mAtom) ||
+               (nsCSSPseudoClasses::lastNode == pseudoClass->mAtom)) {
         nsIContent* lastChild = nsnull;
         nsIContent* parent = data.mParentContent;
         if (parent) {
@@ -3679,7 +3679,7 @@ static PRBool SelectorMatches(RuleProcessorData &data,
           do {
             parent->ChildAt(--index, lastChild);
             if (lastChild) { // stop at first non-comment and non-whitespace node (and non-text node for lastChild)
-              if (IsSignificantChild(lastChild, (nsCSSAtoms::lastNodePseudo == pseudoClass->mAtom))) {
+              if (IsSignificantChild(lastChild, (nsCSSPseudoClasses::lastNode == pseudoClass->mAtom))) {
                 break;
               }
               NS_RELEASE(lastChild);
@@ -3692,7 +3692,7 @@ static PRBool SelectorMatches(RuleProcessorData &data,
         result = PRBool(localTrue == (data.mContent == lastChild));
         NS_IF_RELEASE(lastChild);
       }
-      else if (nsCSSAtoms::emptyPseudo == pseudoClass->mAtom) {
+      else if (nsCSSPseudoClasses::empty == pseudoClass->mAtom) {
         nsIContent* child = nsnull;
         nsIContent* element = data.mContent;
         PRInt32 index = -1;
@@ -3711,7 +3711,7 @@ static PRBool SelectorMatches(RuleProcessorData &data,
         result = PRBool(localTrue == (child == nsnull));
         NS_IF_RELEASE(child);
       }
-      else if (nsCSSAtoms::rootPseudo == pseudoClass->mAtom) {
+      else if (nsCSSPseudoClasses::root == pseudoClass->mAtom) {
         if (data.mParentContent) {
           result = localFalse;
         }
@@ -3719,11 +3719,11 @@ static PRBool SelectorMatches(RuleProcessorData &data,
           result = localTrue;
         }
       }
-      else if (nsCSSAtoms::xblBoundElementPseudo == pseudoClass->mAtom) {
+      else if (nsCSSPseudoClasses::mozBoundElement == pseudoClass->mAtom) {
         result = (data.mScopedRoot && data.mScopedRoot == data.mContent)
                    ? localTrue : localFalse;
       }
-      else if (nsCSSAtoms::langPseudo == pseudoClass->mAtom) {
+      else if (nsCSSPseudoClasses::lang == pseudoClass->mAtom) {
         NS_ASSERTION(nsnull != pseudoClass->mString, "null lang parameter");
         result = localFalse;
         if (pseudoClass->mString && *pseudoClass->mString) {
@@ -3775,8 +3775,8 @@ static PRBool SelectorMatches(RuleProcessorData &data,
             !aSelector->mTag && !aSelector->mClassList &&
             !aSelector->mIDList && !aSelector->mAttrList &&
             // :hover or :active
-            (nsCSSAtoms::activePseudo == pseudoClass->mAtom ||
-             nsCSSAtoms::hoverPseudo == pseudoClass->mAtom) &&
+            (nsCSSPseudoClasses::active == pseudoClass->mAtom ||
+             nsCSSPseudoClasses::hover == pseudoClass->mAtom) &&
             // important for |IsQuirkEventSensitive|:
             data.mIsHTMLContent && !data.mIsHTMLLink &&
             !IsQuirkEventSensitive(data.mContentTag)) {
@@ -3786,19 +3786,19 @@ static PRBool SelectorMatches(RuleProcessorData &data,
           // quirk should apply only to ":hover" (if to anything at all).
           result = localFalse;
         } else {
-          if (nsCSSAtoms::activePseudo == pseudoClass->mAtom) {
+          if (nsCSSPseudoClasses::active == pseudoClass->mAtom) {
             result = (aStateMask & NS_EVENT_STATE_ACTIVE) ||
                      (localTrue == (0 != (data.mEventState & NS_EVENT_STATE_ACTIVE)));
           }
-          else if (nsCSSAtoms::focusPseudo == pseudoClass->mAtom) {
+          else if (nsCSSPseudoClasses::focus == pseudoClass->mAtom) {
             result = (aStateMask & NS_EVENT_STATE_FOCUS) ||
                      (localTrue == (0 != (data.mEventState & NS_EVENT_STATE_FOCUS)));
           }
-          else if (nsCSSAtoms::hoverPseudo == pseudoClass->mAtom) {
+          else if (nsCSSPseudoClasses::hover == pseudoClass->mAtom) {
             result = (aStateMask & NS_EVENT_STATE_HOVER) ||
                      (localTrue == (0 != (data.mEventState & NS_EVENT_STATE_HOVER)));
           }
-          else if (nsCSSAtoms::dragOverPseudo == pseudoClass->mAtom) {
+          else if (nsCSSPseudoClasses::mozDragOver == pseudoClass->mAtom) {
             result = (aStateMask & NS_EVENT_STATE_DRAGOVER) ||
                      (localTrue == (0 != (data.mEventState & NS_EVENT_STATE_DRAGOVER)));
           }
@@ -3807,13 +3807,13 @@ static PRBool SelectorMatches(RuleProcessorData &data,
       else if (IsLinkPseudo(pseudoClass->mAtom)) {
         if (data.mIsHTMLLink || data.mIsSimpleXLink) {
           if (result) {
-            if (nsCSSAtoms::anyLinkPseudo == pseudoClass->mAtom) {
+            if (nsCSSPseudoClasses::mozAnyLink == pseudoClass->mAtom) {
               result = localTrue;
             }
-            else if (nsCSSAtoms::linkPseudo == pseudoClass->mAtom) {
+            else if (nsCSSPseudoClasses::link == pseudoClass->mAtom) {
               result = PRBool(localTrue == (eLinkState_Unvisited == data.mLinkState));
             }
-            else if (nsCSSAtoms::visitedPseudo == pseudoClass->mAtom) {
+            else if (nsCSSPseudoClasses::visited == pseudoClass->mAtom) {
               result = PRBool(localTrue == (eLinkState_Visited == data.mLinkState));
             }
           }
@@ -3822,7 +3822,7 @@ static PRBool SelectorMatches(RuleProcessorData &data,
           result = localFalse;  // not a link
         }
       }
-      else if (nsCSSAtoms::checkedPseudo == pseudoClass->mAtom) {
+      else if (nsCSSPseudoClasses::checked == pseudoClass->mAtom) {
         // This pseudoclass matches the selected state on the following elements:
         //  <option>
         //  <input type=checkbox>
@@ -4398,11 +4398,11 @@ PRBool IsStateSelector(nsCSSSelector& aSelector)
 {
   nsAtomStringList* pseudoClass = aSelector.mPseudoClassList;
   while (pseudoClass) {
-    if ((pseudoClass->mAtom == nsCSSAtoms::activePseudo) ||
-        (pseudoClass->mAtom == nsCSSAtoms::checkedPseudo) ||
-        (pseudoClass->mAtom == nsCSSAtoms::dragOverPseudo) || 
-        (pseudoClass->mAtom == nsCSSAtoms::focusPseudo) || 
-        (pseudoClass->mAtom == nsCSSAtoms::hoverPseudo)) {
+    if ((pseudoClass->mAtom == nsCSSPseudoClasses::active) ||
+        (pseudoClass->mAtom == nsCSSPseudoClasses::checked) ||
+        (pseudoClass->mAtom == nsCSSPseudoClasses::mozDragOver) || 
+        (pseudoClass->mAtom == nsCSSPseudoClasses::focus) || 
+        (pseudoClass->mAtom == nsCSSPseudoClasses::hover)) {
       return PR_TRUE;
     }
     pseudoClass = pseudoClass->mNext;
diff --git a/mozilla/layout/style/nsHTMLCSSStyleSheet.cpp b/mozilla/layout/style/nsHTMLCSSStyleSheet.cpp
index 2a26809a7a9..f60df20c683 100644
--- a/mozilla/layout/style/nsHTMLCSSStyleSheet.cpp
+++ b/mozilla/layout/style/nsHTMLCSSStyleSheet.cpp
@@ -43,7 +43,7 @@
 #include "nsIAtom.h"
 #include "nsIURL.h"
 #include "nsISupportsArray.h"
-#include "nsHTMLAtoms.h"
+#include "nsCSSPseudoElements.h"
 #include "nsIHTMLContent.h"
 #include "nsIStyleRule.h"
 #include "nsIFrame.h"
@@ -318,7 +318,7 @@ HTMLCSSStyleSheetImpl::RulesMatching(PseudoRuleProcessorData* aData,
     return NS_OK;
 
   nsIAtom* pseudoTag = aData->mPseudoTag;
-  if (pseudoTag == nsHTMLAtoms::firstLinePseudo) {
+  if (pseudoTag == nsCSSPseudoElements::firstLine) {
     if (!mFirstLineRule) {
       mFirstLineRule = new CSSFirstLineRule(this);
       if (!mFirstLineRule)
@@ -327,7 +327,7 @@ HTMLCSSStyleSheetImpl::RulesMatching(PseudoRuleProcessorData* aData,
     }
     aData->mRuleWalker->Forward(mFirstLineRule);
   }
-  else if (pseudoTag == nsHTMLAtoms::firstLetterPseudo) {
+  else if (pseudoTag == nsCSSPseudoElements::firstLetter) {
     if (!mFirstLetterRule) {
       mFirstLetterRule = new CSSFirstLetterRule(this);
       if (!mFirstLetterRule)
diff --git a/mozilla/layout/style/nsHTMLStyleSheet.cpp b/mozilla/layout/style/nsHTMLStyleSheet.cpp
index cb08bea676b..a986ea1fe86 100644
--- a/mozilla/layout/style/nsHTMLStyleSheet.cpp
+++ b/mozilla/layout/style/nsHTMLStyleSheet.cpp
@@ -56,6 +56,7 @@
 #include "nsLayoutCID.h"
 #include "nsIDOMHTMLDocument.h"
 #include "nsIDOMHTMLElement.h"
+#include "nsCSSAnonBoxes.h"
 
 #include "nsRuleWalker.h"
 
@@ -1049,7 +1050,7 @@ HTMLStyleSheetImpl::RulesMatching(PseudoRuleProcessorData* aData,
                                   nsIAtom* aMedium)
 {
   nsIAtom* pseudoTag = aData->mPseudoTag;
-  if (pseudoTag == nsHTMLAtoms::tableColPseudo) {
+  if (pseudoTag == nsCSSAnonBoxes::tableCol) {
     nsRuleWalker *ruleWalker = aData->mRuleWalker;
     if (ruleWalker) {
       ruleWalker->Forward(mTableColRule);
diff --git a/mozilla/layout/style/nsRuleNode.cpp b/mozilla/layout/style/nsRuleNode.cpp
index c15d2886eb3..e72b02a3826 100644
--- a/mozilla/layout/style/nsRuleNode.cpp
+++ b/mozilla/layout/style/nsRuleNode.cpp
@@ -48,7 +48,7 @@
 #include "nsIFontMetrics.h"
 #include "nsIDocShellTreeItem.h"
 #include "nsStyleUtil.h"
-#include "nsCSSAtoms.h"
+#include "nsCSSPseudoElements.h"
 #include "nsThemeConstants.h"
 #include "nsITheme.h"
 #include "pldhash.h"
@@ -2730,8 +2730,8 @@ nsRuleNode::ComputeDisplayData(nsStyleStruct* aStartStruct,
 
   nsCOMPtr<nsIAtom> pseudoTag;
   aContext->GetPseudoType(*getter_AddRefs(pseudoTag));
-  PRBool generatedContent = (pseudoTag == nsCSSAtoms::beforePseudo || 
-                             pseudoTag == nsCSSAtoms::afterPseudo);
+  PRBool generatedContent = (pseudoTag == nsCSSPseudoElements::before || 
+                             pseudoTag == nsCSSPseudoElements::after);
 
   if (parentContext && 
       ((aRuleDetail != eRuleFullReset &&
diff --git a/mozilla/layout/style/nsStyleSet.cpp b/mozilla/layout/style/nsStyleSet.cpp
index 3d14f8620d7..db51bbb524d 100644
--- a/mozilla/layout/style/nsStyleSet.cpp
+++ b/mozilla/layout/style/nsStyleSet.cpp
@@ -49,7 +49,7 @@
 #include "nsIContent.h"
 #include "nsIDocument.h"
 #include "nsIStyleFrameConstruction.h"
-#include "nsLayoutAtoms.h"
+#include "nsCSSAnonBoxes.h"
 #include "nsTimer.h"
 #include "nsICSSStyleSheet.h"
 #include "nsNetUtil.h"
@@ -58,7 +58,6 @@
 #include "nsRuleWalker.h"
 #include "nsIHTMLDocument.h"
 #include "nsIDOMHTMLBodyElement.h"
-#include "nsHTMLAtoms.h"
 #include "nsHashtable.h"
 
 #ifdef MOZ_PERF_METRICS
@@ -1143,7 +1142,7 @@ nsIStyleContext* StyleSetImpl::ResolveStyleForNonElement(
         mOverrideRuleProcessors) {
       EnsureRuleWalker(aPresContext);
       result = GetContext(aPresContext, aParentContext,
-                          nsHTMLAtoms::mozNonElementPseudo);
+                          nsCSSAnonBoxes::mozNonElement);
       NS_ASSERTION(mRuleWalker->AtRoot(), "rule walker must be at root");
     }
   }
diff --git a/mozilla/layout/tables/nsTableFrame.cpp b/mozilla/layout/tables/nsTableFrame.cpp
index 641ce693d31..f0421603323 100644
--- a/mozilla/layout/tables/nsTableFrame.cpp
+++ b/mozilla/layout/tables/nsTableFrame.cpp
@@ -61,6 +61,7 @@
 #include "nsVoidArray.h"
 #include "nsIView.h"
 #include "nsHTMLAtoms.h"
+#include "nsCSSAnonBoxes.h"
 #include "nsHTMLReflowCommand.h"
 #include "nsLayoutAtoms.h"
 #include "nsIDeviceContext.h"
@@ -860,7 +861,7 @@ nsTableFrame::CreateAnonymousColGroupFrame(nsIPresContext&     aPresContext,
 
   nsCOMPtr<nsIStyleContext> colGroupStyle;
   aPresContext.ResolvePseudoStyleContextFor(colGroupContent,
-                                            nsHTMLAtoms::tableColGroupPseudo,
+                                            nsCSSAnonBoxes::tableColGroup,
                                             mStyleContext,
                                             getter_AddRefs(colGroupStyle));        
   // Create a col group frame
@@ -978,7 +979,7 @@ nsTableFrame::CreateAnonymousColFrames(nsIPresContext&       aPresContext,
       // all other anonymous cols use a pseudo style context of the col group
       aColGroupFrame.GetContent(getter_AddRefs(iContent));
       aColGroupFrame.GetStyleContext(getter_AddRefs(parentStyleContext));
-      aPresContext.ResolvePseudoStyleContextFor(iContent, nsHTMLAtoms::tableColPseudo,
+      aPresContext.ResolvePseudoStyleContextFor(iContent, nsCSSAnonBoxes::tableCol,
                                                 parentStyleContext, getter_AddRefs(styleContext));
     }
     // ASSERTION to check for bug 54454 sneaking back in...
diff --git a/mozilla/layout/xul/base/src/nsBoxFrame.cpp b/mozilla/layout/xul/base/src/nsBoxFrame.cpp
index f5a68930da0..7174d4f89f9 100644
--- a/mozilla/layout/xul/base/src/nsBoxFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsBoxFrame.cpp
@@ -90,6 +90,7 @@
 #include "nsIScrollableFrame.h"
 #include "nsWidgetsCID.h"
 #include "nsLayoutAtoms.h"
+#include "nsCSSAnonBoxes.h"
 #include "nsViewsCID.h"
 #include "nsIScrollableView.h"
 #include "nsHTMLContainerFrame.h"
@@ -2556,7 +2557,7 @@ nsBoxFrame::CreateViewForFrame(nsIPresContext*  aPresContext,
     if (!aForce) {
       nsIAtom*  pseudoTag;
       aStyleContext->GetPseudoType(pseudoTag);
-      if (pseudoTag == nsLayoutAtoms::scrolledContentPseudo) {
+      if (pseudoTag == nsCSSAnonBoxes::scrolledContent) {
         NS_FRAME_LOG(NS_FRAME_TRACE_CALLS,
           ("nsBoxFrame::CreateViewForFrame: scrolled frame=%p", aFrame));
         aForce = PR_TRUE;
diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
index 10545001999..7363444d761 100644
--- a/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
+++ b/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
@@ -53,8 +53,8 @@
 #include "nsTreeSelection.h"
 
 #include "nsXULAtoms.h"
+#include "nsCSSAnonBoxes.h"
 #include "nsHTMLAtoms.h"
-#include "nsCSSAtoms.h"
 
 #include "nsIContent.h"
 #include "nsIStyleContext.h"
@@ -437,7 +437,7 @@ nsTreeBodyFrame::CalcMaxRowWidth(nsBoxLayoutState& aState)
     return 0;
 
   nsCOMPtr<nsIStyleContext> rowContext;
-  GetPseudoStyleContext(nsXULAtoms::moztreerow, getter_AddRefs(rowContext));
+  GetPseudoStyleContext(nsCSSAnonBoxes::moztreerow, getter_AddRefs(rowContext));
   nsMargin rowMargin(0,0,0,0);
   nsStyleBorderPadding  bPad;
   rowContext->GetBorderPaddingFor(bPad);
@@ -1244,7 +1244,7 @@ nsTreeBodyFrame::GetCoordsForCellItem(PRInt32 aRow, const PRUnichar *aColID, con
     mView->GetCellProperties(aRow, currCol->GetID().get(), mScratchArray);
 
     nsCOMPtr<nsIStyleContext> rowContext;
-    GetPseudoStyleContext(nsXULAtoms::moztreerow, getter_AddRefs(rowContext));
+    GetPseudoStyleContext(nsCSSAnonBoxes::moztreerow, getter_AddRefs(rowContext));
 
     // We don't want to consider any of the decorations that may be present
     // on the current row, so we have to deflate the rect by the border and 
@@ -1252,7 +1252,7 @@ nsTreeBodyFrame::GetCoordsForCellItem(PRInt32 aRow, const PRUnichar *aColID, con
     AdjustForBorderPadding(rowContext, cellRect);
 
     nsCOMPtr<nsIStyleContext> cellContext;
-    GetPseudoStyleContext(nsXULAtoms::moztreecell, getter_AddRefs(cellContext));
+    GetPseudoStyleContext(nsCSSAnonBoxes::moztreecell, getter_AddRefs(cellContext));
 
     NS_NAMED_LITERAL_STRING(cell, "cell");
     if (currCol->IsCycler() || cell.Equals(aCellItem)) {
@@ -1301,7 +1301,7 @@ nsTreeBodyFrame::GetCoordsForCellItem(PRInt32 aRow, const PRUnichar *aColID, con
 
       // Find the twisty rect by computing its size. 
       nsCOMPtr<nsIStyleContext> twistyContext;
-      GetPseudoStyleContext(nsXULAtoms::moztreetwisty, getter_AddRefs(twistyContext));
+      GetPseudoStyleContext(nsCSSAnonBoxes::moztreetwisty, getter_AddRefs(twistyContext));
 
       // |GetImageSize| returns the rect of the twisty image, including the 
       // borders and padding. 
@@ -1326,7 +1326,7 @@ nsTreeBodyFrame::GetCoordsForCellItem(PRInt32 aRow, const PRUnichar *aColID, con
 
     // Cell Image
     nsCOMPtr<nsIStyleContext> imageContext;
-    GetPseudoStyleContext(nsXULAtoms::moztreeimage, getter_AddRefs(imageContext));
+    GetPseudoStyleContext(nsCSSAnonBoxes::moztreeimage, getter_AddRefs(imageContext));
 
     nsRect imageSize = GetImageSize(aRow, currCol->GetID().get(), PR_FALSE, imageContext);
     if (NS_LITERAL_STRING("image").Equals(aCellItem)) {
@@ -1354,7 +1354,7 @@ nsTreeBodyFrame::GetCoordsForCellItem(PRInt32 aRow, const PRUnichar *aColID, con
     // been cropped and use the remaining rect as the text Rect. Otherwise,
     // we add in borders and padding to the text dimension and give that back. 
     nsCOMPtr<nsIStyleContext> textContext;
-    GetPseudoStyleContext(nsXULAtoms::moztreecelltext, getter_AddRefs(textContext));
+    GetPseudoStyleContext(nsCSSAnonBoxes::moztreecelltext, getter_AddRefs(textContext));
 
     const nsStyleFont* fontStyle = (const nsStyleFont*) textContext->GetStyleData(eStyleStruct_Font);
     nsCOMPtr<nsIDeviceContext> dc;
@@ -1412,7 +1412,7 @@ nsTreeBodyFrame::GetItemWithinCellAt(PRInt32 aX, const nsRect& aCellRect,
 
   // Resolve style for the cell.
   nsCOMPtr<nsIStyleContext> cellContext;
-  GetPseudoStyleContext(nsXULAtoms::moztreecell, getter_AddRefs(cellContext));
+  GetPseudoStyleContext(nsCSSAnonBoxes::moztreecell, getter_AddRefs(cellContext));
 
   // Obtain the margins for the cell and then deflate our rect by that 
   // amount.  The cell is assumed to be contained within the deflated rect.
@@ -1464,7 +1464,7 @@ nsTreeBodyFrame::GetItemWithinCellAt(PRInt32 aX, const nsRect& aCellRect,
 
     // Resolve style for the twisty.
     nsCOMPtr<nsIStyleContext> twistyContext;
-    GetPseudoStyleContext(nsXULAtoms::moztreetwisty, getter_AddRefs(twistyContext));
+    GetPseudoStyleContext(nsCSSAnonBoxes::moztreetwisty, getter_AddRefs(twistyContext));
 
     // We will treat a click as hitting the twisty if it happens on the margins, borders, padding,
     // or content of the twisty object.  By allowing a "slop" into the margin, we make it a little
@@ -1496,7 +1496,7 @@ nsTreeBodyFrame::GetItemWithinCellAt(PRInt32 aX, const nsRect& aCellRect,
   
   // Resolve style for the image.
   nsCOMPtr<nsIStyleContext> imageContext;
-  GetPseudoStyleContext(nsXULAtoms::moztreeimage, getter_AddRefs(imageContext));
+  GetPseudoStyleContext(nsCSSAnonBoxes::moztreeimage, getter_AddRefs(imageContext));
 
   nsRect iconSize = GetImageSize(aRowIndex, aColumn->GetID().get(), PR_FALSE, imageContext);
   const nsStyleMargin* imageMarginData = (const nsStyleMargin*)imageContext->GetStyleData(eStyleStruct_Margin);
@@ -1535,7 +1535,7 @@ nsTreeBodyFrame::GetCellWidth(PRInt32 aRow, const nsAString& aColID,
 
     // Adjust borders and padding for the cell.
     nsCOMPtr<nsIStyleContext> cellContext;
-    GetPseudoStyleContext(nsXULAtoms::moztreecell, getter_AddRefs(cellContext));
+    GetPseudoStyleContext(nsCSSAnonBoxes::moztreecell, getter_AddRefs(cellContext));
     nsMargin m(0,0,0,0);
     nsStyleBorderPadding  bPad;
     cellContext->GetBorderPaddingFor(bPad);
@@ -1555,7 +1555,7 @@ nsTreeBodyFrame::GetCellWidth(PRInt32 aRow, const nsAString& aColID,
       
       // Find the twisty rect by computing its size.
       nsCOMPtr<nsIStyleContext> twistyContext;
-      GetPseudoStyleContext(nsXULAtoms::moztreetwisty, getter_AddRefs(twistyContext));
+      GetPseudoStyleContext(nsCSSAnonBoxes::moztreetwisty, getter_AddRefs(twistyContext));
 
       // |GetImageSize| returns the rect of the twisty image, including the 
       // borders and padding.
@@ -1571,7 +1571,7 @@ nsTreeBodyFrame::GetCellWidth(PRInt32 aRow, const nsAString& aColID,
     }
 
     nsCOMPtr<nsIStyleContext> imageContext;
-    GetPseudoStyleContext(nsXULAtoms::moztreeimage, getter_AddRefs(imageContext));
+    GetPseudoStyleContext(nsCSSAnonBoxes::moztreeimage, getter_AddRefs(imageContext));
 
     // Account for the width of the cell image.
     nsRect imageSize = GetImageSize(aRow, currCol->GetID().get(), PR_FALSE, imageContext);
@@ -1582,7 +1582,7 @@ nsTreeBodyFrame::GetCellWidth(PRInt32 aRow, const nsAString& aColID,
     mView->GetCellText(aRow, currCol->GetID().get(), cellText);
 
     nsCOMPtr<nsIStyleContext> textContext;
-    GetPseudoStyleContext(nsXULAtoms::moztreecelltext, getter_AddRefs(textContext));
+    GetPseudoStyleContext(nsCSSAnonBoxes::moztreecelltext, getter_AddRefs(textContext));
 
     // Get the borders and padding for the text.
     nsStyleBorderPadding borderPadding;
@@ -1966,7 +1966,7 @@ PRInt32 nsTreeBodyFrame::GetRowHeight()
   // + the specified margins.
   nsCOMPtr<nsIStyleContext> rowContext;
   mScratchArray->Clear();
-  GetPseudoStyleContext(nsXULAtoms::moztreerow, getter_AddRefs(rowContext));
+  GetPseudoStyleContext(nsCSSAnonBoxes::moztreerow, getter_AddRefs(rowContext));
   if (rowContext) {
     const nsStylePosition* myPosition = (const nsStylePosition*)
           rowContext->GetStyleData(eStyleStruct_Position);
@@ -2013,7 +2013,7 @@ PRInt32 nsTreeBodyFrame::GetIndentation()
   // Look up the correct indentation.  It is equal to the specified indentation width.
   nsCOMPtr<nsIStyleContext> indentContext;
   mScratchArray->Clear();
-  GetPseudoStyleContext(nsXULAtoms::moztreeindentation, getter_AddRefs(indentContext));
+  GetPseudoStyleContext(nsCSSAnonBoxes::moztreeindentation, getter_AddRefs(indentContext));
   if (indentContext) {
     const nsStylePosition* myPosition = (const nsStylePosition*)
           indentContext->GetStyleData(eStyleStruct_Position);
@@ -2176,7 +2176,7 @@ nsTreeBodyFrame::PaintColumn(nsTreeColumn*        aColumn,
   // Resolve style for the column.  It contains all the info we need to lay ourselves
   // out and to paint.
   nsCOMPtr<nsIStyleContext> colContext;
-  GetPseudoStyleContext(nsXULAtoms::moztreecolumn, getter_AddRefs(colContext));
+  GetPseudoStyleContext(nsCSSAnonBoxes::moztreecolumn, getter_AddRefs(colContext));
 
   // Obtain the margins for the cell and then deflate our rect by that 
   // amount.  The cell is assumed to be contained within the deflated rect.
@@ -2214,7 +2214,7 @@ nsTreeBodyFrame::PaintRow(PRInt32              aRowIndex,
   // Resolve style for the row.  It contains all the info we need to lay ourselves
   // out and to paint.
   nsCOMPtr<nsIStyleContext> rowContext;
-  GetPseudoStyleContext(nsXULAtoms::moztreerow, getter_AddRefs(rowContext));
+  GetPseudoStyleContext(nsCSSAnonBoxes::moztreerow, getter_AddRefs(rowContext));
 
   // Obtain the margins for the row and then deflate our rect by that 
   // amount.  The row is assumed to be contained within the deflated rect.
@@ -2258,7 +2258,7 @@ nsTreeBodyFrame::PaintRow(PRInt32              aRowIndex,
 
     // Resolve style for the separator.
     nsCOMPtr<nsIStyleContext> separatorContext;
-    GetPseudoStyleContext(nsXULAtoms::moztreeseparator, getter_AddRefs(separatorContext));
+    GetPseudoStyleContext(nsCSSAnonBoxes::moztreeseparator, getter_AddRefs(separatorContext));
     PRBool useTheme = PR_FALSE;
     nsCOMPtr<nsITheme> theme;
     const nsStyleDisplay* displayData = (const nsStyleDisplay*)separatorContext->GetStyleData(eStyleStruct_Display);
@@ -2338,7 +2338,7 @@ nsTreeBodyFrame::PaintCell(PRInt32              aRowIndex,
   // Resolve style for the cell.  It contains all the info we need to lay ourselves
   // out and to paint.
   nsCOMPtr<nsIStyleContext> cellContext;
-  GetPseudoStyleContext(nsXULAtoms::moztreecell, getter_AddRefs(cellContext));
+  GetPseudoStyleContext(nsCSSAnonBoxes::moztreecell, getter_AddRefs(cellContext));
 
   // Obtain the margins for the cell and then deflate our rect by that 
   // amount.  The cell is assumed to be contained within the deflated rect.
@@ -2377,7 +2377,7 @@ nsTreeBodyFrame::PaintCell(PRInt32              aRowIndex,
 
     // Resolve the style to use for the connecting lines.
     nsCOMPtr<nsIStyleContext> lineContext;
-    GetPseudoStyleContext(nsXULAtoms::moztreeline, getter_AddRefs(lineContext));
+    GetPseudoStyleContext(nsCSSAnonBoxes::moztreeline, getter_AddRefs(lineContext));
     const nsStyleVisibility* vis = 
       (const nsStyleVisibility*)lineContext->GetStyleData(eStyleStruct_Visibility);
     
@@ -2388,7 +2388,7 @@ nsTreeBodyFrame::PaintCell(PRInt32              aRowIndex,
       // before painting of connecting lines since it would paint lines over
       // the twisty. But we need to leave a place for it.
       nsCOMPtr<nsIStyleContext> twistyContext;
-      GetPseudoStyleContext(nsXULAtoms::moztreetwisty, getter_AddRefs(twistyContext));
+      GetPseudoStyleContext(nsCSSAnonBoxes::moztreetwisty, getter_AddRefs(twistyContext));
 
       nsRect twistySize = GetImageSize(aRowIndex, aColumn->GetID().get(), PR_TRUE, twistyContext);
 
@@ -2528,7 +2528,7 @@ nsTreeBodyFrame::PaintTwisty(PRInt32              aRowIndex,
 
   // Resolve style for the twisty.
   nsCOMPtr<nsIStyleContext> twistyContext;
-  GetPseudoStyleContext(nsXULAtoms::moztreetwisty, getter_AddRefs(twistyContext));
+  GetPseudoStyleContext(nsCSSAnonBoxes::moztreetwisty, getter_AddRefs(twistyContext));
 
   PRBool useTheme = PR_FALSE;
   nsCOMPtr<nsITheme> theme;
@@ -2636,7 +2636,7 @@ nsTreeBodyFrame::PaintImage(PRInt32              aRowIndex,
 {
   // Resolve style for the image.
   nsCOMPtr<nsIStyleContext> imageContext;
-  GetPseudoStyleContext(nsXULAtoms::moztreeimage, getter_AddRefs(imageContext));
+  GetPseudoStyleContext(nsCSSAnonBoxes::moztreeimage, getter_AddRefs(imageContext));
 
   // Obtain the margins for the twisty and then deflate our rect by that 
   // amount.  The twisty is assumed to be contained within the deflated rect.
@@ -2725,7 +2725,7 @@ nsTreeBodyFrame::PaintText(PRInt32              aRowIndex,
   // Resolve style for the text.  It contains all the info we need to lay ourselves
   // out and to paint.
   nsCOMPtr<nsIStyleContext> textContext;
-  GetPseudoStyleContext(nsXULAtoms::moztreecelltext, getter_AddRefs(textContext));
+  GetPseudoStyleContext(nsCSSAnonBoxes::moztreecelltext, getter_AddRefs(textContext));
 
   // Obtain the margins for the text and then deflate our rect by that 
   // amount.  The text is assumed to be contained within the deflated rect.
@@ -2949,7 +2949,7 @@ nsTreeBodyFrame::PaintProgressMeter(PRInt32              aRowIndex,
   // Resolve style for the progress meter.  It contains all the info we need
   // to lay ourselves out and to paint.
   nsCOMPtr<nsIStyleContext> meterContext;
-  GetPseudoStyleContext(nsXULAtoms::moztreeprogressmeter, getter_AddRefs(meterContext));
+  GetPseudoStyleContext(nsCSSAnonBoxes::moztreeprogressmeter, getter_AddRefs(meterContext));
 
   // Obtain the margins for the progress meter and then deflate our rect by that 
   // amount. The progress meter is assumed to be contained within the deflated
@@ -3043,7 +3043,7 @@ nsTreeBodyFrame::PaintDropFeedback(nsIPresContext*      aPresContext,
 
         // Resolve the style to use for the drop feedback.
         nsCOMPtr<nsIStyleContext> feedbackContext;
-        GetPseudoStyleContext(nsXULAtoms::moztreedropfeedback, getter_AddRefs(feedbackContext));
+        GetPseudoStyleContext(nsCSSAnonBoxes::moztreedropfeedback, getter_AddRefs(feedbackContext));
 
         const nsStyleVisibility* vis = 
           (const nsStyleVisibility*)feedbackContext->GetStyleData(eStyleStruct_Visibility);
@@ -3077,7 +3077,7 @@ nsTreeBodyFrame::PaintDropFeedback(nsIPresContext*      aPresContext,
           currX += mIndentation * level;
 
           nsCOMPtr<nsIStyleContext> twistyContext;
-          GetPseudoStyleContext(nsXULAtoms::moztreetwisty, getter_AddRefs(twistyContext));
+          GetPseudoStyleContext(nsCSSAnonBoxes::moztreetwisty, getter_AddRefs(twistyContext));
           nsRect twistySize = GetImageSize(mDropRow, currCol->GetID().get(), PR_TRUE, twistyContext);
           const nsStyleMargin* twistyMarginData = (const nsStyleMargin*)twistyContext->GetStyleData(eStyleStruct_Margin);
           nsMargin twistyMargin;
diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeContentView.cpp b/mozilla/layout/xul/base/src/tree/src/nsTreeContentView.cpp
index 84bad4cc1a7..bc3b5f24b36 100644
--- a/mozilla/layout/xul/base/src/tree/src/nsTreeContentView.cpp
+++ b/mozilla/layout/xul/base/src/tree/src/nsTreeContentView.cpp
@@ -41,7 +41,6 @@
 #include "nsINameSpaceManager.h"
 #include "nsHTMLAtoms.h"
 #include "nsXULAtoms.h"
-#include "nsCSSAtoms.h"
 #include "nsLayoutAtoms.h"
 #include "nsIDOMDocument.h"
 #include "nsIBoxObject.h"