diff --git a/mozilla/editor/composer/src/res/EditorOverride.css b/mozilla/editor/composer/src/res/EditorOverride.css
index 9ea9f2f5e5a..aeb7db46f29 100644
--- a/mozilla/editor/composer/src/res/EditorOverride.css
+++ b/mozilla/editor/composer/src/res/EditorOverride.css
@@ -95,7 +95,7 @@ label {
     -moz-user-select: all !important;
 }
 
-:-moz-display-comboboxcontrol-frame {
+::-moz-display-comboboxcontrol-frame {
   -moz-user-select: text !important;
 }
 
diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp
index 5171d6279ff..16a81f3f05f 100644
--- a/mozilla/layout/base/nsPresShell.cpp
+++ b/mozilla/layout/base/nsPresShell.cpp
@@ -2509,16 +2509,16 @@ nsresult PresShell::SetPrefFocusRules(void)
         NS_ENSURE_SUCCESS(result, result);
         if (focusRingWidth != 1) {
           // If the focus ring width is different from the default, fix buttons with rings
-          strRule.Assign(NS_LITERAL_STRING("button:-moz-focus-inner, input[type=\"reset\"]:-moz-focus-inner,"));
-          strRule.Append(NS_LITERAL_STRING("input[type=\"button\"]:-moz-focus-inner, "));
-          strRule.Append(NS_LITERAL_STRING("input[type=\"submit\"]:-moz-focus-inner { padding: 1px 2px 1px 2px; border: "));
+          strRule.Assign(NS_LITERAL_STRING("button::-moz-focus-inner, input[type=\"reset\"]::-moz-focus-inner,"));
+          strRule.Append(NS_LITERAL_STRING("input[type=\"button\"]::-moz-focus-inner, "));
+          strRule.Append(NS_LITERAL_STRING("input[type=\"submit\"]::-moz-focus-inner { padding: 1px 2px 1px 2px; border: "));
           strRule.AppendInt(focusRingWidth);
           strRule.Append(NS_LITERAL_STRING("px dotted transparent !important; } "));
           result = sheet->InsertRule(strRule,0,&index);
           NS_ENSURE_SUCCESS(result, result);
           
-          strRule.Assign(NS_LITERAL_STRING("button:focus:-moz-focus-inner, input[type=\"reset\"]:focus:-moz-focus-inner,"));
-          strRule.Append(NS_LITERAL_STRING("input[type=\"button\"]:focus:-moz-focus-inner, input[type=\"submit\"]:focus:-moz-focus-inner {"));
+          strRule.Assign(NS_LITERAL_STRING("button:focus::-moz-focus-inner, input[type=\"reset\"]:focus::-moz-focus-inner,"));
+          strRule.Append(NS_LITERAL_STRING("input[type=\"button\"]:focus::-moz-focus-inner, input[type=\"submit\"]:focus::-moz-focus-inner {"));
           strRule.Append(NS_LITERAL_STRING("border-color: ButtonText !important; }"));
           result = sheet->InsertRule(strRule,0,&index);
         }
@@ -4825,8 +4825,8 @@ PresShell::SetAnonymousContentFor(nsIContent* aContent, nsISupportsArray* aAnony
       oldAnonymousElements->Count(&count);
       
       while (PRInt32(--count) >= 0) {
-        nsCOMPtr<nsISupports> isupports( getter_AddRefs(oldAnonymousElements->ElementAt(count)) );
-        nsCOMPtr<nsIContent> content( do_QueryInterface(isupports) );
+        nsCOMPtr<nsIContent> content = do_QueryElementAt(oldAnonymousElements,
+                                                         count);
         NS_ASSERTION(content != nsnull, "not an nsIContent");
         if (! content)
           continue;
@@ -4865,8 +4865,7 @@ ClearDocumentEnumerator(nsHashKey* aKey, void* aData, void* aClosure)
   PRUint32 count;
   anonymousElements->Count(&count);
   while (PRInt32(--count) >= 0) {
-    nsCOMPtr<nsISupports> isupports( getter_AddRefs(anonymousElements->ElementAt(count)) );
-    nsCOMPtr<nsIContent> content( do_QueryInterface(isupports) );
+    nsCOMPtr<nsIContent> content = do_QueryElementAt(anonymousElements, count);
     NS_ASSERTION(content != nsnull, "not an nsIContent");
     if (! content)
       continue;
diff --git a/mozilla/layout/forms/resources/content/xbl-forms.css b/mozilla/layout/forms/resources/content/xbl-forms.css
index 6a3a57aa24a..835c928af4d 100644
--- a/mozilla/layout/forms/resources/content/xbl-forms.css
+++ b/mozilla/layout/forms/resources/content/xbl-forms.css
@@ -159,8 +159,9 @@ input[type="file"] > input[type="button"] {
  * The following rules are copied from forms.css, for widgets that aren't yet
  * defined in XBL.
  */
-*|*:-moz-fieldset-content {
+*|*::-moz-fieldset-content {
   display: block;
+  height: inherit;   /* Need this so percentage heights of kids work right */
 }
 
 form {
@@ -224,7 +225,7 @@ textarea > scrollbar {
   cursor: default;
 }
 
-*|*:-moz-singleline-textcontrol-frame {
+*|*::-moz-singleline-textcontrol-frame {
   overflow: hidden;
   white-space: nowrap;
   background-color: inherit;
@@ -236,7 +237,7 @@ textarea[disabled],
 option[disabled],
 optgroup[disabled],
 select[disabled],
-select[disabled]:-moz-display-comboboxcontrol-frame {
+select[disabled]::-moz-display-comboboxcontrol-frame {
   color: GrayText;
   cursor: default;
 }
@@ -281,7 +282,7 @@ input[type="file"] > input[type="button"] {
   height: inherit;
 }
 
-input[type="file"] > input[type="button"]:-moz-focus-inner
+input[type="file"] > input[type="button"]::-moz-focus-inner
  {
   padding: 0px 2px 0px 2px;
   border: 1px dotted transparent;
diff --git a/mozilla/layout/html/base/src/nsPresShell.cpp b/mozilla/layout/html/base/src/nsPresShell.cpp
index 5171d6279ff..16a81f3f05f 100644
--- a/mozilla/layout/html/base/src/nsPresShell.cpp
+++ b/mozilla/layout/html/base/src/nsPresShell.cpp
@@ -2509,16 +2509,16 @@ nsresult PresShell::SetPrefFocusRules(void)
         NS_ENSURE_SUCCESS(result, result);
         if (focusRingWidth != 1) {
           // If the focus ring width is different from the default, fix buttons with rings
-          strRule.Assign(NS_LITERAL_STRING("button:-moz-focus-inner, input[type=\"reset\"]:-moz-focus-inner,"));
-          strRule.Append(NS_LITERAL_STRING("input[type=\"button\"]:-moz-focus-inner, "));
-          strRule.Append(NS_LITERAL_STRING("input[type=\"submit\"]:-moz-focus-inner { padding: 1px 2px 1px 2px; border: "));
+          strRule.Assign(NS_LITERAL_STRING("button::-moz-focus-inner, input[type=\"reset\"]::-moz-focus-inner,"));
+          strRule.Append(NS_LITERAL_STRING("input[type=\"button\"]::-moz-focus-inner, "));
+          strRule.Append(NS_LITERAL_STRING("input[type=\"submit\"]::-moz-focus-inner { padding: 1px 2px 1px 2px; border: "));
           strRule.AppendInt(focusRingWidth);
           strRule.Append(NS_LITERAL_STRING("px dotted transparent !important; } "));
           result = sheet->InsertRule(strRule,0,&index);
           NS_ENSURE_SUCCESS(result, result);
           
-          strRule.Assign(NS_LITERAL_STRING("button:focus:-moz-focus-inner, input[type=\"reset\"]:focus:-moz-focus-inner,"));
-          strRule.Append(NS_LITERAL_STRING("input[type=\"button\"]:focus:-moz-focus-inner, input[type=\"submit\"]:focus:-moz-focus-inner {"));
+          strRule.Assign(NS_LITERAL_STRING("button:focus::-moz-focus-inner, input[type=\"reset\"]:focus::-moz-focus-inner,"));
+          strRule.Append(NS_LITERAL_STRING("input[type=\"button\"]:focus::-moz-focus-inner, input[type=\"submit\"]:focus::-moz-focus-inner {"));
           strRule.Append(NS_LITERAL_STRING("border-color: ButtonText !important; }"));
           result = sheet->InsertRule(strRule,0,&index);
         }
@@ -4825,8 +4825,8 @@ PresShell::SetAnonymousContentFor(nsIContent* aContent, nsISupportsArray* aAnony
       oldAnonymousElements->Count(&count);
       
       while (PRInt32(--count) >= 0) {
-        nsCOMPtr<nsISupports> isupports( getter_AddRefs(oldAnonymousElements->ElementAt(count)) );
-        nsCOMPtr<nsIContent> content( do_QueryInterface(isupports) );
+        nsCOMPtr<nsIContent> content = do_QueryElementAt(oldAnonymousElements,
+                                                         count);
         NS_ASSERTION(content != nsnull, "not an nsIContent");
         if (! content)
           continue;
@@ -4865,8 +4865,7 @@ ClearDocumentEnumerator(nsHashKey* aKey, void* aData, void* aClosure)
   PRUint32 count;
   anonymousElements->Count(&count);
   while (PRInt32(--count) >= 0) {
-    nsCOMPtr<nsISupports> isupports( getter_AddRefs(anonymousElements->ElementAt(count)) );
-    nsCOMPtr<nsIContent> content( do_QueryInterface(isupports) );
+    nsCOMPtr<nsIContent> content = do_QueryElementAt(anonymousElements, count);
     NS_ASSERTION(content != nsnull, "not an nsIContent");
     if (! content)
       continue;
diff --git a/mozilla/layout/html/document/src/forms.css b/mozilla/layout/html/document/src/forms.css
index 5d642b7420f..7fda907e92f 100644
--- a/mozilla/layout/html/document/src/forms.css
+++ b/mozilla/layout/html/document/src/forms.css
@@ -42,7 +42,7 @@
 @namespace url(http://www.w3.org/1999/xhtml); /* set default namespace to HTML */
 @namespace xul url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-*|*:-moz-fieldset-content {
+*|*::-moz-fieldset-content {
   display: block;
   height: inherit;   /* Need this so percentage heights of kids work right */
 }
@@ -119,7 +119,7 @@ textarea > scrollbar {
   cursor: default;
 }
 
-*|*:-moz-singleline-textcontrol-frame {
+*|*::-moz-singleline-textcontrol-frame {
   overflow: hidden;
   white-space: nowrap;
   background-color: inherit;
@@ -179,12 +179,12 @@ select[size] {
    -moz-appearance: listbox;
 }
 
-select:-moz-dummy-option { 
+select::-moz-dummy-option { 
   visibility: hidden; 
   content: "XX"; /* demo 8, edge case test 1 */
 }
 
-*|*:-moz-display-comboboxcontrol-frame {
+*|*::-moz-display-comboboxcontrol-frame {
   overflow: hidden;
   /* This top/bottom padding plus the combobox top/bottom border need to
      add up to the top/bottom borderpadding of text inputs and buttons */ 
@@ -234,7 +234,7 @@ optgroup:before {
   content: attr(label);
 }
 
-*|*:-moz-dropdown-list {
+*|*::-moz-dropdown-list {
   z-index: 2147483647;
   background-color: inherit;
   -moz-user-select: none;
@@ -380,7 +380,7 @@ input[type="radio"]:hover:active {
   border-style: inset !important;
 }
 
-*|*:-moz-radio {
+*|*::-moz-radio {
   width: 4px;
   height: 4px;
   background-color: -moz-FieldText ! important;
@@ -419,7 +419,7 @@ button {
   white-space: normal;  
 }
 
-*|*:-moz-button-content {
+*|*::-moz-button-content {
   display: block;
   text-align: center;
 }
@@ -432,20 +432,20 @@ input[type="submit"]:active:hover {
   border-style: inset;
 }
 
-button:-moz-focus-inner,
-input[type="reset"]:-moz-focus-inner,
-input[type="button"]:-moz-focus-inner,
-input[type="submit"]:-moz-focus-inner,
-input[type="file"] > input[type="button"]:-moz-focus-inner {
+button::-moz-focus-inner,
+input[type="reset"]::-moz-focus-inner,
+input[type="button"]::-moz-focus-inner,
+input[type="submit"]::-moz-focus-inner,
+input[type="file"] > input[type="button"]::-moz-focus-inner {
   padding: 0px 2px 0px 2px;
   border: 1px dotted transparent;
 }
 
-button:focus:-moz-focus-inner,
-input[type="reset"]:focus:-moz-focus-inner,
-input[type="button"]:focus:-moz-focus-inner,
-input[type="submit"]:focus:-moz-focus-inner,
-input[type="file"] > input[type="button"]:focus:-moz-focus-inner {
+button:focus::-moz-focus-inner,
+input[type="reset"]:focus::-moz-focus-inner,
+input[type="button"]:focus::-moz-focus-inner,
+input[type="submit"]:focus::-moz-focus-inner,
+input[type="file"] > input[type="button"]:focus::-moz-focus-inner {
   border-color: ButtonText;
 }
 
diff --git a/mozilla/layout/html/document/src/mac/platform-forms.css b/mozilla/layout/html/document/src/mac/platform-forms.css
index dbbc9fb033e..7693818428c 100644
--- a/mozilla/layout/html/document/src/mac/platform-forms.css
+++ b/mozilla/layout/html/document/src/mac/platform-forms.css
@@ -120,11 +120,11 @@ input[type="submit"]:active:hover {
   padding: 0;
 }
 
-button:-moz-focus-inner,
-input[type="reset"]:-moz-focus-inner,
-input[type="button"]:-moz-focus-inner,
-input[type="submit"]:-moz-focus-inner,
-input[type="file"] > input[type="button"]:-moz-focus-inner {
+button::-moz-focus-inner,
+input[type="reset"]::-moz-focus-inner,
+input[type="button"]::-moz-focus-inner,
+input[type="submit"]::-moz-focus-inner,
+input[type="file"] > input[type="button"]::-moz-focus-inner {
   padding: 0;
   border: 0;
 }
diff --git a/mozilla/layout/html/document/src/quirk.css b/mozilla/layout/html/document/src/quirk.css
index 592390c5e6f..a2dac8aa7b7 100644
--- a/mozilla/layout/html/document/src/quirk.css
+++ b/mozilla/layout/html/document/src/quirk.css
@@ -89,7 +89,7 @@ li > ol:first-node {
 /* Quirk: prevent bullet from resizing with the list item
  *   see bug 97351
  */
-li:-moz-list-bullet {
+li::-moz-list-bullet {
   font-size: -moz-initial;
 }
 
diff --git a/mozilla/layout/html/document/src/ua.css b/mozilla/layout/html/document/src/ua.css
index e5407ee23e4..b544966ceed 100644
--- a/mozilla/layout/html/document/src/ua.css
+++ b/mozilla/layout/html/document/src/ua.css
@@ -46,12 +46,12 @@
 
 /* Tables */
 
-*|*:-moz-table {
+*|*::-moz-table {
   display: table !important;
   -moz-box-sizing: border-box; /* XXX do we really want this? */
 }
 
-*|*:-moz-table-outer {
+*|*::-moz-table-outer {
   display: table !important;
   margin: 0;
   padding: 0;
@@ -76,34 +76,35 @@
   -moz-opacity: inherit;
   page-break-before: inherit;
   page-break-after: inherit;
+  table-layout: inherit;
 }
 
-*|*:-moz-table-row {
+*|*::-moz-table-row {
   display: table-row !important;
 }
 
-/* The :-moz-table-column pseudo-element is for extra columns at the end 
+/* The ::-moz-table-column pseudo-element is for extra columns at the end 
    of a table. */
-*|*:-moz-table-column {
+*|*::-moz-table-column {
   display: table-column !important;
 }
 
-*|*:-moz-table-column-group {
+*|*::-moz-table-column-group {
   display: table-column-group !important;
 }
  
-*|*:-moz-table-row-group {
+*|*::-moz-table-row-group {
   display: table-row-group !important;
 }
 
-*|*:-moz-table-cell {
+*|*::-moz-table-cell {
   display: table-cell !important;
   white-space: inherit;
 }
 
 /* Lists */
 
-*|*:-moz-list-bullet, *|*:-moz-list-number {
+*|*::-moz-list-bullet, *|*::-moz-list-number {
   display: inline;
   vertical-align: baseline;
   margin-right: 8px;
@@ -126,20 +127,20 @@
 
 /* Miscellaneous */
 
-*|*:-moz-anonymous-block, *|*:-moz-cell-content {
+*|*::-moz-anonymous-block, *|*::-moz-cell-content {
   display: block !important;
 }
 
-*|*:-moz-viewport, *|*:-moz-viewport-scroll, *|*:-moz-canvas {
+*|*::-moz-viewport, *|*::-moz-viewport-scroll, *|*::-moz-canvas {
   display: block !important;
   background-color: inherit;
 }
 
-*|*:-moz-viewport-scroll {
+*|*::-moz-viewport-scroll {
   overflow: auto;
 }
 
-*|*:-moz-scrolled-content { 
+*|*::-moz-scrolled-content { 
   /* e.g., text inputs, select boxes */
   background: inherit;
   padding: inherit;
@@ -147,20 +148,20 @@
   -moz-box-orient: inherit;
 }
 
-*|*:-moz-page, *|*:-moz-page-sequence {
+*|*::-moz-page, *|*::-moz-page-sequence {
   display: block !important;
   background: transparent;
 }
 
-*|*:-moz-pagecontent {
+*|*::-moz-pagecontent {
   display: block !important;
 }
 
-*|*:-moz-pagebreak {
+*|*::-moz-pagebreak {
   display: -moz-page-break !important;
 }
 
-*|*:-moz-anonymous-positioned-block {
+*|*::-moz-anonymous-positioned-block {
   display: block !important;
   position: relative;
   top: inherit; 
@@ -172,7 +173,7 @@
   -moz-opacity: inherit;
 }
 
-*|*:-moz-gc-wrapper-block {
+*|*::-moz-gc-wrapper-block {
   display: block !important;
 }
 
@@ -184,7 +185,7 @@
     cursor: default !important;
   }
 
-  *|*:-moz-viewport, *|*:-moz-viewport-scroll, *|*:-moz-canvas {
+  *|*::-moz-viewport, *|*::-moz-viewport-scroll, *|*::-moz-canvas {
     background-color: #737373 !important;
   }
 
diff --git a/mozilla/layout/html/forms/resources/content/xbl-forms.css b/mozilla/layout/html/forms/resources/content/xbl-forms.css
index 6a3a57aa24a..835c928af4d 100644
--- a/mozilla/layout/html/forms/resources/content/xbl-forms.css
+++ b/mozilla/layout/html/forms/resources/content/xbl-forms.css
@@ -159,8 +159,9 @@ input[type="file"] > input[type="button"] {
  * The following rules are copied from forms.css, for widgets that aren't yet
  * defined in XBL.
  */
-*|*:-moz-fieldset-content {
+*|*::-moz-fieldset-content {
   display: block;
+  height: inherit;   /* Need this so percentage heights of kids work right */
 }
 
 form {
@@ -224,7 +225,7 @@ textarea > scrollbar {
   cursor: default;
 }
 
-*|*:-moz-singleline-textcontrol-frame {
+*|*::-moz-singleline-textcontrol-frame {
   overflow: hidden;
   white-space: nowrap;
   background-color: inherit;
@@ -236,7 +237,7 @@ textarea[disabled],
 option[disabled],
 optgroup[disabled],
 select[disabled],
-select[disabled]:-moz-display-comboboxcontrol-frame {
+select[disabled]::-moz-display-comboboxcontrol-frame {
   color: GrayText;
   cursor: default;
 }
@@ -281,7 +282,7 @@ input[type="file"] > input[type="button"] {
   height: inherit;
 }
 
-input[type="file"] > input[type="button"]:-moz-focus-inner
+input[type="file"] > input[type="button"]::-moz-focus-inner
  {
   padding: 0px 2px 0px 2px;
   border: 1px dotted transparent;
diff --git a/mozilla/layout/html/table/src/nsTableOuterFrame.cpp b/mozilla/layout/html/table/src/nsTableOuterFrame.cpp
index 974a9554c70..ae903239c24 100644
--- a/mozilla/layout/html/table/src/nsTableOuterFrame.cpp
+++ b/mozilla/layout/html/table/src/nsTableOuterFrame.cpp
@@ -409,12 +409,11 @@ nsTableOuterFrame::GetParentStyleContextFrame(nsIPresContext* aPresContext,
   // data by giving the table frame the style context associated with
   // the table content node and creating a style context for the outer
   // frame that is a *child* of the table frame's style context,
-  // matching the :table-outer (should be :-moz-table-outer!)
-  // pseudo-element.  html.css has a rule that causes that
-  // pseudo-element (and thus the outer table) to inherit *some* style
-  // properties from the table frame.  The children of the table inherit
-  // directly from the inner table, and the outer table's style context
-  // is a leaf.
+  // matching the ::-moz-table-outer pseudo-element.  html.css has a
+  // rule that causes that pseudo-element (and thus the outer table)
+  // to inherit *some* style properties from the table frame.  The
+  // children of the table inherit directly from the inner table, and
+  // the outer table's style context is a leaf.
 
   if (!mInnerTableFrame) {
     *aProviderFrame = this;
diff --git a/mozilla/layout/html/tests/formctls/bugs/bug46099.html b/mozilla/layout/html/tests/formctls/bugs/bug46099.html
index 43d0629e1b1..3ead393b52b 100644
--- a/mozilla/layout/html/tests/formctls/bugs/bug46099.html
+++ b/mozilla/layout/html/tests/formctls/bugs/bug46099.html
@@ -3,13 +3,13 @@
 <HEAD>
 <TITLE></TITLE>
 <STYLE>
-*:focus:-moz-display-comboboxcontrol-frame {
+*:focus::-moz-display-comboboxcontrol-frame {
 	background-color: #FFCC99 !important;
 }
 </STYLE>
 </HEAD>
 <BODY>
-<H3>Very strange effect when using *:focus:-moz-display-comboboxcontrol-frame</H3>
+<H3>Very strange effect when using *:focus::-moz-display-comboboxcontrol-frame</H3>
 <P>Move the pointer into and out of the table</P>
 <P>Move the pointer over the controls in the second table and compare. The only difference between both tables is, that the first one has "align=left"</P>
 	<TABLE border align="left">
diff --git a/mozilla/layout/style/forms.css b/mozilla/layout/style/forms.css
index 5d642b7420f..7fda907e92f 100644
--- a/mozilla/layout/style/forms.css
+++ b/mozilla/layout/style/forms.css
@@ -42,7 +42,7 @@
 @namespace url(http://www.w3.org/1999/xhtml); /* set default namespace to HTML */
 @namespace xul url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-*|*:-moz-fieldset-content {
+*|*::-moz-fieldset-content {
   display: block;
   height: inherit;   /* Need this so percentage heights of kids work right */
 }
@@ -119,7 +119,7 @@ textarea > scrollbar {
   cursor: default;
 }
 
-*|*:-moz-singleline-textcontrol-frame {
+*|*::-moz-singleline-textcontrol-frame {
   overflow: hidden;
   white-space: nowrap;
   background-color: inherit;
@@ -179,12 +179,12 @@ select[size] {
    -moz-appearance: listbox;
 }
 
-select:-moz-dummy-option { 
+select::-moz-dummy-option { 
   visibility: hidden; 
   content: "XX"; /* demo 8, edge case test 1 */
 }
 
-*|*:-moz-display-comboboxcontrol-frame {
+*|*::-moz-display-comboboxcontrol-frame {
   overflow: hidden;
   /* This top/bottom padding plus the combobox top/bottom border need to
      add up to the top/bottom borderpadding of text inputs and buttons */ 
@@ -234,7 +234,7 @@ optgroup:before {
   content: attr(label);
 }
 
-*|*:-moz-dropdown-list {
+*|*::-moz-dropdown-list {
   z-index: 2147483647;
   background-color: inherit;
   -moz-user-select: none;
@@ -380,7 +380,7 @@ input[type="radio"]:hover:active {
   border-style: inset !important;
 }
 
-*|*:-moz-radio {
+*|*::-moz-radio {
   width: 4px;
   height: 4px;
   background-color: -moz-FieldText ! important;
@@ -419,7 +419,7 @@ button {
   white-space: normal;  
 }
 
-*|*:-moz-button-content {
+*|*::-moz-button-content {
   display: block;
   text-align: center;
 }
@@ -432,20 +432,20 @@ input[type="submit"]:active:hover {
   border-style: inset;
 }
 
-button:-moz-focus-inner,
-input[type="reset"]:-moz-focus-inner,
-input[type="button"]:-moz-focus-inner,
-input[type="submit"]:-moz-focus-inner,
-input[type="file"] > input[type="button"]:-moz-focus-inner {
+button::-moz-focus-inner,
+input[type="reset"]::-moz-focus-inner,
+input[type="button"]::-moz-focus-inner,
+input[type="submit"]::-moz-focus-inner,
+input[type="file"] > input[type="button"]::-moz-focus-inner {
   padding: 0px 2px 0px 2px;
   border: 1px dotted transparent;
 }
 
-button:focus:-moz-focus-inner,
-input[type="reset"]:focus:-moz-focus-inner,
-input[type="button"]:focus:-moz-focus-inner,
-input[type="submit"]:focus:-moz-focus-inner,
-input[type="file"] > input[type="button"]:focus:-moz-focus-inner {
+button:focus::-moz-focus-inner,
+input[type="reset"]:focus::-moz-focus-inner,
+input[type="button"]:focus::-moz-focus-inner,
+input[type="submit"]:focus::-moz-focus-inner,
+input[type="file"] > input[type="button"]:focus::-moz-focus-inner {
   border-color: ButtonText;
 }
 
diff --git a/mozilla/layout/style/quirk.css b/mozilla/layout/style/quirk.css
index 592390c5e6f..a2dac8aa7b7 100644
--- a/mozilla/layout/style/quirk.css
+++ b/mozilla/layout/style/quirk.css
@@ -89,7 +89,7 @@ li > ol:first-node {
 /* Quirk: prevent bullet from resizing with the list item
  *   see bug 97351
  */
-li:-moz-list-bullet {
+li::-moz-list-bullet {
   font-size: -moz-initial;
 }
 
diff --git a/mozilla/layout/style/ua.css b/mozilla/layout/style/ua.css
index e5407ee23e4..b544966ceed 100644
--- a/mozilla/layout/style/ua.css
+++ b/mozilla/layout/style/ua.css
@@ -46,12 +46,12 @@
 
 /* Tables */
 
-*|*:-moz-table {
+*|*::-moz-table {
   display: table !important;
   -moz-box-sizing: border-box; /* XXX do we really want this? */
 }
 
-*|*:-moz-table-outer {
+*|*::-moz-table-outer {
   display: table !important;
   margin: 0;
   padding: 0;
@@ -76,34 +76,35 @@
   -moz-opacity: inherit;
   page-break-before: inherit;
   page-break-after: inherit;
+  table-layout: inherit;
 }
 
-*|*:-moz-table-row {
+*|*::-moz-table-row {
   display: table-row !important;
 }
 
-/* The :-moz-table-column pseudo-element is for extra columns at the end 
+/* The ::-moz-table-column pseudo-element is for extra columns at the end 
    of a table. */
-*|*:-moz-table-column {
+*|*::-moz-table-column {
   display: table-column !important;
 }
 
-*|*:-moz-table-column-group {
+*|*::-moz-table-column-group {
   display: table-column-group !important;
 }
  
-*|*:-moz-table-row-group {
+*|*::-moz-table-row-group {
   display: table-row-group !important;
 }
 
-*|*:-moz-table-cell {
+*|*::-moz-table-cell {
   display: table-cell !important;
   white-space: inherit;
 }
 
 /* Lists */
 
-*|*:-moz-list-bullet, *|*:-moz-list-number {
+*|*::-moz-list-bullet, *|*::-moz-list-number {
   display: inline;
   vertical-align: baseline;
   margin-right: 8px;
@@ -126,20 +127,20 @@
 
 /* Miscellaneous */
 
-*|*:-moz-anonymous-block, *|*:-moz-cell-content {
+*|*::-moz-anonymous-block, *|*::-moz-cell-content {
   display: block !important;
 }
 
-*|*:-moz-viewport, *|*:-moz-viewport-scroll, *|*:-moz-canvas {
+*|*::-moz-viewport, *|*::-moz-viewport-scroll, *|*::-moz-canvas {
   display: block !important;
   background-color: inherit;
 }
 
-*|*:-moz-viewport-scroll {
+*|*::-moz-viewport-scroll {
   overflow: auto;
 }
 
-*|*:-moz-scrolled-content { 
+*|*::-moz-scrolled-content { 
   /* e.g., text inputs, select boxes */
   background: inherit;
   padding: inherit;
@@ -147,20 +148,20 @@
   -moz-box-orient: inherit;
 }
 
-*|*:-moz-page, *|*:-moz-page-sequence {
+*|*::-moz-page, *|*::-moz-page-sequence {
   display: block !important;
   background: transparent;
 }
 
-*|*:-moz-pagecontent {
+*|*::-moz-pagecontent {
   display: block !important;
 }
 
-*|*:-moz-pagebreak {
+*|*::-moz-pagebreak {
   display: -moz-page-break !important;
 }
 
-*|*:-moz-anonymous-positioned-block {
+*|*::-moz-anonymous-positioned-block {
   display: block !important;
   position: relative;
   top: inherit; 
@@ -172,7 +173,7 @@
   -moz-opacity: inherit;
 }
 
-*|*:-moz-gc-wrapper-block {
+*|*::-moz-gc-wrapper-block {
   display: block !important;
 }
 
@@ -184,7 +185,7 @@
     cursor: default !important;
   }
 
-  *|*:-moz-viewport, *|*:-moz-viewport-scroll, *|*:-moz-canvas {
+  *|*::-moz-viewport, *|*::-moz-viewport-scroll, *|*::-moz-canvas {
     background-color: #737373 !important;
   }
 
diff --git a/mozilla/layout/tables/nsTableOuterFrame.cpp b/mozilla/layout/tables/nsTableOuterFrame.cpp
index 974a9554c70..ae903239c24 100644
--- a/mozilla/layout/tables/nsTableOuterFrame.cpp
+++ b/mozilla/layout/tables/nsTableOuterFrame.cpp
@@ -409,12 +409,11 @@ nsTableOuterFrame::GetParentStyleContextFrame(nsIPresContext* aPresContext,
   // data by giving the table frame the style context associated with
   // the table content node and creating a style context for the outer
   // frame that is a *child* of the table frame's style context,
-  // matching the :table-outer (should be :-moz-table-outer!)
-  // pseudo-element.  html.css has a rule that causes that
-  // pseudo-element (and thus the outer table) to inherit *some* style
-  // properties from the table frame.  The children of the table inherit
-  // directly from the inner table, and the outer table's style context
-  // is a leaf.
+  // matching the ::-moz-table-outer pseudo-element.  html.css has a
+  // rule that causes that pseudo-element (and thus the outer table)
+  // to inherit *some* style properties from the table frame.  The
+  // children of the table inherit directly from the inner table, and
+  // the outer table's style context is a leaf.
 
   if (!mInnerTableFrame) {
     *aProviderFrame = this;
diff --git a/mozilla/webshell/tests/viewer/samples/aform.css b/mozilla/webshell/tests/viewer/samples/aform.css
index 72fee109c69..a19afda1169 100644
--- a/mozilla/webshell/tests/viewer/samples/aform.css
+++ b/mozilla/webshell/tests/viewer/samples/aform.css
@@ -16,7 +16,7 @@ input[type="radio"] {
  background-color:white;
 }
 
-:-moz-radio {
+::-moz-radio {
  -moz-border-radius:1px; 
  border: 2px solid black; 
 }
@@ -62,7 +62,7 @@ select[size="1"] option:checked {
   color: white;
 }
 
-:-moz-dropdown-list {
+::-moz-dropdown-list {
   border: 1px solid black;
   background-color:white;
 }
diff --git a/mozilla/webshell/tests/viewer/samples/bform.css b/mozilla/webshell/tests/viewer/samples/bform.css
index 0f15c95fba2..dc018463dbd 100644
--- a/mozilla/webshell/tests/viewer/samples/bform.css
+++ b/mozilla/webshell/tests/viewer/samples/bform.css
@@ -28,7 +28,7 @@ select {
   background-color:rgb(200, 200, 200);
 }
 
-:-moz-dropdown-list {
+::-moz-dropdown-list {
   border-color:black;
   background-color:rgb(200, 200, 200);
 }
diff --git a/mozilla/webshell/tests/viewer/samples/cform.css b/mozilla/webshell/tests/viewer/samples/cform.css
index 5c4bfde67e2..bd1d478e974 100644
--- a/mozilla/webshell/tests/viewer/samples/cform.css
+++ b/mozilla/webshell/tests/viewer/samples/cform.css
@@ -33,7 +33,7 @@ select {
   background-color:rgb(200, 200, 200);
 }
 
-:-moz-dropdown-list {
+::-moz-dropdown-list {
   border-color:black;
   background-color:rgb(200, 200, 200);
 }
diff --git a/mozilla/webshell/tests/viewer/samples/demoform.css b/mozilla/webshell/tests/viewer/samples/demoform.css
index 9dd90237df6..7390a6865e4 100644
--- a/mozilla/webshell/tests/viewer/samples/demoform.css
+++ b/mozilla/webshell/tests/viewer/samples/demoform.css
@@ -16,7 +16,7 @@ input[type="radio"] {
  -moz-border-radius:0;
 }
 
-:-moz-radio {
+::-moz-radio {
  width:8px;
  width:8px;
  background-color:yellow;
@@ -47,7 +47,7 @@ select {
   background-color:#0000cc;
 }
 
-:-moz-dropdown-list {
+::-moz-dropdown-list {
   background-color:#0000cc;
   border:4px inset green;
 }
diff --git a/mozilla/webshell/tests/viewer/samples/mozform.css b/mozilla/webshell/tests/viewer/samples/mozform.css
index 67c4325c879..c264e933ab9 100644
--- a/mozilla/webshell/tests/viewer/samples/mozform.css
+++ b/mozilla/webshell/tests/viewer/samples/mozform.css
@@ -36,7 +36,7 @@ input[type=radio]:hover {
   border : 2px solid black;
 }
 
-:-moz-radio {
+::-moz-radio {
   background-color:black;
   width:6px;
   height:6px;
@@ -78,7 +78,7 @@ input[type="button"][disabled]:active {
   padding: 1px;
 }
 
-input[type="button"]:-moz-focus-inner {
+input[type="button"]::-moz-focus-inner {
    padding-left  : 2px;
    padding-right : 2px;
    padding-top   : 1px;
@@ -86,7 +86,7 @@ input[type="button"]:-moz-focus-inner {
    margin: 0px;
 }
 
-input[type="button"]:focus:-moz-focus-inner {
+input[type="button"]:focus::-moz-focus-inner {
    padding-left  : 1px;
    padding-right : 1px;
    padding-top   : 0px;
@@ -137,7 +137,7 @@ button[disabled]:active {
   padding: 1px;
 }
 
-button:-moz-focus-inner {
+button::-moz-focus-inner {
    padding-left  : 2px;
    padding-right : 2px;
    padding-top   : 1px;
@@ -145,7 +145,7 @@ button:-moz-focus-inner {
    margin: 0px;
 }
 
-button:focus:-moz-focus-inner {
+button:focus::-moz-focus-inner {
    padding-left  : 1px;
    padding-right : 1px;
    padding-top   : 0px;
@@ -155,7 +155,7 @@ button:focus:-moz-focus-inner {
    border : 1px dotted black;
 }
 
-:-moz-dropdown-list {
+::-moz-dropdown-list {
   border-color:black;
   -moz-border-radius:4px;
   background-color:rgb(200, 200, 200);
diff --git a/mozilla/webshell/tests/viewer/samples/xulTest.css b/mozilla/webshell/tests/viewer/samples/xulTest.css
index f91b59d4779..6c6e87a73d6 100644
--- a/mozilla/webshell/tests/viewer/samples/xulTest.css
+++ b/mozilla/webshell/tests/viewer/samples/xulTest.css
@@ -110,19 +110,19 @@ titledbutton[pseudoclass~="active"]:-moz-outline {
    border : 1px solid black;
 }
  
-titledbutton:-moz-focus-inner {
+titledbutton::-moz-focus-inner {
 }
 
-titledbutton:-moz-focus-outer {
+titledbutton::-moz-focus-outer {
 }
 
 titledbutton[pseudoclass~="focus"] {
 }
 
-titledbutton[pseudoclass~="focus"]:-moz-focus-inner {
+titledbutton[pseudoclass~="focus"]::-moz-focus-inner {
 }
 
-titledbutton[pseudoclass~="focus"]:-moz-focus-outer {
+titledbutton[pseudoclass~="focus"]::-moz-focus-outer {
 }
 
 titledbutton[pseudoclass~="disabled"] {