diff options
author | Moonchild <moonchild@palemoon.org> | 2021-01-19 08:08:18 +0000 |
---|---|---|
committer | Moonchild <moonchild@palemoon.org> | 2021-01-19 08:08:18 +0000 |
commit | c76214f0b54cf74b69d0fb4afa0d2eca2e898a98 (patch) | |
tree | 15ee2e9776727ecabcdc52d06de55dfd576485c1 /layout/reftests/abs-pos | |
parent | 810c2bf8080da2bc8ec4efb05223fea31817944b (diff) | |
parent | 75286e68d703b1d8a4e0a7c72ce45d089024c124 (diff) | |
download | UXP-c76214f0b54cf74b69d0fb4afa0d2eca2e898a98.tar UXP-c76214f0b54cf74b69d0fb4afa0d2eca2e898a98.tar.gz UXP-c76214f0b54cf74b69d0fb4afa0d2eca2e898a98.tar.lz UXP-c76214f0b54cf74b69d0fb4afa0d2eca2e898a98.tar.xz UXP-c76214f0b54cf74b69d0fb4afa0d2eca2e898a98.zip |
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
Diffstat (limited to 'layout/reftests/abs-pos')
-rw-r--r-- | layout/reftests/abs-pos/reftest-stylo.list | 69 | ||||
-rw-r--r-- | layout/reftests/abs-pos/reftest.list | 8 |
2 files changed, 4 insertions, 73 deletions
diff --git a/layout/reftests/abs-pos/reftest-stylo.list b/layout/reftests/abs-pos/reftest-stylo.list deleted file mode 100644 index e6988eb1e..000000000 --- a/layout/reftests/abs-pos/reftest-stylo.list +++ /dev/null @@ -1,69 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -== font-size-wrap.html font-size-wrap.html -== abs-pos-auto-margin-1.html abs-pos-auto-margin-1.html -fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,73,1) == auto-offset-inline-block-1.html auto-offset-inline-block-1.html -# bug 696670 -== fieldset-1.html fieldset-1.html -== table-1.html table-1.html -== table-2.html table-2.html -== table-3.html table-3.html -== table-caption-1.html table-caption-1.html -== table-caption-2.html table-caption-2.html -== table-caption-3.html table-caption-3.html -== table-caption-4.html table-caption-4.html -skip-if((B2G&&browserIsRemote)||Mulet) == table-caption-5.html table-caption-5.html -# TODO: change to == when bug 967870 is is -# Initial mulet triage: parity with B2G/B2G Desktop -== table-cell-1.html table-cell-1.html -== table-cell-2.html table-cell-2.html -== table-cell-3.html table-cell-3.html -== table-cell-4.html table-cell-4.html -== table-cell-5.html table-cell-5.html -== table-cell-6.html table-cell-6.html -== table-cell-7.html table-cell-7.html -skip-if((B2G&&browserIsRemote)||Mulet) == table-cell-8.html table-cell-8.html -# TODO: change to == when bug 967870 is is -# Initial mulet triage: parity with B2G/B2G Desktop -== table-row-1.html table-row-1.html -== table-row-2.html table-row-2.html -== table-row-3.html table-row-3.html -== table-row-4.html table-row-4.html -== table-row-5.html table-row-5.html -== table-row-6.html table-row-6.html -== table-row-7.html table-row-7.html -== table-row-group-1.html table-row-group-1.html -== table-row-group-2.html table-row-group-2.html -== table-row-group-3.html table-row-group-3.html -== table-row-group-4.html table-row-group-4.html -== table-row-group-5.html table-row-group-5.html -== table-row-group-6.html table-row-group-6.html -== table-row-group-7.html table-row-group-7.html -== table-header-group-1.html table-header-group-1.html -== table-header-group-2.html table-header-group-2.html -== table-header-group-3.html table-header-group-3.html -== table-header-group-4.html table-header-group-4.html -== table-header-group-5.html table-header-group-5.html -== table-header-group-6.html table-header-group-6.html -== table-header-group-7.html table-header-group-7.html -# == table-footer-group-1.html table-footer-group-1.html -== table-footer-group-2.html table-footer-group-2.html -== table-footer-group-3.html table-footer-group-3.html -== table-footer-group-4.html table-footer-group-4.html -== table-footer-group-5.html table-footer-group-5.html -== table-footer-group-6.html table-footer-group-6.html -== table-footer-group-7.html table-footer-group-7.html -== continuation-positioned-inline-1.html continuation-positioned-inline-1.html -== continuation-positioned-inline-2.html continuation-positioned-inline-2.html -== scrollframe-1.html scrollframe-1.html -fails == scrollframe-2.html scrollframe-2-ref.html #bug #bug -# Initial mulet triage: parity with B2G/B2G Desktop -fuzzy-if(gtkWidget,1,8) == select-1.html select-1.html -fails fuzzy-if(gtkWidget,1,8) == select-1-dynamic.html select-1-dynamic.html -== select-2.html select-2.html -fuzzy-if(gtkWidget,1,19) fuzzy-if(Android||B2G,17,726) fuzzy-if(asyncPan&&!layersGPUAccelerated,102,98) fuzzy-if(browserIsRemote&&winWidget,102,107) == select-3.html select-3.html -== multi-column-1.html multi-column-1.html -== button-1.html button-1.html -== button-2.html button-2.html -== relative-row-animation-1.html relative-row-animation-1.html -fuzzy-if(Android,12,50) == fixed-pos-auto-offset-1a.html fixed-pos-auto-offset-1a.html -fuzzy-if(Android,12,50) == fixed-pos-auto-offset-1b.html fixed-pos-auto-offset-1b.html diff --git a/layout/reftests/abs-pos/reftest.list b/layout/reftests/abs-pos/reftest.list index e4c41c4e3..d4d1b57ca 100644 --- a/layout/reftests/abs-pos/reftest.list +++ b/layout/reftests/abs-pos/reftest.list @@ -49,14 +49,14 @@ fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azur == continuation-positioned-inline-1.html continuation-positioned-inline-ref.html == continuation-positioned-inline-2.html continuation-positioned-inline-ref.html == scrollframe-1.html scrollframe-1-ref.html -fuzzy-if(gtkWidget,1,1) fuzzy-if(Android,9,185) fuzzy-if(asyncPan&&!layersGPUAccelerated,140,144) == scrollframe-2.html scrollframe-2-ref.html #bug 756530 +fuzzy-if(gtkWidget,1,1) fuzzy-if(asyncPan&&!layersGPUAccelerated,140,144) == scrollframe-2.html scrollframe-2-ref.html #bug 756530 fuzzy-if(gtkWidget,1,8) == select-1.html select-1-ref.html fuzzy-if(gtkWidget,1,8) == select-1-dynamic.html select-1-ref.html == select-2.html select-2-ref.html -fuzzy-if(gtkWidget,1,19) fuzzy-if(Android,17,726) fuzzy-if(asyncPan&&!layersGPUAccelerated,110,114) fuzzy-if(browserIsRemote&&winWidget,110,114) == select-3.html select-3-ref.html +fuzzy-if(gtkWidget,1,19) fuzzy-if(asyncPan&&!layersGPUAccelerated,110,114) fuzzy-if(browserIsRemote&&winWidget,110,114) == select-3.html select-3-ref.html == multi-column-1.html multi-column-1-ref.html == button-1.html button-1-ref.html == button-2.html button-2-ref.html == relative-row-animation-1.html relative-row-animation-1-ref.html -fuzzy-if(Android,12,50) == fixed-pos-auto-offset-1a.html fixed-pos-auto-offset-1-ref.html -fuzzy-if(Android,12,50) == fixed-pos-auto-offset-1b.html fixed-pos-auto-offset-1-ref.html +== fixed-pos-auto-offset-1a.html fixed-pos-auto-offset-1-ref.html +== fixed-pos-auto-offset-1b.html fixed-pos-auto-offset-1-ref.html |