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, 207 deletions

diff --git a/layout/reftests/w3c-css/submitted/flexbox/reftest-stylo.list b/layout/reftests/w3c-css/submitted/flexbox/reftest-stylo.list
deleted file mode 100644
index 41635050d..000000000
--- a/layout/reftests/w3c-css/submitted/flexbox/reftest-stylo.list
+++ /dev/null
@@ -1,206 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Tests for absolutely-positioned children of a flex container
-== flexbox-abspos-child-001a.html flexbox-abspos-child-001a.html
-== flexbox-abspos-child-001b.html flexbox-abspos-child-001b.html
-
-# Tests for handling anonymous flex items
-== flexbox-anonymous-items-001.html flexbox-anonymous-items-001.html
-
-# Tests for alignment of flex lines (align-content property)
-== flexbox-align-content-horiz-001a.xhtml flexbox-align-content-horiz-001a.xhtml
-== flexbox-align-content-horiz-001b.xhtml flexbox-align-content-horiz-001b.xhtml
-== flexbox-align-content-vert-001a.xhtml flexbox-align-content-vert-001a.xhtml
-== flexbox-align-content-vert-001b.xhtml flexbox-align-content-vert-001b.xhtml
-
-# Tests for cross-axis alignment (align-self / align-items properties)
-== flexbox-align-self-baseline-horiz-001a.xhtml flexbox-align-self-baseline-horiz-001a.xhtml
-== flexbox-align-self-baseline-horiz-001b.xhtml flexbox-align-self-baseline-horiz-001b.xhtml
-== flexbox-align-self-baseline-horiz-002.xhtml flexbox-align-self-baseline-horiz-002.xhtml
-== flexbox-align-self-baseline-horiz-003.xhtml flexbox-align-self-baseline-horiz-003.xhtml
-== flexbox-align-self-baseline-horiz-004.xhtml flexbox-align-self-baseline-horiz-004.xhtml
-== flexbox-align-self-baseline-horiz-005.xhtml flexbox-align-self-baseline-horiz-005.xhtml
-
-== flexbox-align-self-stretch-vert-001.html flexbox-align-self-stretch-vert-001.html
-== flexbox-align-self-stretch-vert-002.html flexbox-align-self-stretch-vert-002.html
-
-== flexbox-align-self-horiz-001-block.xhtml flexbox-align-self-horiz-001-block.xhtml
-== flexbox-align-self-horiz-001-table.xhtml flexbox-align-self-horiz-001-table.xhtml
-random == flexbox-align-self-horiz-002.xhtml flexbox-align-self-horiz-002.xhtml
-== flexbox-align-self-horiz-003.xhtml flexbox-align-self-horiz-003.xhtml
-== flexbox-align-self-horiz-004.xhtml flexbox-align-self-horiz-004.xhtml
-== flexbox-align-self-horiz-005.xhtml flexbox-align-self-horiz-005.xhtml
-== flexbox-align-self-vert-001.xhtml flexbox-align-self-vert-001.xhtml
-== flexbox-align-self-vert-002.xhtml flexbox-align-self-vert-002.xhtml
-== flexbox-align-self-vert-003.xhtml flexbox-align-self-vert-003.xhtml
-== flexbox-align-self-vert-004.xhtml flexbox-align-self-vert-004.xhtml
-fuzzy-if(Android,158,32) == flexbox-align-self-vert-rtl-001.xhtml flexbox-align-self-vert-rtl-001.xhtml
-== flexbox-align-self-vert-rtl-002.xhtml flexbox-align-self-vert-rtl-002.xhtml
-== flexbox-align-self-vert-rtl-003.xhtml flexbox-align-self-vert-rtl-003.xhtml
-== flexbox-align-self-vert-rtl-004.xhtml flexbox-align-self-vert-rtl-004.xhtml
-
-# Tests for computing the baseline of a flex container
-== flexbox-baseline-align-self-baseline-horiz-001.html flexbox-baseline-align-self-baseline-horiz-001.html
-== flexbox-baseline-align-self-baseline-vert-001.html flexbox-baseline-align-self-baseline-vert-001.html
-== flexbox-baseline-empty-001a.html flexbox-baseline-empty-001a.html
-== flexbox-baseline-empty-001b.html flexbox-baseline-empty-001b.html
-== flexbox-baseline-multi-item-horiz-001.html flexbox-baseline-multi-item-horiz-001.html
-== flexbox-baseline-multi-item-vert-001.html flexbox-baseline-multi-item-vert-001.html
-== flexbox-baseline-multi-line-horiz-001.html flexbox-baseline-multi-line-horiz-001.html
-== flexbox-baseline-multi-line-horiz-002.html flexbox-baseline-multi-line-horiz-002.html
-== flexbox-baseline-multi-line-horiz-003.html flexbox-baseline-multi-line-horiz-003.html
-== flexbox-baseline-multi-line-horiz-004.html flexbox-baseline-multi-line-horiz-004.html
-== flexbox-baseline-multi-line-vert-001.html flexbox-baseline-multi-line-vert-001.html
-== flexbox-baseline-multi-line-vert-002.html flexbox-baseline-multi-line-vert-002.html
-== flexbox-baseline-single-item-001a.html flexbox-baseline-single-item-001a.html
-== flexbox-baseline-single-item-001b.html flexbox-baseline-single-item-001b.html
-
-# Basic tests with with blocks as flex items
-== flexbox-basic-block-horiz-001.xhtml flexbox-basic-block-horiz-001.xhtml
-== flexbox-basic-block-vert-001.xhtml flexbox-basic-block-vert-001.xhtml
-
-# Tests for basic handling of <canvas>/<img>/etc as a flex item
-== flexbox-basic-canvas-horiz-001.xhtml flexbox-basic-canvas-horiz-001.xhtml
-== flexbox-basic-canvas-vert-001.xhtml flexbox-basic-canvas-vert-001.xhtml
-== flexbox-basic-fieldset-horiz-001.xhtml flexbox-basic-fieldset-horiz-001.xhtml
-== flexbox-basic-fieldset-vert-001.xhtml flexbox-basic-fieldset-vert-001.xhtml
-== flexbox-basic-iframe-horiz-001.xhtml flexbox-basic-iframe-horiz-001.xhtml
-== flexbox-basic-iframe-vert-001.xhtml flexbox-basic-iframe-vert-001.xhtml
-== flexbox-basic-img-horiz-001.xhtml flexbox-basic-img-horiz-001.xhtml
-== flexbox-basic-img-vert-001.xhtml flexbox-basic-img-vert-001.xhtml
-== flexbox-basic-textarea-horiz-001.xhtml flexbox-basic-textarea-horiz-001.xhtml
-== flexbox-basic-textarea-vert-001.xhtml flexbox-basic-textarea-vert-001.xhtml
-== flexbox-basic-video-horiz-001.xhtml flexbox-basic-video-horiz-001.xhtml
-== flexbox-basic-video-vert-001.xhtml flexbox-basic-video-vert-001.xhtml
-
-# Tests for "page-break-before" / "page-break-after" on a flex item
-== flexbox-break-request-horiz-001a.html flexbox-break-request-horiz-001a.html
-== flexbox-break-request-horiz-001b.html flexbox-break-request-horiz-001b.html
-== flexbox-break-request-horiz-002a.html flexbox-break-request-horiz-002a.html
-== flexbox-break-request-horiz-002b.html flexbox-break-request-horiz-002b.html
-== flexbox-break-request-vert-001a.html flexbox-break-request-vert-001a.html
-== flexbox-break-request-vert-001b.html flexbox-break-request-vert-001b.html
-== flexbox-break-request-vert-002a.html flexbox-break-request-vert-002a.html
-== flexbox-break-request-vert-002b.html flexbox-break-request-vert-002b.html
-
-# Tests for flex items with "visibility:collapse"
-== flexbox-collapsed-item-baseline-001.html flexbox-collapsed-item-baseline-001.html
-== flexbox-collapsed-item-horiz-001.html flexbox-collapsed-item-horiz-001.html
-== flexbox-collapsed-item-horiz-002.html flexbox-collapsed-item-horiz-002.html
-== flexbox-collapsed-item-horiz-003.html flexbox-collapsed-item-horiz-003.html
-
-# Tests for flex-flow shorthand property
-== flexbox-flex-flow-001.html flexbox-flex-flow-001.html
-== flexbox-flex-flow-002.html flexbox-flex-flow-002.html
-
-# Tests for flex-wrap property
-== flexbox-flex-wrap-horiz-001.html flexbox-flex-wrap-horiz-001.html
-== flexbox-flex-wrap-horiz-002.html flexbox-flex-wrap-horiz-002.html
-== flexbox-flex-wrap-vert-001.html flexbox-flex-wrap-vert-001.html
-== flexbox-flex-wrap-vert-002.html flexbox-flex-wrap-vert-002.html
-
-# Tests for intrinsic ratio interactions on flex items.
-# (Note that tests 001 and 002 share a reference case; they render the same,
-# because they don't do any direction-specific stretching/flexing.)
-== flexbox-intrinsic-ratio-001.html flexbox-intrinsic-ratio-001.html
-== flexbox-intrinsic-ratio-002.html flexbox-intrinsic-ratio-002.html
-== flexbox-intrinsic-ratio-003.html flexbox-intrinsic-ratio-003.html
-== flexbox-intrinsic-ratio-004.html flexbox-intrinsic-ratio-004.html
-== flexbox-intrinsic-ratio-005.html flexbox-intrinsic-ratio-005.html
-== flexbox-intrinsic-ratio-006.html flexbox-intrinsic-ratio-006.html
-
-# Tests for flex items as (pseudo) stacking contexts
-== flexbox-items-as-stacking-contexts-001.xhtml flexbox-items-as-stacking-contexts-001.xhtml
-== flexbox-items-as-stacking-contexts-002.html flexbox-items-as-stacking-contexts-002.html
-== flexbox-items-as-stacking-contexts-003.html flexbox-items-as-stacking-contexts-003.html
-
-# Tests for main-axis alignment (jusify-content property)
-== flexbox-justify-content-horiz-001a.xhtml flexbox-justify-content-horiz-001a.xhtml
-== flexbox-justify-content-horiz-001b.xhtml flexbox-justify-content-horiz-001b.xhtml
-== flexbox-justify-content-horiz-002.xhtml flexbox-justify-content-horiz-002.xhtml
-== flexbox-justify-content-horiz-003.xhtml flexbox-justify-content-horiz-003.xhtml
-== flexbox-justify-content-horiz-004.xhtml flexbox-justify-content-horiz-004.xhtml
-== flexbox-justify-content-horiz-005.xhtml flexbox-justify-content-horiz-005.xhtml
-== flexbox-justify-content-vert-001a.xhtml flexbox-justify-content-vert-001a.xhtml
-== flexbox-justify-content-vert-001b.xhtml flexbox-justify-content-vert-001b.xhtml
-== flexbox-justify-content-vert-002.xhtml flexbox-justify-content-vert-002.xhtml
-== flexbox-justify-content-vert-003.xhtml flexbox-justify-content-vert-003.xhtml
-== flexbox-justify-content-vert-004.xhtml flexbox-justify-content-vert-004.xhtml
-== flexbox-justify-content-vert-005.xhtml flexbox-justify-content-vert-005.xhtml
-
-# Tests for flexbox with margin, border, and/or padding on flex items
-== flexbox-margin-auto-horiz-001.xhtml flexbox-margin-auto-horiz-001.xhtml
-== flexbox-margin-auto-horiz-002.xhtml flexbox-margin-auto-horiz-002.xhtml
-== flexbox-mbp-horiz-001.xhtml flexbox-mbp-horiz-001.xhtml
-== flexbox-mbp-horiz-001-reverse.xhtml flexbox-mbp-horiz-001-reverse.xhtml
-== flexbox-mbp-horiz-001-rtl.xhtml flexbox-mbp-horiz-001-rtl.xhtml
-== flexbox-mbp-horiz-001-rtl-reverse.xhtml flexbox-mbp-horiz-001-rtl-reverse.xhtml
-random == flexbox-mbp-horiz-002a.xhtml flexbox-mbp-horiz-002a.xhtml
-random == flexbox-mbp-horiz-002b.xhtml flexbox-mbp-horiz-002b.xhtml
-== flexbox-mbp-horiz-003.xhtml flexbox-mbp-horiz-003.xhtml
-== flexbox-mbp-horiz-003-reverse.xhtml flexbox-mbp-horiz-003-reverse.xhtml
-== flexbox-mbp-horiz-004.xhtml flexbox-mbp-horiz-004.xhtml
-
-# Tests for min-height:auto / min-width:auto on flex items
-== flexbox-min-height-auto-001.html flexbox-min-height-auto-001.html
-== flexbox-min-height-auto-002a.html flexbox-min-height-auto-002a.html
-== flexbox-min-height-auto-002b.html flexbox-min-height-auto-002b.html
-# bug 1055354
-== flexbox-min-height-auto-002c.html flexbox-min-height-auto-002c.html
-== flexbox-min-height-auto-003.html flexbox-min-height-auto-003.html
-== flexbox-min-height-auto-004.html flexbox-min-height-auto-004.html
-== flexbox-min-width-auto-001.html flexbox-min-width-auto-001.html
-== flexbox-min-width-auto-002a.html flexbox-min-width-auto-002a.html
-== flexbox-min-width-auto-002b.html flexbox-min-width-auto-002b.html
-== flexbox-min-width-auto-002c.html flexbox-min-width-auto-002c.html
-== flexbox-min-width-auto-003.html flexbox-min-width-auto-003.html
-== flexbox-min-width-auto-004.html flexbox-min-width-auto-004.html
-
-# Tests for flex containers with the "overflow" property set
-== flexbox-overflow-horiz-001.html flexbox-overflow-horiz-001.html
-== flexbox-overflow-horiz-002.html flexbox-overflow-horiz-002.html
-== flexbox-overflow-horiz-003.html flexbox-overflow-horiz-003.html
-== flexbox-overflow-horiz-004.html flexbox-overflow-horiz-004.html
-== flexbox-overflow-horiz-005.html flexbox-overflow-horiz-005.html
-== flexbox-overflow-vert-001.html flexbox-overflow-vert-001.html
-== flexbox-overflow-vert-002.html flexbox-overflow-vert-002.html
-== flexbox-overflow-vert-003.html flexbox-overflow-vert-003.html
-== flexbox-overflow-vert-004.html flexbox-overflow-vert-004.html
-== flexbox-overflow-vert-005.html flexbox-overflow-vert-005.html
-
-# Tests for the order in which we paint flex items
-== flexbox-paint-ordering-001.xhtml flexbox-paint-ordering-001.xhtml
-== flexbox-paint-ordering-002.xhtml flexbox-paint-ordering-002.xhtml
-
-# Tests for "display:flex" on root node
-== flexbox-root-node-001a.html flexbox-root-node-001a.html
-== flexbox-root-node-001b.html flexbox-root-node-001b.html
-
-# Tests for sizing of flex containers, e.g. under min/max size constraints
-== flexbox-sizing-horiz-001.xhtml flexbox-sizing-horiz-001.xhtml
-== flexbox-sizing-horiz-002.xhtml flexbox-sizing-horiz-002.xhtml
-== flexbox-sizing-vert-001.xhtml flexbox-sizing-vert-001.xhtml
-== flexbox-sizing-vert-002.xhtml flexbox-sizing-vert-002.xhtml
-
-# Tests for table-fixup *not happening* on direct children of a flex container
-== flexbox-table-fixup-001.xhtml flexbox-table-fixup-001.xhtml
-
-# Tests for handling of whitespace within anonymous flex items.
-== flexbox-whitespace-handling-001a.xhtml flexbox-whitespace-handling-001a.xhtml
-== flexbox-whitespace-handling-001b.xhtml flexbox-whitespace-handling-001b.xhtml
-== flexbox-whitespace-handling-002.xhtml flexbox-whitespace-handling-002.xhtml
-
-# Tests for flex containers with pseudo-elements
-== flexbox-with-pseudo-elements-001.html flexbox-with-pseudo-elements-001.html
-== flexbox-with-pseudo-elements-002.html flexbox-with-pseudo-elements-002.html
-== flexbox-with-pseudo-elements-003.html flexbox-with-pseudo-elements-003.html
-
-# Tests for combined influence of 'writing-mode' & 'direction' on flex axes
-== flexbox-writing-mode-001.html flexbox-writing-mode-001.html
-== flexbox-writing-mode-002.html flexbox-writing-mode-002.html
-== flexbox-writing-mode-003.html flexbox-writing-mode-003.html
-== flexbox-writing-mode-004.html flexbox-writing-mode-004.html
-== flexbox-writing-mode-005.html flexbox-writing-mode-005.html
-== flexbox-writing-mode-006.html flexbox-writing-mode-006.html
-== flexbox-writing-mode-007.html flexbox-writing-mode-007.html
-== flexbox-writing-mode-008.html flexbox-writing-mode-008.html
-== flexbox-writing-mode-009.html flexbox-writing-mode-009.html
diff --git a/layout/reftests/w3c-css/submitted/flexbox/reftest.list b/layout/reftests/w3c-css/submitted/flexbox/reftest.list
index 3df75aee6..281ef4758 100644
--- a/layout/reftests/w3c-css/submitted/flexbox/reftest.list
+++ b/layout/reftests/w3c-css/submitted/flexbox/reftest.list
@@ -34,7 +34,7 @@
 == flexbox-align-self-vert-002.xhtml  flexbox-align-self-vert-002-ref.xhtml
 == flexbox-align-self-vert-003.xhtml  flexbox-align-self-vert-003-ref.xhtml
 == flexbox-align-self-vert-004.xhtml  flexbox-align-self-vert-004-ref.xhtml
-fuzzy-if(Android,158,32) == flexbox-align-self-vert-rtl-001.xhtml  flexbox-align-self-vert-rtl-001-ref.xhtml
+== flexbox-align-self-vert-rtl-001.xhtml  flexbox-align-self-vert-rtl-001-ref.xhtml
 == flexbox-align-self-vert-rtl-002.xhtml  flexbox-align-self-vert-rtl-002-ref.xhtml
 == flexbox-align-self-vert-rtl-003.xhtml  flexbox-align-self-vert-rtl-003-ref.xhtml
 == flexbox-align-self-vert-rtl-004.xhtml  flexbox-align-self-vert-rtl-004-ref.xhtml