Merge m-c to inbound.
authorRyan VanderMeulen <ryanvm@gmail.com>
Mon, 10 Jun 2013 15:46:15 -0400
changeset 134555 2f6978e0b8e30a815365c0f674830d985d06e22c
parent 134548 6053305ba2b37afa331e66b7d8aa25d03de6cd5d (current diff)
parent 134554 9115d8b717e130d229e314e9b26a9557aec3f81b (diff)
child 134556 d3c0ebcaf1375261117530656f62dfa9a30810f5
push id29266
push userryanvm@gmail.com
push dateMon, 10 Jun 2013 19:46:08 +0000
treeherdermozilla-inbound@2f6978e0b8e3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone24.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge m-c to inbound.
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -605,17 +605,17 @@ pref("hal.processPriorityManager.gonk.Lo
 
 // Fire a memory pressure event when the system has less than Xmb of memory
 // remaining.  You should probably set this just above Y.KillUnderMB for
 // the highest priority class Y that you want to make an effort to keep alive.
 // (For example, we want BACKGROUND_PERCEIVABLE to stay alive.)  If you set
 // this too high, then we'll send out a memory pressure event every Z seconds
 // (see below), even while we have processes that we would happily kill in
 // order to free up memory.
-pref("hal.processPriorityManager.gonk.notifyLowMemUnderMB", 10);
+pref("hal.processPriorityManager.gonk.notifyLowMemUnderMB", 14);
 
 // We wait this long before polling the memory-pressure fd after seeing one
 // memory pressure event.  (When we're not under memory pressure, we sit
 // blocked on a poll(), and this pref has no effect.)
 pref("gonk.systemMemoryPressureRecoveryPollMS", 5000);
 
 #ifndef DEBUG
 // Enable pre-launching content processes for improved startup time
--- a/b2g/chrome/content/identity.js
+++ b/b2g/chrome/content/identity.js
@@ -104,23 +104,26 @@ function doInternalRequest() {
       options.origin,
       function(assertion, internalParams) {
         internalParams = internalParams || {};
         if (assertion) {
           identityCall({
             method: 'login',
             assertion: assertion,
             _internalParams: internalParams});
+        } else {
+          identityCall({
+            method: 'cancel'
+          });
         }
         closeIdentityDialog();
       },
       stringifiedOptions);
   }
 }
-
 function doInternalLogout(aOptions) {
   log("doInternalLogout:", (options && isLoaded));
   if (options && isLoaded) {
     let BrowserID = content.wrappedJSObject.BrowserID;
     BrowserID.internal.logout(options.origin, function() {
       identityCall({method:'logout'});
       closeIdentityDialog();
     });
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_585991_autocomplete_keys.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_585991_autocomplete_keys.js
@@ -189,18 +189,22 @@ function testReturnKey()
     is(completeNode.value, prefix + "valueOf",
         "completeNode.value holds valueOf");
 
     popup._panel.addEventListener("popuphidden", function onHidden() {
       popup._panel.removeEventListener("popuphidden", onHidden, false);
 
       ok(!popup.isOpen, "popup is not open after VK_RETURN");
 
-      is(inputNode.value, "window.foobarBug585991.valueOf",
-         "completion was successful after VK_RETURN");
+      // modified by bug 873250
+      is(inputNode.value, "", "no completion after VK_RETURN");
+      isnot(jsterm.lastInputValue, "window.foobarBug585991.valueOf",
+        "lastInputValue is not window.foobarBug585991.valueOf");
+      EventUtils.synthesizeKey("VK_UP", {});
+      is(inputNode.value, jsterm.lastInputValue, "previous entry was lastInputNode")
 
       ok(!completeNode.value, "completeNode is empty");
 
       dontShowArrayNumbers();
     }, false);
 
     EventUtils.synthesizeKey("VK_RETURN", {});
   }, false);
--- a/browser/devtools/webconsole/webconsole.js
+++ b/browser/devtools/webconsole/webconsole.js
@@ -3944,23 +3944,19 @@ JSTerm.prototype = {
           this.clearCompletion();
           aEvent.preventDefault();
         }
         else if (this.sidebar) {
           this._sidebarDestroy();
         }
         break;
 
+      // Bug 873250 - always enter, ignore autocomplete
       case Ci.nsIDOMKeyEvent.DOM_VK_RETURN:
-        if (this.autocompletePopup.isOpen && this.autocompletePopup.selectedIndex > -1) {
-          this.acceptProposedCompletion();
-        }
-        else {
-          this.execute();
-        }
+        this.execute();
         aEvent.preventDefault();
         break;
 
       case Ci.nsIDOMKeyEvent.DOM_VK_UP:
         if (this.autocompletePopup.isOpen) {
           inputUpdated = this.complete(this.COMPLETE_BACKWARD);
         }
         else if (this.canCaretGoPrevious()) {