diff --git a/mozilla/content/html/content/src/nsHTMLAtomList.h b/mozilla/content/html/content/src/nsHTMLAtomList.h
index bd7739cd67f..14c44aacf58 100644
--- a/mozilla/content/html/content/src/nsHTMLAtomList.h
+++ b/mozilla/content/html/content/src/nsHTMLAtomList.h
@@ -218,6 +218,7 @@ 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")
 HTML_ATOM(repeat, "repeat")
 HTML_ATOM(rev, "rev")
@@ -233,6 +234,7 @@ HTML_ATOM(scrolling, "scrolling")
 HTML_ATOM(select, "select")
 HTML_ATOM(selected, "selected")
 HTML_ATOM(selectedindex, "selectedindex")
+HTML_ATOM(setcookie, "set-cookie")
 HTML_ATOM(shape, "shape")
 HTML_ATOM(size, "size")
 HTML_ATOM(spacer, "spacer")
diff --git a/mozilla/content/shared/public/nsHTMLAtomList.h b/mozilla/content/shared/public/nsHTMLAtomList.h
index bd7739cd67f..14c44aacf58 100644
--- a/mozilla/content/shared/public/nsHTMLAtomList.h
+++ b/mozilla/content/shared/public/nsHTMLAtomList.h
@@ -218,6 +218,7 @@ 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")
 HTML_ATOM(repeat, "repeat")
 HTML_ATOM(rev, "rev")
@@ -233,6 +234,7 @@ HTML_ATOM(scrolling, "scrolling")
 HTML_ATOM(select, "select")
 HTML_ATOM(selected, "selected")
 HTML_ATOM(selectedindex, "selectedindex")
+HTML_ATOM(setcookie, "set-cookie")
 HTML_ATOM(shape, "shape")
 HTML_ATOM(size, "size")
 HTML_ATOM(spacer, "spacer")
diff --git a/mozilla/layout/generic/nsHTMLParts.h b/mozilla/layout/generic/nsHTMLParts.h
index 86ebf4943da..6584aa215ee 100644
--- a/mozilla/layout/generic/nsHTMLParts.h
+++ b/mozilla/layout/generic/nsHTMLParts.h
@@ -40,6 +40,7 @@ class nsIURI;
 class nsString;
 class nsIWebShell;
 class nsIPresShell;
+class nsIChannel;
 
 /**
  * Additional frame-state bits used by nsBlockFrame
@@ -381,7 +382,8 @@ extern nsresult NS_NewTableCellFrame(nsIPresShell* aPresShell, nsIFrame** aResul
 extern nsresult NS_NewHTMLContentSink(nsIHTMLContentSink** aInstancePtrResult,
                                       nsIDocument* aDoc,
                                       nsIURI* aURL,
-                                      nsIWebShell* aWebShell);
+                                      nsIWebShell* aWebShell,
+                                      nsIChannel* aChannel);
 extern nsresult NS_NewHTMLFragmentContentSink(nsIHTMLFragmentContentSink** aInstancePtrResult);
 
 /** Create a new HTML reflow command */
diff --git a/mozilla/layout/html/base/src/nsHTMLAtomList.h b/mozilla/layout/html/base/src/nsHTMLAtomList.h
index bd7739cd67f..14c44aacf58 100644
--- a/mozilla/layout/html/base/src/nsHTMLAtomList.h
+++ b/mozilla/layout/html/base/src/nsHTMLAtomList.h
@@ -218,6 +218,7 @@ 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")
 HTML_ATOM(repeat, "repeat")
 HTML_ATOM(rev, "rev")
@@ -233,6 +234,7 @@ HTML_ATOM(scrolling, "scrolling")
 HTML_ATOM(select, "select")
 HTML_ATOM(selected, "selected")
 HTML_ATOM(selectedindex, "selectedindex")
+HTML_ATOM(setcookie, "set-cookie")
 HTML_ATOM(shape, "shape")
 HTML_ATOM(size, "size")
 HTML_ATOM(spacer, "spacer")
diff --git a/mozilla/layout/html/base/src/nsHTMLParts.h b/mozilla/layout/html/base/src/nsHTMLParts.h
index 86ebf4943da..6584aa215ee 100644
--- a/mozilla/layout/html/base/src/nsHTMLParts.h
+++ b/mozilla/layout/html/base/src/nsHTMLParts.h
@@ -40,6 +40,7 @@ class nsIURI;
 class nsString;
 class nsIWebShell;
 class nsIPresShell;
+class nsIChannel;
 
 /**
  * Additional frame-state bits used by nsBlockFrame
@@ -381,7 +382,8 @@ extern nsresult NS_NewTableCellFrame(nsIPresShell* aPresShell, nsIFrame** aResul
 extern nsresult NS_NewHTMLContentSink(nsIHTMLContentSink** aInstancePtrResult,
                                       nsIDocument* aDoc,
                                       nsIURI* aURL,
-                                      nsIWebShell* aWebShell);
+                                      nsIWebShell* aWebShell,
+                                      nsIChannel* aChannel);
 extern nsresult NS_NewHTMLFragmentContentSink(nsIHTMLFragmentContentSink** aInstancePtrResult);
 
 /** Create a new HTML reflow command */