Merge fx-team to central, a=merge

devtools/client/responsive.html/test/browser/browser_device_change.js

@@ -10,8 +10,15 @@ const DEFAULT_UA = Cc["@mozilla.org/network/protocol;1?name=http"]
   .userAgent;
 const NOKIA_UA = "Mozilla/5.0 (compatible; MSIE 10.0; Windows Phone 8.0; " +
   "Trident/6.0; IEMobile/10.0; ARM; Touch; NOKIA; Lumia 520)";
+const Types = require("devtools/client/responsive.html/types");
 
 addRDMTask(TEST_URL, function* ({ ui, manager }) {
+  let { store } = ui.toolWindow;
+
+  // Wait until the viewport has been added and the device list has been loaded
+  yield waitUntilState(store, state => state.viewports.length == 1
+    && state.devices.listState == Types.deviceListState.LOADED);
+
   // Test defaults
   testViewportDimensions(ui, 320, 480);
   yield testUserAgent(ui, DEFAULT_UA);

dom/html/test/browser_bug592641.js

@@ -30,7 +30,7 @@ function load1Soon() {
 
 function load1Done() {
   // Check the title
-  var title = ctx.tab1Browser.contentWindow.document.title;
+  var title = ctx.tab1Browser.contentTitle;
   checkTitle(title);
 
   // Try loading the same image in a new tab to make sure things work in
@@ -49,7 +49,7 @@ function load2Soon() {
 
 function load2Done() {
   // Check the title
-  var title = ctx.tab2Browser.contentWindow.document.title;
+  var title = ctx.tab2Browser.contentTitle;
   checkTitle(title);
 
   // Clean up

mobile/android/services/src/main/java/org/mozilla/gecko/fxa/FxAccountDeviceRegistrator.java

@@ -43,7 +43,7 @@ public class FxAccountDeviceRegistrator implements BundleEventListener {
 
   // The current version of the device registration, we use this to re-register
   // devices after we update what we send on device registration.
-  public static final Integer DEVICE_REGISTRATION_VERSION = 1;
+  public static final Integer DEVICE_REGISTRATION_VERSION = 2;
 
   private static FxAccountDeviceRegistrator instance;
   private final WeakReference<Context> context;

toolkit/content/license.html

@@ -4182,7 +4182,7 @@ PERFORMANCE OF THIS SOFTWARE.
     <h1><a id="node-properties"></a>node-properties License</h1>
 
     <p>This license applies to
-    <span class="path">devtools/client/shared/vendor/node-properties.js</span>.</p>
+    <span class="path">devtools/shared/node-properties/node-properties.js</span>.</p>
 
 <pre>
 The MIT License (MIT)
@@ -4878,7 +4878,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     <h1><a id="sprintf.js"></a>sprintf.js License</h1>
 
     <p>This license applies to
-    <span class="path">devtools/client/shared/vendor/sprintf.js</span>.</p>
+    <span class="path">devtools/shared/sprintfjs/sprintf.js</span>.</p>
 
 <pre>
 Copyright (c) 2007-2016, Alexandru Marasteanu &lt;hello [at) alexei (dot] ro&gt;

toolkit/content/widgets/tree.xml

@@ -383,9 +383,13 @@
             }
             setTimeout(selectText, 0);
 
+            // Clear the text because we don't want the text appearing underneath the input.
+            this.view.setCellText(row, column, "");
+            // Save the original text so we can restore it after stoping editing.
+            input.setAttribute("data-original-text", input.value);
+
             this._editingRow = row;
             this._editingColumn = column;
-
             this.setAttribute("editing", "true");
             return true;
           ]]>
@@ -402,16 +406,15 @@
             var input = this.inputField;
             var editingRow = this._editingRow;
             var editingColumn = this._editingColumn;
+            var value = accept ? input.value : input.getAttribute("data-original-text");
             this._editingRow = -1;
             this._editingColumn = null;
-            if (accept) {
+            this.view.setCellText(editingRow, editingColumn, value);
-              var value = input.value;
-              this.view.setCellText(editingRow, editingColumn, value);
-            }
 
             input.hidden = true;
             input.value = "";
             this.removeAttribute("editing");
+            input.removeAttribute("data-original-text");
           ]]>
         </body>
       </method>