diff --git a/mozilla/parser/htmlparser/public/nsHTMLTagList.h b/mozilla/parser/htmlparser/public/nsHTMLTagList.h
index 70def89f2b5..aadb05edac1 100644
--- a/mozilla/parser/htmlparser/public/nsHTMLTagList.h
+++ b/mozilla/parser/htmlparser/public/nsHTMLTagList.h
@@ -140,7 +140,6 @@ HTML_TAG(optgroup, OptGroup)
HTML_TAG(option, Option)
HTML_TAG(p, Paragraph)
HTML_TAG(param, Shared)
-HTML_TAG(parsererror, Div)
HTML_TAG(plaintext, Span)
HTML_TAG(pre, Pre)
HTML_TAG(q, Shared)
@@ -151,7 +150,6 @@ HTML_TAG(select, Select)
HTML_TAG(server, Span)
HTML_TAG(small, Span)
HTML_TAG(sound, Span)
-HTML_TAG(sourcetext, Div)
HTML_TAG(spacer, Shared)
HTML_TAG(span, Span)
HTML_TAG(strike, Span)
diff --git a/mozilla/parser/htmlparser/public/nsHTMLTags.h b/mozilla/parser/htmlparser/public/nsHTMLTags.h
index f9243468948..214b732b504 100644
--- a/mozilla/parser/htmlparser/public/nsHTMLTags.h
+++ b/mozilla/parser/htmlparser/public/nsHTMLTags.h
@@ -63,7 +63,7 @@ enum nsHTMLTag {
#undef HTML_TAG
#undef HTML_OTHER
-// Currently there are 110 HTML tags. eHTMLTag_text = 112.
+// Currently there are 108 HTML tags. eHTMLTag_text = 110.
#define NS_HTML_TAG_MAX PRInt32(eHTMLTag_text - 1)
class nsHTMLTags {
diff --git a/mozilla/parser/htmlparser/src/COtherElements.h b/mozilla/parser/htmlparser/src/COtherElements.h
index 7d40be9428a..0b2c1b4a6fb 100644
--- a/mozilla/parser/htmlparser/src/COtherElements.h
+++ b/mozilla/parser/htmlparser/src/COtherElements.h
@@ -2345,7 +2345,6 @@ void CElementTable::InitializeElements() {
mDfltElements[eHTMLTag_p].mContainsGroups.mBits.mSelf=0;
CElement::InitializeLeaf( mDfltElements[eHTMLTag_param], eHTMLTag_param, CElement::GetEmptyGroup(), CLeafElement::GetContainedGroups());
- CBlockElement::Initialize( mDfltElements[eHTMLTag_parsererror],eHTMLTag_parsererror);
CElement::Initialize( mDfltElements[eHTMLTag_plaintext], eHTMLTag_plaintext);
CBlockElement::Initialize( mDfltElements[eHTMLTag_pre], eHTMLTag_pre);
mDfltElements[eHTMLTag_pre].mExcludeKids=kPreExcludeKids;
@@ -2365,7 +2364,6 @@ void CElementTable::InitializeElements() {
CElement::Initialize( mDfltElements[eHTMLTag_server], eHTMLTag_server);
CFontStyleElement::Initialize( mDfltElements[eHTMLTag_small], eHTMLTag_small);
- CElement::Initialize( mDfltElements[eHTMLTag_sourcetext], eHTMLTag_sourcetext);
CElement::Initialize( mDfltElements[eHTMLTag_spacer], eHTMLTag_spacer);
CSpecialElement::Initialize( mDfltElements[eHTMLTag_span], eHTMLTag_span);
CFontStyleElement::Initialize( mDfltElements[eHTMLTag_strike], eHTMLTag_strike);
diff --git a/mozilla/parser/htmlparser/src/nsElementTable.cpp b/mozilla/parser/htmlparser/src/nsElementTable.cpp
index 23b0f792744..9bb9320f9ad 100644
--- a/mozilla/parser/htmlparser/src/nsElementTable.cpp
+++ b/mozilla/parser/htmlparser/src/nsElementTable.cpp
@@ -943,15 +943,6 @@ void InitializeElementTable(void) {
/*special props, prop-range*/ kNonContainer, kNoPropRange,
/*special parents,kids,skip*/ &gParamParents,0,eHTMLTag_unknown);
- Initialize(
- /*tag*/ eHTMLTag_parsererror,
- /*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown,
- /*rootnodes,endrootnodes*/ &gRootTags,&gRootTags,
- /*autoclose starttags and endtags*/ &gDivAutoClose,0,0,0,
- /*parent,incl,exclgroups*/ kNone, (kSelf|kFlowEntity), kNone,
- /*special props, prop-range*/ 0, kNoPropRange,
- /*special parents,kids,skip*/ 0,0,eHTMLTag_unknown);
-
Initialize(
/*tag*/ eHTMLTag_plaintext,
/*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown,
@@ -1043,15 +1034,6 @@ void InitializeElementTable(void) {
/*special props, prop-range*/ kNonContainer,kDefaultPropRange, // Ref. to Bug 25749
/*special parents,kids,skip*/ 0,0,eHTMLTag_unknown);
- Initialize(
- /*tag*/ eHTMLTag_sourcetext,
- /*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown,
- /*rootnodes,endrootnodes*/ &gRootTags,&gRootTags,
- /*autoclose starttags and endtags*/ &gDivAutoClose,0,0,0,
- /*parent,incl,exclgroups*/ kNone, (kSelf|kFlowEntity), kNone,
- /*special props, prop-range*/ 0,kDefaultPropRange,
- /*special parents,kids,skip*/ 0,0,eHTMLTag_unknown);
-
Initialize(
/*tag*/ eHTMLTag_spacer,
diff --git a/mozilla/parser/htmlparser/src/nsHTMLTags.cpp b/mozilla/parser/htmlparser/src/nsHTMLTags.cpp
index cac9ab4db85..a39a785232f 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLTags.cpp
+++ b/mozilla/parser/htmlparser/src/nsHTMLTags.cpp
@@ -199,8 +199,6 @@ static const PRUnichar sHTMLTagUnicodeName_p[] =
{'p', '\0'};
static const PRUnichar sHTMLTagUnicodeName_param[] =
{'p', 'a', 'r', 'a', 'm', '\0'};
-static const PRUnichar sHTMLTagUnicodeName_parsererror[] =
- {'p', 'a', 'r', 's', 'e', 'r', 'e', 'r', 'r', 'o', 'r', '\0'};
static const PRUnichar sHTMLTagUnicodeName_plaintext[] =
{'p', 'l', 'a', 'i', 'n', 't', 'e', 'x', 't', '\0'};
static const PRUnichar sHTMLTagUnicodeName_pre[] =
@@ -221,8 +219,6 @@ static const PRUnichar sHTMLTagUnicodeName_small[] =
{'s', 'm', 'a', 'l', 'l', '\0'};
static const PRUnichar sHTMLTagUnicodeName_sound[] =
{'s', 'o', 'u', 'n', 'd', '\0'};
-static const PRUnichar sHTMLTagUnicodeName_sourcetext[] =
- {'s', 'o', 'u', 'r', 'c', 'e', 't', 'e', 'x', 't', '\0'};
static const PRUnichar sHTMLTagUnicodeName_spacer[] =
{'s', 'p', 'a', 'c', 'e', 'r', '\0'};
static const PRUnichar sHTMLTagUnicodeName_span[] =
@@ -310,7 +306,7 @@ HTMLTagsKeyCompareUCPtr(const void *key1, const void *key2)
static PRUint32 sMaxTagNameLength;
-#define NS_HTMLTAG_NAME_MAX_LENGTH 11
+#define NS_HTMLTAG_NAME_MAX_LENGTH 10
// static
nsresult
diff --git a/mozilla/parser/htmlparser/tools/gentags.pl b/mozilla/parser/htmlparser/tools/gentags.pl
index 97a9e78713f..99fb46770bb 100644
--- a/mozilla/parser/htmlparser/tools/gentags.pl
+++ b/mozilla/parser/htmlparser/tools/gentags.pl
@@ -121,7 +121,6 @@ $tags[$i++] = "optgroup";
$tags[$i++] = "option";
$tags[$i++] = "p";
$tags[$i++] = "param";
-$tags[$i++] = "parsererror";
$tags[$i++] = "plaintext";
$tags[$i++] = "pre";
$tags[$i++] = "q";
@@ -132,7 +131,6 @@ $tags[$i++] = "select";
$tags[$i++] = "server";
$tags[$i++] = "small";
$tags[$i++] = "sound";
-$tags[$i++] = "sourcetext";
$tags[$i++] = "spacer";
$tags[$i++] = "span";
$tags[$i++] = "strike";