Bug 594730 - Make the content attribute in <meta> act as an encoding declaration only if http-equiv="Content-Type" is present. rs=jonas, a=blocking2.0-betaN.

2010-12-08 14:37:19 +02:00
parent 84cb7c5086
commit e4808f1f2e
22 changed files with 471 additions and 203 deletions
--- a/parser/html/nsHtml5Tokenizer.cpp
+++ b/parser/html/nsHtml5Tokenizer.cpp
@@ -3680,12 +3680,13 @@ nsHtml5Tokenizer::emitDoctypeToken(PRInt32 pos)
  systemIdentifier = nsnull;
 }

-void 
+PRBool 
 nsHtml5Tokenizer::internalEncodingDeclaration(nsString* internalCharset)
 {
  if (encodingDeclarationHandler) {
-    encodingDeclarationHandler->internalEncodingDeclaration(internalCharset);
+    return encodingDeclarationHandler->internalEncodingDeclaration(internalCharset);
  }
+  return PR_FALSE;
 }

 void