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/javasrc/Tokenizer.java
+++ b/parser/html/javasrc/Tokenizer.java
@@ -6460,11 +6460,12 @@ public class Tokenizer implements Locator {

    // ]NOCPP]

-    public void internalEncodingDeclaration(String internalCharset)
+    public boolean internalEncodingDeclaration(String internalCharset)
            throws SAXException {
        if (encodingDeclarationHandler != null) {
-            encodingDeclarationHandler.internalEncodingDeclaration(internalCharset);
+            return encodingDeclarationHandler.internalEncodingDeclaration(internalCharset);
        }
+        return false;
    }

    /**