Merge latest green b2g-inbound changeset and mozilla-central

browser/base/content/test/chrome/Makefile.in

@@ -0,0 +1,7 @@
+# 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/.
+
+MOCHITEST_CHROME_FILES = \
+  test_aboutCrashed.xul \
+  $(NULL)

browser/base/content/test/chrome/moz.build

@@ -0,0 +1,6 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+

browser/base/content/test/chrome/test_aboutCrashed.xul

@@ -0,0 +1,86 @@
+<?xml version="1.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/. -->
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
+
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <script type="application/javascript"
+          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
+  <iframe type="content" id="frame1"/>
+  <iframe type="content" id="frame2" onload="doTest()"/>
+  <script type="application/javascript"><![CDATA[
+    const Ci = Components.interfaces;
+    const Cu = Components.utils;
+
+    Cu.import("resource://gre/modules/Services.jsm");
+    Cu.import("resource://gre/modules/Task.jsm");
+    Cu.import("resource://gre/modules/Promise.jsm");
+    Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+    SimpleTest.waitForExplicitFinish();
+
+    // Load error pages do not fire "load" events, so let's use a progressListener.
+    function waitForErrorPage(frame) {
+      let errorPageDeferred = Promise.defer();
+
+      let progressListener = {
+        onLocationChange: function(aWebProgress, aRequest, aLocation, aFlags) {
+          if (aFlags & Ci.nsIWebProgressListener.LOCATION_CHANGE_ERROR_PAGE) {
+            frame.docShell.QueryInterface(Ci.nsIInterfaceRequestor)
+                          .getInterface(Ci.nsIWebProgress)
+                          .removeProgressListener(progressListener,
+                                                  Ci.nsIWebProgress.NOTIFY_LOCATION);
+
+            errorPageDeferred.resolve();
+          }
+        },
+
+        QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
+                                               Ci.nsISupportsWeakReference])
+      };
+
+      frame.docShell.QueryInterface(Ci.nsIInterfaceRequestor)
+                    .getInterface(Ci.nsIWebProgress)
+                    .addProgressListener(progressListener,
+                                         Ci.nsIWebProgress.NOTIFY_LOCATION);
+
+      return errorPageDeferred.promise;
+    }
+
+  function doTest() {
+    Task.spawn(function test_aboutCrashed() {
+      let frame1 = document.getElementById("frame1");
+      let frame2 = document.getElementById("frame2");
+      let uri1 = Services.io.newURI("http://www.example.com/1", null, null);
+      let uri2 = Services.io.newURI("http://www.example.com/2", null, null);
+
+      let errorPageReady = waitForErrorPage(frame1);
+      frame1.docShell.chromeEventHandler.setAttribute("crashedPageTitle", "pageTitle");
+      frame1.docShell.displayLoadError(Components.results.NS_ERROR_CONTENT_CRASHED, uri1, null);
+
+      yield errorPageReady;
+      frame1.docShell.chromeEventHandler.removeAttribute("crashedPageTitle");
+
+      SimpleTest.is(frame1.contentDocument.documentURI,
+                    "about:tabcrashed?e=tabcrashed&u=http%3A//www.example.com/1&c=UTF-8&d=pageTitle",
+                    "Correct about:tabcrashed displayed for page with title.");
+
+      errorPageReady = waitForErrorPage(frame2);
+      frame2.docShell.displayLoadError(Components.results.NS_ERROR_CONTENT_CRASHED, uri2, null);
+
+      yield errorPageReady;
+
+      SimpleTest.is(frame2.contentDocument.documentURI,
+                    "about:tabcrashed?e=tabcrashed&u=http%3A//www.example.com/2&c=UTF-8&d=%20",
+                    "Correct about:tabcrashed displayed for page with no title.");
+
+      SimpleTest.finish();
+  });
+  }
+  ]]></script>
+
+  <body xmlns="http://www.w3.org/1999/xhtml" style="height: 300px; overflow: auto;" />
+</window>

browser/base/content/test/moz.build

@@ -4,5 +4,5 @@
 # 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/.
 
-DIRS += ['general', 'newtab', 'social']
+DIRS += ['chrome', 'general', 'newtab', 'social']
 

browser/devtools/framework/toolbox-options.js

@@ -40,9 +40,6 @@ function OptionsPanel(iframeWindow, toolbox) {
   this.toolbox = toolbox;
   this.isReady = false;
 
-  // Make restart method available from xul
-  this.panelWin.restart = this.restart;
-
   EventEmitter.decorate(this);
 };
 
@@ -57,7 +54,6 @@ OptionsPanel.prototype = {
 
     this.setupToolsList();
     this.populatePreferences();
-    this.prepareRestartPreferences();
 
     this._disableJSClicked = this._disableJSClicked.bind(this);
 
@@ -201,34 +197,6 @@ OptionsPanel.prototype = {
     }
   },
 
-  /**
-   * Handles checkbox click inside hbox with class "hidden-labels-box". The
-   * labels inside the hbox are shown again when the user click on the checkbox
-   * in the box.
-   */
-  prepareRestartPreferences: function() {
-    let checkboxes = this.panelDoc.querySelectorAll(".hidden-labels-box > checkbox");
-    for (let checkbox of checkboxes) {
-      checkbox.addEventListener("command", function(target) {
-        target.parentNode.classList.toggle("visible");
-      }.bind(null, checkbox));
-    }
-  },
-
-  restart: function() {
-    let canceled = Cc["@mozilla.org/supports-PRBool;1"]
-                     .createInstance(Ci.nsISupportsPRBool);
-    Services.obs.notifyObservers(canceled, "quit-application-requested", "restart");
-    if (canceled.data) {
-      return;
-    }
-
-    // restart
-    Cc['@mozilla.org/toolkit/app-startup;1']
-      .getService(Ci.nsIAppStartup)
-      .quit(Ci.nsIAppStartup.eAttemptQuit | Ci.nsIAppStartup.eRestart);
-  },
-
   /**
    * Disables JavaScript for the currently loaded tab. We force a page refresh
    * here because setting docShell.allowJavascript to true fails to block JS

browser/devtools/framework/toolbox-options.xul

@@ -74,21 +74,11 @@
             <checkbox label="&options.enableChrome.label3;"
                       tooltiptext="&options.enableChrome.tooltip;"
                       data-pref="devtools.chrome.enabled"/>
-            <label class="options-citation-label"
-                   value="&options.context.requiresRestart2;"/>
-            <label class="text-link"
-                   onclick="restart()"
-                   value="&options.restartButton.label;"/>
           </hbox>
           <hbox class="hidden-labels-box">
             <checkbox label="&options.enableRemote.label3;"
                       tooltiptext="&options.enableRemote.tooltip;"
                       data-pref="devtools.debugger.remote-enabled"/>
-            <label class="options-citation-label"
-                   value="&options.context.requiresRestart2;"/>
-            <label class="text-link"
-                   onclick="restart()"
-                   value="&options.restartButton.label;"/>
           </hbox>
         </vbox>
       </vbox>

browser/locales/en-US/chrome/browser/devtools/toolbox.dtd

@@ -52,15 +52,6 @@
   -  -->
 <!ENTITY options.defaultColorUnit.name "Color Names">
 
-<!-- LOCALIZATION NOTE (options.context.requiresRestart2): This is the requires
-  -  restart label at right of settings that require a browser restart to be
-  -  effective. -->
-<!ENTITY options.context.requiresRestart2  "Requires browser restart">
-
-<!-- LOCALIZATION NOTE (options.restartButton.label): This is the label for the
-  -  restart button next to options.context.requiresRestart2 label. -->
-<!ENTITY options.restartButton.label  "Restart now">
-
 <!-- LOCALIZATION NOTE (options.context.triggersPageRefresh2): This is the
   -  triggers page refresh label next to the settings in the advanced settings
   -  group in the options panel which trigger page reload. -->

browser/modules/TabCrashReporter.jsm

@@ -64,6 +64,9 @@ this.TabCrashReporter = {
   },
 
   onAboutTabCrashedLoad: function (aBrowser) {
+    if (!this.childMap)
+      return;
+
     let dumpID = this.childMap.get(this.browserMap.get(aBrowser));
     if (!dumpID)
       return;

build/autoconf/android.m4

@@ -294,7 +294,7 @@ case "$target" in
     # The build tools got moved around to different directories in
     # SDK Tools r22.  Try to locate them.
     android_build_tools=""
-    for suffix in android-4.3 18.0.1 18.0.0 17.0.0 android-4.2.2; do
+    for suffix in android-4.3 18.1.0 18.0.1 18.0.0 17.0.0 android-4.2.2; do
         tools_directory="$android_sdk/../../build-tools/$suffix"
         if test -d "$tools_directory" ; then
             android_build_tools="$tools_directory"

docshell/base/nsDocShell.cpp

@@ -4347,6 +4347,13 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI *aURI,
         nsCOMPtr<Element> element = do_QueryInterface(handler);
         element->GetAttribute(NS_LITERAL_STRING("crashedPageTitle"), messageStr);
       }
+
+      // DisplayLoadError requires a non-empty messageStr to proceed and call LoadErrorPage.
+      // If the page doesn't have a title, we will use a blank space which will be trimmed
+      // and thus treated as empty by the front-end.
+      if (messageStr.IsEmpty()) {
+        messageStr.Assign(NS_LITERAL_STRING(" "));
+      }
     }
     else {
         // Errors requiring simple formatting

dom/locales/en-US/chrome/appstrings.properties

@@ -33,5 +33,3 @@ phishingBlocked=The website at %S has been reported as a web forgery designed to
 cspFrameAncestorBlocked=This page has a content security policy that prevents it from being embedded in this way.
 corruptedContentError=The page you are trying to view cannot be shown because an error in the data transmission was detected.
 remoteXUL=This page uses an unsupported technology that is no longer available by default.
-#LOCALIZATION NOTE (tabcrashed): The following string is shown in the tab title if a page with a blank title has crashed. Current UX says that the tab title should remain blank
-tabcrashed=

js/src/build/autoconf/android.m4

@@ -294,7 +294,7 @@ case "$target" in
     # The build tools got moved around to different directories in
     # SDK Tools r22.  Try to locate them.
     android_build_tools=""
-    for suffix in android-4.3 18.0.1 18.0.0 17.0.0 android-4.2.2; do
+    for suffix in android-4.3 18.1.0 18.0.1 18.0.0 17.0.0 android-4.2.2; do
         tools_directory="$android_sdk/../../build-tools/$suffix"
         if test -d "$tools_directory" ; then
             android_build_tools="$tools_directory"

toolkit/mozapps/extensions/test/xpcshell/test_AddonRepository_cache.js

@@ -406,18 +406,8 @@ const WITH_EXTENSION_CACHE = [{
 
 /*
  * Trigger an AddonManager background update check
- *
- * @param  aCallback
- *         Callback to call once the background update is complete
  */
-function trigger_background_update(aCallback) {
-  Services.obs.addObserver({
-    observe: function(aSubject, aTopic, aData) {
-      Services.obs.removeObserver(this, "addons-background-update-complete");
-      do_execute_soon(aCallback);
-    }
-  }, "addons-background-update-complete", false);
-
+function trigger_background_update() {
   gInternalManager.notify(null);
 }
 
@@ -707,15 +697,21 @@ function run_test_13() {
   check_database_exists(true);
   Services.prefs.setCharPref(PREF_GETADDONS_BYIDS_PERF, GETADDONS_EMPTY);
 
-  trigger_background_update(function() {
-    // Database should have been deleted
-    check_database_exists(false);
+  Services.obs.addObserver({
+    observe: function(aSubject, aTopic, aData) {
+      Services.obs.removeObserver(this, "addons-background-update-complete");
 
-    AddonManager.getAddonsByIDs(ADDON_IDS, function(aAddons) {
-      check_results(aAddons, WITHOUT_CACHE);
-      do_execute_soon(run_test_14);
-    });
-  });
+      // Database should have been deleted with the background update.
+      check_database_exists(false);
+
+      AddonManager.getAddonsByIDs(ADDON_IDS, function(aAddons) {
+        check_results(aAddons, WITHOUT_CACHE);
+        do_execute_soon(run_test_14);
+      });
+    }
+  }, "addons-background-update-complete", false);
+
+  trigger_background_update();
 }
 
 // Tests that the XPI add-ons have the correct properties if caching is
@@ -740,12 +736,14 @@ function run_test_14() {
 function run_test_15() {
   Services.prefs.setCharPref(PREF_GETADDONS_BYIDS_PERF, GETADDONS_RESULTS);
 
-  trigger_background_update(function() {
+  waitForFlushedData(function() {
     AddonManager.getAddonsByIDs(ADDON_IDS, function(aAddons) {
       check_results(aAddons, WITH_CACHE);
       do_execute_soon(run_test_16);
     });
   });
+
+  trigger_background_update();
 }
 
 // Tests that restarting the manager does not change the checked properties
@@ -764,11 +762,13 @@ function run_test_16() {
 function run_test_17() {
   Services.prefs.setCharPref(PREF_GETADDONS_CACHE_TYPES, "foo,bar,extension,baz");
 
-  trigger_background_update(function() {
+  waitForFlushedData(function() {
     AddonManager.getAddonsByIDs(ADDON_IDS, function(aAddons) {
       check_results(aAddons, WITH_EXTENSION_CACHE);
       end_test();
     });
   });
+
+  trigger_background_update();
 }