Merge m-c to m-i

b2g/config/gaia.json

@@ -1,4 +1,4 @@
 {
-    "revision": "ebb5c473c94911bb98acff5d46f6af209c12583e", 
+    "revision": "06ea7706d72174637b5f956122f52200d3f81fda", 
     "repo_path": "/integration/gaia-central"
 }

browser/devtools/debugger/debugger-view.js

@@ -734,6 +734,7 @@ ResultsPanelContainer.prototype = Heritage.extend(WidgetMethods, {
         this._panel.className = "results-panel";
         this._panel.setAttribute("level", "top");
         this._panel.setAttribute("noautofocus", "true");
+        this._panel.setAttribute("consumeoutsideclicks", "false");
         document.documentElement.appendChild(this._panel);
       }
       if (!this.widget) {

browser/devtools/debugger/debugger.xul

@@ -358,8 +358,9 @@
   <panel id="searchbox-help-panel"
          level="top"
          type="arrow"
+         position="before_start"
          noautofocus="true"
-         position="before_start">
+         consumeoutsideclicks="false">
     <vbox>
       <hbox>
         <label id="filter-label"/>
@@ -405,10 +406,10 @@
   </panel>
 
   <panel id="conditional-breakpoint-panel"
-         hidden="true"
          level="top"
          type="arrow"
-         noautofocus="true">
+         noautofocus="true"
+         consumeoutsideclicks="false">
     <vbox>
       <label id="conditional-breakpoint-panel-description"
              value="&debuggerUI.condBreakPanelTitle;"/>
@@ -418,8 +419,9 @@
 
   <panel id="resumption-order-panel"
          type="arrow"
+         position="before_start"
          noautofocus="true"
-         position="before_start">
+         consumeoutsideclicks="false">
     <hbox align="start">
       <image class="alert-icon"/>
       <label id="resumption-panel-desc" class="description"/>

browser/devtools/webconsole/hudservice.js

@@ -483,7 +483,7 @@ WebConsole.prototype = {
 
     let showSource = ({ DebuggerView }) => {
       if (DebuggerView.Sources.containsValue(aSourceURL)) {
-        DebuggerView.setEditorLocation(aSourceURL, aSourceLine);
+        DebuggerView.setEditorLocation(aSourceURL, aSourceLine, { noDebug: true });
         return;
       }
       toolbox.selectTool("webconsole");

dom/bluetooth/BluetoothHfpManager.cpp

@@ -1653,14 +1653,8 @@ BluetoothHfpManager::ConnectSco(BluetoothReplyRunnable* aRunnable)
 bool
 BluetoothHfpManager::DisconnectSco()
 {
-  if (!IsConnected()) {
-    BT_WARNING("BluetoothHfpManager is not connected");
-    return false;
-  }
-
-  SocketConnectionStatus status = mScoSocket->GetConnectionStatus();
-  if (status != SOCKET_CONNECTED && status != SOCKET_CONNECTING) {
-    BT_WARNING("No SCO exists");
+  if (!IsScoConnected()) {
+    BT_WARNING("SCO has been already disconnected.");
     return false;
   }
 

dom/wifi/WifiWorker.js

@@ -2348,7 +2348,7 @@ function WifiWorker() {
       self.networksArray = [];
       for (let i = 1; i < lines.length; ++i) {
         // bssid / frequency / signal level / flags / ssid
-        var match = /([\S]+)\s+([\S]+)\s+([\S]+)\s+(\[[\S]+\])?\s+(.*)/.exec(lines[i]);
+        var match = /([\S]+)\s+([\S]+)\s+([\S]+)\s+(\[[\S]+\])?\s(.*)/.exec(lines[i]);
 
         if (match && match[5]) {
           let ssid = match[5],