Merge branch 'master' into Basilisk-releasev2018.09.05

3 files changed, 14 insertions, 37 deletions

diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js
index 4e42a5687..b1d7ab5f6 100644
--- a/toolkit/content/aboutSupport.js
+++ b/toolkit/content/aboutSupport.js
@@ -180,9 +180,12 @@ var snapshotFormatters = {
           title = key;
         }
       }
+      let td = $.new("td", value);
+      td.style["white-space"] = "pre-wrap";
+
       return $.new("tr", [
         $.new("th", title, "column"),
-        $.new("td", value),
+        td,
       ]);
     }
 
@@ -306,8 +309,16 @@ var snapshotFormatters = {
            apzInfo.length
            ? apzInfo.join("; ")
            : localizedMsg(["apzNone"]));
-    addRowFromKey("features", "webglRenderer");
+    addRowFromKey("features", "webgl1WSIInfo");
+    addRowFromKey("features", "webgl1Renderer");
+    addRowFromKey("features", "webgl1Version");
+    addRowFromKey("features", "webgl1DriverExtensions");
+    addRowFromKey("features", "webgl1Extensions");
+    addRowFromKey("features", "webgl2WSIInfo");
     addRowFromKey("features", "webgl2Renderer");
+    addRowFromKey("features", "webgl2Version");
+    addRowFromKey("features", "webgl2DriverExtensions");
+    addRowFromKey("features", "webgl2Extensions");
     addRowFromKey("features", "supportsHardwareH264", "hardwareH264");
     addRowFromKey("features", "currentAudioBackend", "audioBackend");
     addRowFromKey("features", "direct2DEnabled", "#Direct2D");
diff --git a/toolkit/content/tests/chrome/window_browser_drop.xul b/toolkit/content/tests/chrome/window_browser_drop.xul
index 8a22ccce9..2d9bcd2a1 100644
--- a/toolkit/content/tests/chrome/window_browser_drop.xul
+++ b/toolkit/content/tests/chrome/window_browser_drop.xul
@@ -31,7 +31,7 @@ function dropOnRemoteBrowserAsync(browser, data, shouldExpectStateChange) {
       });
     }
 
-    let dataTransfer = new content.DataTransfer("dragstart", false);
+    let dataTransfer = new content.DataTransfer();
     for (let i = 0; i < data.length; i++) {
       let types = data[i];
       for (let j = 0; j < types.length; j++) {
@@ -166,18 +166,6 @@ function* dropLinksOnBrowser(browser, type) {
                           data: "http://www.mozilla.org/\nMozilla.org\nhttp://www.example.com/\nExample.com" } ] ],
                     "text/x-moz-url with 2 URLs drop on browser " + type);
 
-  // Dropping multiple items should open multiple pages.
-  yield* expectLink(browser,
-                    [ { url: "http://www.example.com/",
-                        name: "Example.com" },
-                      { url: "http://www.mozilla.org/",
-                        name: "http://www.mozilla.org/" }],
-                    [ [ { type: "text/x-moz-url",
-                          data: "http://www.example.com/\nExample.com" } ],
-                      [ { type: "text/plain",
-                          data: "http://www.mozilla.org/" } ] ],
-                    "text/x-moz-url and text/plain drop on browser " + type);
-
   // Dropping single item with multiple types should open single page.
   yield* expectLink(browser,
                     [ { url: "http://www.example.org/",
diff --git a/toolkit/content/widgets/tabbox.xml b/toolkit/content/widgets/tabbox.xml
index 02adb70b3..60c395c13 100644
--- a/toolkit/content/widgets/tabbox.xml
+++ b/toolkit/content/widgets/tabbox.xml
@@ -792,19 +792,6 @@
       <field name="arrowKeysShouldWrap" readonly="true">
         /Mac/.test(navigator.platform)
       </field>
-      <property name="TelemetryStopwatch" readonly="true">
-        <getter><![CDATA[
-          let module = {};
-          Cu.import("resource://gre/modules/TelemetryStopwatch.jsm", module);
-          Object.defineProperty(this, "TelemetryStopwatch", {
-            configurable: true,
-            enumerable: true,
-            writable: true,
-            value: module.TelemetryStopwatch
-          });
-          return module.TelemetryStopwatch;
-        ]]></getter>
-      </property>
     </implementation>
 
     <handlers>
@@ -814,11 +801,6 @@
           return;
 
         if (this != this.parentNode.selectedItem) { // Not selected yet
-          let stopwatchid = this.parentNode.getAttribute("stopwatchid");
-          if (stopwatchid) {
-            this.TelemetryStopwatch.start(stopwatchid);
-          }
-
           // Call this before setting the 'ignorefocus' attribute because this
           // will pass on focus if the formerly selected tab was focused as well.
           this.parentNode._selectNewTab(this);
@@ -836,10 +818,6 @@
             this.setAttribute("ignorefocus", "true");
             setTimeout(tab => tab.removeAttribute("ignorefocus"), 0, this);
           }
-
-          if (stopwatchid) {
-            this.TelemetryStopwatch.finish(stopwatchid);
-          }
         }
         // Otherwise this tab is already selected and we will fall
         // through to mousedown behavior which sets focus on the current tab,