Renamed bullet pseudo style

content/html/content/src/nsHTMLAtoms.cpp

@@ -20,6 +20,8 @@
 // XXX make this be autogenerated. doh!
 
 nsIAtom* nsHTMLAtoms::mozAnonymousBlock;
+nsIAtom* nsHTMLAtoms::mozListBulletPseudo;
+
 nsIAtom* nsHTMLAtoms::_baseHref;
 nsIAtom* nsHTMLAtoms::_baseTarget;
 nsIAtom* nsHTMLAtoms::a;
@@ -45,7 +47,6 @@ nsIAtom* nsHTMLAtoms::border;
 nsIAtom* nsHTMLAtoms::bordercolor;
 nsIAtom* nsHTMLAtoms::bottompadding;
 nsIAtom* nsHTMLAtoms::br;
-nsIAtom* nsHTMLAtoms::bulletPseudo;
 nsIAtom* nsHTMLAtoms::button;
 nsIAtom* nsHTMLAtoms::buttonContentPseudo;
 nsIAtom* nsHTMLAtoms::caption;
@@ -276,6 +277,7 @@ void nsHTMLAtoms::AddrefAtoms()
 {
   if (0 == gRefCnt) {
     mozAnonymousBlock = NS_NewAtom(":-moz-anonymous-block");
+    mozListBulletPseudo = NS_NewAtom(":-moz-list-bullet");
 
     _baseHref = NS_NewAtom(NS_HTML_BASE_HREF);
     _baseTarget = NS_NewAtom(NS_HTML_BASE_TARGET);
@@ -302,7 +304,6 @@ void nsHTMLAtoms::AddrefAtoms()
     bordercolor = NS_NewAtom("bordercolor");
     bottompadding = NS_NewAtom("bottompadding");
     br = NS_NewAtom("br");
-    bulletPseudo = NS_NewAtom(":bullet");
     button = NS_NewAtom("button");
     buttonContentPseudo = NS_NewAtom(":button-content");
     caption = NS_NewAtom("caption");
@@ -534,6 +535,8 @@ void nsHTMLAtoms::ReleaseAtoms()
   NS_PRECONDITION(gRefCnt != 0, "bad release atoms");
   if (--gRefCnt == 0) {
     NS_RELEASE(mozAnonymousBlock);
+    NS_RELEASE(mozListBulletPseudo);
+
     NS_RELEASE(_baseHref);
     NS_RELEASE(_baseTarget);
     NS_RELEASE(a);
@@ -556,7 +559,6 @@ void nsHTMLAtoms::ReleaseAtoms()
     NS_RELEASE(bordercolor);
     NS_RELEASE(bottompadding);
     NS_RELEASE(br);
-    NS_RELEASE(bulletPseudo);
     NS_RELEASE(button);
     NS_RELEASE(buttonContentPseudo);
     NS_RELEASE(caption);

content/html/content/src/nsHTMLAtoms.h

@@ -36,6 +36,7 @@ public:
   static void ReleaseAtoms();
 
   static nsIAtom* mozAnonymousBlock;
+  static nsIAtom* mozListBulletPseudo;
 
   // Special attribute atoms
   static nsIAtom* _baseHref;
@@ -66,7 +67,6 @@ public:
   static nsIAtom* bordercolor;
   static nsIAtom* bottompadding;
   static nsIAtom* br;
-  static nsIAtom* bulletPseudo;
   static nsIAtom* button;
   static nsIAtom* buttonContentPseudo;
 

content/shared/public/nsHTMLAtoms.h

@@ -36,6 +36,7 @@ public:
   static void ReleaseAtoms();
 
   static nsIAtom* mozAnonymousBlock;
+  static nsIAtom* mozListBulletPseudo;
 
   // Special attribute atoms
   static nsIAtom* _baseHref;
@@ -66,7 +67,6 @@ public:
   static nsIAtom* bordercolor;
   static nsIAtom* bottompadding;
   static nsIAtom* br;
-  static nsIAtom* bulletPseudo;
   static nsIAtom* button;
   static nsIAtom* buttonContentPseudo;
 

content/shared/src/nsHTMLAtoms.cpp

@@ -20,6 +20,8 @@
 // XXX make this be autogenerated. doh!
 
 nsIAtom* nsHTMLAtoms::mozAnonymousBlock;
+nsIAtom* nsHTMLAtoms::mozListBulletPseudo;
+
 nsIAtom* nsHTMLAtoms::_baseHref;
 nsIAtom* nsHTMLAtoms::_baseTarget;
 nsIAtom* nsHTMLAtoms::a;
@@ -45,7 +47,6 @@ nsIAtom* nsHTMLAtoms::border;
 nsIAtom* nsHTMLAtoms::bordercolor;
 nsIAtom* nsHTMLAtoms::bottompadding;
 nsIAtom* nsHTMLAtoms::br;
-nsIAtom* nsHTMLAtoms::bulletPseudo;
 nsIAtom* nsHTMLAtoms::button;
 nsIAtom* nsHTMLAtoms::buttonContentPseudo;
 nsIAtom* nsHTMLAtoms::caption;
@@ -276,6 +277,7 @@ void nsHTMLAtoms::AddrefAtoms()
 {
   if (0 == gRefCnt) {
     mozAnonymousBlock = NS_NewAtom(":-moz-anonymous-block");
+    mozListBulletPseudo = NS_NewAtom(":-moz-list-bullet");
 
     _baseHref = NS_NewAtom(NS_HTML_BASE_HREF);
     _baseTarget = NS_NewAtom(NS_HTML_BASE_TARGET);
@@ -302,7 +304,6 @@ void nsHTMLAtoms::AddrefAtoms()
     bordercolor = NS_NewAtom("bordercolor");
     bottompadding = NS_NewAtom("bottompadding");
     br = NS_NewAtom("br");
-    bulletPseudo = NS_NewAtom(":bullet");
     button = NS_NewAtom("button");
     buttonContentPseudo = NS_NewAtom(":button-content");
     caption = NS_NewAtom("caption");
@@ -534,6 +535,8 @@ void nsHTMLAtoms::ReleaseAtoms()
   NS_PRECONDITION(gRefCnt != 0, "bad release atoms");
   if (--gRefCnt == 0) {
     NS_RELEASE(mozAnonymousBlock);
+    NS_RELEASE(mozListBulletPseudo);
+
     NS_RELEASE(_baseHref);
     NS_RELEASE(_baseTarget);
     NS_RELEASE(a);
@@ -556,7 +559,6 @@ void nsHTMLAtoms::ReleaseAtoms()
     NS_RELEASE(bordercolor);
     NS_RELEASE(bottompadding);
     NS_RELEASE(br);
-    NS_RELEASE(bulletPseudo);
     NS_RELEASE(button);
     NS_RELEASE(buttonContentPseudo);
     NS_RELEASE(caption);

layout/html/base/src/nsHTMLAtoms.cpp

@@ -20,6 +20,8 @@
 // XXX make this be autogenerated. doh!
 
 nsIAtom* nsHTMLAtoms::mozAnonymousBlock;
+nsIAtom* nsHTMLAtoms::mozListBulletPseudo;
+
 nsIAtom* nsHTMLAtoms::_baseHref;
 nsIAtom* nsHTMLAtoms::_baseTarget;
 nsIAtom* nsHTMLAtoms::a;
@@ -45,7 +47,6 @@ nsIAtom* nsHTMLAtoms::border;
 nsIAtom* nsHTMLAtoms::bordercolor;
 nsIAtom* nsHTMLAtoms::bottompadding;
 nsIAtom* nsHTMLAtoms::br;
-nsIAtom* nsHTMLAtoms::bulletPseudo;
 nsIAtom* nsHTMLAtoms::button;
 nsIAtom* nsHTMLAtoms::buttonContentPseudo;
 nsIAtom* nsHTMLAtoms::caption;
@@ -276,6 +277,7 @@ void nsHTMLAtoms::AddrefAtoms()
 {
   if (0 == gRefCnt) {
     mozAnonymousBlock = NS_NewAtom(":-moz-anonymous-block");
+    mozListBulletPseudo = NS_NewAtom(":-moz-list-bullet");
 
     _baseHref = NS_NewAtom(NS_HTML_BASE_HREF);
     _baseTarget = NS_NewAtom(NS_HTML_BASE_TARGET);
@@ -302,7 +304,6 @@ void nsHTMLAtoms::AddrefAtoms()
     bordercolor = NS_NewAtom("bordercolor");
     bottompadding = NS_NewAtom("bottompadding");
     br = NS_NewAtom("br");
-    bulletPseudo = NS_NewAtom(":bullet");
     button = NS_NewAtom("button");
     buttonContentPseudo = NS_NewAtom(":button-content");
     caption = NS_NewAtom("caption");
@@ -534,6 +535,8 @@ void nsHTMLAtoms::ReleaseAtoms()
   NS_PRECONDITION(gRefCnt != 0, "bad release atoms");
   if (--gRefCnt == 0) {
     NS_RELEASE(mozAnonymousBlock);
+    NS_RELEASE(mozListBulletPseudo);
+
     NS_RELEASE(_baseHref);
     NS_RELEASE(_baseTarget);
     NS_RELEASE(a);
@@ -556,7 +559,6 @@ void nsHTMLAtoms::ReleaseAtoms()
     NS_RELEASE(bordercolor);
     NS_RELEASE(bottompadding);
     NS_RELEASE(br);
-    NS_RELEASE(bulletPseudo);
     NS_RELEASE(button);
     NS_RELEASE(buttonContentPseudo);
     NS_RELEASE(caption);

layout/html/base/src/nsHTMLAtoms.h

@@ -36,6 +36,7 @@ public:
   static void ReleaseAtoms();
 
   static nsIAtom* mozAnonymousBlock;
+  static nsIAtom* mozListBulletPseudo;
 
   // Special attribute atoms
   static nsIAtom* _baseHref;
@@ -66,7 +67,6 @@ public:
   static nsIAtom* bordercolor;
   static nsIAtom* bottompadding;
   static nsIAtom* br;
-  static nsIAtom* bulletPseudo;
   static nsIAtom* button;
   static nsIAtom* buttonContentPseudo;
 

layout/html/document/src/ua.css

@@ -308,8 +308,9 @@ fieldset {
 
 /* lists */
 
-:bullet {
+:-moz-list-bullet {
   display: inline;
+  vertical-align: baseline;
   margin-right: 8px;
 }
 

layout/style/ua.css

@@ -308,8 +308,9 @@ fieldset {
 
 /* lists */
 
-:bullet {
+:-moz-list-bullet {
   display: inline;
+  vertical-align: baseline;
   margin-right: 8px;
 }