Preserve history on charset reload. Bug 134911, r+sr=bz, a=roc

docshell/base/nsDocShell.cpp

@@ -4764,7 +4764,6 @@ nsDocShell::Embed(nsIContentViewer * aContentViewer,
 
     // Determine if this type of load should update history
     switch (mLoadType) {
-    case LOAD_RELOAD_CHARSET_CHANGE: // don't preserve history in charset reload
     case LOAD_NORMAL_REPLACE:
     case LOAD_STOP_CONTENT_AND_REPLACE:
     case LOAD_RELOAD_BYPASS_CACHE:

docshell/test/browser/Makefile.in

@@ -46,6 +46,7 @@ include $(topsrcdir)/config/rules.mk
 _BROWSER_TEST_FILES =	\
 		browser_bug92473.js \
 		test-form_sjis.html \
+		browser_bug134911.js \
 		browser_bug349769.js \
 		browser_bug388121-1.js \
 		browser_bug388121-2.js \

docshell/test/browser/test-form_sjis.html

@@ -10,10 +10,12 @@
   <h2>This page is encoded in Shift_JIS, but has an incorrect meta charset
      claiming that it is windows-1251</h2>
   <p id="testpar">ユニコードは、すべての文字に固有の番号を付与します</p>
+  <form>
   <p>
    <textarea id="testtextarea" rows=6 cols=60>ユニコードは、すべての文字に固有の番号を付与します</textarea>
    <input id="testinput" type="text" size=60 value="ユニコードは、すべての文字に固有の番号を付与します">
   </p>
+  </form>
   <h2>Expected text on load:</h2>
   <p>&#x453;&#x2020;&#x453;&#x6A;&#x453;&#x52;&#x403;&#x5B;&#x453;&#x68;&#x201A;&#x41D;&#x403;&#x41;&#x201A;&#xB7;&#x201A;&#x427;&#x201A;&#x414;&#x201A;&#x41C;&#x2022;&#xB6;&#x40B;&#x459;&#x201A;&#x419;&#x40A;&#x415;&#x2014;&#x4C;&#x201A;&#x41C;&#x201D;&#x424;&#x40C;&#x2020;&#x201A;&#x440;&#x2022;&#x74;&#x2014;&#x5E;&#x201A;&#xB5;&#x201A;&#x42C;&#x201A;&#xB7;</p>
   <h2>Expected text on resetting the encoding to Shift_JIS:</h2>