Bug 456342 - also restore non-standard input field types (such as type="search"). r=dietrich

browser/components/sessionstore/src/nsSessionStore.js

@@ -1223,10 +1223,8 @@ SessionStoreService.prototype = {
    *        document reference
    */
   _collectFormDataForFrame: function sss_collectFormDataForFrame(aDocument) {
-    let formNodesXPath = "//textarea|//select|//xhtml:textarea|//xhtml:select|" +
-      "//input[not(@type) or @type='text' or @type='checkbox' or @type='radio' or @type='file']|" +
-      "//xhtml:input[not(@type) or @type='text' or @type='checkbox' or @type='radio' or @type='file']";
-    let formNodes = aDocument.evaluate(formNodesXPath, aDocument, XPathHelper.resolveNS,
+    let formNodes = aDocument.evaluate(XPathHelper.restorableFormNodes, aDocument,
+                                       XPathHelper.resolveNS,
                                        Ci.nsIDOMXPathResult.UNORDERED_NODE_ITERATOR_TYPE, null);
     let node = formNodes.iterateNext();
     if (!node)
@@ -2384,6 +2382,21 @@ let XPathHelper = {
     return !/'/.test(aArg) ? "'" + aArg + "'" :
            !/"/.test(aArg) ? '"' + aArg + '"' :
            "concat('" + aArg.replace(/'+/g, "',\"$&\",'") + "')";
+  },
+
+  /**
+   * @returns an XPath query to all savable form field nodes
+   */
+  get restorableFormNodes() {
+    // for a comprehensive list of all available <INPUT> types see
+    // http://mxr.mozilla.org/mozilla-central/search?string=kInputTypeTable
+    let ignoreTypes = ["password", "hidden", "button", "image", "submit", "reset"];
+    let ignore = "not(@type='" + ignoreTypes.join("' or @type='") + "')";
+    let formNodesXPath = "//textarea|//select|//xhtml:textarea|//xhtml:select|" +
+      "//input[" + ignore + "]|//xhtml:input[" + ignore + "]";
+    
+    delete this.restorableFormNodes;
+    return (this.restorableFormNodes = formNodesXPath);
   }
 };
 

browser/components/sessionstore/test/browser/Makefile.in

@@ -55,6 +55,8 @@ _BROWSER_TEST_FILES = \
 	browser_448741.js \
 	browser_454908.js \
 	browser_454908_sample.html \
+	browser_456342.js \
+	browser_456342_sample.xhtml \
 	$(NULL)
 
 libs:: $(_BROWSER_TEST_FILES)

browser/components/sessionstore/test/browser/browser_456342.js

@@ -0,0 +1,72 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is sessionstore test code.
+ *
+ * The Initial Developer of the Original Code is
+ * Simon Bünzli <zeniko@gmail.com>.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+function test() {
+  /** Test for Bug 456342 **/
+  
+  waitForExplicitFinish();
+  
+  // make sure we do save form data
+  let privacy_level = gPrefService.getIntPref("browser.sessionstore.privacy_level");
+  gPrefService.setIntPref("browser.sessionstore.privacy_level", 0);
+  
+  let testURL = "chrome://mochikit/content/browser/" +
+    "browser/components/sessionstore/test/browser/browser_456342_sample.xhtml";
+  let tab = gBrowser.addTab(testURL);
+  tab.linkedBrowser.addEventListener("load", function(aEvent) {
+    gBrowser.removeTab(tab);
+    
+    let ss = Cc["@mozilla.org/browser/sessionstore;1"]
+               .getService(Ci.nsISessionStore);
+    let undoItems = eval("(" + ss.getClosedTabData(window) + ")");
+    let savedFormData = undoItems[0].state.entries[0].formdata;
+    
+    let countGood = 0, countBad = 0;
+    for each (let value in savedFormData) {
+      if (value == "save me")
+        countGood++;
+      else
+        countBad++;
+    }
+    
+    is(countGood, 4, "Saved text for non-standard input fields");
+    is(countBad,  0, "Didn't save text for ignored field types");
+    
+    // clean up
+    gPrefService.setIntPref("browser.sessionstore.privacy_level", privacy_level);
+    finish();
+  }, true);
+}

browser/components/sessionstore/test/browser/browser_456342_sample.xhtml

@@ -0,0 +1,26 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head><title>Test for bug 456342</title></head>
+
+<body>
+<h3>Non-standard &lt;input&gt;s</h3>
+<p>Search        <input type="search"       value="save me" id="searchTerm"/></p>
+<p>Image Search: <input type="image search" value="save me" /></p>
+<p>Autocomplete: <input type="autocomplete" value="save me" name="fill-in"/></p>
+<p>Mistyped:     <input type="txet"         value="save me" name="mistyped"/></p>
+
+<h3>Ignored types</h3>
+<input type="hidden" value="don't save" name="hideme"/>
+<input type="HIDDEN" value="don't save" name="hideme"/>
+<input type="submit" value="don't save" name="submit"/>
+<input type="reset"  value="don't save" name="reset"/>
+<input type="image"  value="don't save" name="image"/>
+<input type="button" value="don't save" name="button"/>
+<input type="password" value="don't save" name="password"/>
+<input type="PassWord" value="don't save" name="password2"/>
+<input type="PASSWORD" value="don't save" name="password3"/>
+
+</body>
+</html>