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, 2 insertions, 139 deletions

diff --git a/layout/reftests/image/reftest-stylo.list b/layout/reftests/image/reftest-stylo.list
deleted file mode 100644
index 23d4783a3..000000000
--- a/layout/reftests/image/reftest-stylo.list
+++ /dev/null
@@ -1,137 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-fuzzy-if(Android,8,30) == background-image-zoom-1.html background-image-zoom-1.html
-fails-if(usesRepeatResampling) == background-image-zoom-2.html background-image-zoom-2.html
-== image-seam-1a.html image-seam-1a.html
-== image-seam-1b.html image-seam-1b.html
-fuzzy-if(Android,255,154) == image-seam-2.html image-seam-2.html
-# Bug 1128229
-skip-if((B2G&&browserIsRemote)||Mulet) == image-zoom-1.html image-zoom-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == image-zoom-2.html image-zoom-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== invalid-url-image-1.html invalid-url-image-1.html
-random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == sync-image-switch-1a.html sync-image-switch-1a.html
-# bug 855050 for WinXP
-random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == sync-image-switch-1b.html sync-image-switch-1b.html
-# bug 855050 for WinXP
-random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == sync-image-switch-1c.html sync-image-switch-1c.html
-# bug 855050 for WinXP
-random-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == sync-image-switch-1d.html sync-image-switch-1d.html
-# bug 855050 for WinXP
-
-# Tests for "object-fit" & "object-position"
-skip == image-object-fit-dyn-1.html image-object-fit-dyn-1.html
-skip == image-object-fit-with-background-1.html image-object-fit-with-background-1.html
-skip == image-object-fit-with-background-2.html image-object-fit-with-background-2.html
-skip == image-object-position-dyn-1.html image-object-position-dyn-1.html
-skip == image-object-position-with-background-1.html image-object-position-with-background-1.html
-skip == image-object-position-with-background-2.html image-object-position-with-background-2.html
-# Bug 1128229
-
-# Tests for image-orientation used with 'from-image' (note that all
-# image-orientation tests are fuzzy because the JPEG images do not perfectly
-# reproduce blocks of solid color, even at maximum quality):
-== image-orientation-from-image.html?none image-orientation-from-image.html?none
-== image-orientation-from-image.html?0 image-orientation-from-image.html?0
-== image-orientation-from-image.html?90 image-orientation-from-image.html?90
-== image-orientation-from-image.html?180 image-orientation-from-image.html?180
-== image-orientation-from-image.html?270 image-orientation-from-image.html?270
-== image-orientation-from-image.html?0&flip image-orientation-from-image.html?0&flip
-== image-orientation-from-image.html?90&flip image-orientation-from-image.html?90&flip
-== image-orientation-from-image.html?180&flip image-orientation-from-image.html?180&flip
-== image-orientation-from-image.html?270&flip image-orientation-from-image.html?270&flip
-
-# Tests for image-orientation used with an explicit orientation:
-fuzzy(1,1) == image-orientation-explicit.html?0 image-orientation-explicit.html?0
-== image-orientation-explicit.html?90 image-orientation-explicit.html?90
-== image-orientation-explicit.html?180 image-orientation-explicit.html?180
-== image-orientation-explicit.html?270 image-orientation-explicit.html?270
-== image-orientation-explicit.html?0&flip image-orientation-explicit.html?0&flip
-== image-orientation-explicit.html?90&flip image-orientation-explicit.html?90&flip
-== image-orientation-explicit.html?180&flip image-orientation-explicit.html?180&flip
-== image-orientation-explicit.html?270&flip image-orientation-explicit.html?270&flip
-
-# Tests for image-orientation used with non-axis-aligned angles:
-fuzzy(1,1) == image-orientation-explicit.html?-45 image-orientation-explicit.html?-45
-fuzzy(1,1) == image-orientation-explicit.html?-15 image-orientation-explicit.html?-15
-fuzzy(1,1) == image-orientation-explicit.html?15 image-orientation-explicit.html?15
-== image-orientation-explicit.html?45 image-orientation-explicit.html?45
-== image-orientation-explicit.html?75 image-orientation-explicit.html?75
-== image-orientation-explicit.html?105 image-orientation-explicit.html?105
-== image-orientation-explicit.html?135 image-orientation-explicit.html?135
-== image-orientation-explicit.html?165 image-orientation-explicit.html?165
-== image-orientation-explicit.html?195 image-orientation-explicit.html?195
-== image-orientation-explicit.html?225 image-orientation-explicit.html?225
-== image-orientation-explicit.html?255 image-orientation-explicit.html?255
-== image-orientation-explicit.html?285 image-orientation-explicit.html?285
-fuzzy(1,1) == image-orientation-explicit.html?315 image-orientation-explicit.html?315
-fuzzy(1,1) == image-orientation-explicit.html?345 image-orientation-explicit.html?345
-
-# Tests for image-orientation used on generated content:
-== image-orientation-generated-content.html?from-image image-orientation-generated-content.html?from-image
-== image-orientation-generated-content.html?0 image-orientation-generated-content.html?0
-== image-orientation-generated-content.html?90 image-orientation-generated-content.html?90
-== image-orientation-generated-content.html?180 image-orientation-generated-content.html?180
-== image-orientation-generated-content.html?270 image-orientation-generated-content.html?270
-== image-orientation-generated-content.html?0&flip image-orientation-generated-content.html?0&flip
-== image-orientation-generated-content.html?90&flip image-orientation-generated-content.html?90&flip
-== image-orientation-generated-content.html?180&flip image-orientation-generated-content.html?180&flip
-== image-orientation-generated-content.html?270&flip image-orientation-generated-content.html?270&flip
-
-# Tests that image-orientation does not apply to decorative images:
-== image-orientation-background.html?from-image image-orientation-background.html?from-image
-== image-orientation-background.html?90&flip image-orientation-background.html?90&flip
-== image-orientation-border-image.html?from-image image-orientation-border-image.html?from-image
-== image-orientation-border-image.html?90&flip image-orientation-border-image.html?90&flip
-== image-orientation-list-style-image.html?from-image image-orientation-list-style-image.html?from-image
-== image-orientation-list-style-image.html?90&flip image-orientation-list-style-image.html?90&flip
-
-# Sanity checks for the image-orientation tests. Ensures that the various
-# combinations of rotations and flips actually look different from each other.
-== image-orientation-ref.html?0 image-orientation-ref.html?0
-== image-orientation-ref.html?0 image-orientation-ref.html?0
-== image-orientation-ref.html?0 image-orientation-ref.html?0
-== image-orientation-ref.html?90 image-orientation-ref.html?90
-== image-orientation-ref.html?90 image-orientation-ref.html?90
-== image-orientation-ref.html?180 image-orientation-ref.html?180
-== image-orientation-ref.html?0 image-orientation-ref.html?0
-== image-orientation-ref.html?90 image-orientation-ref.html?90
-== image-orientation-ref.html?180 image-orientation-ref.html?180
-== image-orientation-ref.html?270 image-orientation-ref.html?270
-== image-orientation-generated-content-ref.html?0 image-orientation-generated-content-ref.html?0
-== image-orientation-generated-content-ref.html?0 image-orientation-generated-content-ref.html?0
-== image-orientation-generated-content-ref.html?0 image-orientation-generated-content-ref.html?0
-== image-orientation-generated-content-ref.html?90 image-orientation-generated-content-ref.html?90
-== image-orientation-generated-content-ref.html?90 image-orientation-generated-content-ref.html?90
-== image-orientation-generated-content-ref.html?180 image-orientation-generated-content-ref.html?180
-== image-orientation-generated-content-ref.html?0 image-orientation-generated-content-ref.html?0
-== image-orientation-generated-content-ref.html?90 image-orientation-generated-content-ref.html?90
-== image-orientation-generated-content-ref.html?180 image-orientation-generated-content-ref.html?180
-== image-orientation-generated-content-ref.html?270 image-orientation-generated-content-ref.html?270
-== image-orientation-dynamic.html image-orientation-dynamic.html
-
-# <img srcset> tests
-skip == image-srcset-basic-selection-0.1x.html image-srcset-basic-selection-0.1x.html
-skip == image-srcset-basic-selection-2x.html image-srcset-basic-selection-2x.html
-skip == image-srcset-basic-selection-0.5x.html image-srcset-basic-selection-0.5x.html
-skip == image-srcset-basic-selection-0.6x.html image-srcset-basic-selection-0.6x.html
-skip == image-srcset-basic-selection-1.5x.html image-srcset-basic-selection-1.5x.html
-skip == image-srcset-basic-selection-1x.html image-srcset-basic-selection-1x.html
-skip == image-srcset-basic-selection-width-0.5x.html image-srcset-basic-selection-width-0.5x.html
-skip == image-srcset-basic-selection-width-10x.html image-srcset-basic-selection-width-10x.html
-skip == image-srcset-basic-selection-width-2x.html image-srcset-basic-selection-width-2x.html
-skip == image-srcset-basic-selection-width-1x.html image-srcset-basic-selection-width-1x.html
-== image-srcset-default-2x.html image-srcset-default-2x.html
-== image-srcset-default-1x.html image-srcset-default-1x.html
-== image-srcset-default-src-2x.html image-srcset-default-src-2x.html
-== image-srcset-default-src-1x.html image-srcset-default-src-1x.html
-== image-srcset-orientation-2x.html image-srcset-orientation-2x.html
-== image-srcset-orientation-1x.html image-srcset-orientation-1x.html
-== image-srcset-svg-3x.html image-srcset-svg-3x.html
-== image-srcset-svg-2x.html image-srcset-svg-2x.html
-== image-srcset-svg-1x.html image-srcset-svg-1x.html
-== image-srcset-svg-default-2x.html image-srcset-svg-default-2x.html
-== image-srcset-svg-default-1x.html image-srcset-svg-default-1x.html
-
-== image-resize-percent-height.html image-resize-percent-height.html
-== image-resize-percent-width.html image-resize-percent-width.html
diff --git a/layout/reftests/image/reftest.list b/layout/reftests/image/reftest.list
index 0eddb61fc..ad3179464 100644
--- a/layout/reftests/image/reftest.list
+++ b/layout/reftests/image/reftest.list
@@ -1,8 +1,8 @@
-fuzzy-if(Android,8,30) == background-image-zoom-1.html background-image-zoom-1-ref.html
+== background-image-zoom-1.html background-image-zoom-1-ref.html
 fails-if(usesRepeatResampling) == background-image-zoom-2.html about:blank
 == image-seam-1a.html image-seam-1-ref.html
 == image-seam-1b.html image-seam-1-ref.html
-fuzzy-if(Android,255,154) == image-seam-2.html  image-seam-2-ref.html  # Bug 1128229
+== image-seam-2.html  image-seam-2-ref.html  # Bug 1128229
 == image-zoom-1.html image-zoom-1-ref.html
 == image-zoom-2.html image-zoom-1-ref.html
 == invalid-url-image-1.html invalid-url-image-1-ref.html