Merge mozilla-central to autoland

2019-03-08 06:41:04 +02:00 · 2019-03-08 06:41:04 +02:00 · 77aa564189
--- a/browser/components/preferences/siteDataSettings.js
+++ b/browser/components/preferences/siteDataSettings.js
@ -221,7 +221,7 @@ let gSiteDataSettings = {
    this._updateButtonsState();
  },

-  saveChanges() {
+  async saveChanges() {
    // Tracks whether the user confirmed their decision.
    let allowed = false;

@ -233,12 +233,20 @@ let gSiteDataSettings = {
      if (this._sites.length == removals.length) {
        allowed = SiteDataManager.promptSiteDataRemoval(window);
        if (allowed) {
-          SiteDataManager.removeAll();
+          try {
+            await SiteDataManager.removeAll();
+          } catch (e) {
+            Cu.reportError(e);
+          }
        }
      } else {
        allowed = SiteDataManager.promptSiteDataRemoval(window, removals);
        if (allowed) {
-          SiteDataManager.remove(removals).catch(Cu.reportError);
+          try {
+            await SiteDataManager.remove(removals);
+          } catch (e) {
+            Cu.reportError(e);
+          }
        }
      }
    }
--- a/dom/base/crashtests/326778-1.xul
+++ b/dom/base/crashtests/326778-1.xul
@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<script>
-<![CDATA[
-try {
-  document.getBoxObjectFor({});
-} catch(e) { }
-]]>
-</script>
-</window>
--- a/dom/base/crashtests/crashtests.list
+++ b/dom/base/crashtests/crashtests.list
@ -11,7 +11,6 @@ load 308120-1.xul
 load 325730-1.html
 load 326618-1.html
 load 326646-1.html
-load 326778-1.xul
 load 326865-1.html
 load 327571-1.html
 load 327694.html
--- a/dom/base/test/mochitest.ini
+++ b/dom/base/test/mochitest.ini
@ -308,7 +308,6 @@ skip-if = toolkit == 'android'
 [test_bug338679.html]
 [test_bug339494.html]
 [test_bug339494.xhtml]
-[test_bug340571.html]
 [test_bug343596.html]
 [test_bug345339.html]
 [test_bug346485.html]
--- a/dom/base/test/test_bug340571.html
+++ b/dom/base/test/test_bug340571.html
@ -1,28 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=340571
-->
-<head>
-  <title>Test for Bug 340571</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=340571">Mozilla Bug 340571</a>
-<p id="display"></p>
-<div><select id="sel"></select></div>
-<script type="application/javascript">
-ok(!document.getBoxObjectFor, "Detecting getBoxObjectFor");
-try {
-  document.getBoxObjectFor(document.body);
-  ok(false, "getBoxObjectFor succeeded");
-} catch (e) {
-  ok(true, "getBoxObjectFor succeeded");
-}
-
-var sel = document.getElementById("sel");
-ok(!sel.boxObject, "Getting boxObject");
-</script>
-</body>
-</html>
--- a/dom/webidl/TreeColumn.webidl
+++ b/dom/webidl/TreeColumn.webidl
@ -28,6 +28,12 @@ interface TreeColumn {
  TreeColumn? getNext();
  TreeColumn? getPrevious();

+  /**
+   * Returns the previous displayed column, if any, accounting for
+   * the ordinals set on the columns.
+   */
+  readonly attribute TreeColumn? previousColumn;
+
  [Throws]
  void invalidate();
 };
--- a/dom/xul/crashtests/326644-2-inner.xul
+++ b/dom/xul/crashtests/326644-2-inner.xul
@ -1,10 +0,0 @@
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
- title="Testcase bug 326644 - Crash when changing enumerated properties of objects in xul">
-<html:script><![CDATA[
-function doe() {
-document.documentElement.boxObject.firstChild.hidden = true;
-document.documentElement.boxObject.firstChild.tooltip = 'test';
-}
-setTimeout(doe,100);
-]]></html:script>
-</window>
--- a/dom/xul/crashtests/326644-2.html
+++ b/dom/xul/crashtests/326644-2.html
@ -1,9 +0,0 @@
-<html class="reftest-wait">
-<head>
-<script>
-setTimeout('document.documentElement.className = ""', 1000);
-</script>
-<body>
-<iframe src="326644-2-inner.xul"></iframe>
-</body>
-</html>
--- a/dom/xul/crashtests/crashtests.list
+++ b/dom/xul/crashtests/crashtests.list
@ -4,7 +4,6 @@ load 253479-1.xul
 load 253479-2.xul
 load 326204-1.xul
 load 326644-1.html
-load 326644-2.html
 load 326864-1.xul
 load 326875-1.xul
 load 326881-1.xul
--- a/gfx/layers/PersistentBufferProvider.cpp
+++ b/gfx/layers/PersistentBufferProvider.cpp
@ -304,7 +304,7 @@ PersistentBufferProviderShared::BorrowDrawTarget(
      }

      if (!tex) {
-        gfxCriticalError() << "Unexpected BufferProvider over-production.";
+        gfxCriticalNote << "Unexpected BufferProvider over-production.";
        // It would be pretty bad to keep piling textures up at this point so we
        // call NotifyInactive to remove some of our textures.
        NotifyInactive();
--- a/layout/xul/crashtests/327776-1.xul
+++ b/layout/xul/crashtests/327776-1.xul
@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<script>
-<![CDATA[
-function init()
-{ 
-  var span = document.getElementsByTagName("span")[0]; 
-  var boxobj = document.getBoxObjectFor(span);
-  try {
-    boxobj.setPropertyAsSupports(undefined, undefined);
-  } catch(e) {
-  }
-}
-window.addEventListener("load", init, false);
-]]>
-</script>
-
-<body xmlns="http://www.w3.org/1999/xhtml">
-
-<span></span>
-
-</body>
-</window>
--- a/layout/xul/crashtests/346083-1.xul
+++ b/layout/xul/crashtests/346083-1.xul
@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<body xmlns="http://www.w3.org/1999/xhtml">
-
-<script>
-<![CDATA[
-document.getBoxObjectFor(document.getElementsByTagName("body")[0]).setProperty("foo", undefined);
-]]>
-</script>
-
-</body>
-</window>
--- a/layout/xul/crashtests/346281-1.xul
+++ b/layout/xul/crashtests/346281-1.xul
@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<body xmlns="http://www.w3.org/1999/xhtml">
-
-<script>
-<![CDATA[
-var boxy = document.getBoxObjectFor(document.getElementsByTagName("body")[0]);
-boxy.setPropertyAsSupports("zoink", undefined);
-try {
-  boxy.removeProperty(undefined);
-} catch(e) { }
-]]>
-</script>
-
-</body>
-</window>
--- a/layout/xul/crashtests/407152.xul
+++ b/layout/xul/crashtests/407152.xul
@ -1,7 +0,0 @@
-<triple xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" style="display: block;">
-<box style="display: block; position: relative; -moz-binding: url(data:text/xml;charset=utf-8,%3Cbindings%20xmlns%3D%22http%3A//www.mozilla.org/xbl%22%3E%0A%3Cbinding%20id%3D%22a%22%3E%0A%3Cimplementation%3E%0A%3Cfield%20name%3D%22_field%22%3Ethis.ownerDocument.getBoxObjectFor%28this.ownerDocument.documentElement%29%3B%3C/field%3E%0A%3C/implementation%3E%0A%3Ccontent%3E%0A%3C/binding%3E%0A%3C/bindings%3E);">
-<box style="position: fixed; -moz-binding: url(data:text/xml;charset=utf-8,%3Cbindings%20xmlns%3D%22http%3A//www.mozilla.org/xbl%22%3E%0A%3Cbinding%20id%3D%22a%22%3E%0A%3Ccontent%3E%0A%3Cchildren%20xmlns%3D%22http%3A//www.mozilla.org/xbl%22/%3E%3C/content%3E%3C/binding%3E%3C/bindings%3E);"/>
-<iframe/>
-</box>
-<scrollbox onoverflow="document.documentElement.removeAttribute('style')"/>
-</triple>
--- a/layout/xul/crashtests/crashtests.list
+++ b/layout/xul/crashtests/crashtests.list
@ -15,15 +15,12 @@ load 321056-1.xhtml
 load 322786-1.xul
 load 325377.xul
 load 326879-1.xul
-load 327776-1.xul
 load 328135-1.xul
 load 329327-1.xul
 load 329407-1.xml
 load 329477-1.xhtml
 load 336962-1.xul
 load 344228-1.xul
-load 346083-1.xul
-load 346281-1.xul
 load 350460.xul
 load 365151.xul
 load 366112-1.xul
@ -49,7 +46,6 @@ load 391974-1.html
 load 399013.xul
 load 402912-1.xhtml
 load 404192.xhtml
-load 407152.xul
 load 408904-1.xul
 load 412479-1.xhtml
 load 417509.xul
--- a/layout/xul/tree/nsTreeColumns.cpp
+++ b/layout/xul/tree/nsTreeColumns.cpp
@ -236,6 +236,22 @@ int32_t nsTreeColumn::GetWidth(mozilla::ErrorResult& aRv) {
  return nsPresContext::AppUnitsToIntCSSPixels(frame->GetRect().width);
 }

+already_AddRefed<nsTreeColumn> nsTreeColumn::GetPreviousColumn() {
+  nsIFrame* frame = GetFrame();
+  while (frame) {
+    frame = frame->GetPrevSibling();
+    if (frame && frame->GetContent()->IsElement()) {
+      RefPtr<nsTreeColumn> column =
+        mColumns->GetColumnFor(frame->GetContent()->AsElement());
+      if (column) {
+        return column.forget();
+      }
+    }
+  }
+
+  return nullptr;
+}
+
 nsTreeColumns::nsTreeColumns(nsTreeBodyFrame* aTree) : mTree(aTree) {}

 nsTreeColumns::~nsTreeColumns() { nsTreeColumns::InvalidateColumns(); }
--- a/layout/xul/tree/nsTreeColumns.h
+++ b/layout/xul/tree/nsTreeColumns.h
@ -71,6 +71,8 @@ class nsTreeColumn final : public nsISupports, public nsWrapperCache {
  nsTreeColumn* GetNext() const { return mNext; }
  nsTreeColumn* GetPrevious() const { return mPrevious; }

+  already_AddRefed<nsTreeColumn> GetPreviousColumn();
+
  void Invalidate(mozilla::ErrorResult& aRv);

  friend class nsTreeBodyFrame;
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/GeckoLoader.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/GeckoLoader.java
@ -212,7 +212,7 @@ public final class GeckoLoader {
    }

    @SuppressWarnings("deprecation")
-    private static final String getCPUABI() {
+    private static String getCPUABI() {
        return android.os.Build.CPU_ABI;
    }

@ -359,7 +359,7 @@ public final class GeckoLoader {
        return message.toString();
    }

-    private static final boolean attemptLoad(final String path) {
+    private static boolean attemptLoad(final String path) {
        try {
            System.load(path);
            return true;
@ -376,7 +376,7 @@ public final class GeckoLoader {
     *
     * Returns null or the cause exception.
     */
-    private static final Throwable doLoadLibraryExpected(final Context context, final String lib) {
+    private static Throwable doLoadLibraryExpected(final Context context, final String lib) {
        try {
            // Attempt 1: the way that should work.
            System.loadLibrary(lib);
--- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java
@ -163,7 +163,7 @@ public final class GeckoRuntime implements Parcelable {
        }
    };

-    private static final String getProcessName(Context context) {
+    private static String getProcessName(Context context) {
        final ActivityManager manager = (ActivityManager)context.getSystemService(Context.ACTIVITY_SERVICE);
        for (final ActivityManager.RunningAppProcessInfo info : manager.getRunningAppProcesses()) {
            if (info.pid == Process.myPid()) {
--- a/security/manager/ssl/nsCertTree.cpp
+++ b/security/manager/ssl/nsCertTree.cpp
@ -1011,7 +1011,10 @@ nsCertTree::ToggleOpenState(int32_t index) {
  if (el) {
    el->open = !el->open;
    int32_t newChildren = (el->open) ? el->numChildren : -el->numChildren;
-    if (mTree) mTree->RowCountChanged(index + 1, newChildren);
+    if (mTree) {
+      mTree->RowCountChanged(index + 1, newChildren);
+      mTree->InvalidateRow(index);
+    }
  }
  return NS_OK;
 }
--- a/toolkit/content/widgets/tree.js
+++ b/toolkit/content/widgets/tree.js
@ -335,15 +335,16 @@
    }

    get _previousVisibleColumn() {
-      var sib = this.boxObject.previousSibling;
+      var tree = this.parentNode.parentNode;
+      let sib = tree.columns.getColumnFor(this).previousColumn;
      while (sib) {
-        if (sib.localName == "treecol" &&
-            sib.getBoundingClientRect().width > 0 &&
-            sib.parentNode == this.parentNode) {
-          return sib;
+        if (sib.element && sib.element.getBoundingClientRect().width > 0) {
+          return sib.element;
        }
-        sib = sib.boxObject.previousSibling;
+
+        sib = sib.previousColumn;
      }
+
      return null;
    }