Master merge

This merges master into release to replace Redwood.

# Conflicts:
#	CLOBBER
#	build/moz.configure/old.configure
#	config/milestone.txt
#	config/moz.build
#	config/system-headers
#	dom/abort/AbortController.cpp
#	dom/abort/AbortController.h
#	dom/abort/AbortSignal.cpp
#	dom/abort/AbortSignal.h
#	dom/abort/moz.build
#	dom/abort/tests/moz.build
#	dom/animation/KeyframeEffect.cpp
#	dom/base/CustomElementRegistry.cpp
#	dom/base/DocGroup.cpp
#	dom/base/ResizeObserverController.cpp
#	dom/base/ResizeObserverController.h
#	dom/base/nsContentUtils.cpp
#	dom/base/nsContentUtils.h
#	dom/base/nsDocument.cpp
#	dom/base/nsIDocument.h
#	dom/fetch/FetchObserver.cpp
#	dom/fetch/FetchObserver.h
#	dom/heapsnapshot/AutoMemMap.cpp
#	dom/heapsnapshot/AutoMemMap.h
#	dom/heapsnapshot/CoreDump.proto
#	dom/heapsnapshot/HeapSnapshot.cpp
#	dom/heapsnapshot/HeapSnapshotTempFileHelperChild.h
#	dom/heapsnapshot/HeapSnapshotTempFileHelperParent.cpp
#	dom/heapsnapshot/HeapSnapshotTempFileHelperParent.h
#	dom/heapsnapshot/PHeapSnapshotTempFileHelper.ipdl
#	dom/heapsnapshot/moz.build
#	dom/heapsnapshot/tests/gtest/moz.build
#	dom/html/nsGenericHTMLElement.h
#	dom/media/platforms/PlatformDecoderModule.h
#	dom/media/platforms/moz.build
#	dom/script/ModuleLoadRequest.cpp
#	dom/script/ModuleLoadRequest.h
#	dom/script/ModuleScript.cpp
#	dom/script/ModuleScript.h
#	dom/script/ScriptElement.cpp
#	dom/script/ScriptElement.h
#	dom/script/ScriptLoadHandler.cpp
#	dom/script/ScriptLoadHandler.h
#	dom/script/ScriptLoader.cpp
#	dom/script/ScriptLoader.h
#	dom/script/ScriptSettings.cpp
#	dom/script/ScriptSettings.h
#	dom/script/nsIScriptElement.h
#	dom/script/nsIScriptLoaderObserver.idl
#	dom/webidl/HTMLLinkElement.webidl
#	gfx/gl/moz.build
#	gfx/graphite2/src/moz.build
#	gfx/layers/moz.build
#	js/ductwork/inspector/moz.build
#	js/ductwork/moz.build
#	js/src/gc/Heap.h
#	js/src/moz.build
#	js/src/vm/UnboxedObject-inl.h
#	js/src/vm/UnboxedObject.cpp
#	js/src/vm/UnboxedObject.h
#	layout/base/crashtests/crashtests.list
#	layout/build/moz.build
#	layout/generic/AspectRatio.h
#	layout/generic/crashtests/crashtests.list
#	layout/reftests/bidi/reftest-stylo.list
#	layout/reftests/reftest-stylo.list
#	layout/reftests/table-bordercollapse/reftest.list
#	layout/reftests/writing-mode/reftest-stylo.list
#	layout/style/StyleSheet.cpp
#	layout/style/nsRuleNode.cpp
#	layout/style/nsStyleStruct.cpp
#	layout/style/nsStyleStruct.h
#	modules/libpref/init/all.js
#	nsprpub/pr/src/linking/prlink.c
#	parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/AttributeName.java
#	parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/ElementName.java
#	parser/html/nsHtml5AtomList.h
#	parser/html/nsHtml5AttributeName.cpp
#	parser/html/nsHtml5AttributeName.h
#	parser/html/nsHtml5ElementName.cpp
#	parser/html/nsHtml5ElementName.h
#	parser/html/nsHtml5TreeBuilderCppSupplement.h
#	parser/htmlparser/nsElementTable.cpp
#	parser/htmlparser/nsHTMLTagList.h
#	security/nss/lib/nss/nss.h
#	security/nss/lib/softoken/pkcs11.c
#	security/nss/lib/softoken/softkver.h
#	security/nss/lib/util/nssutil.h
#	testing/web-platform/tests/tools/html5lib/html5lib/html5parser.py
#	testing/web-platform/tests/tools/html5lib/html5lib/treebuilders/_base.py
#	toolkit/modules/AppConstants.jsm

12 files changed, 6 insertions, 160 deletions

diff --git a/layout/tools/reftest/Makefile.in b/layout/tools/reftest/Makefile.in
index 7ff59cd8b..bbd4cb7e4 100644
--- a/layout/tools/reftest/Makefile.in
+++ b/layout/tools/reftest/Makefile.in
@@ -1,4 +1,3 @@
-# vim: set shiftwidth=8 tabstop=8 autoindent noexpandtab copyindent:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/tools/reftest/bootstrap.js b/layout/tools/reftest/bootstrap.js
index 18ca74f69..3e86a45a9 100644
--- a/layout/tools/reftest/bootstrap.js
+++ b/layout/tools/reftest/bootstrap.js
@@ -33,12 +33,6 @@ var WindowListener = {
 };
 
 function startup(data, reason) {
-  if (Services.appinfo.OS == "Android") {
-    Cm.addBootstrappedManifestLocation(data.installPath);
-    Services.wm.addListener(WindowListener);
-    return;
-  }
-
   let orig = Services.wm.getMostRecentWindow("navigator:browser");
 
   let ios = Cc["@mozilla.org/network/io-service;1"]
@@ -61,12 +55,7 @@ function startup(data, reason) {
 }
 
 function shutdown(data, reason) {
-  if (Services.appinfo.OS == "Android") {
-    Services.wm.removeListener(WindowListener);
-    Cm.removedBootstrappedManifestLocation(data.installPath);
-    OnRefTestUnload();
-    Cu.unload("chrome://reftest/content/reftest.jsm");
-  }
+  // Any special shutdown commands go here.
 }
 
 
diff --git a/layout/tools/reftest/clean-reftest-output.pl b/layout/tools/reftest/clean-reftest-output.pl
index b1959281d..0daef31ed 100755
--- a/layout/tools/reftest/clean-reftest-output.pl
+++ b/layout/tools/reftest/clean-reftest-output.pl
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-# vim: set shiftwidth=4 tabstop=8 autoindent expandtab:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/tools/reftest/mach_commands.py b/layout/tools/reftest/mach_commands.py
index e790486ef..a85181f9a 100644
--- a/layout/tools/reftest/mach_commands.py
+++ b/layout/tools/reftest/mach_commands.py
@@ -208,80 +208,6 @@ class ReftestRunner(MozbuildObject):
 
         return rv
 
-    def run_android_test(self, **kwargs):
-        """Runs a reftest, in Firefox for Android."""
-
-        args = Namespace(**kwargs)
-        if args.suite not in ('reftest', 'crashtest', 'jstestbrowser'):
-            raise Exception('None or unrecognized reftest suite type.')
-
-        self._setup_objdir(args)
-        import remotereftest
-
-        default_manifest = {
-            "reftest": (self.topsrcdir, "layout", "reftests", "reftest.list"),
-            "crashtest": (self.topsrcdir, "testing", "crashtest", "crashtests.list"),
-            "jstestbrowser": ("jsreftest", "tests", "jstests.list")
-        }
-
-        if not args.tests:
-            args.tests = [os.path.join(*default_manifest[args.suite])]
-
-        args.extraProfileFiles.append(
-            os.path.join(self.topsrcdir, "mobile", "android", "fonts"))
-
-        hyphenation_path = os.path.join(self.topsrcdir, "intl", "locales")
-
-        for (dirpath, dirnames, filenames) in os.walk(hyphenation_path):
-            for filename in filenames:
-                if filename.endswith('.dic'):
-                    args.extraProfileFiles.append(os.path.join(dirpath, filename))
-
-        if not args.httpdPath:
-            args.httpdPath = os.path.join(self.tests_dir, "modules")
-        if not args.symbolsPath:
-            args.symbolsPath = os.path.join(self.topobjdir, "crashreporter-symbols")
-        if not args.xrePath:
-            args.xrePath = os.environ.get("MOZ_HOST_BIN")
-        if not args.app:
-            args.app = self.substs["ANDROID_PACKAGE_NAME"]
-        if not args.utilityPath:
-            args.utilityPath = args.xrePath
-        args.dm_trans = "adb"
-        args.ignoreWindowSize = True
-        args.printDeviceInfo = False
-
-        from mozrunner.devices.android_device import grant_runtime_permissions
-        grant_runtime_permissions(self)
-
-        # A symlink and some path manipulations are required so that test
-        # manifests can be found both locally and remotely (via a url)
-        # using the same relative path.
-        if args.suite == "jstestbrowser":
-            staged_js_dir = os.path.join(self.topobjdir, "dist", "test-stage", "jsreftest")
-            tests = os.path.join(self.reftest_dir, 'jsreftest')
-            if not os.path.isdir(tests):
-                os.symlink(staged_js_dir, tests)
-            args.extraProfileFiles.append(os.path.join(staged_js_dir, "tests", "user.js"))
-        else:
-            tests = os.path.join(self.reftest_dir, "tests")
-            if not os.path.isdir(tests):
-                os.symlink(self.topsrcdir, tests)
-            for i, path in enumerate(args.tests):
-                # Non-absolute paths are relative to the packaged directory, which
-                # has an extra tests/ at the start
-                if os.path.exists(os.path.abspath(path)):
-                    path = os.path.relpath(path, os.path.join(self.topsrcdir))
-                args.tests[i] = os.path.join('tests', path)
-
-        self.log_manager.enable_unstructured()
-        try:
-            rv = remotereftest.run_test_harness(parser, args)
-        finally:
-            self.log_manager.disable_unstructured()
-
-        return rv
-
 
 def process_test_objects(kwargs):
     """|mach test| works by providing a test_objects argument, from
@@ -299,12 +225,7 @@ def get_parser():
     global parser
     here = os.path.abspath(os.path.dirname(__file__))
     build_obj = MozbuildObject.from_environment(cwd=here)
-    if conditions.is_android(build_obj):
-        parser = reftestcommandline.RemoteArgumentsParser()
-    elif conditions.is_mulet(build_obj):
-        parser = reftestcommandline.B2GArgumentParser()
-    else:
-        parser = reftestcommandline.DesktopArgumentsParser()
+    parser = reftestcommandline.DesktopArgumentsParser()
     return parser
 
 
@@ -340,12 +261,6 @@ class MachCommands(MachCommandBase):
     def _run_reftest(self, **kwargs):
         process_test_objects(kwargs)
         reftest = self._spawn(ReftestRunner)
-        if conditions.is_android(self):
-            from mozrunner.devices.android_device import verify_android_device
-            verify_android_device(self, install=True, xre=True)
-            return reftest.run_android_test(**kwargs)
-        elif conditions.is_mulet(self):
-            return reftest.run_mulet_test(**kwargs)
         return reftest.run_desktop_test(**kwargs)
 
 
diff --git a/layout/tools/reftest/mach_test_package_commands.py b/layout/tools/reftest/mach_test_package_commands.py
index e3bf64cb8..197800cf2 100644
--- a/layout/tools/reftest/mach_test_package_commands.py
+++ b/layout/tools/reftest/mach_test_package_commands.py
@@ -29,8 +29,6 @@ def run_reftest(context, **kwargs):
     normalize = partial(context.normalize_test_path, test_root)
     args.tests = map(normalize, args.tests)
 
-    if mozinfo.info.get('buildapp') == 'mobile/android':
-        return run_reftest_android(context, args)
     return run_reftest_desktop(context, args)
 
 
@@ -44,37 +42,13 @@ def run_reftest_desktop(context, args):
     return run_test_harness(parser, args)
 
 
-def run_reftest_android(context, args):
-    from remotereftest import run_test_harness
-
-    args.app = args.app or 'org.mozilla.fennec'
-    args.utilityPath = context.hostutils
-    args.xrePath = context.hostutils
-    args.httpdPath = context.module_dir
-    args.dm_trans = 'adb'
-    args.ignoreWindowSize = True
-    args.printDeviceInfo = False
-
-    config = context.mozharness_config
-    if config:
-        args.remoteWebServer = config['remote_webserver']
-        args.httpPort = config['emulator']['http_port']
-        args.sslPort = config['emulator']['ssl_port']
-        args.adb_path = config['exes']['adb'] % {'abs_work_dir': context.mozharness_workdir}
-
-    return run_test_harness(parser, args)
-
-
 def setup_argument_parser():
     import mozinfo
     import reftestcommandline
 
     global parser
     mozinfo.find_and_update_from_json(here)
-    if mozinfo.info.get('buildapp') == 'mobile/android':
-        parser = reftestcommandline.RemoteArgumentsParser()
-    else:
-        parser = reftestcommandline.DesktopArgumentsParser()
+    parser = reftestcommandline.DesktopArgumentsParser()
     return parser
 
 
diff --git a/layout/tools/reftest/moz.build b/layout/tools/reftest/moz.build
index 4dcf1a6f6..77d30b9aa 100644
--- a/layout/tools/reftest/moz.build
+++ b/layout/tools/reftest/moz.build
@@ -1,5 +1,4 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/layout/tools/reftest/reftest-analyzer-structured.xhtml b/layout/tools/reftest/reftest-analyzer-structured.xhtml
index b06bd8169..a399521d4 100644
--- a/layout/tools/reftest/reftest-analyzer-structured.xhtml
+++ b/layout/tools/reftest/reftest-analyzer-structured.xhtml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- -*- Mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set shiftwidth=2 tabstop=2 autoindent expandtab: -->
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
diff --git a/layout/tools/reftest/reftest-analyzer.xhtml b/layout/tools/reftest/reftest-analyzer.xhtml
index 64a50253e..deed7bad6 100644
--- a/layout/tools/reftest/reftest-analyzer.xhtml
+++ b/layout/tools/reftest/reftest-analyzer.xhtml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- -*- Mode: HTML; tab-width: 2; indent-tabs-mode: nil; -*- -->
-<!-- vim: set shiftwidth=2 tabstop=2 autoindent expandtab: -->
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
diff --git a/layout/tools/reftest/reftest-content.js b/layout/tools/reftest/reftest-content.js
index f26cae8ef..04e4714ff 100644
--- a/layout/tools/reftest/reftest-content.js
+++ b/layout/tools/reftest/reftest-content.js
@@ -1,5 +1,4 @@
 /* -*- indent-tabs-mode: nil; js-indent-level: 4 -*- /
-/* vim: set shiftwidth=4 tabstop=8 autoindent cindent expandtab: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
diff --git a/layout/tools/reftest/reftest.jsm b/layout/tools/reftest/reftest.jsm
index c885150a4..cd2e02f27 100644
--- a/layout/tools/reftest/reftest.jsm
+++ b/layout/tools/reftest/reftest.jsm
@@ -1,5 +1,4 @@
 /* -*- indent-tabs-mode: nil; js-indent-level: 4 -*- /
-/* vim: set shiftwidth=4 tabstop=8 autoindent cindent expandtab: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -303,16 +302,7 @@ this.OnRefTestLoad = function OnRefTestLoad(win)
     // what size our window is
     gBrowser.setAttribute("style", "padding: 0px; margin: 0px; border:none; min-width: 800px; min-height: 1000px; max-width: 800px; max-height: 1000px");
 
-    if (Services.appinfo.OS == "Android") {
-      let doc;
-      doc = gContainingWindow.document.getElementById('main-window');
-      while (doc.hasChildNodes()) {
-        doc.removeChild(doc.firstChild);
-      }
-      doc.appendChild(gBrowser);
-    } else {
-      document.getElementById("reftest-window").appendChild(gBrowser);
-    }
+    document.getElementById("reftest-window").appendChild(gBrowser);
 
     // reftests should have the test plugins enabled, not click-to-play
     let plugin1 = getTestPlugin("Test Plug-in");
@@ -342,10 +332,6 @@ function InitAndStartRefTests()
         logger.error("EXCEPTION: " + e);
     }
 
-    try {
-      prefs.setBoolPref("android.widget_paints_background", false);
-    } catch (e) {}
-
     /* set the gLoadTimeout */
     gLoadTimeout = prefs.getIntPref("reftest.timeout", 5 * 60 * 1000); //5 minutes as per bug 479518
 
@@ -621,7 +607,7 @@ function BuildConditionSandbox(aURL) {
 
     // Shortcuts for widget toolkits.
     sandbox.B2G = false;
-    sandbox.Android = xr.OS == "Android" && !sandbox.B2G;
+    sandbox.Android = false;
     sandbox.cocoaWidget = xr.widgetToolkit == "cocoa";
     sandbox.gtkWidget = xr.widgetToolkit == "gtk2"
                         || xr.widgetToolkit == "gtk3";
@@ -631,14 +617,6 @@ function BuildConditionSandbox(aURL) {
     // Scrollbars that are semi-transparent. See bug 1169666.
     sandbox.transparentScrollbars = xr.widgetToolkit == "gtk3";
 
-    if (sandbox.Android) {
-        var sysInfo = CC["@mozilla.org/system-info;1"].getService(CI.nsIPropertyBag2);
-
-        // This is currently used to distinguish Android 4.0.3 (SDK version 15)
-        // and later from Android 2.x
-        sandbox.AndroidVersion = sysInfo.getPropertyAsInt32("version");
-    }
-
 #if MOZ_ASAN
     sandbox.AddressSanitizer = true;
 #else
diff --git a/layout/tools/reftest/reftest.xul b/layout/tools/reftest/reftest.xul
index ae5355d20..46ae6e29e 100644
--- a/layout/tools/reftest/reftest.xul
+++ b/layout/tools/reftest/reftest.xul
@@ -1,4 +1,3 @@
-<!-- vim: set shiftwidth=4 tabstop=8 autoindent expandtab: -->
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
diff --git a/layout/tools/reftest/reftestcommandline.py b/layout/tools/reftest/reftestcommandline.py
index f983be528..40bd8a5ee 100644
--- a/layout/tools/reftest/reftestcommandline.py
+++ b/layout/tools/reftest/reftestcommandline.py
@@ -352,8 +352,7 @@ class DesktopArgumentsParser(ReftestArgumentsParser):
 
         if options.app is None:
             bin_dir = (self.build_obj.get_binary_path() if
-                       self.build_obj and self.build_obj.substs[
-                           'MOZ_BUILD_APP'] != 'mobile/android'
+                       self.build_obj
                        else None)
 
             if bin_dir:
@@ -744,7 +743,5 @@ class RemoteArgumentsParser(ReftestArgumentsParser):
                 self.error("ERROR: Invalid screen resolution %sx%s, please adjust to 1366x1050 or higher" % (
                     width, height))
 
-        # Disable e10s by default on Android because we don't run Android
-        # e10s jobs anywhere yet.
         options.e10s = False
         return options