diff --git a/mozilla/content/html/content/src/nsHTMLFontElement.cpp b/mozilla/content/html/content/src/nsHTMLFontElement.cpp index 63ce87791b6..65eb39773c6 100644 --- a/mozilla/content/html/content/src/nsHTMLFontElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLFontElement.cpp @@ -228,6 +228,7 @@ MapFontAttributesInto(const nsIHTMLMappedAttributes* aAttributes, if (face.EqualsIgnoreCase("-moz-fixed")) { font->mFlags |= NS_STYLE_FONT_USE_FIXED; } +/* bug 12737 else { nsCompatibility mode; aPresContext->GetCompatibilityMode(&mode); @@ -235,6 +236,7 @@ MapFontAttributesInto(const nsIHTMLMappedAttributes* aAttributes, font->mFixedFont.name = familyList; } } +*/ } else { font->mFont.name = defaultFont.name; diff --git a/mozilla/content/html/style/src/nsCSSStyleRule.cpp b/mozilla/content/html/style/src/nsCSSStyleRule.cpp index 04e532acd65..088c833eefd 100644 --- a/mozilla/content/html/style/src/nsCSSStyleRule.cpp +++ b/mozilla/content/html/style/src/nsCSSStyleRule.cpp @@ -1282,6 +1282,7 @@ MapDeclarationFontInto(nsICSSDeclaration* aDeclaration, if (face.EqualsIgnoreCase("-moz-fixed")) { font->mFlags |= NS_STYLE_FONT_USE_FIXED; } +/* bug 12737 else { nsCompatibility mode; aPresContext->GetCompatibilityMode(&mode); @@ -1289,6 +1290,7 @@ MapDeclarationFontInto(nsICSSDeclaration* aDeclaration, font->mFixedFont.name = familyList; } } +*/ } else { font->mFont.name = defaultFont.name; diff --git a/mozilla/layout/html/content/src/nsHTMLFontElement.cpp b/mozilla/layout/html/content/src/nsHTMLFontElement.cpp index 63ce87791b6..65eb39773c6 100644 --- a/mozilla/layout/html/content/src/nsHTMLFontElement.cpp +++ b/mozilla/layout/html/content/src/nsHTMLFontElement.cpp @@ -228,6 +228,7 @@ MapFontAttributesInto(const nsIHTMLMappedAttributes* aAttributes, if (face.EqualsIgnoreCase("-moz-fixed")) { font->mFlags |= NS_STYLE_FONT_USE_FIXED; } +/* bug 12737 else { nsCompatibility mode; aPresContext->GetCompatibilityMode(&mode); @@ -235,6 +236,7 @@ MapFontAttributesInto(const nsIHTMLMappedAttributes* aAttributes, font->mFixedFont.name = familyList; } } +*/ } else { font->mFont.name = defaultFont.name; diff --git a/mozilla/layout/html/style/src/nsCSSStyleRule.cpp b/mozilla/layout/html/style/src/nsCSSStyleRule.cpp index 04e532acd65..088c833eefd 100644 --- a/mozilla/layout/html/style/src/nsCSSStyleRule.cpp +++ b/mozilla/layout/html/style/src/nsCSSStyleRule.cpp @@ -1282,6 +1282,7 @@ MapDeclarationFontInto(nsICSSDeclaration* aDeclaration, if (face.EqualsIgnoreCase("-moz-fixed")) { font->mFlags |= NS_STYLE_FONT_USE_FIXED; } +/* bug 12737 else { nsCompatibility mode; aPresContext->GetCompatibilityMode(&mode); @@ -1289,6 +1290,7 @@ MapDeclarationFontInto(nsICSSDeclaration* aDeclaration, font->mFixedFont.name = familyList; } } +*/ } else { font->mFont.name = defaultFont.name; diff --git a/mozilla/layout/style/nsCSSStyleRule.cpp b/mozilla/layout/style/nsCSSStyleRule.cpp index 04e532acd65..088c833eefd 100644 --- a/mozilla/layout/style/nsCSSStyleRule.cpp +++ b/mozilla/layout/style/nsCSSStyleRule.cpp @@ -1282,6 +1282,7 @@ MapDeclarationFontInto(nsICSSDeclaration* aDeclaration, if (face.EqualsIgnoreCase("-moz-fixed")) { font->mFlags |= NS_STYLE_FONT_USE_FIXED; } +/* bug 12737 else { nsCompatibility mode; aPresContext->GetCompatibilityMode(&mode); @@ -1289,6 +1290,7 @@ MapDeclarationFontInto(nsICSSDeclaration* aDeclaration, font->mFixedFont.name = familyList; } } +*/ } else { font->mFont.name = defaultFont.name;