Bug 620106 - Allow chardet (if enabled) reload the page during load. r=sicking, a=blocking2.0-final.

2011-02-11 12:33:32 +02:00
parent 865dd5f113
commit 200d06cfa8
11 changed files with 1174 additions and 37 deletions
--- a/parser/html/nsHtml5TreeOperation.cpp
+++ b/parser/html/nsHtml5TreeOperation.cpp
@@ -670,7 +670,8 @@ nsHtml5TreeOperation::Perform(nsHtml5TreeOpExecutor* aBuilder,
    }
    case eTreeOpNeedsCharsetSwitchTo: {
      char* str = mOne.charPtr;
-      aBuilder->NeedsCharsetSwitchTo(str);
+      PRInt32 charsetSource = mInt;
+      aBuilder->NeedsCharsetSwitchTo(str, charsetSource);
      return rv;    
    }
    case eTreeOpUpdateStyleSheet: {