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

2 files changed, 1 insertions, 34 deletions

diff --git a/layout/reftests/svg/smil/event/reftest-stylo.list b/layout/reftests/svg/smil/event/reftest-stylo.list
deleted file mode 100644
index b70cafd53..000000000
--- a/layout/reftests/svg/smil/event/reftest-stylo.list
+++ /dev/null
@@ -1,33 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Tests related to SVG Animation (using SMIL) that use event timing.
-
-== event-begin-1.svg event-begin-1.svg
-== event-begin-offset-1.svg event-begin-offset-1.svg
-== event-begin-offset-2.svg event-begin-offset-2.svg
-== event-begin-timeevent-1.svg event-begin-timeevent-1.svg
-== event-begin-timeevent-2.svg event-begin-timeevent-2.svg
-random-if(Android) == event-begin-timeevent-3.svg event-begin-timeevent-3.svg
-== event-begin-load-1.svg event-begin-load-1.svg
-== event-bubble-1.svg event-bubble-1.svg
-== event-custom-1.svg event-custom-1.svg
-== event-end-1.svg event-end-1.svg
-== event-end-2.svg event-end-2.svg
-== event-end-open-1.svg event-end-open-1.svg
-== event-end-trimmed-1.svg event-end-trimmed-1.svg
-== event-preventDefault-1.svg event-preventDefault-1.svg
-== event-seek-1.svg event-seek-1.svg
-== event-target-default-1.svg event-target-default-1.svg
-== event-target-default-2.svg event-target-default-2.svg
-== event-target-id-change-1.svg event-target-id-change-1.svg
-== event-target-id-change-2.svg event-target-id-change-2.svg
-== event-target-id-change-3.svg event-target-id-change-3.svg
-== event-target-xlink-change-1.svg event-target-xlink-change-1.svg
-== event-target-xlink-change-2.svg event-target-xlink-change-2.svg
-== event-target-xlink-change-3.svg event-target-xlink-change-3.svg
-== event-target-xlink-change-4.svg event-target-xlink-change-4.svg
-== event-target-surgery-1.svg event-target-surgery-1.svg
-skip == event-target-surgery-2.svg event-target-surgery-2.svg
-== event-target-surgery-3.svg event-target-surgery-3.svg
-skip == event-target-non-svg-1.xhtml event-target-non-svg-1.xhtml
-== accesskey-entity-1.svg accesskey-entity-1.svg
-== accesskey-entity-2.svg accesskey-entity-2.svg
diff --git a/layout/reftests/svg/smil/event/reftest.list b/layout/reftests/svg/smil/event/reftest.list
index 02b845b07..fc2b057e5 100644
--- a/layout/reftests/svg/smil/event/reftest.list
+++ b/layout/reftests/svg/smil/event/reftest.list
@@ -5,7 +5,7 @@
 == event-begin-offset-2.svg green-box-ref.svg
 == event-begin-timeevent-1.svg green-box-ref.svg
 == event-begin-timeevent-2.svg green-box-ref.svg
-random-if(Android) == event-begin-timeevent-3.svg green-box-ref.svg
+== event-begin-timeevent-3.svg green-box-ref.svg
 == event-begin-load-1.svg green-box-ref.svg
 == event-bubble-1.svg green-box-ref.svg
 == event-custom-1.svg green-box-ref.svg