Merge fx-team to m-c

browser/components/sessionstore/src/DocumentUtils.jsm

@@ -55,7 +55,8 @@ this.DocumentUtils = {
       }
 
       if (node instanceof Ci.nsIDOMHTMLInputElement ||
-          node instanceof Ci.nsIDOMHTMLTextAreaElement) {
+          node instanceof Ci.nsIDOMHTMLTextAreaElement ||
+          node instanceof Ci.nsIDOMXULTextBoxElement) {
         switch (node.type) {
           case "checkbox":
           case "radio":
@@ -202,10 +203,10 @@ this.DocumentUtils = {
       for (let i = 0; i < aNode.options.length; i++) {
         if (aNode.options[i].value == aValue.value) {
           aNode.selectedIndex = i;
+          eventType = "change";
           break;
         }
       }
-      eventType = "change";
     } else if (aValue && aValue.fileList && aValue.type == "file" &&
       aNode.type == "file") {
       aNode.mozSetFileNameArray(aValue.fileList, aValue.fileList.length);

browser/components/sessionstore/src/TextAndScrollData.jsm

@@ -86,13 +86,6 @@ let TextAndScrollDataInternal = {
     let scrollX = {}, scrollY = {};
     domWindowUtils.getScrollXY(false, scrollX, scrollY);
     entry.scroll = scrollX.value + "," + scrollY.value;
-
-    if (topURL == "about:config") {
-      entry.formdata = {
-        id: { "textbox": content.top.document.getElementById("textbox").value },
-        xpath: {}
-      };
-    }
   },
 
   isAboutSessionRestore: function (url) {

browser/components/sessionstore/src/XPathGenerator.jsm

@@ -8,8 +8,14 @@ this.EXPORTED_SYMBOLS = ["XPathGenerator"];
 
 this.XPathGenerator = {
   // these two hashes should be kept in sync
-  namespaceURIs:     { "xhtml": "http://www.w3.org/1999/xhtml" },
-  namespacePrefixes: { "http://www.w3.org/1999/xhtml": "xhtml" },
+  namespaceURIs:     {
+    "xhtml": "http://www.w3.org/1999/xhtml",
+    "xul": "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+  },
+  namespacePrefixes: {
+    "http://www.w3.org/1999/xhtml": "xhtml",
+    "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul": "xul"
+  },
 
   /**
    * Generates an approximate XPath query to an (X)HTML node
@@ -93,6 +99,9 @@ this.XPathGenerator = {
     let formNodesXPath = "//textarea|//select|//xhtml:textarea|//xhtml:select|" +
       "//input[" + ignore + "]|//xhtml:input[" + ignore + "]";
 
+    // Special case for about:config's search field.
+    formNodesXPath += '|/xul:window[@id="config"]//xul:textbox[@id="textbox"]';
+
     delete this.restorableFormNodes;
     return (this.restorableFormNodes = formNodesXPath);
   }

browser/devtools/commandline/test/browser.ini

@@ -10,33 +10,40 @@ skip-if = true # Bug 845831
 [browser_cmd_calllog_chrome.js]
 skip-if = true # Bug 845831
 [browser_cmd_appcache_invalid.js]
-[browser_cmd_appcache_invalid_appcache.appcache]
-[browser_cmd_appcache_invalid_appcache.appcache^headers^]
-[browser_cmd_appcache_invalid_index.html]
-[browser_cmd_appcache_invalid_page1.html]
-[browser_cmd_appcache_invalid_page2.html]
-[browser_cmd_appcache_invalid_page3.html]
-[browser_cmd_appcache_invalid_page3.html^headers^]
+support-files =
+  browser_cmd_appcache_invalid_appcache.appcache
+  browser_cmd_appcache_invalid_appcache.appcache^headers^
+  browser_cmd_appcache_invalid_index.html
+  browser_cmd_appcache_invalid_page1.html
+  browser_cmd_appcache_invalid_page2.html
+  browser_cmd_appcache_invalid_page3.html
+  browser_cmd_appcache_invalid_page3.html^headers^
 [browser_cmd_appcache_valid.js]
-[browser_cmd_appcache_valid_appcache.appcache]
-[browser_cmd_appcache_valid_appcache.appcache^headers^]
-[browser_cmd_appcache_valid_index.html]
-[browser_cmd_appcache_valid_page1.html]
-[browser_cmd_appcache_valid_page2.html]
-[browser_cmd_appcache_valid_page3.html]
+support-files =
+  browser_cmd_appcache_valid_appcache.appcache
+  browser_cmd_appcache_valid_appcache.appcache^headers^
+  browser_cmd_appcache_valid_index.html
+  browser_cmd_appcache_valid_page1.html
+  browser_cmd_appcache_valid_page2.html
+  browser_cmd_appcache_valid_page3.html
 [browser_cmd_commands.js]
-[browser_cmd_cookie.html]
 [browser_cmd_cookie.js]
+support-files =
+ browser_cmd_cookie.html
 [browser_cmd_jsb.js]
-[browser_cmd_jsb_script.jsi]
-[browser_cmd_media.html]
+support-files =
+  browser_cmd_jsb_script.jsi
 [browser_cmd_media.js]
-[browser_cmd_pagemod_export.html]
+support-files =
+  browser_cmd_media.html
 [browser_cmd_pagemod_export.js]
+support-files =
+  browser_cmd_pagemod_export.html
 [browser_cmd_pref.js]
 [browser_cmd_restart.js]
-[browser_cmd_screenshot.html]
 [browser_cmd_screenshot.js]
+support-files =
+  browser_cmd_screenshot.html
 [browser_cmd_settings.js]
 [browser_gcli_async.js]
 [browser_gcli_canon.js]

browser/devtools/webconsole/test/Makefile.in

@@ -1,16 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-ifeq ($(OS_ARCH), Darwin)
-MOCHITEST_BROWSER_FILES += \
-	browser_webconsole_bug_804845_ctrl_key_nav.js \
-        $(NULL)
-endif
-
-ifeq ($(OS_ARCH),WINNT)
-MOCHITEST_BROWSER_FILES += \
-	browser_webconsole_bug_623749_ctrl_a_select_all_winnt.js \
-	$(NULL)
-endif
-

browser/devtools/webconsole/test/browser.ini

@@ -185,6 +185,8 @@ support-files =
 [browser_webconsole_bug_618311_close_panels.js]
 [browser_webconsole_bug_621644_jsterm_dollar.js]
 [browser_webconsole_bug_622303_persistent_filters.js]
+[browser_webconsole_bug_623749_ctrl_a_select_all_winnt.js]
+run-if = os == "win"
 [browser_webconsole_bug_630733_response_redirect_headers.js]
 [browser_webconsole_bug_632275_getters_document_width.js]
 [browser_webconsole_bug_632347_iterators_generators.js]
@@ -210,6 +212,8 @@ support-files =
 [browser_webconsole_bug_770099_bad_policyuri.js]
 [browser_webconsole_bug_770099_violation.js]
 [browser_webconsole_bug_782653_CSS_links_in_Style_Editor.js]
+[browser_webconsole_bug_804845_ctrl_key_nav.js]
+run-if = os == "mac"
 [browser_webconsole_bug_817834_add_edited_input_to_history.js]
 [browser_webconsole_bug_821877_csp_errors.js]
 [browser_webconsole_bug_837351_securityerrors.js]