From 39f5c51c10ed438a511806a0454cc1b91bfa2f61 Mon Sep 17 00:00:00 2001 From: Daniel Jacobs Date: Mon, 18 Mar 2024 16:43:23 -0400 Subject: [PATCH 01/33] Issue #2483 - Support DOMMatrix2DInit for addPath --- dom/canvas/CanvasPath.h | 6 ++--- dom/canvas/CanvasRenderingContext2D.cpp | 26 +++++++++++++++------- dom/webidl/CanvasRenderingContext2D.webidl | 2 +- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dom/canvas/CanvasPath.h b/dom/canvas/CanvasPath.h index e31b375cc3..0aa74d49ff 100644 --- a/dom/canvas/CanvasPath.h +++ b/dom/canvas/CanvasPath.h @@ -16,7 +16,7 @@ namespace mozilla { namespace dom { enum class CanvasWindingRule : uint32_t; -class SVGMatrix; +struct DOMMatrix2DInit; class CanvasPath final : public nsWrapperCache @@ -69,8 +69,8 @@ public: CanvasPath(nsISupports* aParent, already_AddRefed aPathBuilder); - void AddPath(CanvasPath& aCanvasPath, - const Optional>& aMatrix); + void AddPath(CanvasPath& aCanvasPath, const DOMMatrix2DInit& aInit, + ErrorResult& aError); private: virtual ~CanvasPath() {} diff --git a/dom/canvas/CanvasRenderingContext2D.cpp b/dom/canvas/CanvasRenderingContext2D.cpp index d8c3c4e135..f63338567d 100644 --- a/dom/canvas/CanvasRenderingContext2D.cpp +++ b/dom/canvas/CanvasRenderingContext2D.cpp @@ -80,6 +80,7 @@ #include "mozilla/CheckedInt.h" #include "mozilla/DebugOnly.h" #include "mozilla/dom/ContentParent.h" +#include "mozilla/dom/DOMMatrix.h" #include "mozilla/dom/ImageBitmap.h" #include "mozilla/dom/ImageData.h" #include "mozilla/dom/PBrowserParent.h" @@ -6579,19 +6580,28 @@ CanvasPath::BezierTo(const gfx::Point& aCP1, } void -CanvasPath::AddPath(CanvasPath& aCanvasPath, const Optional>& aMatrix) +CanvasPath::AddPath(CanvasPath& aCanvasPath, const DOMMatrix2DInit& aInit, + ErrorResult& aError) + { RefPtr tempPath = aCanvasPath.GetPath(CanvasWindingRule::Nonzero, gfxPlatform::GetPlatform()->ScreenReferenceDrawTarget()); - if (aMatrix.WasPassed()) { - const SVGMatrix& m = aMatrix.Value(); - Matrix transform(m.A(), m.B(), m.C(), m.D(), m.E(), m.F()); + RefPtr matrix = + DOMMatrixReadOnly::FromMatrix(GetParentObject(), aInit, aError); + if (aError.Failed()) { + return; + } - if (!transform.IsIdentity()) { - RefPtr tempBuilder = tempPath->TransformedCopyToBuilder(transform, FillRule::FILL_WINDING); - tempPath = tempBuilder->Finish(); - } + Matrix transform(*(matrix->GetInternal2D())); + + if (!transform.IsFinite()) { + return; + } + + if (!transform.IsIdentity()) { + RefPtr tempBuilder = tempPath->TransformedCopyToBuilder(transform, FillRule::FILL_WINDING); + tempPath = tempBuilder->Finish(); } EnsurePathBuilder(); // in case a path is added to itself diff --git a/dom/webidl/CanvasRenderingContext2D.webidl b/dom/webidl/CanvasRenderingContext2D.webidl index 1c55642152..fe48385d7a 100644 --- a/dom/webidl/CanvasRenderingContext2D.webidl +++ b/dom/webidl/CanvasRenderingContext2D.webidl @@ -335,6 +335,6 @@ interface TextMetrics { Constructor(DOMString pathString)] interface Path2D { - void addPath(Path2D path, optional SVGMatrix transformation); + [Throws] void addPath(Path2D path, optional DOMMatrix2DInit transformation); }; Path2D implements CanvasPathMethods; From 9ca2104248e3ab87e53835e7a259256e658b115c Mon Sep 17 00:00:00 2001 From: Daniel Jacobs Date: Wed, 20 Mar 2024 10:59:53 -0400 Subject: [PATCH 02/33] Issue #2483 - Slight adjustments for allowing addPath with DOMMatrix --- dom/base/DOMMatrix.cpp | 39 +++++++++++++++++++++++++++++++++++++++ dom/base/DOMMatrix.h | 14 ++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/dom/base/DOMMatrix.cpp b/dom/base/DOMMatrix.cpp index f0358125f8..56cf6f1b17 100644 --- a/dom/base/DOMMatrix.cpp +++ b/dom/base/DOMMatrix.cpp @@ -117,6 +117,17 @@ ValidateAndFixupMatrixInit(DOMMatrixInit& aMatrixInit, ErrorResult& aRv) #undef Check3DField } +void +DOMMatrixReadOnly::SetDataFromMatrix2DInit(const DOMMatrix2DInit& aMatrixInit) { + MOZ_ASSERT(Is2D()); + mMatrix2D->_11 = aMatrixInit.mM11.Value(); + mMatrix2D->_12 = aMatrixInit.mM12.Value(); + mMatrix2D->_21 = aMatrixInit.mM21.Value(); + mMatrix2D->_22 = aMatrixInit.mM22.Value(); + mMatrix2D->_31 = aMatrixInit.mM41.Value(); + mMatrix2D->_32 = aMatrixInit.mM42.Value(); +} + void DOMMatrixReadOnly::SetDataFromMatrixInit(DOMMatrixInit& aMatrixInit) { @@ -149,6 +160,34 @@ DOMMatrixReadOnly::SetDataFromMatrixInit(DOMMatrixInit& aMatrixInit) } } +already_AddRefed DOMMatrixReadOnly::FromMatrix( + nsISupports* aParent, const DOMMatrix2DInit& aMatrixInit, + ErrorResult& aRv) { + DOMMatrix2DInit matrixInit(aMatrixInit); + if (!ValidateAndFixupMatrix2DInit(matrixInit, aRv)) { + return nullptr; + }; + + RefPtr matrix = + new DOMMatrixReadOnly(aParent, /* is2D */ true); + matrix->SetDataFromMatrix2DInit(matrixInit); + return matrix.forget(); +} + +already_AddRefed DOMMatrixReadOnly::FromMatrix( + nsISupports* aParent, const DOMMatrixInit& aMatrixInit, ErrorResult& aRv) { + DOMMatrixInit matrixInit(aMatrixInit); + if (!ValidateAndFixupMatrixInit(matrixInit, aRv)) { + return nullptr; + }; + + RefPtr rval = + new DOMMatrixReadOnly(aParent, matrixInit.mIs2D.Value()); + rval->SetDataFromMatrixInit(matrixInit); + return rval.forget(); + +} + already_AddRefed DOMMatrixReadOnly::FromMatrix(const GlobalObject& aGlobal, const DOMMatrixInit& aMatrixInit, ErrorResult& aRv) { diff --git a/dom/base/DOMMatrix.h b/dom/base/DOMMatrix.h index 99e7714add..423580e2c4 100644 --- a/dom/base/DOMMatrix.h +++ b/dom/base/DOMMatrix.h @@ -26,6 +26,7 @@ class DOMPoint; class StringOrUnrestrictedDoubleSequence; struct DOMPointInit; struct DOMMatrixInit; +struct DOMMatrix2DInit; class DOMMatrixReadOnly : public nsWrapperCache { @@ -57,6 +58,12 @@ public: nsISupports* GetParentObject() const { return mParent; } virtual JSObject* WrapObject(JSContext* cx, JS::Handle aGivenProto) override; + static already_AddRefed + FromMatrix(nsISupports* aParent, const DOMMatrix2DInit& aMatrixInit, ErrorResult& aRv); + + static already_AddRefed + FromMatrix(nsISupports* aParent, const DOMMatrixInit& aMatrixInit, ErrorResult& aRv); + static already_AddRefed FromMatrix(const GlobalObject& aGlobal, const DOMMatrixInit& aMatrixInit, ErrorResult& aRv); @@ -207,6 +214,12 @@ public: ErrorResult& aRv) const; void Stringify(nsAString& aResult); bool WriteStructuredClone(JSStructuredCloneWriter* aWriter) const; + const gfx::Matrix* GetInternal2D() const { + if (Is2D()) { + return mMatrix2D; + } + return nullptr; + } protected: nsCOMPtr mParent; @@ -220,6 +233,7 @@ protected: * where all of its members are properly defined. * The init dictionary's dimension must match the matrix one. */ + void SetDataFromMatrix2DInit(const DOMMatrix2DInit& aMatrixInit); void SetDataFromMatrixInit(DOMMatrixInit& aMatrixInit); DOMMatrixReadOnly* SetMatrixValue(const nsAString& aTransformList, ErrorResult& aRv); From 2aa7dc2652361fc58bf21fea2969f1a7e7bcee9e Mon Sep 17 00:00:00 2001 From: trav90 Date: Fri, 22 Mar 2024 10:28:06 -0500 Subject: [PATCH 03/33] No Issue - Only explicitly enforce GCC SSE2 optimizations when building on Intel 32-bit architectures SSE2 optimizations are used by default on 64-bit platforms. By no longer explicitly enabling SSE2 on 64-bit GCC, we can more easily enable other optimizations (e.g. AVX) without worrying about them being overridden by the SSE2 flags. --- build/autoconf/compiler-opts.m4 | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/build/autoconf/compiler-opts.m4 b/build/autoconf/compiler-opts.m4 index 77c2e85b5e..c5cc8730a9 100644 --- a/build/autoconf/compiler-opts.m4 +++ b/build/autoconf/compiler-opts.m4 @@ -176,22 +176,24 @@ if test "$GNU_CC"; then CFLAGS="$CFLAGS -ffunction-sections -fdata-sections" CXXFLAGS="$CXXFLAGS -ffunction-sections -fdata-sections" fi - CFLAGS="$CFLAGS -fno-math-errno" - CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-math-errno" + CFLAGS="$CFLAGS -fno-math-errno -pipe" + CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-math-errno -pipe" - if test "$CPU_ARCH" = "x86" -o "$CPU_ARCH" = "x86_64"; then - CFLAGS="$CFLAGS -msse2 -mfpmath=sse" - CXXFLAGS="$CXXFLAGS -msse2 -mfpmath=sse" - fi + case "${host_cpu}" in + i*86) + CFLAGS="$CFLAGS -msse2 -mfpmath=sse" + CXXFLAGS="$CXXFLAGS -msse2 -mfpmath=sse" + ;; + esac if test -z "$CLANG_CC"; then case "$CC_VERSION" in 4.* | 5.*) ;; *) - # Lifetime Dead Store Elimination level 2 (default in GCC6+) breaks Gecko. - # Instead of completely disabling this optimization on newer GCC's, - # we'll force them to use level 1 optimization with -flifetime-dse=1. + # Lifetime Dead Store Elimination level 2 (default in GCC) breaks Goanna. + # Instead of completely disabling this optimization, we force level 1 + # optimization instead with -flifetime-dse=1. # Add it first so that a mozconfig can override by setting CFLAGS/CXXFLAGS. CFLAGS="-flifetime-dse=1 $CFLAGS" CXXFLAGS="-flifetime-dse=1 $CXXFLAGS" From 656ee639c5d176a08a8433a0e5d5031ec3fec244 Mon Sep 17 00:00:00 2001 From: FranklinDM Date: Tue, 24 May 2022 02:04:10 +0800 Subject: [PATCH 04/33] Issue #2112 - Part 1: Remove Stylo tests --- dom/base/test/reftest/reftest-stylo.list | 2 - .../test/reftest/filters/reftest-stylo.list | 21 -- dom/canvas/test/reftest/reftest-stylo.list | 169 --------------- dom/encoding/test/reftest/reftest-stylo.list | 6 - .../reftests/autofocus/reftest-stylo.list | 36 ---- .../toblob-todataurl/reftest-stylo.list | 17 -- .../global-attributes/reftest-stylo.list | 59 ------ dom/plugins/test/reftest/reftest-stylo.list | 33 --- dom/tests/reftest/reftest-stylo.list | 20 -- .../reftest/xml-stylesheet/reftest-stylo.list | 13 -- editor/reftests/reftest-stylo.list | 177 ---------------- editor/reftests/xul/reftest-stylo.list | 67 ------ .../apz/test/reftest/reftest-stylo.list | 20 -- gfx/tests/reftest/reftest-stylo.list | 12 -- image/test/reftest/apng/reftest-stylo.list | 7 - image/test/reftest/blob/reftest-stylo.list | 8 - .../reftest/bmp/bmp-1bpp/reftest-stylo.list | 22 -- .../reftest/bmp/bmp-24bpp/reftest-stylo.list | 22 -- .../reftest/bmp/bmp-4bpp/reftest-stylo.list | 25 --- .../reftest/bmp/bmp-8bpp/reftest-stylo.list | 25 --- .../bmp/bmp-corrupted/reftest-stylo.list | 19 -- .../reftest/bmp/bmpsuite/b/reftest-stylo.list | 85 -------- .../reftest/bmp/bmpsuite/g/reftest-stylo.list | 113 ---------- .../reftest/bmp/bmpsuite/q/reftest-stylo.list | 131 ------------ .../reftest/bmp/bmpsuite/reftest-stylo.list | 8 - image/test/reftest/bmp/reftest-stylo.list | 17 -- .../color-management/reftest-stylo.list | 8 - .../reftest/downscaling/reftest-stylo.list | 195 ------------------ .../encoders-lossless/reftest-stylo.list | 160 -------------- image/test/reftest/generic/reftest-stylo.list | 2 - image/test/reftest/gif/reftest-stylo.list | 57 ----- image/test/reftest/ico/cur/reftest-stylo.list | 5 - .../ico/ico-bmp-1bpp/reftest-stylo.list | 25 --- .../ico/ico-bmp-24bpp/reftest-stylo.list | 24 --- .../ico/ico-bmp-32bpp/reftest-stylo.list | 23 --- .../ico/ico-bmp-4bpp/reftest-stylo.list | 24 --- .../ico/ico-bmp-8bpp/reftest-stylo.list | 25 --- .../ico/ico-bmp-corrupted/reftest-stylo.list | 11 - .../reftest/ico/ico-mixed/reftest-stylo.list | 4 - .../reftest/ico/ico-png/reftest-stylo.list | 30 --- image/test/reftest/ico/reftest-stylo.list | 13 -- image/test/reftest/jpeg/reftest-stylo.list | 57 ----- .../pngsuite-ancillary/reftest-stylo.list | 63 ------ .../pngsuite-background/reftest-stylo.list | 23 --- .../pngsuite-basic-i/reftest-stylo.list | 34 --- .../pngsuite-basic-n/reftest-stylo.list | 34 --- .../pngsuite-chunkorder/reftest-stylo.list | 22 -- .../pngsuite-corrupted/reftest-stylo.list | 11 - .../pngsuite-filtering/reftest-stylo.list | 23 --- .../reftest/pngsuite-gamma/reftest-stylo.list | 39 ---- .../pngsuite-oddsizes/reftest-stylo.list | 78 ------- .../pngsuite-palettes/reftest-stylo.list | 15 -- .../pngsuite-transparency/reftest-stylo.list | 27 --- .../reftest/pngsuite-zlib/reftest-stylo.list | 9 - image/test/reftest/reftest-stylo.list | 65 ------ .../reftest_border_abspos-stylo.list | 27 --- .../reftest_border_parent-stylo.list | 28 --- .../reftest_margin_abspos-stylo.list | 28 --- .../reftest_margin_parent-stylo.list | 28 --- .../reftest_padding_abspos-stylo.list | 28 --- .../reftest_padding_parent-stylo.list | 28 --- .../horizontal/reftest_plain-stylo.list | 28 --- .../reftest_border_abspos-stylo.list | 5 - .../reftest_border_parent-stylo.list | 5 - .../reftest_margin_abspos-stylo.list | 5 - .../reftest_margin_parent-stylo.list | 5 - .../reftest_padding_abspos-stylo.list | 5 - .../reftest_padding_parent-stylo.list | 5 - .../reftest_plain-stylo.list | 5 - .../mixed/reftest_border_abspos-stylo.list | 5 - .../mixed/reftest_border_parent-stylo.list | 5 - .../mixed/reftest_margin_abspos-stylo.list | 5 - .../mixed/reftest_margin_parent-stylo.list | 5 - .../mixed/reftest_padding_abspos-stylo.list | 5 - .../mixed/reftest_padding_parent-stylo.list | 5 - .../mixed/reftest_plain-stylo.list | 5 - .../vertical/reftest_border_abspos-stylo.list | 22 -- .../vertical/reftest_border_parent-stylo.list | 21 -- .../vertical/reftest_margin_abspos-stylo.list | 21 -- .../vertical/reftest_margin_parent-stylo.list | 21 -- .../reftest_padding_abspos-stylo.list | 21 -- .../reftest_padding_parent-stylo.list | 21 -- .../vertical/reftest_plain-stylo.list | 21 -- .../default-preferences-tests-stylo.list | 29 --- .../reftest-sanity/scripttests-stylo.list | 11 - .../reftest-sanity/urlprefixtests-stylo.list | 24 --- layout/tables/reftests/reftest-stylo.list | 10 - layout/xul/grid/reftests/reftest-stylo.list | 38 ---- layout/xul/reftest/reftest-stylo.list | 14 -- netwerk/test/reftest/reftest-stylo.list | 3 - .../tests/reftest/reftest-stylo.list | 26 --- .../default/tests/reftests/reftest-stylo.list | 2 - .../reftest-stylo.list | 3 - .../reftest-stylo.list | 2 - .../content/tests/reftests/reftest-stylo.list | 6 - .../themes/osx/reftests/reftest-stylo.list | 6 - widget/reftests/reftest-stylo.list | 8 - 97 files changed, 2835 deletions(-) delete mode 100644 dom/base/test/reftest/reftest-stylo.list delete mode 100644 dom/canvas/test/reftest/filters/reftest-stylo.list delete mode 100644 dom/canvas/test/reftest/reftest-stylo.list delete mode 100644 dom/encoding/test/reftest/reftest-stylo.list delete mode 100644 dom/html/reftests/autofocus/reftest-stylo.list delete mode 100644 dom/html/reftests/toblob-todataurl/reftest-stylo.list delete mode 100644 dom/imptests/html/html/dom/elements/global-attributes/reftest-stylo.list delete mode 100644 dom/plugins/test/reftest/reftest-stylo.list delete mode 100644 dom/tests/reftest/reftest-stylo.list delete mode 100644 dom/tests/reftest/xml-stylesheet/reftest-stylo.list delete mode 100644 editor/reftests/reftest-stylo.list delete mode 100644 editor/reftests/xul/reftest-stylo.list delete mode 100644 gfx/layers/apz/test/reftest/reftest-stylo.list delete mode 100644 gfx/tests/reftest/reftest-stylo.list delete mode 100644 image/test/reftest/apng/reftest-stylo.list delete mode 100644 image/test/reftest/blob/reftest-stylo.list delete mode 100644 image/test/reftest/bmp/bmp-1bpp/reftest-stylo.list delete mode 100644 image/test/reftest/bmp/bmp-24bpp/reftest-stylo.list delete mode 100644 image/test/reftest/bmp/bmp-4bpp/reftest-stylo.list delete mode 100644 image/test/reftest/bmp/bmp-8bpp/reftest-stylo.list delete mode 100644 image/test/reftest/bmp/bmp-corrupted/reftest-stylo.list delete mode 100644 image/test/reftest/bmp/bmpsuite/b/reftest-stylo.list delete mode 100644 image/test/reftest/bmp/bmpsuite/g/reftest-stylo.list delete mode 100644 image/test/reftest/bmp/bmpsuite/q/reftest-stylo.list delete mode 100644 image/test/reftest/bmp/bmpsuite/reftest-stylo.list delete mode 100644 image/test/reftest/bmp/reftest-stylo.list delete mode 100644 image/test/reftest/color-management/reftest-stylo.list delete mode 100644 image/test/reftest/downscaling/reftest-stylo.list delete mode 100644 image/test/reftest/encoders-lossless/reftest-stylo.list delete mode 100644 image/test/reftest/generic/reftest-stylo.list delete mode 100644 image/test/reftest/gif/reftest-stylo.list delete mode 100644 image/test/reftest/ico/cur/reftest-stylo.list delete mode 100644 image/test/reftest/ico/ico-bmp-1bpp/reftest-stylo.list delete mode 100644 image/test/reftest/ico/ico-bmp-24bpp/reftest-stylo.list delete mode 100644 image/test/reftest/ico/ico-bmp-32bpp/reftest-stylo.list delete mode 100644 image/test/reftest/ico/ico-bmp-4bpp/reftest-stylo.list delete mode 100644 image/test/reftest/ico/ico-bmp-8bpp/reftest-stylo.list delete mode 100644 image/test/reftest/ico/ico-bmp-corrupted/reftest-stylo.list delete mode 100644 image/test/reftest/ico/ico-mixed/reftest-stylo.list delete mode 100644 image/test/reftest/ico/ico-png/reftest-stylo.list delete mode 100644 image/test/reftest/ico/reftest-stylo.list delete mode 100644 image/test/reftest/jpeg/reftest-stylo.list delete mode 100644 image/test/reftest/pngsuite-ancillary/reftest-stylo.list delete mode 100644 image/test/reftest/pngsuite-background/reftest-stylo.list delete mode 100644 image/test/reftest/pngsuite-basic-i/reftest-stylo.list delete mode 100644 image/test/reftest/pngsuite-basic-n/reftest-stylo.list delete mode 100644 image/test/reftest/pngsuite-chunkorder/reftest-stylo.list delete mode 100644 image/test/reftest/pngsuite-corrupted/reftest-stylo.list delete mode 100644 image/test/reftest/pngsuite-filtering/reftest-stylo.list delete mode 100644 image/test/reftest/pngsuite-gamma/reftest-stylo.list delete mode 100644 image/test/reftest/pngsuite-oddsizes/reftest-stylo.list delete mode 100644 image/test/reftest/pngsuite-palettes/reftest-stylo.list delete mode 100644 image/test/reftest/pngsuite-transparency/reftest-stylo.list delete mode 100644 image/test/reftest/pngsuite-zlib/reftest-stylo.list delete mode 100644 image/test/reftest/reftest-stylo.list delete mode 100644 layout/reftests/position-dynamic-changes/horizontal/reftest_border_abspos-stylo.list delete mode 100644 layout/reftests/position-dynamic-changes/horizontal/reftest_border_parent-stylo.list delete mode 100644 layout/reftests/position-dynamic-changes/horizontal/reftest_margin_abspos-stylo.list delete mode 100644 layout/reftests/position-dynamic-changes/horizontal/reftest_margin_parent-stylo.list delete mode 100644 layout/reftests/position-dynamic-changes/horizontal/reftest_padding_abspos-stylo.list delete mode 100644 layout/reftests/position-dynamic-changes/horizontal/reftest_padding_parent-stylo.list delete mode 100644 layout/reftests/position-dynamic-changes/horizontal/reftest_plain-stylo.list delete mode 100644 layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_border_abspos-stylo.list delete mode 100644 layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_border_parent-stylo.list delete mode 100644 layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_margin_abspos-stylo.list delete mode 100644 layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_margin_parent-stylo.list delete mode 100644 layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_padding_abspos-stylo.list delete mode 100644 layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_padding_parent-stylo.list delete mode 100644 layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_plain-stylo.list delete mode 100644 layout/reftests/position-dynamic-changes/mixed/reftest_border_abspos-stylo.list delete mode 100644 layout/reftests/position-dynamic-changes/mixed/reftest_border_parent-stylo.list delete mode 100644 layout/reftests/position-dynamic-changes/mixed/reftest_margin_abspos-stylo.list delete mode 100644 layout/reftests/position-dynamic-changes/mixed/reftest_margin_parent-stylo.list delete mode 100644 layout/reftests/position-dynamic-changes/mixed/reftest_padding_abspos-stylo.list delete mode 100644 layout/reftests/position-dynamic-changes/mixed/reftest_padding_parent-stylo.list delete mode 100644 layout/reftests/position-dynamic-changes/mixed/reftest_plain-stylo.list delete mode 100644 layout/reftests/position-dynamic-changes/vertical/reftest_border_abspos-stylo.list delete mode 100644 layout/reftests/position-dynamic-changes/vertical/reftest_border_parent-stylo.list delete mode 100644 layout/reftests/position-dynamic-changes/vertical/reftest_margin_abspos-stylo.list delete mode 100644 layout/reftests/position-dynamic-changes/vertical/reftest_margin_parent-stylo.list delete mode 100644 layout/reftests/position-dynamic-changes/vertical/reftest_padding_abspos-stylo.list delete mode 100644 layout/reftests/position-dynamic-changes/vertical/reftest_padding_parent-stylo.list delete mode 100644 layout/reftests/position-dynamic-changes/vertical/reftest_plain-stylo.list delete mode 100644 layout/reftests/reftest-sanity/default-preferences-tests-stylo.list delete mode 100644 layout/reftests/reftest-sanity/scripttests-stylo.list delete mode 100644 layout/reftests/reftest-sanity/urlprefixtests-stylo.list delete mode 100644 layout/tables/reftests/reftest-stylo.list delete mode 100644 layout/xul/grid/reftests/reftest-stylo.list delete mode 100644 layout/xul/reftest/reftest-stylo.list delete mode 100644 netwerk/test/reftest/reftest-stylo.list delete mode 100644 parser/htmlparser/tests/reftest/reftest-stylo.list delete mode 100644 python/mozbuild/mozbuild/test/frontend/data/files-test-metadata/default/tests/reftests/reftest-stylo.list delete mode 100644 python/mozbuild/mozbuild/test/frontend/data/test-manifest-emitted-includes/reftest-stylo.list delete mode 100644 python/mozbuild/mozbuild/test/frontend/data/test-manifest-keys-extracted/reftest-stylo.list delete mode 100644 toolkit/content/tests/reftests/reftest-stylo.list delete mode 100644 toolkit/themes/osx/reftests/reftest-stylo.list delete mode 100644 widget/reftests/reftest-stylo.list diff --git a/dom/base/test/reftest/reftest-stylo.list b/dom/base/test/reftest/reftest-stylo.list deleted file mode 100644 index 8fd85a02f9..0000000000 --- a/dom/base/test/reftest/reftest-stylo.list +++ /dev/null @@ -1,2 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -== test_bug920877.html test_bug920877.html diff --git a/dom/canvas/test/reftest/filters/reftest-stylo.list b/dom/canvas/test/reftest/filters/reftest-stylo.list deleted file mode 100644 index a907469650..0000000000 --- a/dom/canvas/test/reftest/filters/reftest-stylo.list +++ /dev/null @@ -1,21 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -default-preferences pref(canvas.filters.enabled,true) - -== default-color.html default-color.html -== drop-shadow.html drop-shadow.html -== drop-shadow-transformed.html drop-shadow-transformed.html -fuzzy-if(azureSkia,1,1500) == global-alpha.html global-alpha.html -== global-composite-operation.html global-composite-operation.html -== liveness.html liveness.html -== multiple-drop-shadows.html multiple-drop-shadows.html -== shadow.html shadow.html -== subregion-fill-paint.html subregion-fill-paint.html -== subregion-stroke-paint.html subregion-stroke-paint.html -== svg-bbox.html svg-bbox.html -== svg-inline.html svg-inline.html -== svg-liveness.html svg-liveness.html -== svg-off-screen.html svg-off-screen.html -== units.html units.html -== units-em.html units-em.html -== units-ex.html units-ex.html -== units-off-screen.html units-off-screen.html diff --git a/dom/canvas/test/reftest/reftest-stylo.list b/dom/canvas/test/reftest/reftest-stylo.list deleted file mode 100644 index 795c0672a2..0000000000 --- a/dom/canvas/test/reftest/reftest-stylo.list +++ /dev/null @@ -1,169 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# WebGL Reftests! -default-preferences pref(webgl.force-enabled,true) pref(media.useAudioChannelAPI,true) pref(dom.audiochannel.mutedByDefault,false) - -# Check that disabling works: -== webgl-disable-test.html?nogl webgl-disable-test.html?nogl -pref(webgl.disabled,true) == webgl-disable-test.html webgl-disable-test.html - -# Basic WebGL tests: -# Do we get pixels to the screen at all? -# Neither of these should ever break. -== webgl-clear-test.html webgl-clear-test.html -pref(webgl.force-layers-readback,true) == webgl-clear-test.html?readback webgl-clear-test.html?readback - -# Make sure that our choice of attribs doesn't break rendering. -== webgl-clear-test.html?depth webgl-clear-test.html?depth -== webgl-clear-test.html?stencil webgl-clear-test.html?stencil -== webgl-clear-test.html?depth&stencil webgl-clear-test.html?depth&stencil - -# Check that resize works: -== webgl-resize-test.html webgl-resize-test.html - -# Check that captureStream() displays in a local video element -== webgl-capturestream-test.html?preserve webgl-capturestream-test.html?preserve - -# Some of the failure conditions are a little crazy. I'm (jgilbert) setting these based on -# failures encountered when running on Try, and then targetting the Try config by -# differences in the `sandbox` contents. That is, I'm labeling based on symptoms rather -# than cause. -# WinXP R: winWidget && layersGPUAccelerated && !d3d11 -# Win7+ R: winWidget && layersGPUAccelerated && d3d11 -# Win7+ Ru: winWidget && !layersGPUAccelerated && d3d11 -# (Note that we have to remove spaces when used below) - -# IMPORTANT: Expected outcomes are evaluated left-to-right, and they replace eachother. -# That means that if an unconditional status (`fuzzy()`) is to the right of another status -# (such as fails-if), it will overwrite the old status. -# -# As such, all unconditional statuses should be to the left of conditional statuses. -# (See /layout/tools/reftest/reftest.js:945) - -# Does we draw the correct colors in the correct places? -# Combinations: PowerSet([readback, aa, preserve, premult, alpha]) x [frame=1,frame=6] -# This is 2^6 = 64 combinations. -== webgl-color-test.html?frame=1&__&________&_______&_____ webgl-color-test.html?frame=1&__&________&_______&_____ -== webgl-color-test.html?frame=1&aa&________&_______&_____ webgl-color-test.html?frame=1&aa&________&_______&_____ -== webgl-color-test.html?frame=1&__&preserve&_______&_____ webgl-color-test.html?frame=1&__&preserve&_______&_____ -== webgl-color-test.html?frame=1&aa&preserve&_______&_____ webgl-color-test.html?frame=1&aa&preserve&_______&_____ -== webgl-color-test.html?frame=1&__&________&premult&_____ webgl-color-test.html?frame=1&__&________&premult&_____ -== webgl-color-test.html?frame=1&aa&________&premult&_____ webgl-color-test.html?frame=1&aa&________&premult&_____ -== webgl-color-test.html?frame=1&__&preserve&premult&_____ webgl-color-test.html?frame=1&__&preserve&premult&_____ -== webgl-color-test.html?frame=1&aa&preserve&premult&_____ webgl-color-test.html?frame=1&aa&preserve&premult&_____ -fuzzy(1,30000) fails-if(winWidget&&layersGPUAccelerated&&!d3d11) == webgl-color-test.html?frame=1&__&________&_______&alpha webgl-color-test.html?frame=1&__&________&_______&alpha -fuzzy(1,30000) fails-if(winWidget&&layersGPUAccelerated&&!d3d11) == webgl-color-test.html?frame=1&aa&________&_______&alpha webgl-color-test.html?frame=1&aa&________&_______&alpha -fuzzy(1,30000) fails-if(winWidget&&layersGPUAccelerated&&!d3d11) == webgl-color-test.html?frame=1&__&preserve&_______&alpha webgl-color-test.html?frame=1&__&preserve&_______&alpha -fuzzy(1,30000) fails-if(winWidget&&layersGPUAccelerated&&!d3d11) == webgl-color-test.html?frame=1&aa&preserve&_______&alpha webgl-color-test.html?frame=1&aa&preserve&_______&alpha -== webgl-color-test.html?frame=1&__&________&premult&alpha webgl-color-test.html?frame=1&__&________&premult&alpha -== webgl-color-test.html?frame=1&aa&________&premult&alpha webgl-color-test.html?frame=1&aa&________&premult&alpha -== webgl-color-test.html?frame=1&__&preserve&premult&alpha webgl-color-test.html?frame=1&__&preserve&premult&alpha -== webgl-color-test.html?frame=1&aa&preserve&premult&alpha webgl-color-test.html?frame=1&aa&preserve&premult&alpha - -== webgl-color-test.html?frame=6&__&________&_______&_____ webgl-color-test.html?frame=6&__&________&_______&_____ -== webgl-color-test.html?frame=6&aa&________&_______&_____ webgl-color-test.html?frame=6&aa&________&_______&_____ -== webgl-color-test.html?frame=6&__&preserve&_______&_____ webgl-color-test.html?frame=6&__&preserve&_______&_____ -== webgl-color-test.html?frame=6&aa&preserve&_______&_____ webgl-color-test.html?frame=6&aa&preserve&_______&_____ -== webgl-color-test.html?frame=6&__&________&premult&_____ webgl-color-test.html?frame=6&__&________&premult&_____ -== webgl-color-test.html?frame=6&aa&________&premult&_____ webgl-color-test.html?frame=6&aa&________&premult&_____ -== webgl-color-test.html?frame=6&__&preserve&premult&_____ webgl-color-test.html?frame=6&__&preserve&premult&_____ -== webgl-color-test.html?frame=6&aa&preserve&premult&_____ webgl-color-test.html?frame=6&aa&preserve&premult&_____ -fuzzy(1,30000) fails-if(winWidget&&layersGPUAccelerated&&!d3d11) == webgl-color-test.html?frame=6&__&________&_______&alpha webgl-color-test.html?frame=6&__&________&_______&alpha -fuzzy(1,30000) fails-if(winWidget&&layersGPUAccelerated&&!d3d11) == webgl-color-test.html?frame=6&aa&________&_______&alpha webgl-color-test.html?frame=6&aa&________&_______&alpha -fuzzy(1,30000) fails-if(winWidget&&layersGPUAccelerated&&!d3d11) == webgl-color-test.html?frame=6&__&preserve&_______&alpha webgl-color-test.html?frame=6&__&preserve&_______&alpha -fuzzy(1,30000) fails-if(winWidget&&layersGPUAccelerated&&!d3d11) == webgl-color-test.html?frame=6&aa&preserve&_______&alpha webgl-color-test.html?frame=6&aa&preserve&_______&alpha -== webgl-color-test.html?frame=6&__&________&premult&alpha webgl-color-test.html?frame=6&__&________&premult&alpha -== webgl-color-test.html?frame=6&aa&________&premult&alpha webgl-color-test.html?frame=6&aa&________&premult&alpha -== webgl-color-test.html?frame=6&__&preserve&premult&alpha webgl-color-test.html?frame=6&__&preserve&premult&alpha -== webgl-color-test.html?frame=6&aa&preserve&premult&alpha webgl-color-test.html?frame=6&aa&preserve&premult&alpha - -pref(webgl.force-layers-readback,true) == webgl-color-test.html?frame=1&readback&__&________&_______&_____ webgl-color-test.html?frame=1&readback&__&________&_______&_____ -pref(webgl.force-layers-readback,true) == webgl-color-test.html?frame=1&readback&aa&________&_______&_____ webgl-color-test.html?frame=1&readback&aa&________&_______&_____ -pref(webgl.force-layers-readback,true) == webgl-color-test.html?frame=1&readback&__&preserve&_______&_____ webgl-color-test.html?frame=1&readback&__&preserve&_______&_____ -pref(webgl.force-layers-readback,true) == webgl-color-test.html?frame=1&readback&aa&preserve&_______&_____ webgl-color-test.html?frame=1&readback&aa&preserve&_______&_____ -pref(webgl.force-layers-readback,true) == webgl-color-test.html?frame=1&readback&__&________&premult&_____ webgl-color-test.html?frame=1&readback&__&________&premult&_____ -pref(webgl.force-layers-readback,true) == webgl-color-test.html?frame=1&readback&aa&________&premult&_____ webgl-color-test.html?frame=1&readback&aa&________&premult&_____ -pref(webgl.force-layers-readback,true) == webgl-color-test.html?frame=1&readback&__&preserve&premult&_____ webgl-color-test.html?frame=1&readback&__&preserve&premult&_____ -pref(webgl.force-layers-readback,true) == webgl-color-test.html?frame=1&readback&aa&preserve&premult&_____ webgl-color-test.html?frame=1&readback&aa&preserve&premult&_____ -fuzzy(1,30000) fails-if(winWidget&&layersGPUAccelerated&&!d3d11) pref(webgl.force-layers-readback,true) == webgl-color-test.html?frame=1&readback&__&________&_______&alpha webgl-color-test.html?frame=1&readback&__&________&_______&alpha -fuzzy(1,30000) fails-if(winWidget&&layersGPUAccelerated&&!d3d11) pref(webgl.force-layers-readback,true) == webgl-color-test.html?frame=1&readback&aa&________&_______&alpha webgl-color-test.html?frame=1&readback&aa&________&_______&alpha -fuzzy(1,30000) fails-if(winWidget&&layersGPUAccelerated&&!d3d11) pref(webgl.force-layers-readback,true) == webgl-color-test.html?frame=1&readback&__&preserve&_______&alpha webgl-color-test.html?frame=1&readback&__&preserve&_______&alpha -fuzzy(1,30000) fails-if(winWidget&&layersGPUAccelerated&&!d3d11) pref(webgl.force-layers-readback,true) == webgl-color-test.html?frame=1&readback&aa&preserve&_______&alpha webgl-color-test.html?frame=1&readback&aa&preserve&_______&alpha -pref(webgl.force-layers-readback,true) == webgl-color-test.html?frame=1&readback&__&________&premult&alpha webgl-color-test.html?frame=1&readback&__&________&premult&alpha -pref(webgl.force-layers-readback,true) == webgl-color-test.html?frame=1&readback&aa&________&premult&alpha webgl-color-test.html?frame=1&readback&aa&________&premult&alpha -pref(webgl.force-layers-readback,true) == webgl-color-test.html?frame=1&readback&__&preserve&premult&alpha webgl-color-test.html?frame=1&readback&__&preserve&premult&alpha -pref(webgl.force-layers-readback,true) == webgl-color-test.html?frame=1&readback&aa&preserve&premult&alpha webgl-color-test.html?frame=1&readback&aa&preserve&premult&alpha - -pref(webgl.force-layers-readback,true) == webgl-color-test.html?frame=6&readback&__&________&_______&_____ webgl-color-test.html?frame=6&readback&__&________&_______&_____ -pref(webgl.force-layers-readback,true) == webgl-color-test.html?frame=6&readback&aa&________&_______&_____ webgl-color-test.html?frame=6&readback&aa&________&_______&_____ -pref(webgl.force-layers-readback,true) == webgl-color-test.html?frame=6&readback&__&preserve&_______&_____ webgl-color-test.html?frame=6&readback&__&preserve&_______&_____ -pref(webgl.force-layers-readback,true) == webgl-color-test.html?frame=6&readback&aa&preserve&_______&_____ webgl-color-test.html?frame=6&readback&aa&preserve&_______&_____ -pref(webgl.force-layers-readback,true) == webgl-color-test.html?frame=6&readback&__&________&premult&_____ webgl-color-test.html?frame=6&readback&__&________&premult&_____ -pref(webgl.force-layers-readback,true) == webgl-color-test.html?frame=6&readback&aa&________&premult&_____ webgl-color-test.html?frame=6&readback&aa&________&premult&_____ -pref(webgl.force-layers-readback,true) == webgl-color-test.html?frame=6&readback&__&preserve&premult&_____ webgl-color-test.html?frame=6&readback&__&preserve&premult&_____ -pref(webgl.force-layers-readback,true) == webgl-color-test.html?frame=6&readback&aa&preserve&premult&_____ webgl-color-test.html?frame=6&readback&aa&preserve&premult&_____ -fuzzy(1,30000) fails-if(winWidget&&layersGPUAccelerated&&!d3d11) pref(webgl.force-layers-readback,true) == webgl-color-test.html?frame=6&readback&__&________&_______&alpha webgl-color-test.html?frame=6&readback&__&________&_______&alpha -fuzzy(1,30000) fails-if(winWidget&&layersGPUAccelerated&&!d3d11) pref(webgl.force-layers-readback,true) == webgl-color-test.html?frame=6&readback&aa&________&_______&alpha webgl-color-test.html?frame=6&readback&aa&________&_______&alpha -fuzzy(1,30000) fails-if(winWidget&&layersGPUAccelerated&&!d3d11) pref(webgl.force-layers-readback,true) == webgl-color-test.html?frame=6&readback&__&preserve&_______&alpha webgl-color-test.html?frame=6&readback&__&preserve&_______&alpha -fuzzy(1,30000) fails-if(winWidget&&layersGPUAccelerated&&!d3d11) pref(webgl.force-layers-readback,true) == webgl-color-test.html?frame=6&readback&aa&preserve&_______&alpha webgl-color-test.html?frame=6&readback&aa&preserve&_______&alpha -pref(webgl.force-layers-readback,true) == webgl-color-test.html?frame=6&readback&__&________&premult&alpha webgl-color-test.html?frame=6&readback&__&________&premult&alpha -pref(webgl.force-layers-readback,true) == webgl-color-test.html?frame=6&readback&aa&________&premult&alpha webgl-color-test.html?frame=6&readback&aa&________&premult&alpha -pref(webgl.force-layers-readback,true) == webgl-color-test.html?frame=6&readback&__&preserve&premult&alpha webgl-color-test.html?frame=6&readback&__&preserve&premult&alpha -pref(webgl.force-layers-readback,true) == webgl-color-test.html?frame=6&readback&aa&preserve&premult&alpha webgl-color-test.html?frame=6&readback&aa&preserve&premult&alpha - -# Check for hanging bindings/state settings: -== webgl-hanging-fb-test.html?__&________ webgl-hanging-fb-test.html?__&________ -== webgl-hanging-fb-test.html?aa&________ webgl-hanging-fb-test.html?aa&________ -== webgl-hanging-fb-test.html?__&preserve webgl-hanging-fb-test.html?__&preserve -== webgl-hanging-fb-test.html?aa&preserve webgl-hanging-fb-test.html?aa&preserve -pref(webgl.force-layers-readback,true) == webgl-hanging-fb-test.html?readback&__&________ webgl-hanging-fb-test.html?readback&__&________ -pref(webgl.force-layers-readback,true) == webgl-hanging-fb-test.html?readback&aa&________ webgl-hanging-fb-test.html?readback&aa&________ -pref(webgl.force-layers-readback,true) == webgl-hanging-fb-test.html?readback&__&preserve webgl-hanging-fb-test.html?readback&__&preserve -pref(webgl.force-layers-readback,true) == webgl-hanging-fb-test.html?readback&aa&preserve webgl-hanging-fb-test.html?readback&aa&preserve - -== webgl-hanging-scissor-test.html?__ webgl-hanging-scissor-test.html?__ -== webgl-hanging-scissor-test.html?aa webgl-hanging-scissor-test.html?aa -pref(webgl.force-layers-readback,true) == webgl-hanging-scissor-test.html?readback&__ webgl-hanging-scissor-test.html?readback&__ -pref(webgl.force-layers-readback,true) == webgl-hanging-scissor-test.html?readback&aa webgl-hanging-scissor-test.html?readback&aa - - -# Check that our experimental prefs still work: - -# 16bpp for Android/B2G: [16bpp] * PowerSet([readback, premult, alpha]) -# RGB565 dithers 127 to [123,132]. (Max error: 5) -# RGBA4444 dithers 128 to [119,136], and 191 to [192]. (Max error: 9) -fuzzy(5,30000) skip-if(!(Android||B2G)) pref(webgl.prefer-16bpp,true) == webgl-color-test.html?16bpp&________&_______&_____ webgl-color-test.html?16bpp&________&_______&_____ -fuzzy(5,30000) skip-if(!(Android||B2G)) pref(webgl.prefer-16bpp,true) pref(webgl.force-layers-readback,true) == webgl-color-test.html?16bpp&readback&_______&_____ webgl-color-test.html?16bpp&readback&_______&_____ -fuzzy(5,30000) skip-if(!(Android||B2G)) pref(webgl.prefer-16bpp,true) == webgl-color-test.html?16bpp&________&premult&_____ webgl-color-test.html?16bpp&________&premult&_____ -fuzzy(5,30000) skip-if(!(Android||B2G)) pref(webgl.prefer-16bpp,true) pref(webgl.force-layers-readback,true) == webgl-color-test.html?16bpp&readback&premult&_____ webgl-color-test.html?16bpp&readback&premult&_____ -fuzzy(9,40000) skip-if(!(Android||B2G)) pref(webgl.prefer-16bpp,true) == webgl-color-test.html?16bpp&________&_______&alpha webgl-color-test.html?16bpp&________&_______&alpha -fuzzy(9,40000) skip-if(!(Android||B2G)) pref(webgl.prefer-16bpp,true) pref(webgl.force-layers-readback,true) == webgl-color-test.html?16bpp&readback&_______&alpha webgl-color-test.html?16bpp&readback&_______&alpha -fuzzy(9,40000) skip-if(!(Android||B2G)) pref(webgl.prefer-16bpp,true) == webgl-color-test.html?16bpp&________&premult&alpha webgl-color-test.html?16bpp&________&premult&alpha -fuzzy(9,40000) skip-if(!(Android||B2G)) pref(webgl.prefer-16bpp,true) pref(webgl.force-layers-readback,true) == webgl-color-test.html?16bpp&readback&premult&alpha webgl-color-test.html?16bpp&readback&premult&alpha - -# Force native GL (Windows): -skip-if(!winWidget) pref(webgl.disable-angle,true) == webgl-color-test.html?native-gl webgl-color-test.html?native-gl - - -# Non-WebGL Reftests! - -# Do we correctly handle multiple clip paths? -== clip-multiple-paths.html clip-multiple-paths.html - -# Bug 1255062 -== clip-multiple-move-1.html clip-multiple-move-1.html -== clip-multiple-move-2.html clip-multiple-move-2.html - -# Bug 815648 -== stroketext-shadow.html stroketext-shadow.html - -# focus rings -pref(canvas.focusring.enabled,true) skip-if(B2G) skip-if(cocoaWidget) skip-if(winWidget) needs-focus == drawFocusIfNeeded.html drawFocusIfNeeded.html -pref(canvas.customfocusring.enabled,true) skip-if(B2G) skip-if(cocoaWidget) skip-if(Android) skip-if(winWidget) fuzzy-if(gtkWidget,64,410) needs-focus == drawCustomFocusRing.html drawCustomFocusRing.html - -# Check that captureStream() displays in a local video element -skip == capturestream.html capturestream.html - -fuzzy-if(azureSkia,16,2) fuzzy-if(Android,3,40) fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),1,1) == 1177726-text-stroke-bounds.html 1177726-text-stroke-bounds.html - -# Canvas Filter Reftests -include filters/reftest-stylo.list diff --git a/dom/encoding/test/reftest/reftest-stylo.list b/dom/encoding/test/reftest/reftest-stylo.list deleted file mode 100644 index 819793fc80..0000000000 --- a/dom/encoding/test/reftest/reftest-stylo.list +++ /dev/null @@ -1,6 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -== bug863728-1.html bug863728-1.html -skip fuzzy-if(skiaContent,1,10) == bug863728-2.html bug863728-2.html -== bug863728-3.html bug863728-3.html -== bug945215-1.html bug945215-1.html -skip fuzzy-if(skiaContent,1,10) == bug945215-2.html bug945215-2.html diff --git a/dom/html/reftests/autofocus/reftest-stylo.list b/dom/html/reftests/autofocus/reftest-stylo.list deleted file mode 100644 index 5e2300b52b..0000000000 --- a/dom/html/reftests/autofocus/reftest-stylo.list +++ /dev/null @@ -1,36 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -default-preferences pref(dom.forms.number,true) -fails skip-if(B2G||Mulet) fuzzy-if(skiaContent,1,3) needs-focus == input-load.html input-load.html -# B2G timed out waiting for reftest-wait to be removed -# Initial mulet triage: parity with B2G/B2G Desktop -fails skip-if(B2G||Mulet) fuzzy-if(skiaContent,1,3) needs-focus == input-create.html input-create.html -# B2G timed out waiting for reftest-wait to be removed -# Initial mulet triage: parity with B2G/B2G Desktop -# skip skip-if(B2G||Mulet) fuzzy-if(skiaContent,1,3) needs-focus == input-number.html input-number.html -# B2G timed out waiting for reftest-wait to be removed -# Initial mulet triage: parity with B2G/B2G Desktop -fails skip-if(B2G||Mulet) fuzzy-if(skiaContent,1,3) needs-focus == button-load.html button-load.html -# B2G timed out waiting for reftest-wait to be removed -# Initial mulet triage: parity with B2G/B2G Desktop -random needs-focus == button-create.html button-create.html -# B2G timed out waiting for reftest-wait to be removed -# Initial mulet triage: parity with B2G/B2G Desktop -random needs-focus == textarea-load.html textarea-load.html -# B2G timed out waiting for reftest-wait to be removed -# Initial mulet triage: parity with B2G/B2G Desktop -random needs-focus == textarea-create.html textarea-create.html -# B2G timed out waiting for reftest-wait to be removed -# Initial mulet triage: parity with B2G/B2G Desktop -fails skip-if(B2G||Mulet) fuzzy-if(skiaContent,2,4) needs-focus == select-load.html select-load.html -# B2G timed out waiting for reftest-wait to be removed -# Initial mulet triage: parity with B2G/B2G Desktop -fails skip-if(B2G||Mulet) fuzzy-if(skiaContent,2,4) needs-focus == select-create.html select-create.html -# B2G timed out waiting for reftest-wait to be removed -# Initial mulet triage: parity with B2G/B2G Desktop -needs-focus == autofocus-after-load.html autofocus-after-load.html -fails-if(B2G||Mulet) fuzzy-if(skiaContent,2,5) needs-focus == autofocus-leaves-iframe.html autofocus-leaves-iframe.html -# B2G focus difference between test and reference -# Initial mulet triage: parity with B2G/B2G Desktop -skip == autofocus-after-body-focus.html autofocus-after-body-focus.html -# bug 773482 -# Initial mulet triage: parity with B2G/B2G Desktop diff --git a/dom/html/reftests/toblob-todataurl/reftest-stylo.list b/dom/html/reftests/toblob-todataurl/reftest-stylo.list deleted file mode 100644 index c19af123f9..0000000000 --- a/dom/html/reftests/toblob-todataurl/reftest-stylo.list +++ /dev/null @@ -1,17 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -fuzzy-if(Android,105,482) == toblob-quality-0.html toblob-quality-0.html -fuzzy-if(Android,38,2024) == toblob-quality-25.html toblob-quality-25.html -fuzzy-if(Android,29,2336) == toblob-quality-50.html toblob-quality-50.html -fuzzy-if(Android,23,3533) == toblob-quality-75.html toblob-quality-75.html -fuzzy-if(Android,16,4199) == toblob-quality-92.html toblob-quality-92.html -fuzzy-if(Android,8,2461) == toblob-quality-100.html toblob-quality-100.html -fuzzy-if(Android,16,4199) == toblob-quality-undefined.html toblob-quality-undefined.html -fuzzy-if(Android,16,4199) == toblob-quality-default.html toblob-quality-default.html -fuzzy-if(Android,105,482) == todataurl-quality-0.html todataurl-quality-0.html -fails fuzzy-if(Android,38,2024) == todataurl-quality-25.html todataurl-quality-25.html -fuzzy-if(Android,29,2336) == todataurl-quality-50.html todataurl-quality-50.html -fuzzy-if(Android,23,3533) == todataurl-quality-75.html todataurl-quality-75.html -fails fuzzy-if(Android,16,4199) == todataurl-quality-92.html todataurl-quality-92.html -fuzzy-if(Android,8,2461) == todataurl-quality-100.html todataurl-quality-100.html -fuzzy-if(Android,16,4199) == todataurl-quality-undefined.html todataurl-quality-undefined.html -fuzzy-if(Android,16,4199) == todataurl-quality-default.html todataurl-quality-default.html diff --git a/dom/imptests/html/html/dom/elements/global-attributes/reftest-stylo.list b/dom/imptests/html/html/dom/elements/global-attributes/reftest-stylo.list deleted file mode 100644 index 4e76b85322..0000000000 --- a/dom/imptests/html/html/dom/elements/global-attributes/reftest-stylo.list +++ /dev/null @@ -1,59 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# THIS FILE IS AUTOGENERATED BY importTestsuite.py - DO NOT EDIT - -== dir_auto-contained-bdi-L.html dir_auto-contained-bdi-L.html -== dir_auto-contained-bdi-R.html dir_auto-contained-bdi-R.html -== dir_auto-contained-dir_auto-L.html dir_auto-contained-dir_auto-L.html -== dir_auto-contained-dir_auto-R.html dir_auto-contained-dir_auto-R.html -== dir_auto-contained-dir-L.html dir_auto-contained-dir-L.html -== dir_auto-contained-dir-R.html dir_auto-contained-dir-R.html -== dir_auto-contained-L.html dir_auto-contained-L.html -== dir_auto-contained-R.html dir_auto-contained-R.html -== dir_auto-contained-script-L.html dir_auto-contained-script-L.html -== dir_auto-contained-script-R.html dir_auto-contained-script-R.html -== dir_auto-contained-style-L.html dir_auto-contained-style-L.html -== dir_auto-contained-style-R.html dir_auto-contained-style-R.html -== dir_auto-contained-textarea-L.html dir_auto-contained-textarea-L.html -== dir_auto-contained-textarea-R.html dir_auto-contained-textarea-R.html -== dir_auto-EN-L.html dir_auto-EN-L.html -== dir_auto-EN-R.html dir_auto-EN-R.html -== dir_auto-input-EN-L.html dir_auto-input-EN-L.html -== dir_auto-input-EN-R.html dir_auto-input-EN-R.html -== dir_auto-input-L.html dir_auto-input-L.html -== dir_auto-input-N-EN.html dir_auto-input-N-EN.html -== dir_auto-input-N-EN-L.html dir_auto-input-N-EN-L.html -== dir_auto-input-N-EN-R.html dir_auto-input-N-EN-R.html -== dir_auto-input-N-L.html dir_auto-input-N-L.html -== dir_auto-input-N-R.html dir_auto-input-N-R.html -== dir_auto-input-R.html dir_auto-input-R.html -== dir_auto-input-script-EN-L.html dir_auto-input-script-EN-L.html -== dir_auto-input-script-EN-R.html dir_auto-input-script-EN-R.html -== dir_auto-input-script-L.html dir_auto-input-script-L.html -== dir_auto-input-script-N-EN.html dir_auto-input-script-N-EN.html -== dir_auto-input-script-N-EN-L.html dir_auto-input-script-N-EN-L.html -== dir_auto-input-script-N-EN-R.html dir_auto-input-script-N-EN-R.html -== dir_auto-input-script-N-L.html dir_auto-input-script-N-L.html -== dir_auto-input-script-N-R.html dir_auto-input-script-N-R.html -== dir_auto-input-script-R.html dir_auto-input-script-R.html -== dir_auto-isolate.html dir_auto-isolate.html -== dir_auto-L.html dir_auto-L.html -== dir_auto-N-EN.html dir_auto-N-EN.html -== dir_auto-N-EN-L.html dir_auto-N-EN-L.html -== dir_auto-N-EN-R.html dir_auto-N-EN-R.html -== dir_auto-N-L.html dir_auto-N-L.html -== dir_auto-N-R.html dir_auto-N-R.html -== dir_auto-pre-mixed.html dir_auto-pre-mixed.html -== dir_auto-pre-N-between-Rs.html dir_auto-pre-N-between-Rs.html -== dir_auto-pre-N-EN.html dir_auto-pre-N-EN.html -== dir_auto-R.html dir_auto-R.html -== dir_auto-textarea-mixed.html dir_auto-textarea-mixed.html -fails-if(B2G||Mulet||(Android&&asyncPan)) == dir_auto-textarea-N-between-Rs.html dir_auto-textarea-N-between-Rs.html -# B2G scrollbar on opposite side -== dir_auto-textarea-N-EN.html dir_auto-textarea-N-EN.html -== dir_auto-textarea-script-mixed.html dir_auto-textarea-script-mixed.html -fails-if(B2G||Mulet||(Android&&asyncPan)) == dir_auto-textarea-script-N-between-Rs.html dir_auto-textarea-script-N-between-Rs.html -# B2G scrollbar on reference only -== dir_auto-textarea-script-N-EN.html dir_auto-textarea-script-N-EN.html -== lang-xyzzy.html lang-xyzzy.html -== lang-xmllang-01.html lang-xmllang-01.html -== style-01.html style-01.html diff --git a/dom/plugins/test/reftest/reftest-stylo.list b/dom/plugins/test/reftest/reftest-stylo.list deleted file mode 100644 index 0f900b369c..0000000000 --- a/dom/plugins/test/reftest/reftest-stylo.list +++ /dev/null @@ -1,33 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# basic sanity checking -# fails random-if(!haveTestPlugin) == plugin-sanity.html plugin-sanity.html -# fails-if(!haveTestPlugin) == plugin-sanity.html plugin-sanity.html -skip fails-if(!haveTestPlugin) fuzzy-if(skiaContent,1,160000) == plugin-alpha-zindex.html plugin-alpha-zindex.html -fails-if(!haveTestPlugin) fuzzy-if(skiaContent,1,164000) == plugin-alpha-opacity.html plugin-alpha-opacity.html -random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) == windowless-clipping-1.html windowless-clipping-1.html -# bug 631832 -# fuzzy because of anti-aliasing in dashed border -random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) == border-padding-1.html border-padding-1.html -# bug 629430 -skip random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) == border-padding-2.html border-padding-2.html -# bug 629430 -skip random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) skip-if(!haveTestPlugin) skip-if(Android||B2G) == border-padding-3.html border-padding-3.html -# bug 629430 -# bug 773482 -# The following two "pluginproblemui-direction" tests are unreliable on all platforms. They should be re-written or replaced. -#random-if(cocoaWidget||d2d||/^Windows\x20NT\x205\.1/.test(http.oscpu)) fails-if(!haveTestPlugin&&!Android) == pluginproblemui-direction-1.html pluginproblemui-direction-1.html -# bug 567367 -#random-if(cocoaWidget) fails-if(!haveTestPlugin&&!Android) == pluginproblemui-direction-2.html pluginproblemui-direction-2.html -fails-if(!haveTestPlugin) fuzzy-if(skiaContent,1,160000) == plugin-canvas-alpha-zindex.html plugin-canvas-alpha-zindex.html -fails fails-if(!haveTestPlugin) fuzzy-if(skiaContent,1,160000) == plugin-transform-alpha-zindex.html plugin-transform-alpha-zindex.html -skip == plugin-busy-alpha-zindex.html plugin-busy-alpha-zindex.html -skip == plugin-background.html plugin-background.html -skip == plugin-background-1-step.html plugin-background-1-step.html -skip == plugin-background-2-step.html plugin-background-2-step.html -skip == plugin-background-5-step.html plugin-background-5-step.html -skip == plugin-background-10-step.html plugin-background-10-step.html -skip == plugin-transform-1.html plugin-transform-1.html -skip == plugin-transform-2.html plugin-transform-2.html -skip == shrink-1.html shrink-1.html -skip skip-if(!haveTestPlugin) == update-1.html update-1.html -skip skip-if(!haveTestPlugin) == windowless-layers.html windowless-layers.html diff --git a/dom/tests/reftest/reftest-stylo.list b/dom/tests/reftest/reftest-stylo.list deleted file mode 100644 index 204efc5070..0000000000 --- a/dom/tests/reftest/reftest-stylo.list +++ /dev/null @@ -1,20 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -== bug453105.html bug453105.html -== optiontext.html optiontext.html -== bug456008.xhtml bug456008.xhtml -fails fuzzy-if(skiaContent,2,3) == bug439965.html bug439965.html -== bug427779.xml bug427779.xml -fails skip-if(B2G||Mulet) fuzzy-if(skiaContent,1,5) == bug559996.html bug559996.html -# bug 773482 -# Initial mulet triage: parity with B2G/B2G Desktop -skip == bug591981-1.html bug591981-1.html -# Initial mulet triage: parity with B2G/B2G Desktop -skip == bug591981-2.html bug591981-2.html -skip == bug592366-1.html bug592366-1.html -skip == bug592366-2.html bug592366-2.html -# Initial mulet triage: parity with B2G/B2G Desktop -skip == bug592366-1.xhtml bug592366-1.xhtml -# Initial mulet triage: parity with B2G/B2G Desktop -skip == bug592366-2.xhtml bug592366-2.xhtml -# Initial mulet triage: parity with B2G/B2G Desktop -== bug798068.xhtml bug798068.xhtml diff --git a/dom/tests/reftest/xml-stylesheet/reftest-stylo.list b/dom/tests/reftest/xml-stylesheet/reftest-stylo.list deleted file mode 100644 index 8d2e1e32d6..0000000000 --- a/dom/tests/reftest/xml-stylesheet/reftest-stylo.list +++ /dev/null @@ -1,13 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -== css_relative_href.xml css_relative_href.xml -HTTP == css_relative_href_also_external.xml css_relative_href_also_external.xml -HTTP == css_relative_href_also_external_override.xml css_relative_href_also_external_override.xml -== embedded_dtd_id.svg embedded_dtd_id.svg -== error_no_href.svg error_no_href.svg -== lreas_selflink_dtd_id.svg lreas_selflink_dtd_id.svg -== lreas_selflink_empty_href.svg lreas_selflink_empty_href.svg -== lreas_selflink_relative_href.svg lreas_selflink_relative_href.svg -== xslt_relative_href.svg xslt_relative_href.svg -== xslt_selflink_dtd_id.xml xslt_selflink_dtd_id.xml -== xslt_selflink_empty_href.xml xslt_selflink_empty_href.xml -== xslt_selflink_relative_href.xml xslt_selflink_relative_href.xml diff --git a/editor/reftests/reftest-stylo.list b/editor/reftests/reftest-stylo.list deleted file mode 100644 index ce42a4d40a..0000000000 --- a/editor/reftests/reftest-stylo.list +++ /dev/null @@ -1,177 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# include the XUL reftests -include xul/reftest-stylo.list - -== newline-1.html newline-1.html -== newline-2.html newline-2.html -== newline-3.html newline-3.html -== newline-4.html newline-4.html -== dynamic-1.html dynamic-1.html -== dynamic-type-1.html dynamic-type-1.html -== dynamic-type-2.html dynamic-type-2.html -== dynamic-type-3.html dynamic-type-3.html -== dynamic-type-4.html dynamic-type-4.html -== passwd-1.html passwd-1.html -== passwd-2.html passwd-2.html -== passwd-3.html passwd-3.html -needs-focus == passwd-4.html passwd-4.html -== emptypasswd-1.html emptypasswd-1.html -== emptypasswd-2.html emptypasswd-2.html -== caret_on_positioned.html caret_on_positioned.html -skip-if(B2G||Mulet) fails-if(Android) needs-focus == spellcheck-input-disabled.html spellcheck-input-disabled.html -# Initial mulet triage: parity with B2G/B2G Desktop -== spellcheck-input-attr-before.html spellcheck-input-attr-before.html -skip-if(B2G||Mulet) fails-if(Android) needs-focus == spellcheck-input-attr-before.html spellcheck-input-attr-before.html -# Initial mulet triage: parity with B2G/B2G Desktop -== spellcheck-input-attr-after.html spellcheck-input-attr-after.html -skip-if(B2G||Mulet) fails-if(Android) needs-focus == spellcheck-input-attr-after.html spellcheck-input-attr-after.html -# Initial mulet triage: parity with B2G/B2G Desktop -== spellcheck-input-attr-inherit.html spellcheck-input-attr-inherit.html -skip-if(B2G||Mulet) fails-if(Android) needs-focus == spellcheck-input-attr-inherit.html spellcheck-input-attr-inherit.html -# Initial mulet triage: parity with B2G/B2G Desktop -== spellcheck-input-attr-dynamic.html spellcheck-input-attr-dynamic.html -skip-if(B2G||Mulet) fails-if(Android) needs-focus == spellcheck-input-attr-dynamic.html spellcheck-input-attr-dynamic.html -# Initial mulet triage: parity with B2G/B2G Desktop -== spellcheck-input-attr-dynamic-inherit.html spellcheck-input-attr-dynamic-inherit.html -skip-if(B2G||Mulet) fails-if(Android) needs-focus == spellcheck-input-attr-dynamic-inherit.html spellcheck-input-attr-dynamic-inherit.html -# Initial mulet triage: parity with B2G/B2G Desktop -== spellcheck-input-property-dynamic.html spellcheck-input-property-dynamic.html -skip-if(B2G||Mulet) fails-if(Android) needs-focus == spellcheck-input-property-dynamic.html spellcheck-input-property-dynamic.html -# Initial mulet triage: parity with B2G/B2G Desktop -== spellcheck-input-property-dynamic-inherit.html spellcheck-input-property-dynamic-inherit.html -skip-if(B2G||Mulet) fails-if(Android) needs-focus == spellcheck-input-property-dynamic-inherit.html spellcheck-input-property-dynamic-inherit.html -# Initial mulet triage: parity with B2G/B2G Desktop -== spellcheck-input-attr-dynamic-override.html spellcheck-input-attr-dynamic-override.html -skip-if(B2G||Mulet) fails-if(Android) needs-focus == spellcheck-input-attr-dynamic-override.html spellcheck-input-attr-dynamic-override.html -# Initial mulet triage: parity with B2G/B2G Desktop -== spellcheck-input-attr-dynamic-override-inherit.html spellcheck-input-attr-dynamic-override-inherit.html -skip-if(B2G||Mulet) fails-if(Android) needs-focus == spellcheck-input-attr-dynamic-override-inherit.html spellcheck-input-attr-dynamic-override-inherit.html -# Initial mulet triage: parity with B2G/B2G Desktop -== spellcheck-input-property-dynamic-override.html spellcheck-input-property-dynamic-override.html -skip-if(B2G||Mulet) fails-if(Android) needs-focus == spellcheck-input-property-dynamic-override.html spellcheck-input-property-dynamic-override.html -# Initial mulet triage: parity with B2G/B2G Desktop -== spellcheck-input-property-dynamic-override-inherit.html spellcheck-input-property-dynamic-override-inherit.html -skip-if(B2G||Mulet) fails-if(Android) needs-focus == spellcheck-input-property-dynamic-override-inherit.html spellcheck-input-property-dynamic-override-inherit.html -# Initial mulet triage: parity with B2G/B2G Desktop -== spellcheck-textarea-attr.html spellcheck-textarea-attr.html -#the random-if(Android) tests pass on android native, but fail on android-xul, see bug 728942 -skip-if(B2G||Mulet) random-if(Android) needs-focus == spellcheck-textarea-attr.html spellcheck-textarea-attr.html -# Initial mulet triage: parity with B2G/B2G Desktop -needs-focus == spellcheck-textarea-focused.html spellcheck-textarea-focused.html -needs-focus == spellcheck-textarea-focused-reframe.html spellcheck-textarea-focused-reframe.html -needs-focus == spellcheck-textarea-focused-notreadonly.html spellcheck-textarea-focused-notreadonly.html -skip-if(B2G||Mulet) random-if(Android) needs-focus == spellcheck-textarea-nofocus.html spellcheck-textarea-nofocus.html -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if(B2G||Mulet) random-if(Android) needs-focus == spellcheck-textarea-disabled.html spellcheck-textarea-disabled.html -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if(B2G||Mulet) random-if(Android) needs-focus == spellcheck-textarea-attr-inherit.html spellcheck-textarea-attr-inherit.html -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if(B2G||Mulet) random-if(Android) needs-focus == spellcheck-textarea-attr-dynamic.html spellcheck-textarea-attr-dynamic.html -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if(B2G||Mulet) random-if(Android) needs-focus == spellcheck-textarea-attr-dynamic-inherit.html spellcheck-textarea-attr-dynamic-inherit.html -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if(B2G||Mulet) random-if(Android) needs-focus == spellcheck-textarea-property-dynamic.html spellcheck-textarea-property-dynamic.html -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if(B2G||Mulet) random-if(Android) needs-focus == spellcheck-textarea-property-dynamic-inherit.html spellcheck-textarea-property-dynamic-inherit.html -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if(B2G||Mulet) random-if(Android) needs-focus == spellcheck-textarea-attr-dynamic-override.html spellcheck-textarea-attr-dynamic-override.html -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if(B2G||Mulet) random-if(Android) needs-focus == spellcheck-textarea-attr-dynamic-override-inherit.html spellcheck-textarea-attr-dynamic-override-inherit.html -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if(B2G||Mulet) random-if(Android) needs-focus == spellcheck-textarea-property-dynamic-override.html spellcheck-textarea-property-dynamic-override.html -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if(B2G||Mulet) random-if(Android) needs-focus == spellcheck-textarea-property-dynamic-override-inherit.html spellcheck-textarea-property-dynamic-override-inherit.html -# Initial mulet triage: parity with B2G/B2G Desktop -needs-focus == caret_on_focus.html caret_on_focus.html -needs-focus == caret_on_textarea_lastline.html caret_on_textarea_lastline.html -needs-focus == input-text-onfocus-reframe.html input-text-onfocus-reframe.html -needs-focus == input-text-notheme-onfocus-reframe.html input-text-notheme-onfocus-reframe.html -skip-if(B2G||Mulet) needs-focus == caret_after_reframe.html caret_after_reframe.html -# B2G timed out waiting for reftest-wait to be removed -# Initial mulet triage: parity with B2G/B2G Desktop -== nobogusnode-1.html nobogusnode-1.html -== nobogusnode-2.html nobogusnode-2.html -== spellcheck-hyphen-valid.html spellcheck-hyphen-valid.html -skip-if(B2G||Mulet) fails-if(Android) needs-focus == spellcheck-hyphen-invalid.html spellcheck-hyphen-invalid.html -# Initial mulet triage: parity with B2G/B2G Desktop -== spellcheck-slash-valid.html spellcheck-slash-valid.html -== spellcheck-period-valid.html spellcheck-period-valid.html -== spellcheck-space-valid.html spellcheck-space-valid.html -== spellcheck-comma-valid.html spellcheck-comma-valid.html -== spellcheck-hyphen-multiple-valid.html spellcheck-hyphen-multiple-valid.html -skip-if(B2G||Mulet) fails-if(Android) needs-focus == spellcheck-hyphen-multiple-invalid.html spellcheck-hyphen-multiple-invalid.html -# Initial mulet triage: parity with B2G/B2G Desktop -== spellcheck-dotafterquote-valid.html spellcheck-dotafterquote-valid.html -== spellcheck-url-valid.html spellcheck-url-valid.html -needs-focus == spellcheck-non-latin-arabic.html spellcheck-non-latin-arabic.html -needs-focus == spellcheck-non-latin-chinese-simplified.html spellcheck-non-latin-chinese-simplified.html -needs-focus == spellcheck-non-latin-chinese-traditional.html spellcheck-non-latin-chinese-traditional.html -needs-focus == spellcheck-non-latin-hebrew.html spellcheck-non-latin-hebrew.html -needs-focus == spellcheck-non-latin-japanese.html spellcheck-non-latin-japanese.html -needs-focus == spellcheck-non-latin-korean.html spellcheck-non-latin-korean.html -== unneeded_scroll.html unneeded_scroll.html -skip-if(B2G||Mulet) == caret_on_presshell_reinit.html caret_on_presshell_reinit.html -# Initial mulet triage: parity with B2G/B2G Desktop -fuzzy-if(browserIsRemote,255,3) asserts-if(browserIsRemote,0-1) skip-if(B2G||Mulet) fuzzy-if(skiaContent,1,5) == caret_on_presshell_reinit-2.html caret_on_presshell_reinit-2.html -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if(B2G||Mulet) fuzzy-if(asyncPan&&!layersGPUAccelerated,102,2824) == 642800.html 642800.html -# Initial mulet triage: parity with B2G/B2G Desktop -== selection_visibility_after_reframe.html selection_visibility_after_reframe.html -== selection_visibility_after_reframe-2.html selection_visibility_after_reframe-2.html -== selection_visibility_after_reframe-3.html selection_visibility_after_reframe-3.html -== 672709.html 672709.html -== 338427-1.html 338427-1.html -skip-if(Android||B2G||Mulet) needs-focus == 674212-spellcheck.html 674212-spellcheck.html -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if(Android||B2G||Mulet) needs-focus == 338427-2.html 338427-2.html -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if(Android||B2G||Mulet) needs-focus == 338427-3.html 338427-3.html -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if(Android||B2G||Mulet) needs-focus == 462758-grabbers-resizers.html 462758-grabbers-resizers.html -# Initial mulet triage: parity with B2G/B2G Desktop -== readwrite-non-editable.html readwrite-non-editable.html -== readwrite-editable.html readwrite-editable.html -== readonly-non-editable.html readonly-non-editable.html -== readonly-editable.html readonly-editable.html -== dynamic-overflow-change.html dynamic-overflow-change.html -== 694880-1.html 694880-1.html -== 694880-2.html 694880-2.html -== 694880-3.html 694880-3.html -skip == 388980-1.html 388980-1.html -needs-focus == spellcheck-superscript-1.html spellcheck-superscript-1.html -skip-if(B2G||Mulet) fails-if(Android) needs-focus == spellcheck-superscript-2.html spellcheck-superscript-2.html -# bug 783658 -# Initial mulet triage: parity with B2G/B2G Desktop -fuzzy-if(skiaContent,1,3400) needs-focus pref(layout.accessiblecaret.enabled,false) == 824080-1.html 824080-1.html -needs-focus pref(layout.accessiblecaret.enabled,false) == 824080-2.html 824080-2.html -needs-focus pref(layout.accessiblecaret.enabled,false) == 824080-3.html 824080-3.html -needs-focus == 824080-2.html 824080-2.html -fuzzy-if(skiaContent,1,3200) needs-focus pref(layout.accessiblecaret.enabled,false) == 824080-4.html 824080-4.html -fails fuzzy-if(skiaContent,2,1800) needs-focus pref(layout.accessiblecaret.enabled,false) == 824080-5.html 824080-5.html -needs-focus == 824080-4.html 824080-4.html -needs-focus == 824080-6.html 824080-6.html -needs-focus pref(layout.accessiblecaret.enabled,false) == 824080-7.html 824080-7.html -needs-focus == 824080-6.html 824080-6.html -# Bug 674927: copy spellcheck-textarea tests to contenteditable -== spellcheck-contenteditable-attr.html spellcheck-contenteditable-attr.html -fails-if(Android||B2G||Mulet) needs-focus == spellcheck-contenteditable-attr.html spellcheck-contenteditable-attr.html -# B2G no spellcheck underline -# Initial mulet triage: parity with B2G/B2G Desktop -needs-focus == spellcheck-contenteditable-focused.html spellcheck-contenteditable-focused.html -needs-focus == spellcheck-contenteditable-focused-reframe.html spellcheck-contenteditable-focused-reframe.html -== spellcheck-contenteditable-nofocus.html spellcheck-contenteditable-nofocus.html -== spellcheck-contenteditable-disabled.html spellcheck-contenteditable-disabled.html -== spellcheck-contenteditable-disabled-partial.html spellcheck-contenteditable-disabled-partial.html -== spellcheck-contenteditable-attr-inherit.html spellcheck-contenteditable-attr-inherit.html -== spellcheck-contenteditable-attr-dynamic.html spellcheck-contenteditable-attr-dynamic.html -== spellcheck-contenteditable-attr-dynamic-inherit.html spellcheck-contenteditable-attr-dynamic-inherit.html -== spellcheck-contenteditable-property-dynamic.html spellcheck-contenteditable-property-dynamic.html -== spellcheck-contenteditable-property-dynamic-inherit.html spellcheck-contenteditable-property-dynamic-inherit.html -== spellcheck-contenteditable-attr-dynamic-override.html spellcheck-contenteditable-attr-dynamic-override.html -== spellcheck-contenteditable-attr-dynamic-override-inherit.html spellcheck-contenteditable-attr-dynamic-override-inherit.html -== spellcheck-contenteditable-property-dynamic-override.html spellcheck-contenteditable-property-dynamic-override.html -== spellcheck-contenteditable-property-dynamic-override-inherit.html spellcheck-contenteditable-property-dynamic-override-inherit.html -== 911201.html 911201.html -needs-focus == 969773.html 969773.html -fails fuzzy-if(skiaContent,1,220) == 997805.html 997805.html -fails fuzzy-if(skiaContent,1,220) == 1088158.html 1088158.html diff --git a/editor/reftests/xul/reftest-stylo.list b/editor/reftests/xul/reftest-stylo.list deleted file mode 100644 index cfaa7a0583..0000000000 --- a/editor/reftests/xul/reftest-stylo.list +++ /dev/null @@ -1,67 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -fails-if(Android||B2G) skip-if((B2G&&browserIsRemote)||Mulet||((browserIsRemote&&winWidget))) == empty-1.xul empty-1.xul -# bug 783658 -# Initial mulet triage: parity with B2G/B2G Desktop, Windows: bug 1239170 -skip-if((B2G&&browserIsRemote)||Mulet) == empty-2.xul empty-2.xul -# Initial mulet triage: parity with B2G/B2G Desktop -# There is no way to simulate an autocomplete textbox in windows XP/Vista/7/8/10 default theme using CSS. -# Therefore, the equlity tests below should be marked as failing. -fails-if(Android||B2G) fails-if(windowsDefaultTheme&&/^Windows\x20NT\x20(5\.[12]|6\.[012]|10\.0)/.test(http.oscpu)) skip-if((B2G&&browserIsRemote)||Mulet) == autocomplete-1.xul autocomplete-1.xul -# bug 783658 -# Initial mulet triage: parity with B2G/B2G Desktop -fails-if(Android||B2G) fails-if(windowsDefaultTheme&&/^Windows\x20NT\x20(5\.[12]|6\.[012]|10\.0)/.test(http.oscpu)) skip-if((B2G&&browserIsRemote)||Mulet) == emptyautocomplete-1.xul emptyautocomplete-1.xul -# bug 783658 -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if((B2G&&browserIsRemote)||Mulet) == emptymultiline-1.xul emptymultiline-1.xul -# Initial mulet triage: parity with B2G/B2G Desktop -fails-if(Android||B2G) skip-if((B2G&&browserIsRemote)||Mulet) == emptymultiline-2.xul emptymultiline-2.xul -# bug 783658 -# Initial mulet triage: parity with B2G/B2G Desktop -fails-if(Android||B2G) skip-if((B2G&&browserIsRemote)||Mulet||((browserIsRemote&&winWidget))) == emptytextbox-1.xul emptytextbox-1.xul -# bug 783658 -# Initial mulet triage: parity with B2G/B2G Desktop, Windows: bug 1239170 -fails-if(Android||B2G) skip-if((B2G&&browserIsRemote)||Mulet||((browserIsRemote&&winWidget))) == emptytextbox-2.xul emptytextbox-2.xul -# bug 783658 -# Initial mulet triage: parity with B2G/B2G Desktop, Windows: bug 1239170 -fails skip-if((B2G&&browserIsRemote)||Mulet) == emptytextbox-3.xul emptytextbox-3.xul -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if((B2G&&browserIsRemote)||Mulet) == emptytextbox-4.xul emptytextbox-4.xul -# Initial mulet triage: parity with B2G/B2G Desktop -fails-if(Android||B2G) skip-if((B2G&&browserIsRemote)||Mulet||((browserIsRemote&&winWidget))) == emptytextbox-5.xul emptytextbox-5.xul -# bug 783658 -# Initial mulet triage: parity with B2G/B2G Desktop, Windows: bug 1239170 -# There is no way to simulate a number textbox in windows XP/Vista/7 default theme using CSS. -# Therefore, the equlity tests below should be marked as failing. -skip-if((B2G&&browserIsRemote)||Mulet) == number-1.xul number-1.xul -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if((B2G&&browserIsRemote)||Mulet) == number-2.xul number-2.xul -# Initial mulet triage: parity with B2G/B2G Desktop -fails-if(Android||B2G) fails-if(windowsDefaultTheme&&/^Windows\x20NT\x20(5\.[12]|6\.[012]|10\.0)/.test(http.oscpu)) skip-if((B2G&&browserIsRemote)||Mulet) == number-3.xul number-3.xul -# bug 783658 -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if((B2G&&browserIsRemote)||Mulet) == number-4.xul number-4.xul -# Initial mulet triage: parity with B2G/B2G Desktop -fails-if(Android||B2G) fails-if(windowsDefaultTheme&&/^Windows\x20NT\x20(5\.[12]|6\.[012]|10\.0)/.test(http.oscpu)) skip-if((B2G&&browserIsRemote)||Mulet) == number-5.xul number-5.xul -# bug 783658 -# Initial mulet triage: parity with B2G/B2G Desktop -fails-if(Android||B2G) fails-if(windowsDefaultTheme&&/^Windows\x20NT\x20(5\.[12]|6\.[012]|10\.0)/.test(http.oscpu)) skip-if((B2G&&browserIsRemote)||Mulet) == numberwithvalue-1.xul numberwithvalue-1.xul -# bug 783658 -# Initial mulet triage: parity with B2G/B2G Desktop -fails-if(Android||B2G) skip-if((B2G&&browserIsRemote)||Mulet||((browserIsRemote&&winWidget))) == passwd-1.xul passwd-1.xul -# bug 783658 -# Initial mulet triage: parity with B2G/B2G Desktop, Windows: bug 1239170 -fails-if(Android||B2G) skip-if((B2G&&browserIsRemote)||Mulet||((browserIsRemote&&winWidget))) == passwd-2.xul passwd-2.xul -# bug 783658 -# Initial mulet triage: parity with B2G/B2G Desktop, Windows: bug 1239170 -skip-if((B2G&&browserIsRemote)||Mulet) == passwd-3.xul passwd-3.xul -# Initial mulet triage: parity with B2G/B2G Desktop -fails-if(Android||B2G) skip-if((B2G&&browserIsRemote)||Mulet) == plain-1.xul plain-1.xul -# bug 783658 -# Initial mulet triage: parity with B2G/B2G Desktop -fails-if(Android||B2G) skip-if((B2G&&browserIsRemote)||Mulet||(browserIsRemote&&winWidget)) == textbox-1.xul textbox-1.xul -# Initial mulet triage: parity with B2G/B2G Desktop, Windows: bug 1239170 -skip-if((B2G&&browserIsRemote)||Mulet) == textbox-disabled.xul textbox-disabled.xul -# Initial mulet triage: parity with B2G/B2G Desktop -# Read-only textboxes look like normal textboxes in windows Vista/7 default theme -fails-if(windowsDefaultTheme&&/^Windows\x20NT\x20(6\.[012]|10\.0)/.test(http.oscpu)) skip-if((B2G&&browserIsRemote)||Mulet||(browserIsRemote&&winWidget)) == textbox-readonly.xul textbox-readonly.xul -# Initial mulet triage: parity with B2G/B2G Desktop, Windows: bug 1239170 diff --git a/gfx/layers/apz/test/reftest/reftest-stylo.list b/gfx/layers/apz/test/reftest/reftest-stylo.list deleted file mode 100644 index cc2c768276..0000000000 --- a/gfx/layers/apz/test/reftest/reftest-stylo.list +++ /dev/null @@ -1,20 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# The following tests test the async positioning of the scrollbars. -# Basic root-frame scrollbar with async scrolling -skip-if(!asyncPan) fuzzy-if(Android,6,8) == async-scrollbar-1-v.html async-scrollbar-1-v.html -skip-if(!asyncPan) fuzzy-if(Android,6,8) == async-scrollbar-1-h.html async-scrollbar-1-h.html -skip-if(!asyncPan) fuzzy-if(Android,6,8) == async-scrollbar-1-vh.html async-scrollbar-1-vh.html -skip-if(!asyncPan) fuzzy-if(Android,6,8) == async-scrollbar-1-v-rtl.html async-scrollbar-1-v-rtl.html -skip-if(!asyncPan) fuzzy-if(Android,13,8) == async-scrollbar-1-h-rtl.html async-scrollbar-1-h-rtl.html -skip-if(!asyncPan) fuzzy-if(Android,8,10) == async-scrollbar-1-vh-rtl.html async-scrollbar-1-vh-rtl.html - -# Different async zoom levels. Since the scrollthumb gets async-scaled in the -# compositor, the border-radius ends of the scrollthumb are going to be a little -# off, hence the fuzzy-if clauses. -skip-if(!asyncZoom) fuzzy-if(B2G,98,82) == async-scrollbar-zoom-1.html async-scrollbar-zoom-1.html -skip-if(!asyncZoom) fuzzy-if(B2G,94,146) == async-scrollbar-zoom-2.html async-scrollbar-zoom-2.html - -# Meta-viewport tag support -skip-if(!asyncZoom) == initial-scale-1.html initial-scale-1.html - -skip-if(!asyncPan) == frame-reconstruction-scroll-clamping.html frame-reconstruction-scroll-clamping.html diff --git a/gfx/tests/reftest/reftest-stylo.list b/gfx/tests/reftest/reftest-stylo.list deleted file mode 100644 index 378891e06c..0000000000 --- a/gfx/tests/reftest/reftest-stylo.list +++ /dev/null @@ -1,12 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# 468496-1 will also detect bugs in video drivers. -== 468496-1.html 468496-1.html -skip == 611498-1.html 611498-1.html -skip == 709477-1.html 709477-1.html -# bug 773482 -skip-if(!asyncPan) == 1086723.html 1086723.html -== 853889-1.html 853889-1.html -skip-if(Android) fuzzy-if(skiaContent,1,587) == 1143303-1.svg 1143303-1.svg -== 1149923.html 1149923.html -# use fuzzy due to few distorted pixels caused by border-radius -== 1131264-1.svg 1131264-1.svg diff --git a/image/test/reftest/apng/reftest-stylo.list b/image/test/reftest/apng/reftest-stylo.list deleted file mode 100644 index 229de21616..0000000000 --- a/image/test/reftest/apng/reftest-stylo.list +++ /dev/null @@ -1,7 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# APNG tests -# -# delaytest.html delays the reftest snapshot to allow time for the -# animation to complete. -random == delaytest.html?bug411852-1.png delaytest.html?bug411852-1.png -random == delaytest.html?bug546272.png delaytest.html?bug546272.png diff --git a/image/test/reftest/blob/reftest-stylo.list b/image/test/reftest/blob/reftest-stylo.list deleted file mode 100644 index 06f01ef7f0..0000000000 --- a/image/test/reftest/blob/reftest-stylo.list +++ /dev/null @@ -1,8 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Blob URI tests - -# Test that blob URIs don't get merged if they have different ref params. -# (We run the test twice to check both cached and non-cached cases.) -default-preferences pref(image.mozsamplesize.enabled,true) -== blob-uri-with-ref-param.html blob-uri-with-ref-param.html -== blob-uri-with-ref-param.html blob-uri-with-ref-param.html diff --git a/image/test/reftest/bmp/bmp-1bpp/reftest-stylo.list b/image/test/reftest/bmp/bmp-1bpp/reftest-stylo.list deleted file mode 100644 index ff10dd8119..0000000000 --- a/image/test/reftest/bmp/bmp-1bpp/reftest-stylo.list +++ /dev/null @@ -1,22 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# BMP 1BPP tests - -# Images of various sizes -fails == bmp-size-1x1-1bpp.bmp bmp-size-1x1-1bpp.bmp -fails == bmp-size-2x2-1bpp.bmp bmp-size-2x2-1bpp.bmp -fails == bmp-size-3x3-1bpp.bmp bmp-size-3x3-1bpp.bmp -fails == bmp-size-4x4-1bpp.bmp bmp-size-4x4-1bpp.bmp -fails == bmp-size-5x5-1bpp.bmp bmp-size-5x5-1bpp.bmp -fails == bmp-size-6x6-1bpp.bmp bmp-size-6x6-1bpp.bmp -fails == bmp-size-7x7-1bpp.bmp bmp-size-7x7-1bpp.bmp -fails == bmp-size-8x8-1bpp.bmp bmp-size-8x8-1bpp.bmp -fails == bmp-size-9x9-1bpp.bmp bmp-size-9x9-1bpp.bmp -fails == bmp-size-15x15-1bpp.bmp bmp-size-15x15-1bpp.bmp -fails == bmp-size-16x16-1bpp.bmp bmp-size-16x16-1bpp.bmp -fails == bmp-size-17x17-1bpp.bmp bmp-size-17x17-1bpp.bmp -fails == bmp-size-31x31-1bpp.bmp bmp-size-31x31-1bpp.bmp -fails == bmp-size-32x32-1bpp.bmp bmp-size-32x32-1bpp.bmp -fails == bmp-size-33x33-1bpp.bmp bmp-size-33x33-1bpp.bmp -fails == bmp-not-square-1bpp.bmp bmp-not-square-1bpp.bmp -fails == os2bmp-size-32x32-1bpp.bmp os2bmp-size-32x32-1bpp.bmp -fails == top-to-bottom-16x16-1bpp.bmp top-to-bottom-16x16-1bpp.bmp diff --git a/image/test/reftest/bmp/bmp-24bpp/reftest-stylo.list b/image/test/reftest/bmp/bmp-24bpp/reftest-stylo.list deleted file mode 100644 index 29040bfc52..0000000000 --- a/image/test/reftest/bmp/bmp-24bpp/reftest-stylo.list +++ /dev/null @@ -1,22 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# BMP 24BPP tests - -# Images of various sizes -fails == bmp-size-1x1-24bpp.bmp bmp-size-1x1-24bpp.bmp -fails == bmp-size-2x2-24bpp.bmp bmp-size-2x2-24bpp.bmp -fails == bmp-size-3x3-24bpp.bmp bmp-size-3x3-24bpp.bmp -fails == bmp-size-4x4-24bpp.bmp bmp-size-4x4-24bpp.bmp -fails == bmp-size-5x5-24bpp.bmp bmp-size-5x5-24bpp.bmp -fails == bmp-size-6x6-24bpp.bmp bmp-size-6x6-24bpp.bmp -fails == bmp-size-7x7-24bpp.bmp bmp-size-7x7-24bpp.bmp -fails == bmp-size-8x8-24bpp.bmp bmp-size-8x8-24bpp.bmp -fails == bmp-size-9x9-24bpp.bmp bmp-size-9x9-24bpp.bmp -fails == bmp-size-15x15-24bpp.bmp bmp-size-15x15-24bpp.bmp -fails == bmp-size-16x16-24bpp.bmp bmp-size-16x16-24bpp.bmp -fails == bmp-size-17x17-24bpp.bmp bmp-size-17x17-24bpp.bmp -fails == bmp-size-31x31-24bpp.bmp bmp-size-31x31-24bpp.bmp -fails == bmp-size-32x32-24bpp.bmp bmp-size-32x32-24bpp.bmp -fails == bmp-size-33x33-24bpp.bmp bmp-size-33x33-24bpp.bmp -fails == bmp-not-square-24bpp.bmp bmp-not-square-24bpp.bmp -fails == os2bmp-size-32x32-24bpp.bmp os2bmp-size-32x32-24bpp.bmp -fails == top-to-bottom-16x16-24bpp.bmp top-to-bottom-16x16-24bpp.bmp diff --git a/image/test/reftest/bmp/bmp-4bpp/reftest-stylo.list b/image/test/reftest/bmp/bmp-4bpp/reftest-stylo.list deleted file mode 100644 index 229f1c0d6c..0000000000 --- a/image/test/reftest/bmp/bmp-4bpp/reftest-stylo.list +++ /dev/null @@ -1,25 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# BMP 4BPP tests - -# Images of various sizes -fails == bmp-size-1x1-4bpp.bmp bmp-size-1x1-4bpp.bmp -fails == bmp-size-2x2-4bpp.bmp bmp-size-2x2-4bpp.bmp -fails == bmp-size-3x3-4bpp.bmp bmp-size-3x3-4bpp.bmp -fails == bmp-size-4x4-4bpp.bmp bmp-size-4x4-4bpp.bmp -fails == bmp-size-5x5-4bpp.bmp bmp-size-5x5-4bpp.bmp -fails == bmp-size-6x6-4bpp.bmp bmp-size-6x6-4bpp.bmp -fails == bmp-size-7x7-4bpp.bmp bmp-size-7x7-4bpp.bmp -fails == bmp-size-8x8-4bpp.bmp bmp-size-8x8-4bpp.bmp -fails == bmp-size-9x9-4bpp.bmp bmp-size-9x9-4bpp.bmp -fails == bmp-size-15x15-4bpp.bmp bmp-size-15x15-4bpp.bmp -skip == bmp-size-16x16-4bpp.bmp bmp-size-16x16-4bpp.bmp -fails == bmp-size-17x17-4bpp.bmp bmp-size-17x17-4bpp.bmp -fails == bmp-size-31x31-4bpp.bmp bmp-size-31x31-4bpp.bmp -fails == bmp-size-32x32-4bpp.bmp bmp-size-32x32-4bpp.bmp -fails == bmp-size-33x33-4bpp.bmp bmp-size-33x33-4bpp.bmp -fails == bmp-not-square-4bpp.bmp bmp-not-square-4bpp.bmp -fails == os2bmp-size-32x32-4bpp.bmp os2bmp-size-32x32-4bpp.bmp -fails == top-to-bottom-16x16-4bpp.bmp top-to-bottom-16x16-4bpp.bmp -# test that delta skips are drawn as transparent -# taken from http://bmptestsuite.sourceforge.net/ -== rle4-delta-320x240.bmp rle4-delta-320x240.bmp diff --git a/image/test/reftest/bmp/bmp-8bpp/reftest-stylo.list b/image/test/reftest/bmp/bmp-8bpp/reftest-stylo.list deleted file mode 100644 index 237517976e..0000000000 --- a/image/test/reftest/bmp/bmp-8bpp/reftest-stylo.list +++ /dev/null @@ -1,25 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# BMP 8BPP tests - -# Images of various sizes -fails == bmp-size-1x1-8bpp.bmp bmp-size-1x1-8bpp.bmp -fails == bmp-size-2x2-8bpp.bmp bmp-size-2x2-8bpp.bmp -fails == bmp-size-3x3-8bpp.bmp bmp-size-3x3-8bpp.bmp -fails == bmp-size-4x4-8bpp.bmp bmp-size-4x4-8bpp.bmp -fails == bmp-size-5x5-8bpp.bmp bmp-size-5x5-8bpp.bmp -fails == bmp-size-6x6-8bpp.bmp bmp-size-6x6-8bpp.bmp -fails == bmp-size-7x7-8bpp.bmp bmp-size-7x7-8bpp.bmp -fails == bmp-size-8x8-8bpp.bmp bmp-size-8x8-8bpp.bmp -fails == bmp-size-9x9-8bpp.bmp bmp-size-9x9-8bpp.bmp -fails == bmp-size-15x15-8bpp.bmp bmp-size-15x15-8bpp.bmp -fails == bmp-size-16x16-8bpp.bmp bmp-size-16x16-8bpp.bmp -fails == bmp-size-17x17-8bpp.bmp bmp-size-17x17-8bpp.bmp -fails == bmp-size-31x31-8bpp.bmp bmp-size-31x31-8bpp.bmp -fails == bmp-size-32x32-8bpp.bmp bmp-size-32x32-8bpp.bmp -fails == bmp-size-33x33-8bpp.bmp bmp-size-33x33-8bpp.bmp -fails == bmp-not-square-8bpp.bmp bmp-not-square-8bpp.bmp -random == rle-bmp-not-square-8bpp.bmp rle-bmp-not-square-8bpp.bmp -fails == os2-bmp-size-32x32-8bpp.bmp os2-bmp-size-32x32-8bpp.bmp -random == rle-bmp-size-32x32-8bpp.bmp rle-bmp-size-32x32-8bpp.bmp -== top-to-bottom-rle-bmp-size-32x32-8bpp.bmp top-to-bottom-rle-bmp-size-32x32-8bpp.bmp -fails == top-to-bottom-16x16-8bpp.bmp top-to-bottom-16x16-8bpp.bmp diff --git a/image/test/reftest/bmp/bmp-corrupted/reftest-stylo.list b/image/test/reftest/bmp/bmp-corrupted/reftest-stylo.list deleted file mode 100644 index bb776a7afb..0000000000 --- a/image/test/reftest/bmp/bmp-corrupted/reftest-stylo.list +++ /dev/null @@ -1,19 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Corrupted BMP tests - -skip == wrapper.html?invalid-signature.bmp wrapper.html?invalid-signature.bmp -skip == wrapper.html?invalid-bpp.bmp wrapper.html?invalid-bpp.bmp -skip == wrapper.html?os2-invalid-bpp.bmp wrapper.html?os2-invalid-bpp.bmp -# Tests for an unsupported compression value -skip == wrapper.html?invalid-compression.bmp wrapper.html?invalid-compression.bmp -# Tests for RLE4 with an invalid BPP -skip == wrapper.html?invalid-compression-RLE4.bmp wrapper.html?invalid-compression-RLE4.bmp -# Tests for RLE8 with an invalid BPP -skip == wrapper.html?invalid-compression-RLE8.bmp wrapper.html?invalid-compression-RLE8.bmp - -# Test for BITFIELDS with an invalid BIH size. (This is the obscure -# BITMAPV3INFOHEADER variant mentioned in -# https://en.wikipedia.org/wiki/BMP_file_format which we don't accept.) -skip == wrapper.html?invalid-compression-BITFIELDS.bmp wrapper.html?invalid-compression-BITFIELDS.bmp - -skip == wrapper.html?invalid-truncated-metadata.bmp wrapper.html?invalid-truncated-metadata.bmp diff --git a/image/test/reftest/bmp/bmpsuite/b/reftest-stylo.list b/image/test/reftest/bmp/bmpsuite/b/reftest-stylo.list deleted file mode 100644 index 244d80cb43..0000000000 --- a/image/test/reftest/bmp/bmpsuite/b/reftest-stylo.list +++ /dev/null @@ -1,85 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# bmpsuite "bad" tests - -# See ../README.mozilla for details. - -# BMP: bihsize=40, 127 x 64, bpp=30000, compression=0, colors=2 -# "Header indicates an absurdly large number of bits/pixel." -# [We reject it. So does Chromium.] -skip == wrapper.html?badbitcount.bmp wrapper.html?badbitcount.bmp - -# BMP: bihsize=40, 127 x 64, bpp=1, compression=0, colors=2 -# "Header incorrectly indicates that the bitmap is several GB in size." -# [We accept it. So does Chromium.] -fails == badbitssize.bmp badbitssize.bmp - -# BMP: bihsize=40, 127 x 64, bpp=1, compression=0, colors=2 -# BMP: bihsize=40, 127 x 64, bpp=1, compression=0, colors=2 -# "Density (pixels per meter) suggests the image is much larger in one -# dimension than the other." -# [We accept them. So does Chromium.] -fails == baddens1.bmp baddens1.bmp -fails == baddens2.bmp baddens2.bmp - -# BMP: bihsize=40, 127 x 64, bpp=1, compression=0, colors=2 -# "Header incorrectly indicates that the file is several GB in size." -# [We accept it. So does Chromium.] -fails == badfilesize.bmp badfilesize.bmp - -# BMP: -# "Header size is 66 bytes, which is not a valid size for any known BMP -# version." -# [We reject it. So does Chromium.] -skip == wrapper.html?badheadersize.bmp wrapper.html?badheadersize.bmp - -# BMP: bihsize=40, 127 x 64, bpp=8, compression=0, colors=305402420 -# "Header incorrectly indicates that the palette contains an absurdly large -# number of colors." -# [We reject it. Chromium accepts it but draws nothing. Rejecting seems -# preferable give that the data is clearly untrustworthy.] -skip == wrapper.html?badpalettesize.bmp wrapper.html?badpalettesize.bmp - -# BMP: bihsize=40, 127 x 64, bpp=1, compression=0, colors=2 -# "The 'planes' setting, which is required to be 1, is not 1." -# [We accept it. So does Chromium.] -fails == badplanes.bmp badplanes.bmp - -# BMP: bihsize=40, 127 x 64, bpp=8, compression=1, colors=253 -# "An invalid RLE-compressed image that tries to cause buffer overruns." -# [We accept it, drawing the valid first part and leaving the rest black. -# Chromium accepts it, drawing the valid first part and leaving the rest -# transparent. Using black for the invalid part is arguably better because it -# makes the image edges more obvious.] -== badrle.bmp badrle.bmp - -# BMP: bihsize=40, -127 x 64, bpp=1, compression=0, colors=2 -# "The image claims to be a negative number of pixels in width." -# [We reject it. So does Chromium.] -skip == wrapper.html?badwidth.bmp wrapper.html?badwidth.bmp - -# BMP: bihsize=40, 127 x 64, bpp=8, compression=0, colors=101 -# "Many of the palette indices used in the image are not present in the -# palette." -# [We accept it and use black for the missing colors. So does Chromium.] -fails == pal8badindex.bmp pal8badindex.bmp - -# BMP: bihsize=40, 3000000 x 2000000, bpp=24, compression=0, colors=0 -# "An image with a very large reported width and height." -# [We reject it. So does Chromium.] -skip == wrapper.html?reallybig.bmp wrapper.html?reallybig.bmp - -# BMP: bihsize=40, 127 x -64, bpp=8, compression=1, colors=252 -# "An RLE-compressed image that tries to use top-down orientation, which isn’t -# allowed." -# [We accept it. Chromium rejects it. Accepting seems better given that we can -# decode it perfectly well.] -== rletopdown.bmp rletopdown.bmp - -# BMP: bihsize=40, 127 x 64, bpp=1, compression=0, colors=2 -# "A file that has been truncated in the middle of the bitmap." -# [We accept it, drawing the part that is present and leaving the rest black. -# Chromium draws the part that is present and leaves the rest transparent. -# Using black for the invalid part is arguably better because it makes the -# image edges more obvious.] -fails == shortfile.bmp shortfile.bmp - diff --git a/image/test/reftest/bmp/bmpsuite/g/reftest-stylo.list b/image/test/reftest/bmp/bmpsuite/g/reftest-stylo.list deleted file mode 100644 index ba8a53b4f5..0000000000 --- a/image/test/reftest/bmp/bmpsuite/g/reftest-stylo.list +++ /dev/null @@ -1,113 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# bmpsuite "good" tests - -# See ../README.mozilla for details. - -# BMP: bihsize=40, 127 x 64, bpp=1, compression=0, colors=2 -# "1 bit/pixel paletted image, in which black is the first color in the -# palette." -fails == pal1.bmp pal1.bmp - -# BMP: bihsize=40, 127 x 64, bpp=1, compression=0, colors=2 -# "1 bit/pixel paletted image, in which white is the first color in the -# palette." -fails == pal1wb.bmp pal1wb.bmp - -# BMP: bihsize=40, 127 x 64, bpp=1, compression=0, colors=2 -# "1 bit/pixel paletted image, with colors other than black and white." -fails == pal1bg.bmp pal1bg.bmp - -# BMP: bihsize=40, 127 x 64, bpp=4, compression=0, colors=12 -# "Paletted image with 12 palette colors, and 4 bits/pixel." -fails == pal4.bmp pal4.bmp - -# BMP: bihsize=40, 127 x 64, bpp=4, compression=2, colors=12 -# "4-bit image that uses RLE compression." -== pal4rle.bmp pal4rle.bmp - -# BMP: bihsize=40, 127 x 64, bpp=8, compression=0, colors=252 -# "Our standard paletted image, with 252 palette colors, and 8 bits/pixel." -fails == pal8.bmp pal8.bmp - -# BMP: bihsize=40, 127 x 64, bpp=8, compression=0, colors=0 -# "Every field that can be set to 0 is set to 0: pixels/meter=0; colors used=0 -# (meaning the default 256); size-of-image=0." -fails == pal8-0.bmp pal8-0.bmp - -# BMP: bihsize=40, 127 x 64, bpp=8, compression=1, colors=252 -# "8-bit image that uses RLE compression." -== pal8rle.bmp pal8rle.bmp - -# BMP: bihsize=40, 126 x 63, bpp=8, compression=0, colors=252 -# BMP: bihsize=40, 125 x 62, bpp=8, compression=0, colors=252 -# BMP: bihsize=40, 124 x 61, bpp=8, compression=0, colors=252 -# "Images with different widths and heights. In BMP format, rows are padded to -# a multiple of four bytes, so we test all four possibilities." -fails == pal8w126.bmp pal8w126.bmp -fails == pal8w125.bmp pal8w125.bmp -fails == pal8w124.bmp pal8w124.bmp - -# BMP: bihsize=40, 127 x -64, bpp=8, compression=0, colors=252 -# "BMP images are normally stored from the bottom up, but there is a way to -# store them from the top down." -fails == pal8topdown.bmp pal8topdown.bmp - -# BMP: bihsize=40, 127 x 32, bpp=8, compression=0, colors=252 -# "An image with non-square pixels: the X pixels/meter is twice the Y -# pixels/meter. Image editors can be expected to leave the image 'squashed'; -# image viewers should consider stretching it to its correct proportions." -# [We leave it squashed, as does Chromium.] -fails == pal8nonsquare.bmp pal8nonsquare.bmp - -# BMP: bihsize=12, 127 x 64, bpp=8, compression=0, colors=0 -# "An OS/2-style bitmap." -fails == pal8os2.bmp pal8os2.bmp - -# BMP: bihsize=108, 127 x 64, bpp=8, compression=0, colors=252 -# "A v4 bitmap. I’m not sure that the gamma and chromaticity values in this -# file are sensible, because I can’t find any detailed documentation of them." -fails == pal8v4.bmp pal8v4.bmp - -# BMP: bihsize=124, 127 x 64, bpp=8, compression=0, colors=252 -# "A v5 bitmap. Version 5 has additional colorspace options over v4, so it is -# easier to create, and ought to be more portable." -fails == pal8v5.bmp pal8v5.bmp - -# BMP: bihsize=40, 127 x 64, bpp=16, compression=0, colors=0 -# "A 16-bit image with the default color format: 5 bits each for red, green, and -# blue, and 1 unused bit. The whitest colors should (I assume) be displayed as -# pure white: (255,255,255), not (248,248,248)." -fails == rgb16.bmp rgb16.bmp - -# BMP: bihsize=40, 127 x 64, bpp=16, compression=3, colors=0 -# "A 16-bit image with a BITFIELDS segment indicating 5 red, 6 green, and 5 blue -# bits. This is a standard 16-bit format, even supported by old versions of -# Windows that don’t support any other non-default 16-bit formats. The whitest -# colors should be displayed as pure white: (255,255,255), not (248,252,248)." -== rgb16.bmp rgb16.bmp - -# BMP: bihsize=40, 127 x 64, bpp=16, compression=3, colors=256 -# "A 16-bit image with both a BITFIELDS segment and a palette." -== rgb16.bmp rgb16.bmp - -# BMP: bihsize=40, 127 x 64, bpp=24, compression=0, colors=0 -# "A perfectly ordinary 24-bit (truecolor) image." -fails == rgb24.bmp rgb24.bmp - -# BMP: bihsize=40, 127 x 64, bpp=24, compression=0, colors=256 -# "A 24-bit image, with a palette containing 256 colors. There is little if any -# reason for a truecolor image to contain a palette, but it is legal." -fails == rgb24pal.bmp rgb24pal.bmp - -# BMP: bihsize=40, 127 x 64, bpp=32, compression=0, colors=0 -# "A 32-bit image using the default color format for 32-bit images (no -# BITFIELDS segment). There are 8 bits per color channel, and 8 unused bits. -# The unused bits are set to 0." -skip == rgb32.bmp rgb32.bmp - -# BMP: bihsize=40, 127 x 64, bpp=32, compression=3, colors=0 -# "A 32-bit image with a BITFIELDS segment. As usual, there are 8 bits per color -# channel, and 8 unused bits. But the color channels are in an unusual order, -# so the viewer must read the BITFIELDS, and not just guess." -fails == rgb32bf.bmp rgb32bf.bmp - diff --git a/image/test/reftest/bmp/bmpsuite/q/reftest-stylo.list b/image/test/reftest/bmp/bmpsuite/q/reftest-stylo.list deleted file mode 100644 index 63c55b6713..0000000000 --- a/image/test/reftest/bmp/bmpsuite/q/reftest-stylo.list +++ /dev/null @@ -1,131 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# bmpsuite "questionable" tests - -# See ../README.mozilla for details. - -# BMP: bihsize=40, 127 x 64, bpp=1, compression=0, colors=1 -# "1 bit/pixel paletted image, with only one color in the palette. The -# documentation says that 1-bpp images have a palette size of 2 (not 'up to -# 2'), but it would be silly for a viewer not to support a size of 1." -# [We accept it. So does Chromium.] -fails == pal1p1.bmp pal1p1.bmp - -# BMP: bihsize=40, 127 x 64, bpp=2, compression=0, colors=4 -# "A paletted image with 2 bits/pixel. Usually only 1, 4, and 8 are allowed, -# but 2 is legal on Windows CE." -# [We reject it. So does Chromium.] -skip == wrapper.html?pal2.bmp wrapper.html?pal2.bmp - -# BMP: bihsize=40, 127 x 64, bpp=4, compression=2, colors=13 -# "An RLE-compressed image that used 'delta' codes to skip over some pixels, -# leaving them undefined. Some viewers make undefined pixels transparent, -# others make them black, and others assign them palette color 0 (purple, in -# this case)." -# [We make the undefined pixels transparent. So does Chromium.] -== pal4rletrns.bmp pal4rletrns.bmp - -# BMP: bihsize=40, 127 x 64, bpp=8, compression=1, colors=253 -# "8-bit version of q/pal4rletrns.bmp." -# [Ditto.] -== pal8rletrns.bmp pal8rletrns.bmp - -# BMP: bihsize=40, 127 x 64, bpp=8, compression=0, colors=252 -# "A file with some unused bytes between the palette and the image. This is -# probably valid, but I’m not 100% sure." -# [We accept it. So does Chromium.] -fails == pal8offs.bmp pal8offs.bmp - -# BMP: bihsize=40, 127 x 64, bpp=8, compression=0, colors=300 -# "An 8-bit image with 300 palette colors. This may be invalid, because the -# documentation could be interpreted to imply that 8-bit images aren’t allowed -# to have more than 256 colors." -# [We accept it. So does Chromium.] -fails == pal8oversizepal.bmp pal8oversizepal.bmp - -# BMP: bihsize=12, 127 x 64, bpp=8, compression=0, colors=0 -# "An OS/2v1 with a less-than-full-sized palette. Probably not valid, but such -# files have been seen in the wild." -# [We reject it. Chromium accepts it but draws nothing. Rejecting seems -# preferable given that the color and pixel data must overlap, which can only -# lead to rubbish results.] -skip == wrapper.html?pal8os2sp.bmp wrapper.html?pal8os2sp.bmp - -# BMP: bihsize=64, 127 x 64, bpp=8, compression=0, colors=252 -# "My attempt to make an OS/2v2 bitmap." -# [We accept it. So does Chromium.] -fails == pal8os2v2.bmp pal8os2v2.bmp - -# BMP: bihsize=16, 127 x 64, bpp=8, compression=0, colors=0 -# "An OS/2v2 bitmap whose header has only 16 bytes, instead of the full 64." -# [We accept it. So does Chromium.] -fails == pal8os2v2-16.bmp pal8os2v2-16.bmp - -# BMP: bihsize=40, 127 x 64, bpp=16, compression=3, colors=0 -# "An unusual and silly 16-bit image, with 2 red bits, 3 green bits, and 1 blue -# bit. Most viewers do support this image, but the colors may be darkened with -# a yellow-green shadow. That’s because they’re doing simple bit-shifting -# (possibly including one round of bit replication), instead of proper -# scaling." -fails == rgb16-231.bmp rgb16-231.bmp - -# BMP: bihsize=124, 127 x 64, bpp=16, compression=3, colors=0 -# "A 16-bit image with an alpha channel. There are 4 bits for each color -# channel, and 4 bits for the alpha channel. It’s not clear if this is valid, -# but I can’t find anything that suggests it isn’t." -== rgba16-4444.bmp rgba16-4444.bmp - -# BMP: bihsize=40, 127 x 64, bpp=24, compression=0, colors=300 -# "A 24-bit image, with a palette containing 300 colors. The fact that the -# palette has more than 256 colors may cause some viewers to complain, but the -# documentation does not mention a size limit." -# [We accept it. So does Chromium.] -fails == rgb24largepal.bmp rgb24largepal.bmp - -# BMP: bihsize=124, 127 x 64, bpp=24, compression=0, colors=0 -# "My attempt to make a BMP file with an embedded color profile." -# [We support it, though we don't do anything with the color profile. Chromium -# also handles it.] -fails == rgb24prof.bmp rgb24prof.bmp - -# BMP: bihsize=124, 127 x 64, bpp=24, compression=0, colors=0 -# "My attempt to make a BMP file with a linked color profile." -# [We accept it, though we don't do anything with the color profile. Chromium -# also handles it.] -fails == rgb24lprof.bmp rgb24lprof.bmp - -# BMP: bihsize=124, 127 x 64, bpp=0, compression=4, colors=0 -# BMP: bihsize=124, 127 x 64, bpp=0, compression=5, colors=0 -# "My attempt to make BMP files with embedded JPEG and PNG images. These are -# not likely to be supported by much of anything (they’re intended for -# printers)." -# [We reject them. So does Chromium.] -skip == wrapper.html?rgb24jpeg.bmp wrapper.html?rgb24jpeg.bmp -skip == wrapper.html?rgb24png.bmp wrapper.html?rgb24png.bmp - -# BMP: bihsize=40, 127 x 64, bpp=32, compression=0, colors=0 -# "Same as g/rgb32.bmp, except that the unused bits are set to something other -# than 0. If the image becomes transparent toward the bottom, it probably means -# the viewer uses heuristics to guess whether the undefined data represents -# transparency." -# [We don't apply transparency here. Chromium does the same.] -fails == rgb32fakealpha.bmp rgb32fakealpha.bmp - -# BMP: bihsize=40, 127 x 64, bpp=32, compression=3, colors=0 -# "A 32 bits/pixel image, with all 32 bits used: 11 each for red and green, and -# 10 for blue. As far as I know, this is perfectly valid, but it is unusual." -fails == rgb32-111110.bmp rgb32-111110.bmp - -# BMP: bihsize=124, 127 x 64, bpp=32, compression=3, colors=0 -# "A BMP with an alpha channel. Transparency is barely documented, so it’s -# possible that this file is not correctly formed. The color channels are in an -# unusual order, to prevent viewers from passing this test by making a lucky -# guess." -== rgba32.bmp rgba32.bmp - -# BMP: bihsize=40, 127 x 64, bpp=32, compression=6, colors=0 -# "An image of type BI_ALPHABITFIELDS. Supposedly, this was used on Windows CE. -# I don’t know whether it is constructed correctly." -# [We reject it. So does Chromium.] -skip == wrapper.html?rgba32abf.bmp wrapper.html?rgba32abf.bmp - - diff --git a/image/test/reftest/bmp/bmpsuite/reftest-stylo.list b/image/test/reftest/bmp/bmpsuite/reftest-stylo.list deleted file mode 100644 index 5ec496272e..0000000000 --- a/image/test/reftest/bmp/bmpsuite/reftest-stylo.list +++ /dev/null @@ -1,8 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# bmpsuite tests - -# See README.mozilla for details about these tests. - -include g/reftest-stylo.list -include q/reftest-stylo.list -include b/reftest-stylo.list diff --git a/image/test/reftest/bmp/reftest-stylo.list b/image/test/reftest/bmp/reftest-stylo.list deleted file mode 100644 index 80aa0ab32c..0000000000 --- a/image/test/reftest/bmp/reftest-stylo.list +++ /dev/null @@ -1,17 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# BMP tests - -include bmp-1bpp/reftest-stylo.list -include bmp-4bpp/reftest-stylo.list -include bmp-8bpp/reftest-stylo.list -include bmp-24bpp/reftest-stylo.list -include bmp-corrupted/reftest-stylo.list -include bmpsuite/reftest-stylo.list - -# Two bmp files where the offset to the start of the image data in the file -# is past the end of the file. In 1240629-1.bmp the offset us uint32_max, -# so we are testing that we don't try to allocate a buffer that size (and -# fail on 32 bit platforms) and declare the image in error state. If in the -# future we decide that such bmps (offset past the end of the file) are -# invalid the test will still pass, but won't be testing much. -fails == 1240629-1.bmp 1240629-1.bmp diff --git a/image/test/reftest/color-management/reftest-stylo.list b/image/test/reftest/color-management/reftest-stylo.list deleted file mode 100644 index 64f503fe6e..0000000000 --- a/image/test/reftest/color-management/reftest-stylo.list +++ /dev/null @@ -1,8 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Colormangement - -# test for bug 489133, test for bug 460520 -fails == invalid-chrm.png invalid-chrm.png -fails == invalid-whitepoint.png invalid-whitepoint.png -# test for bug 488955 -== trc-type.html trc-type.html diff --git a/image/test/reftest/downscaling/reftest-stylo.list b/image/test/reftest/downscaling/reftest-stylo.list deleted file mode 100644 index 6feb9080bf..0000000000 --- a/image/test/reftest/downscaling/reftest-stylo.list +++ /dev/null @@ -1,195 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Reftests for downscaling -# -# Downscaling can be a lossy process, so a bit of mismatch is acceptable here, -# as long as it's barely noticable visually. When necessary, this can be -# explicitly allowed via 'fuzzy'/'fuzzy-if' annotations. -# -# Many of these tests check primarily that we don't lose rows or columns of -# pixels when downscaling by making sure that the result isn't too similar to -# about:blank. A small amount of fuzziness is used to ensure that the tests -# don't pass because of very slight deviations; passing tests should be -# substantially different from about:blank. This fuzziness should *not* be -# removed as doing so would make the tests pass in situations where they -# shouldn't. -# -# IMPORTANT: For robustness, each test should be listed *twice* in this -# manifest -- once with the high quality downscaling pref disabled, and once -# with this pref enabled. The pref is set via "default-preferences", so -# simply appending a new test to the lists below each of those lines should be -# sufficient. -# -# Also note that Mac OS X has its own system-level downscaling algorithm, so -# tests here may need Mac-specific "fuzzy-if(cocoaWidget,...)" annotations. -# Similarly, modern versions of Windows have slightly different downscaling -# behavior than other platforms, and may require "fuzzy-if(winWidget,...)". - - -# RUN TESTS NOT AFFECTED BY DOWNSCALE-DURING-DECODE: -# # -fails fuzzy-if(skiaContent,14,416) == downscale-svg-1a.html downscale-svg-1a.html -== downscale-svg-1b.html downscale-svg-1b.html -fails fuzzy-if(skiaContent,8,292) == downscale-svg-1c.html downscale-svg-1c.html -fuzzy-if(B2G,255,207) == downscale-svg-1d.html downscale-svg-1d.html -# right side is 1 pixel off for B2G, probably regression from 974242 -fails fuzzy-if(skiaContent,110,181) == downscale-svg-1e.html downscale-svg-1e.html -fails fuzzy-if(skiaContent,142,77) == downscale-svg-1f.html downscale-svg-1f.html - -# RUN TESTS WITH DOWNSCALE-DURING-DECODE DISABLED: -# # -default-preferences pref(image.downscale-during-decode.enabled,false) - -fuzzy-if(winWidget,16,20) fuzzy-if(cocoaWidget,106,31) == downscale-1.html downscale-1.html - -== downscale-2a.html?203,52,left downscale-2a.html?203,52,left -== downscale-2b.html?203,52,left downscale-2b.html?203,52,left -skip == downscale-2c.html?203,52,left downscale-2c.html?203,52,left -== downscale-2d.html?203,52,left downscale-2d.html?203,52,left -== downscale-2e.html?203,52,left downscale-2e.html?203,52,left - -== downscale-2a.html?205,53,left downscale-2a.html?205,53,left -== downscale-2b.html?205,53,left downscale-2b.html?205,53,left -== downscale-2c.html?205,53,left downscale-2c.html?205,53,left -skip == downscale-2d.html?205,53,left downscale-2d.html?205,53,left -== downscale-2e.html?205,53,left downscale-2e.html?205,53,left - -== downscale-2a.html?203,52,right downscale-2a.html?203,52,right -== downscale-2b.html?203,52,right downscale-2b.html?203,52,right -== downscale-2c.html?203,52,right downscale-2c.html?203,52,right -== downscale-2d.html?203,52,right downscale-2d.html?203,52,right -== downscale-2e.html?203,52,right downscale-2e.html?203,52,right - -== downscale-2a.html?205,53,right downscale-2a.html?205,53,right -== downscale-2b.html?205,53,right downscale-2b.html?205,53,right -== downscale-2c.html?205,53,right downscale-2c.html?205,53,right -== downscale-2d.html?205,53,right downscale-2d.html?205,53,right -== downscale-2e.html?205,53,right downscale-2e.html?205,53,right - -== downscale-2a.html?203,52,top downscale-2a.html?203,52,top -== downscale-2b.html?203,52,top downscale-2b.html?203,52,top -== downscale-2c.html?203,52,top downscale-2c.html?203,52,top -skip == downscale-2d.html?203,52,top downscale-2d.html?203,52,top -== downscale-2e.html?203,52,top downscale-2e.html?203,52,top - -== downscale-2a.html?205,53,top downscale-2a.html?205,53,top -== downscale-2b.html?205,53,top downscale-2b.html?205,53,top -== downscale-2c.html?205,53,top downscale-2c.html?205,53,top -== downscale-2d.html?205,53,top downscale-2d.html?205,53,top -== downscale-2e.html?205,53,top downscale-2e.html?205,53,top - -== downscale-2a.html?203,52,bottom downscale-2a.html?203,52,bottom -== downscale-2b.html?203,52,bottom downscale-2b.html?203,52,bottom -== downscale-2c.html?203,52,bottom downscale-2c.html?203,52,bottom -== downscale-2d.html?203,52,bottom downscale-2d.html?203,52,bottom -skip == downscale-2e.html?203,52,bottom downscale-2e.html?203,52,bottom - -== downscale-2a.html?205,53,bottom downscale-2a.html?205,53,bottom -== downscale-2b.html?205,53,bottom downscale-2b.html?205,53,bottom -== downscale-2c.html?205,53,bottom downscale-2c.html?205,53,bottom -== downscale-2d.html?205,53,bottom downscale-2d.html?205,53,bottom -fails-if(OSX>=1008&&!skiaContent) == downscale-2e.html?205,53,bottom downscale-2e.html?205,53,bottom - -== downscale-moz-icon-1.html downscale-moz-icon-1.html - -== downscale-png.html?16,16,interlaced downscale-png.html?16,16,interlaced -== downscale-png.html?24,24,interlaced downscale-png.html?24,24,interlaced - -# Non-transparent and transparent ICO images -random == downscale-16px.html?ff-0RGB.ico downscale-16px.html?ff-0RGB.ico -random == downscale-16px.html?ff-ARGB.ico downscale-16px.html?ff-ARGB.ico - -# Upside-down (negative height) BMP -random == downscale-8px.html?top-to-bottom-16x16-24bpp.bmp downscale-8px.html?top-to-bottom-16x16-24bpp.bmp - -# Test downscaling from all supported formats from 256 to 32. -== downscale-32px.html?.bmp downscale-32px.html?.bmp -== downscale-32px.html?.gif downscale-32px.html?.gif -== downscale-32px.html?.jpg downscale-32px.html?.jpg -== downscale-32px.html?.png downscale-32px.html?.png -== downscale-32px.html?.svg downscale-32px.html?.svg -== downscale-32px.html?-bmp-in.ico downscale-32px.html?-bmp-in.ico -== downscale-32px.html?-png-in.ico downscale-32px.html?-png-in.ico - -# RUN TESTS WITH DOWNSCALE-DURING-DECODE ENABLED: -# # -default-preferences pref(image.downscale-during-decode.enabled,true) - -fuzzy-if(d2d,31,147) == downscale-1.html downscale-1.html -# intermittently 147 pixels on win7 accelerated only (not win8) - -== downscale-2a.html?203,52,left downscale-2a.html?203,52,left -== downscale-2b.html?203,52,left downscale-2b.html?203,52,left -skip == downscale-2c.html?203,52,left downscale-2c.html?203,52,left -== downscale-2d.html?203,52,left downscale-2d.html?203,52,left -== downscale-2e.html?203,52,left downscale-2e.html?203,52,left -== downscale-2f.html?203,52,left downscale-2f.html?203,52,left - -== downscale-2a.html?205,53,left downscale-2a.html?205,53,left -== downscale-2b.html?205,53,left downscale-2b.html?205,53,left -== downscale-2c.html?205,53,left downscale-2c.html?205,53,left -skip == downscale-2d.html?205,53,left downscale-2d.html?205,53,left -== downscale-2e.html?205,53,left downscale-2e.html?205,53,left -== downscale-2f.html?205,53,left downscale-2f.html?205,53,left - -== downscale-2a.html?203,52,right downscale-2a.html?203,52,right -== downscale-2b.html?203,52,right downscale-2b.html?203,52,right -== downscale-2c.html?203,52,right downscale-2c.html?203,52,right -== downscale-2d.html?203,52,right downscale-2d.html?203,52,right -== downscale-2e.html?203,52,right downscale-2e.html?203,52,right -== downscale-2f.html?203,52,right downscale-2f.html?203,52,right - -== downscale-2a.html?205,53,right downscale-2a.html?205,53,right -== downscale-2b.html?205,53,right downscale-2b.html?205,53,right -== downscale-2c.html?205,53,right downscale-2c.html?205,53,right -== downscale-2d.html?205,53,right downscale-2d.html?205,53,right -== downscale-2e.html?205,53,right downscale-2e.html?205,53,right -== downscale-2f.html?205,53,right downscale-2f.html?205,53,right - -== downscale-2a.html?203,52,top downscale-2a.html?203,52,top -== downscale-2b.html?203,52,top downscale-2b.html?203,52,top -== downscale-2c.html?203,52,top downscale-2c.html?203,52,top -skip == downscale-2d.html?203,52,top downscale-2d.html?203,52,top -== downscale-2e.html?203,52,top downscale-2e.html?203,52,top -== downscale-2f.html?203,52,top downscale-2f.html?203,52,top - -== downscale-2a.html?205,53,top downscale-2a.html?205,53,top -== downscale-2b.html?205,53,top downscale-2b.html?205,53,top -== downscale-2c.html?205,53,top downscale-2c.html?205,53,top -== downscale-2d.html?205,53,top downscale-2d.html?205,53,top -== downscale-2e.html?205,53,top downscale-2e.html?205,53,top -== downscale-2f.html?205,53,top downscale-2f.html?205,53,top - -== downscale-2a.html?203,52,bottom downscale-2a.html?203,52,bottom -== downscale-2b.html?203,52,bottom downscale-2b.html?203,52,bottom -== downscale-2c.html?203,52,bottom downscale-2c.html?203,52,bottom -== downscale-2d.html?203,52,bottom downscale-2d.html?203,52,bottom -skip == downscale-2e.html?203,52,bottom downscale-2e.html?203,52,bottom -== downscale-2f.html?203,52,bottom downscale-2f.html?203,52,bottom - -== downscale-2a.html?205,53,bottom downscale-2a.html?205,53,bottom -== downscale-2b.html?205,53,bottom downscale-2b.html?205,53,bottom -== downscale-2c.html?205,53,bottom downscale-2c.html?205,53,bottom -== downscale-2d.html?205,53,bottom downscale-2d.html?205,53,bottom -== downscale-2e.html?205,53,bottom downscale-2e.html?205,53,bottom -== downscale-2f.html?205,53,bottom downscale-2f.html?205,53,bottom - -== downscale-moz-icon-1.html downscale-moz-icon-1.html - -== downscale-png.html?16,16,interlaced downscale-png.html?16,16,interlaced -== downscale-png.html?24,24,interlaced downscale-png.html?24,24,interlaced - -# Non-transparent and transparent ICO images -random == downscale-16px.html?ff-0RGB.ico downscale-16px.html?ff-0RGB.ico -random == downscale-16px.html?ff-ARGB.ico downscale-16px.html?ff-ARGB.ico - -# Upside-down (negative height) BMP -random == downscale-8px.html?top-to-bottom-16x16-24bpp.bmp downscale-8px.html?top-to-bottom-16x16-24bpp.bmp - -# Test downscaling from all supported formats from 256 to 32. -== downscale-32px.html?.bmp downscale-32px.html?.bmp -== downscale-32px.html?.gif downscale-32px.html?.gif -== downscale-32px.html?.jpg downscale-32px.html?.jpg -== downscale-32px.html?.png downscale-32px.html?.png -== downscale-32px.html?.svg downscale-32px.html?.svg -== downscale-32px.html?-bmp-in.ico downscale-32px.html?-bmp-in.ico -== downscale-32px.html?-png-in.ico downscale-32px.html?-png-in.ico diff --git a/image/test/reftest/encoders-lossless/reftest-stylo.list b/image/test/reftest/encoders-lossless/reftest-stylo.list deleted file mode 100644 index a2b36bcc48..0000000000 --- a/image/test/reftest/encoders-lossless/reftest-stylo.list +++ /dev/null @@ -1,160 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Encoder ref tests -# These reftests must be run as HTTP because of canvas' origin-clean security -# file:// URLs are always considered from a different origin unless same URL -# -# The test will copy a PNG image to a canvas, then use canvas.toDataUrl to get -# the data, then set the data to a new image hence invoking the appropriate -# encoder. -# -# The tests should only be used with lossless encoders. -# -# Valid arguments for encoder.html in the query string: -# - img= -# - mime= -# - options= -# Example: -# encoder.html?img=escape(reference_image.png) -# &mime=escape(image/vnd.microsoft.icon) -# &options=escape(-moz-parse-options:bpp=24;format=png) - -# PNG -skip HTTP == size-1x1.png size-1x1.png -HTTP == size-2x2.png size-2x2.png -skip HTTP == size-3x3.png size-3x3.png -skip HTTP == size-4x4.png size-4x4.png -skip HTTP == size-5x5.png size-5x5.png -skip HTTP == size-6x6.png size-6x6.png -HTTP == size-7x7.png size-7x7.png -fails skip HTTP == size-8x8.png size-8x8.png -skip HTTP == size-9x9.png size-9x9.png -skip HTTP == size-15x15.png size-15x15.png -skip HTTP == size-16x16.png size-16x16.png -skip HTTP == size-17x17.png size-17x17.png -skip HTTP == size-31x31.png size-31x31.png -skip HTTP == size-32x32.png size-32x32.png -skip HTTP == size-33x33.png size-33x33.png - -# BMP using default parse options -skip HTTP == size-1x1.png size-1x1.png -HTTP == size-2x2.png size-2x2.png -skip HTTP == size-3x3.png size-3x3.png -skip HTTP == size-4x4.png size-4x4.png -skip HTTP == size-5x5.png size-5x5.png -skip HTTP == size-6x6.png size-6x6.png -HTTP == size-7x7.png size-7x7.png -fails skip HTTP == size-8x8.png size-8x8.png -skip HTTP == size-9x9.png size-9x9.png -skip HTTP == size-15x15.png size-15x15.png -skip HTTP == size-16x16.png size-16x16.png -skip HTTP == size-17x17.png size-17x17.png -skip HTTP == size-31x31.png size-31x31.png -skip HTTP == size-32x32.png size-32x32.png -skip HTTP == size-33x33.png size-33x33.png - -# BMP using image/bmp mime type and 32bpp parse options -skip HTTP == size-1x1.png size-1x1.png -HTTP == size-2x2.png size-2x2.png -skip HTTP == size-3x3.png size-3x3.png -skip HTTP == size-4x4.png size-4x4.png -skip HTTP == size-5x5.png size-5x5.png -skip HTTP == size-6x6.png size-6x6.png -HTTP == size-7x7.png size-7x7.png -fails skip HTTP == size-8x8.png size-8x8.png -skip HTTP == size-9x9.png size-9x9.png -skip HTTP == size-15x15.png size-15x15.png -skip HTTP == size-16x16.png size-16x16.png -skip HTTP == size-17x17.png size-17x17.png -skip HTTP == size-31x31.png size-31x31.png -skip HTTP == size-32x32.png size-32x32.png -skip HTTP == size-33x33.png size-33x33.png - -# BMP using image/bmp mime type and 24bpp parse options -skip HTTP == size-1x1.png size-1x1.png -HTTP == size-2x2.png size-2x2.png -skip HTTP == size-3x3.png size-3x3.png -skip HTTP == size-4x4.png size-4x4.png -skip HTTP == size-5x5.png size-5x5.png -skip HTTP == size-6x6.png size-6x6.png -HTTP == size-7x7.png size-7x7.png -fails skip HTTP == size-8x8.png size-8x8.png -skip HTTP == size-9x9.png size-9x9.png -skip HTTP == size-15x15.png size-15x15.png -skip HTTP == size-16x16.png size-16x16.png -skip HTTP == size-17x17.png size-17x17.png -skip HTTP == size-31x31.png size-31x31.png -skip HTTP == size-32x32.png size-32x32.png -skip HTTP == size-33x33.png size-33x33.png - -# ICO using default parse options -skip HTTP == size-1x1.png size-1x1.png -HTTP == size-2x2.png size-2x2.png -skip HTTP == size-3x3.png size-3x3.png -skip HTTP == size-4x4.png size-4x4.png -skip HTTP == size-5x5.png size-5x5.png -skip HTTP == size-6x6.png size-6x6.png -HTTP == size-7x7.png size-7x7.png -fails skip HTTP == size-8x8.png size-8x8.png -skip HTTP == size-9x9.png size-9x9.png -skip HTTP == size-15x15.png size-15x15.png -skip HTTP == size-16x16.png size-16x16.png -skip HTTP == size-17x17.png size-17x17.png -skip HTTP == size-31x31.png size-31x31.png -skip HTTP == size-32x32.png size-32x32.png -skip HTTP == size-33x33.png size-33x33.png -# skip HTTP == size-256x256.png size-256x256.png - -# ICO using image/vnd.microsoft.icon mime type and 32bpp parse options with bmp -skip HTTP == size-1x1.png size-1x1.png -HTTP == size-2x2.png size-2x2.png -skip HTTP == size-3x3.png size-3x3.png -skip HTTP == size-4x4.png size-4x4.png -skip HTTP == size-5x5.png size-5x5.png -skip HTTP == size-6x6.png size-6x6.png -HTTP == size-7x7.png size-7x7.png -fails skip HTTP == size-8x8.png size-8x8.png -skip HTTP == size-9x9.png size-9x9.png -skip HTTP == size-15x15.png size-15x15.png -skip HTTP == size-16x16.png size-16x16.png -skip HTTP == size-17x17.png size-17x17.png -skip HTTP == size-31x31.png size-31x31.png -skip HTTP == size-32x32.png size-32x32.png -skip HTTP == size-33x33.png size-33x33.png -# skip HTTP == size-256x256.png size-256x256.png - -# ICO using image/vnd.microsoft.icon mime type and 24bpp parse options with bmp -skip HTTP == size-1x1.png size-1x1.png -HTTP == size-2x2.png size-2x2.png -skip HTTP == size-3x3.png size-3x3.png -skip HTTP == size-4x4.png size-4x4.png -skip HTTP == size-5x5.png size-5x5.png -skip HTTP == size-6x6.png size-6x6.png -HTTP == size-7x7.png size-7x7.png -fails skip HTTP == size-8x8.png size-8x8.png -skip HTTP == size-9x9.png size-9x9.png -skip HTTP == size-15x15.png size-15x15.png -skip HTTP == size-16x16.png size-16x16.png -skip HTTP == size-17x17.png size-17x17.png -skip HTTP == size-31x31.png size-31x31.png -skip HTTP == size-32x32.png size-32x32.png -skip HTTP == size-33x33.png size-33x33.png -# skip HTTP == size-256x256.png size-256x256.png - -# ICO using image/vnd.microsoft.icon mime type png -skip HTTP == size-1x1.png size-1x1.png -HTTP == size-2x2.png size-2x2.png -skip HTTP == size-3x3.png size-3x3.png -skip HTTP == size-4x4.png size-4x4.png -skip HTTP == size-5x5.png size-5x5.png -skip HTTP == size-6x6.png size-6x6.png -HTTP == size-7x7.png size-7x7.png -fails skip HTTP == size-8x8.png size-8x8.png -skip HTTP == size-9x9.png size-9x9.png -skip HTTP == size-15x15.png size-15x15.png -skip HTTP == size-16x16.png size-16x16.png -skip HTTP == size-17x17.png size-17x17.png -skip HTTP == size-31x31.png size-31x31.png -skip HTTP == size-32x32.png size-32x32.png -skip HTTP == size-33x33.png size-33x33.png -# skip HTTP == size-256x256.png size-256x256.png - diff --git a/image/test/reftest/generic/reftest-stylo.list b/image/test/reftest/generic/reftest-stylo.list deleted file mode 100644 index 1c0cbd6d9c..0000000000 --- a/image/test/reftest/generic/reftest-stylo.list +++ /dev/null @@ -1,2 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -HTTP == accept-image-catchall.html accept-image-catchall.html diff --git a/image/test/reftest/gif/reftest-stylo.list b/image/test/reftest/gif/reftest-stylo.list deleted file mode 100644 index 5567ca61db..0000000000 --- a/image/test/reftest/gif/reftest-stylo.list +++ /dev/null @@ -1,57 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# GIF tests - -# tests for bug 519589 -== 1bit-255-trans.gif 1bit-255-trans.gif -== in-colormap-trans.gif in-colormap-trans.gif -== out-of-colormap-trans.gif out-of-colormap-trans.gif - -# a GIF file that uses the comment extension -fails == comment.gif comment.gif - -# a GIF file with a background smaller than the size of the canvas -== small-background-size.gif small-background-size.gif -== small-background-size-2.gif small-background-size-2.gif - -# a transparent gif that disposes previous frames with clear; we must properly -# clear each frame to pass. -random == delaytest.html?transparent-animation.gif delaytest.html?transparent-animation.gif -# incorrect timing dependence (bug 558678) - -# test for bug 641198 -skip == test_bug641198.html test_bug641198.html -# Disabled; see bug 1120144. - -# Bug 1062886: a gif with a single color and an offset -== one-color-offset.gif one-color-offset.gif - -# Bug 1068230 -== tile-transform.html tile-transform.html - -# Bug 1234077 -== truncated-framerect.html truncated-framerect.html - -# webcam-simulacrum.mgif is a hand-edited file containing red.gif and blue.gif, -# concatenated together with the relevant headers for -# multipart/x-mixed-replace. Specifically, with the headers in -# webcam-simulacrum.mjpg^headers^, the web browser will get the following: -# -# HTTP 200 OK -# Content-Type: multipart/x-mixed-replace;boundary=BOUNDARYOMG -# -# --BOUNDARYOMG\r\n -# Content-Type: image/gif\r\n -# \r\n -# (no newline) -# --BOUNDARYOMG\r\n -# Content-Type: image/gif\r\n -# \r\n -# (no newline) -# --BOUNDARYOMG--\r\n -# -# (The boundary is arbitrary, and just has to be defined as something that -# won't be in the text of the contents themselves. --$(boundary)\r\n means -# "Here is the beginning of a boundary," and --$(boundary)-- means "All done -# sending you parts.") -skip-if(B2G) HTTP == webcam.html webcam.html -# bug 773482 diff --git a/image/test/reftest/ico/cur/reftest-stylo.list b/image/test/reftest/ico/cur/reftest-stylo.list deleted file mode 100644 index b59c26dc59..0000000000 --- a/image/test/reftest/ico/cur/reftest-stylo.list +++ /dev/null @@ -1,5 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# ICO BMP and PNG mixed tests - -skip == wrapper.html?pointer.cur wrapper.html?pointer.cur - diff --git a/image/test/reftest/ico/ico-bmp-1bpp/reftest-stylo.list b/image/test/reftest/ico/ico-bmp-1bpp/reftest-stylo.list deleted file mode 100644 index 43a597e78c..0000000000 --- a/image/test/reftest/ico/ico-bmp-1bpp/reftest-stylo.list +++ /dev/null @@ -1,25 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# ICO BMP 1BPP tests - -# Images of various sizes -== ico-size-1x1-1bpp.ico ico-size-1x1-1bpp.ico -== ico-size-2x2-1bpp.ico ico-size-2x2-1bpp.ico -== ico-size-3x3-1bpp.ico ico-size-3x3-1bpp.ico -== ico-size-4x4-1bpp.ico ico-size-4x4-1bpp.ico -== ico-size-5x5-1bpp.ico ico-size-5x5-1bpp.ico -== ico-size-6x6-1bpp.ico ico-size-6x6-1bpp.ico -== ico-size-7x7-1bpp.ico ico-size-7x7-1bpp.ico -== ico-size-8x8-1bpp.ico ico-size-8x8-1bpp.ico -== ico-size-9x9-1bpp.ico ico-size-9x9-1bpp.ico -== ico-size-15x15-1bpp.ico ico-size-15x15-1bpp.ico -== ico-size-16x16-1bpp.ico ico-size-16x16-1bpp.ico -== ico-size-17x17-1bpp.ico ico-size-17x17-1bpp.ico -== ico-size-31x31-1bpp.ico ico-size-31x31-1bpp.ico -== ico-size-32x32-1bpp.ico ico-size-32x32-1bpp.ico -== ico-size-33x33-1bpp.ico ico-size-33x33-1bpp.ico -skip-if(B2G) == ico-size-256x256-1bpp.ico ico-size-256x256-1bpp.ico -# bug 773482 -== ico-partial-transparent-1bpp.ico ico-partial-transparent-1bpp.ico -== ico-transparent-1bpp.ico ico-transparent-1bpp.ico -== ico-not-square-transparent-1bpp.ico ico-not-square-transparent-1bpp.ico - diff --git a/image/test/reftest/ico/ico-bmp-24bpp/reftest-stylo.list b/image/test/reftest/ico/ico-bmp-24bpp/reftest-stylo.list deleted file mode 100644 index 54d8521dc3..0000000000 --- a/image/test/reftest/ico/ico-bmp-24bpp/reftest-stylo.list +++ /dev/null @@ -1,24 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# ICO BMP 24BPP tests - -# Images of various sizes -== ico-size-1x1-24bpp.ico ico-size-1x1-24bpp.ico -== ico-size-2x2-24bpp.ico ico-size-2x2-24bpp.ico -== ico-size-3x3-24bpp.ico ico-size-3x3-24bpp.ico -== ico-size-4x4-24bpp.ico ico-size-4x4-24bpp.ico -skip == ico-size-5x5-24bpp.ico ico-size-5x5-24bpp.ico -== ico-size-6x6-24bpp.ico ico-size-6x6-24bpp.ico -== ico-size-7x7-24bpp.ico ico-size-7x7-24bpp.ico -== ico-size-8x8-24bpp.ico ico-size-8x8-24bpp.ico -== ico-size-9x9-24bpp.ico ico-size-9x9-24bpp.ico -== ico-size-15x15-24bpp.ico ico-size-15x15-24bpp.ico -== ico-size-16x16-24bpp.ico ico-size-16x16-24bpp.ico -== ico-size-17x17-24bpp.ico ico-size-17x17-24bpp.ico -== ico-size-31x31-24bpp.ico ico-size-31x31-24bpp.ico -fails == ico-size-32x32-24bpp.ico ico-size-32x32-24bpp.ico -== ico-size-33x33-24bpp.ico ico-size-33x33-24bpp.ico -== ico-size-256x256-24bpp.ico ico-size-256x256-24bpp.ico -== ico-partial-transparent-24bpp.ico ico-partial-transparent-24bpp.ico -== ico-transparent-24bpp.ico ico-transparent-24bpp.ico -== ico-not-square-transparent-24bpp.ico ico-not-square-transparent-24bpp.ico - diff --git a/image/test/reftest/ico/ico-bmp-32bpp/reftest-stylo.list b/image/test/reftest/ico/ico-bmp-32bpp/reftest-stylo.list deleted file mode 100644 index 3ee7e7b001..0000000000 --- a/image/test/reftest/ico/ico-bmp-32bpp/reftest-stylo.list +++ /dev/null @@ -1,23 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# ICO BMP 32BPP tests - -# Images of various sizes -== ico-size-1x1-32bpp.ico ico-size-1x1-32bpp.ico -== ico-size-2x2-32bpp.ico ico-size-2x2-32bpp.ico -== ico-size-3x3-32bpp.ico ico-size-3x3-32bpp.ico -== ico-size-4x4-32bpp.ico ico-size-4x4-32bpp.ico -== ico-size-5x5-32bpp.ico ico-size-5x5-32bpp.ico -== ico-size-6x6-32bpp.ico ico-size-6x6-32bpp.ico -== ico-size-7x7-32bpp.ico ico-size-7x7-32bpp.ico -== ico-size-8x8-32bpp.ico ico-size-8x8-32bpp.ico -== ico-size-9x9-32bpp.ico ico-size-9x9-32bpp.ico -== ico-size-15x15-32bpp.ico ico-size-15x15-32bpp.ico -== ico-size-16x16-32bpp.ico ico-size-16x16-32bpp.ico -== ico-size-17x17-32bpp.ico ico-size-17x17-32bpp.ico -== ico-size-31x31-32bpp.ico ico-size-31x31-32bpp.ico -== ico-size-32x32-32bpp.ico ico-size-32x32-32bpp.ico -== ico-size-33x33-32bpp.ico ico-size-33x33-32bpp.ico -== ico-size-256x256-32bpp.ico ico-size-256x256-32bpp.ico -== ico-partial-transparent-32bpp.ico ico-partial-transparent-32bpp.ico -== ico-transparent-32bpp.ico ico-transparent-32bpp.ico -== ico-not-square-transparent-32bpp.ico ico-not-square-transparent-32bpp.ico diff --git a/image/test/reftest/ico/ico-bmp-4bpp/reftest-stylo.list b/image/test/reftest/ico/ico-bmp-4bpp/reftest-stylo.list deleted file mode 100644 index 073755a4b1..0000000000 --- a/image/test/reftest/ico/ico-bmp-4bpp/reftest-stylo.list +++ /dev/null @@ -1,24 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# ICO BMP 4BPP tests - -# Images of various sizes -== ico-size-1x1-4bpp.ico ico-size-1x1-4bpp.ico -== ico-size-2x2-4bpp.ico ico-size-2x2-4bpp.ico -== ico-size-3x3-4bpp.ico ico-size-3x3-4bpp.ico -== ico-size-4x4-4bpp.ico ico-size-4x4-4bpp.ico -== ico-size-5x5-4bpp.ico ico-size-5x5-4bpp.ico -== ico-size-6x6-4bpp.ico ico-size-6x6-4bpp.ico -== ico-size-7x7-4bpp.ico ico-size-7x7-4bpp.ico -== ico-size-8x8-4bpp.ico ico-size-8x8-4bpp.ico -== ico-size-9x9-4bpp.ico ico-size-9x9-4bpp.ico -== ico-size-15x15-4bpp.ico ico-size-15x15-4bpp.ico -== ico-size-16x16-4bpp.ico ico-size-16x16-4bpp.ico -== ico-size-17x17-4bpp.ico ico-size-17x17-4bpp.ico -== ico-size-31x31-4bpp.ico ico-size-31x31-4bpp.ico -== ico-size-32x32-4bpp.ico ico-size-32x32-4bpp.ico -== ico-size-33x33-4bpp.ico ico-size-33x33-4bpp.ico -== ico-size-256x256-4bpp.ico ico-size-256x256-4bpp.ico -== ico-partial-transparent-4bpp.ico ico-partial-transparent-4bpp.ico -== ico-transparent-4bpp.ico ico-transparent-4bpp.ico -== ico-not-square-transparent-4bpp.ico ico-not-square-transparent-4bpp.ico - diff --git a/image/test/reftest/ico/ico-bmp-8bpp/reftest-stylo.list b/image/test/reftest/ico/ico-bmp-8bpp/reftest-stylo.list deleted file mode 100644 index c5269d3c81..0000000000 --- a/image/test/reftest/ico/ico-bmp-8bpp/reftest-stylo.list +++ /dev/null @@ -1,25 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# ICO BMP 8BPP tests - -# Images of various sizes -== ico-size-1x1-8bpp.ico ico-size-1x1-8bpp.ico -== ico-size-2x2-8bpp.ico ico-size-2x2-8bpp.ico -== ico-size-3x3-8bpp.ico ico-size-3x3-8bpp.ico -== ico-size-4x4-8bpp.ico ico-size-4x4-8bpp.ico -== ico-size-5x5-8bpp.ico ico-size-5x5-8bpp.ico -skip == ico-size-6x6-8bpp.ico ico-size-6x6-8bpp.ico -== ico-size-7x7-8bpp.ico ico-size-7x7-8bpp.ico -== ico-size-8x8-8bpp.ico ico-size-8x8-8bpp.ico -== ico-size-9x9-8bpp.ico ico-size-9x9-8bpp.ico -== ico-size-15x15-8bpp.ico ico-size-15x15-8bpp.ico -== ico-size-16x16-8bpp.ico ico-size-16x16-8bpp.ico -== ico-size-17x17-8bpp.ico ico-size-17x17-8bpp.ico -== ico-size-31x31-8bpp.ico ico-size-31x31-8bpp.ico -== ico-size-32x32-8bpp.ico ico-size-32x32-8bpp.ico -== ico-size-33x33-8bpp.ico ico-size-33x33-8bpp.ico -skip-if(B2G) == ico-size-256x256-8bpp.ico ico-size-256x256-8bpp.ico -# bug 773482 -== ico-partial-transparent-8bpp.ico ico-partial-transparent-8bpp.ico -== ico-transparent-8bpp.ico ico-transparent-8bpp.ico -== ico-not-square-transparent-8bpp.ico ico-not-square-transparent-8bpp.ico - diff --git a/image/test/reftest/ico/ico-bmp-corrupted/reftest-stylo.list b/image/test/reftest/ico/ico-bmp-corrupted/reftest-stylo.list deleted file mode 100644 index 1dd1a43ae1..0000000000 --- a/image/test/reftest/ico/ico-bmp-corrupted/reftest-stylo.list +++ /dev/null @@ -1,11 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# ICOs containing corrupted BMP tests - -# Invalid value for bits per pixel (BPP) - detected when decoding the header. -skip == wrapper.html?invalid-bpp.ico wrapper.html?invalid-bpp.ico -# Invalid BPP values for RLE4 - detected when decoding the image data. -skip == wrapper.html?invalid-compression-RLE4.ico wrapper.html?invalid-compression-RLE4.ico -# Invalid BPP values for RLE8 - detected when decoding the image data. -skip == wrapper.html?invalid-compression-RLE8.ico wrapper.html?invalid-compression-RLE8.ico -# Invalid compression value - detected when decoding the image data. -skip == wrapper.html?invalid-compression.ico wrapper.html?invalid-compression.ico diff --git a/image/test/reftest/ico/ico-mixed/reftest-stylo.list b/image/test/reftest/ico/ico-mixed/reftest-stylo.list deleted file mode 100644 index a095c24813..0000000000 --- a/image/test/reftest/ico/ico-mixed/reftest-stylo.list +++ /dev/null @@ -1,4 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# ICO BMP and PNG mixed tests - -skip == mixed-bmp-png.ico mixed-bmp-png.ico diff --git a/image/test/reftest/ico/ico-png/reftest-stylo.list b/image/test/reftest/ico/ico-png/reftest-stylo.list deleted file mode 100644 index 1fd990c89f..0000000000 --- a/image/test/reftest/ico/ico-png/reftest-stylo.list +++ /dev/null @@ -1,30 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# ICO PNG tests - -# Images of various sizes -skip == ico-size-1x1-png.ico ico-size-1x1-png.ico -== ico-size-2x2-png.ico ico-size-2x2-png.ico -skip == ico-size-3x3-png.ico ico-size-3x3-png.ico -skip == ico-size-4x4-png.ico ico-size-4x4-png.ico -skip == ico-size-5x5-png.ico ico-size-5x5-png.ico -skip == ico-size-6x6-png.ico ico-size-6x6-png.ico -== ico-size-7x7-png.ico ico-size-7x7-png.ico -fails skip == ico-size-8x8-png.ico ico-size-8x8-png.ico -skip == ico-size-9x9-png.ico ico-size-9x9-png.ico -skip == ico-size-15x15-png.ico ico-size-15x15-png.ico -skip == ico-size-16x16-png.ico ico-size-16x16-png.ico -skip == ico-size-17x17-png.ico ico-size-17x17-png.ico -skip == ico-size-31x31-png.ico ico-size-31x31-png.ico -skip == ico-size-32x32-png.ico ico-size-32x32-png.ico -skip == ico-size-33x33-png.ico ico-size-33x33-png.ico -# skip == ico-size-256x256-png.ico ico-size-256x256-png.ico - -# Corrupted files so no image should be loaded -# x00n0g01 - empty 0x0 grayscale file -skip == wrapper.html?x00n0g01.ico wrapper.html?x00n0g01.ico -# xcrn0g04 - added cr bytes -skip == wrapper.html?xcrn0g04.ico wrapper.html?xcrn0g04.ico - -# Test ICO PNG transparency -== transparent-png.ico transparent-png.ico - diff --git a/image/test/reftest/ico/reftest-stylo.list b/image/test/reftest/ico/reftest-stylo.list deleted file mode 100644 index 52cb9bc6c4..0000000000 --- a/image/test/reftest/ico/reftest-stylo.list +++ /dev/null @@ -1,13 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# ICO tests - -# bmp tests cause lots of intermittents -# include ico-bmp-1bpp/reftest-stylo.list -# include ico-bmp-4bpp/reftest-stylo.list -# include ico-bmp-8bpp/reftest-stylo.list -# include ico-bmp-24bpp/reftest-stylo.list -# include ico-bmp-32bpp/reftest-stylo.list -# include ico-bmp-corrupted/reftest-stylo.list -include ico-png/reftest-stylo.list -include ico-mixed/reftest-stylo.list -include cur/reftest-stylo.list diff --git a/image/test/reftest/jpeg/reftest-stylo.list b/image/test/reftest/jpeg/reftest-stylo.list deleted file mode 100644 index a906cde8e1..0000000000 --- a/image/test/reftest/jpeg/reftest-stylo.list +++ /dev/null @@ -1,57 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# JPEG tests - -# Images of various sizes. -fails == jpg-size-1x1.jpg jpg-size-1x1.jpg -fails == jpg-size-2x2.jpg jpg-size-2x2.jpg -fails == jpg-size-3x3.jpg jpg-size-3x3.jpg -fails == jpg-size-4x4.jpg jpg-size-4x4.jpg -fails == jpg-size-5x5.jpg jpg-size-5x5.jpg -== jpg-size-6x6.jpg jpg-size-6x6.jpg -fails == jpg-size-7x7.jpg jpg-size-7x7.jpg -fails == jpg-size-8x8.jpg jpg-size-8x8.jpg -fails == jpg-size-9x9.jpg jpg-size-9x9.jpg -fails == jpg-size-15x15.jpg jpg-size-15x15.jpg -fails == jpg-size-16x16.jpg jpg-size-16x16.jpg -fails == jpg-size-17x17.jpg jpg-size-17x17.jpg -fails == jpg-size-31x31.jpg jpg-size-31x31.jpg -fails == jpg-size-32x32.jpg jpg-size-32x32.jpg -fails == jpg-size-33x33.jpg jpg-size-33x33.jpg -# Progressive encoding -fails == jpg-progressive.jpg jpg-progressive.jpg -# Grayscale colorspace -fails == jpg-gray.jpg jpg-gray.jpg -# CMYK colorspace -fails == jpg-cmyk-1.jpg jpg-cmyk-1.jpg -fails == jpg-cmyk-2.jpg jpg-cmyk-2.jpg -# This intermittently fails on Android due to async image decoding (bug #685516) -# Sometimes the image decodes in time and the test passes, other times the image -# appears blank and the test fails. This only seems to be triggered since the -# switch to 24-bit colour (bug #803299). -fails random-if(Android) == jpg-srgb-icc.jpg jpg-srgb-icc.jpg - -# webcam-simulacrum.mjpg is a hand-edited file containing red.jpg and blue.jpg, -# concatenated together with the relevant headers for -# multipart/x-mixed-replace. Specifically, with the headers in -# webcam-simulacrum.mjpg^headers^, the web browser will get the following: -# -# HTTP 200 OK -# Content-Type: multipart/x-mixed-replace;boundary=BOUNDARYOMG -# -# --BOUNDARYOMG\r\n -# Content-Type: image/jpeg\r\n -# \r\n -# (no newline) -# --BOUNDARYOMG\r\n -# Content-Type: image/jpeg\r\n -# \r\n -# (no newline) -# --BOUNDARYOMG--\r\n -# -# (The boundary is arbitrary, and just has to be defined as something that -# won't be in the text of the contents themselves. --$(boundary)\r\n means -# "Here is the beginning of a boundary," and --$(boundary)-- means "All done -# sending you parts.") -skip HTTP == webcam-simulacrum.mjpg webcam-simulacrum.mjpg -skip pref(image.mozsamplesize.enabled,true) == jpg-size-32x32.jpg#-moz-samplesize=2 jpg-size-32x32.jpg#-moz-samplesize=2 -skip pref(image.mozsamplesize.enabled,true) == jpg-size-32x32.jpg#-moz-samplesize=8 jpg-size-32x32.jpg#-moz-samplesize=8 diff --git a/image/test/reftest/pngsuite-ancillary/reftest-stylo.list b/image/test/reftest/pngsuite-ancillary/reftest-stylo.list deleted file mode 100644 index 38b0d64e13..0000000000 --- a/image/test/reftest/pngsuite-ancillary/reftest-stylo.list +++ /dev/null @@ -1,63 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# PngSuite - Ancillary chunks - -# cHRM chunks -# -# ccwn2c08 - gamma 1.0000 chunk, chroma chunk w:0.3127,0.3290 r:0.64,0.33 g:0.30,0.60 b:0.15,0.06 -fails fails-if(prefs.getIntPref("gfx.color_management.mode")!=2) fuzzy-if(winWidget,8,569) == ccwn2c08.png ccwn2c08.png -# ccwn3p08 - gamma 1.0000 chunk, chroma chunk w:0.3127,0.3290 r:0.64,0.33 g:0.30,0.60 b:0.15,0.06 -fails fails-if(prefs.getIntPref("gfx.color_management.mode")!=2) fuzzy-if(winWidget,8,577) == ccwn3p08.png ccwn3p08.png - -# pHYs chunks -# -# PngSuite implies these first 3 should end up as 32x32 bitmaps, but -# per discussion in bug 408622 that's not actually true. -# -# cdfn2c08 - physical pixel dimensions, 8x32 flat pixels -fails == cdfn2c08.png cdfn2c08.png -# cdhn2c08 - physical pixel dimensions, 32x8 high pixels -fails == cdhn2c08.png cdhn2c08.png -# cdsn2c08 - physical pixel dimensions, 8x8 square pixels -fails == cdsn2c08.png cdsn2c08.png -# cdun2c08 - physical pixel dimensions, 1000 pixels per 1 meter -fails == cdun2c08.png cdun2c08.png - -# hISt chunks (shouldn't affect display on 24bit systems) -# -# ch1n3p04 - histogram 15 colors -fails == ch1n3p04.png ch1n3p04.png -# ch2n3p08 - histogram 256 colors -fails == ch2n3p08.png ch2n3p08.png - -# tIME chunks (doesn't affect display) -# -# cm0n0g04 - modification time, 01-jan-2000 12:34:56 -fails == cm0n0g04.png cm0n0g04.png -# cm7n0g04 - modification time, 01-jan-1970 00:00:00 -fails == cm7n0g04.png cm7n0g04.png -# cm9n0g04 - modification time, 31-dec-1999 23:59:59 -fails == cm9n0g04.png cm9n0g04.png - -# sBIT chunks -# -# cs3n2c16 - color, 13 significant bits -fails == cs3n2c16.png cs3n2c16.png -# cs3n3p08 - paletted, 3 significant bits -fails == cs3n3p08.png cs3n3p08.png -# cs5n2c08 - color, 5 significant bits -fails == cs5n2c08.png cs5n2c08.png -# cs5n3p08 - paletted, 5 significant bits -fails == cs5n3p08.png cs5n3p08.png -# cs8n2c08 - color, 8 significant bits (reference) -fails == cs8n2c08.png cs8n2c08.png -# cs8n3p08 - paletted, 8 significant bits (reference) -fails == cs8n3p08.png cs8n3p08.png - -# tEXt chunks (doesn't affect display) -# -# ct0n0g04 - no textual data -fails == ct0n0g04.png ct0n0g04.png -# ct1n0g04 - with textual data -fails == ct1n0g04.png ct1n0g04.png -# ctzn0g04 - with compressed textual data -fails == ctzn0g04.png ctzn0g04.png diff --git a/image/test/reftest/pngsuite-background/reftest-stylo.list b/image/test/reftest/pngsuite-background/reftest-stylo.list deleted file mode 100644 index 567b36b5b3..0000000000 --- a/image/test/reftest/pngsuite-background/reftest-stylo.list +++ /dev/null @@ -1,23 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# PngSuite - Background colors -# -# Note 1: The first 4 images have no bKGD chunk, the last 4 do. The background -# color indicated by bKGD isn't used, so the two sets of images are rendered -# identically and thus share common reference HTML files. - -# bgai4a08 - 8 bit grayscale, alpha, no background chunk, interlaced -skip fuzzy-if(cocoaWidget||skiaContent,1,1024) == wrapper.html?bgai4a08.png wrapper.html?bgai4a08.png -# bgai4a16 - 16 bit grayscale, alpha, no background chunk, interlaced -skip fuzzy-if(cocoaWidget||skiaContent,1,1024) == wrapper.html?bgai4a16.png wrapper.html?bgai4a16.png -# bgan6a08 - 3x8 bits rgb color, alpha, no background chunk -skip fuzzy-if(cocoaWidget||skiaContent,1,1024) == wrapper.html?bgan6a08.png wrapper.html?bgan6a08.png -# bgan6a16 - 3x16 bits rgb color, alpha, no background chunk -skip fuzzy-if(cocoaWidget||skiaContent,1,1024) == wrapper.html?bgan6a16.png wrapper.html?bgan6a16.png -# bgbn4a08 - 8 bit grayscale, alpha, black background chunk -skip fuzzy-if(cocoaWidget||skiaContent,1,1024) == wrapper.html?bgbn4a08.png wrapper.html?bgbn4a08.png -# bggn4a16 - 16 bit grayscale, alpha, gray background chunk -skip fuzzy-if(cocoaWidget||skiaContent,1,1024) == wrapper.html?bggn4a16.png wrapper.html?bggn4a16.png -# bgwn6a08 - 3x8 bits rgb color, alpha, white background chunk -skip fuzzy-if(cocoaWidget||skiaContent,1,1024) == wrapper.html?bgwn6a08.png wrapper.html?bgwn6a08.png -# bgyn6a16 - 3x16 bits rgb color, alpha, yellow background chunk -skip fuzzy-if(cocoaWidget||skiaContent,1,1024) == wrapper.html?bgyn6a16.png wrapper.html?bgyn6a16.png diff --git a/image/test/reftest/pngsuite-basic-i/reftest-stylo.list b/image/test/reftest/pngsuite-basic-i/reftest-stylo.list deleted file mode 100644 index cef5dbc6c2..0000000000 --- a/image/test/reftest/pngsuite-basic-i/reftest-stylo.list +++ /dev/null @@ -1,34 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# PngSuite - Basic formats (interlaced) - - -# basi0g01 - black & white -fails == basi0g01.png basi0g01.png -# basi0g02 - 2 bit (4 level) grayscale -fails == basi0g02.png basi0g02.png -# basi0g04 - 4 bit (16 level) grayscale -fails == basi0g04.png basi0g04.png -# basi0g08 - 8 bit (256 level) grayscale -fails == basi0g08.png basi0g08.png -# basi0g16 - 16 bit (64k level) grayscale -fails == basi0g16.png basi0g16.png -# basi2c08 - 3x8 bits rgb color -fails == basi2c08.png basi2c08.png -# basi2c16 - 3x16 bits rgb color -fails == basi2c16.png basi2c16.png -# basi3p01 - 1 bit (2 color) paletted -fails == basi3p01.png basi3p01.png -# basi3p02 - 2 bit (4 color) paletted -fails == basi3p02.png basi3p02.png -# basi3p04 - 4 bit (16 color) paletted -fails == basi3p04.png basi3p04.png -# basi3p08 - 8 bit (256 color) paletted -# fails == basi3p08.png basi3p08.png -# basi4a08 - 8 bit grayscale + 8 bit alpha-channel -#== basi4a08.png basi4a08.png -# basi4a16 - 16 bit grayscale + 16 bit alpha-channel -#== basi4a16.png basi4a16.png -# basi6a08 - 3x8 bits rgb color + 8 bit alpha-channel -#== basi6a08.png basi6a08.png -# basi6a16 - 3x16 bits rgb color + 16 bit alpha-channel -#== basi6a16.png basi6a16.png diff --git a/image/test/reftest/pngsuite-basic-n/reftest-stylo.list b/image/test/reftest/pngsuite-basic-n/reftest-stylo.list deleted file mode 100644 index a4f5946450..0000000000 --- a/image/test/reftest/pngsuite-basic-n/reftest-stylo.list +++ /dev/null @@ -1,34 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# PngSuite - Basic formats (non-interlaced) - - -# basn0g01 - black & white -fails == basn0g01.png basn0g01.png -# basn0g02 - 2 bit (4 level) grayscale -fails == basn0g02.png basn0g02.png -# basn0g04 - 4 bit (16 level) grayscale -fails == basn0g04.png basn0g04.png -# basn0g08 - 8 bit (256 level) grayscale -fails == basn0g08.png basn0g08.png -# basn0g16 - 16 bit (64k level) grayscale -fails == basn0g16.png basn0g16.png -# basn2c08 - 3x8 bits rgb color -fails == basn2c08.png basn2c08.png -# basn2c16 - 3x16 bits rgb color -fails == basn2c16.png basn2c16.png -# basn3p01 - 1 bit (2 color) paletted -fails == basn3p01.png basn3p01.png -# basn3p02 - 2 bit (4 color) paletted -fails == basn3p02.png basn3p02.png -# basn3p04 - 4 bit (16 color) paletted -fails == basn3p04.png basn3p04.png -# basn3p08 - 8 bit (256 color) paletted -fails == basn3p08.png basn3p08.png -# basn4a08 - 8 bit grayscale + 8 bit alpha-channel -#== basn4a08.png basn4a08.png -# basn4a16 - 16 bit grayscale + 16 bit alpha-channel -#== basn4a16.png basn4a16.png -# basn6a08 - 3x8 bits rgb color + 8 bit alpha-channel -#== basn6a08.png basn6a08.png -# basn6a16 - 3x16 bits rgb color + 16 bit alpha-channel -#== basn6a16.png basn6a16.png diff --git a/image/test/reftest/pngsuite-chunkorder/reftest-stylo.list b/image/test/reftest/pngsuite-chunkorder/reftest-stylo.list deleted file mode 100644 index 57415ac0e7..0000000000 --- a/image/test/reftest/pngsuite-chunkorder/reftest-stylo.list +++ /dev/null @@ -1,22 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# PngSuite - Chunk ordering -# -# The resulting images of a type (color or grayscale) should all look the -# same, so they share common HTML reference files. - -# oi1n0g16 - grayscale mother image with 1 idat-chunk -fails == oi1n0g16.png oi1n0g16.png -# oi1n2c16 - color mother image with 1 idat-chunk -fails == oi1n2c16.png oi1n2c16.png -# oi2n0g16 - grayscale image with 2 idat-chunks -fails == oi2n0g16.png oi2n0g16.png -# oi2n2c16 - color image with 2 idat-chunks -fails == oi2n2c16.png oi2n2c16.png -# oi4n0g16 - grayscale image with 4 unequal sized idat-chunks -fails == oi4n0g16.png oi4n0g16.png -# oi4n2c16 - color image with 4 unequal sized idat-chunks -fails == oi4n2c16.png oi4n2c16.png -# oi9n0g16 - grayscale image with all idat-chunks length one -fails == oi9n0g16.png oi9n0g16.png -# oi9n2c16 - color image with all idat-chunks length one -fails == oi9n2c16.png oi9n2c16.png diff --git a/image/test/reftest/pngsuite-corrupted/reftest-stylo.list b/image/test/reftest/pngsuite-corrupted/reftest-stylo.list deleted file mode 100644 index ed4baead8d..0000000000 --- a/image/test/reftest/pngsuite-corrupted/reftest-stylo.list +++ /dev/null @@ -1,11 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# PngSuite - Corrupted files -# -# Note: these are corrupt files, and so no image should be rendered. - -# x00n0g01 - empty 0x0 grayscale file -skip == wrapper.html?x00n0g01.png wrapper.html?x00n0g01.png -# xcrn0g04 - added cr bytes -skip == wrapper.html?xcrn0g04.png wrapper.html?xcrn0g04.png -# xlfn0g04 - added lf bytes -skip == wrapper.html?xlfn0g04.png wrapper.html?xlfn0g04.png diff --git a/image/test/reftest/pngsuite-filtering/reftest-stylo.list b/image/test/reftest/pngsuite-filtering/reftest-stylo.list deleted file mode 100644 index d69ff484ed..0000000000 --- a/image/test/reftest/pngsuite-filtering/reftest-stylo.list +++ /dev/null @@ -1,23 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# PngSuite - Image filtering - -# f00n0g08 - grayscale, no interlacing, filter-type 0 -fails == f00n0g08.png f00n0g08.png -# f00n2c08 - color, no interlacing, filter-type 0 -fails == f00n2c08.png f00n2c08.png -# f01n0g08 - grayscale, no interlacing, filter-type 1 -fails == f01n0g08.png f01n0g08.png -# f01n2c08 - color, no interlacing, filter-type 1 -skip == f01n2c08.png f01n2c08.png -# f02n0g08 - grayscale, no interlacing, filter-type 2 -fails == f02n0g08.png f02n0g08.png -# f02n2c08 - color, no interlacing, filter-type 2 -fails == f02n2c08.png f02n2c08.png -# f03n0g08 - grayscale, no interlacing, filter-type 3 -fails == f03n0g08.png f03n0g08.png -# f03n2c08 - color, no interlacing, filter-type 3 -fails == f03n2c08.png f03n2c08.png -# f04n0g08 - grayscale, no interlacing, filter-type 4 -fails == f04n0g08.png f04n0g08.png -# f04n2c08 - color, no interlacing, filter-type 4 -skip == f04n2c08.png f04n2c08.png diff --git a/image/test/reftest/pngsuite-gamma/reftest-stylo.list b/image/test/reftest/pngsuite-gamma/reftest-stylo.list deleted file mode 100644 index 25439123a5..0000000000 --- a/image/test/reftest/pngsuite-gamma/reftest-stylo.list +++ /dev/null @@ -1,39 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# PngSuite - Gamma values - -# g03n0g16 - grayscale, file-gamma = 0.35 -fails == g03n0g16.png g03n0g16.png -# g03n2c08 - color, file-gamma = 0.35 -fails == g03n2c08.png g03n2c08.png -# g03n3p04 - paletted, file-gamma = 0.35 -fails == g03n3p04.png g03n3p04.png -# g04n0g16 - grayscale, file-gamma = 0.45 -fails == g04n0g16.png g04n0g16.png -# g04n2c08 - color, file-gamma = 0.45 -skip == g04n2c08.png g04n2c08.png -# g04n3p04 - paletted, file-gamma = 0.45 -fails == g04n3p04.png g04n3p04.png -# g05n0g16 - grayscale, file-gamma = 0.55 -fails == g05n0g16.png g05n0g16.png -# g05n2c08 - color, file-gamma = 0.55 -fails == g05n2c08.png g05n2c08.png -# g05n3p04 - paletted, file-gamma = 0.55 -fails == g05n3p04.png g05n3p04.png -# g07n0g16 - grayscale, file-gamma = 0.70 -fails == g07n0g16.png g07n0g16.png -# g07n2c08 - color, file-gamma = 0.70 -fails == g07n2c08.png g07n2c08.png -# g07n3p04 - paletted, file-gamma = 0.70 -fails == g07n3p04.png g07n3p04.png -# g10n0g16 - grayscale, file-gamma = 1.00 -fails == g10n0g16.png g10n0g16.png -# g10n2c08 - color, file-gamma = 1.00 -fails == g10n2c08.png g10n2c08.png -# g10n3p04 - paletted, file-gamma = 1.00 -fails == g10n3p04.png g10n3p04.png -# g25n0g16 - grayscale, file-gamma = 2.50 -fails == g25n0g16.png g25n0g16.png -# g25n2c08 - color, file-gamma = 2.50 -fails == g25n2c08.png g25n2c08.png -# g25n3p04 - paletted, file-gamma = 2.50 -fails == g25n3p04.png g25n3p04.png diff --git a/image/test/reftest/pngsuite-oddsizes/reftest-stylo.list b/image/test/reftest/pngsuite-oddsizes/reftest-stylo.list deleted file mode 100644 index 21254621c6..0000000000 --- a/image/test/reftest/pngsuite-oddsizes/reftest-stylo.list +++ /dev/null @@ -1,78 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# PngSuite - Odd sizes -# -# Note: For each size, there are 2 PNGs (one interlaced, one not). Both -# versions look identical, so they share a common HTML reference file. - -# s01i3p01 - 1x1 paletted file, interlaced -fails == s01i3p01.png s01i3p01.png -# s01n3p01 - 1x1 paletted file, no interlacing -fails == s01n3p01.png s01n3p01.png -# s02i3p01 - 2x2 paletted file, interlaced -fails == s02i3p01.png s02i3p01.png -# s02n3p01 - 2x2 paletted file, no interlacing -fails == s02n3p01.png s02n3p01.png -# s03i3p01 - 3x3 paletted file, interlaced -fails == s03i3p01.png s03i3p01.png -# s03n3p01 - 3x3 paletted file, no interlacing -fails == s03n3p01.png s03n3p01.png -# s04i3p01 - 4x4 paletted file, interlaced -fails == s04i3p01.png s04i3p01.png -# s04n3p01 - 4x4 paletted file, no interlacing -fails == s04n3p01.png s04n3p01.png -# s05i3p02 - 5x5 paletted file, interlaced -fails == s05i3p02.png s05i3p02.png -# s05n3p02 - 5x5 paletted file, no interlacing -skip == s05n3p02.png s05n3p02.png -# s06i3p02 - 6x6 paletted file, interlaced -fails == s06i3p02.png s06i3p02.png -# s06n3p02 - 6x6 paletted file, no interlacing -fails == s06n3p02.png s06n3p02.png -# s07i3p02 - 7x7 paletted file, interlaced -fails == s07i3p02.png s07i3p02.png -# s07n3p02 - 7x7 paletted file, no interlacing -fails == s07n3p02.png s07n3p02.png -# s08i3p02 - 8x8 paletted file, interlaced -fails == s08i3p02.png s08i3p02.png -# s08n3p02 - 8x8 paletted file, no interlacing -fails == s08n3p02.png s08n3p02.png -# s09i3p02 - 9x9 paletted file, interlaced -fails == s09i3p02.png s09i3p02.png -# s09n3p02 - 9x9 paletted file, no interlacing -fails == s09n3p02.png s09n3p02.png -# s32i3p04 - 32x32 paletted file, interlaced -fails == s32i3p04.png s32i3p04.png -# s32n3p04 - 32x32 paletted file, no interlacing -fails == s32n3p04.png s32n3p04.png -# s33i3p04 - 33x33 paletted file, interlaced -fails == s33i3p04.png s33i3p04.png -# s33n3p04 - 33x33 paletted file, no interlacing -fails == s33n3p04.png s33n3p04.png -# s34i3p04 - 34x34 paletted file, interlaced -fails == s34i3p04.png s34i3p04.png -# s34n3p04 - 34x34 paletted file, no interlacing -fails == s34n3p04.png s34n3p04.png -# s35i3p04 - 35x35 paletted file, interlaced -fails == s35i3p04.png s35i3p04.png -# s35n3p04 - 35x35 paletted file, no interlacing -fails == s35n3p04.png s35n3p04.png -# s36i3p04 - 36x36 paletted file, interlaced -fails == s36i3p04.png s36i3p04.png -# s36n3p04 - 36x36 paletted file, no interlacing -fails == s36n3p04.png s36n3p04.png -# s37i3p04 - 37x37 paletted file, interlaced -fails == s37i3p04.png s37i3p04.png -# s37n3p04 - 37x37 paletted file, no interlacing -fails == s37n3p04.png s37n3p04.png -# s38i3p04 - 38x38 paletted file, interlaced -fails == s38i3p04.png s38i3p04.png -# s38n3p04 - 38x38 paletted file, no interlacing -fails == s38n3p04.png s38n3p04.png -# s39i3p04 - 39x39 paletted file, interlaced -fails == s39i3p04.png s39i3p04.png -# s39n3p04 - 39x39 paletted file, no interlacing -fails == s39n3p04.png s39n3p04.png -# s40i3p04 - 40x40 paletted file, interlaced -fails == s40i3p04.png s40i3p04.png -# s40n3p04 - 40x40 paletted file, no interlacing -fails == s40n3p04.png s40n3p04.png diff --git a/image/test/reftest/pngsuite-palettes/reftest-stylo.list b/image/test/reftest/pngsuite-palettes/reftest-stylo.list deleted file mode 100644 index 702529b292..0000000000 --- a/image/test/reftest/pngsuite-palettes/reftest-stylo.list +++ /dev/null @@ -1,15 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# PngSuite - Additional palettes - -# pp0n2c16 - six-cube palette-chunk in true-color image -fails == pp0n2c16.png pp0n2c16.png -# pp0n6a08 - six-cube palette-chunk in true-color+alpha image -#== pp0n6a08.png pp0n6a08.png -# ps1n0g08 - six-cube suggested palette (1 byte) in grayscale image -fails == ps1n0g08.png ps1n0g08.png -# ps1n2c16 - six-cube suggested palette (1 byte) in true-color image -fails == ps1n2c16.png ps1n2c16.png -# ps2n0g08 - six-cube suggested palette (2 bytes) in grayscale image -fails == ps2n0g08.png ps2n0g08.png -# ps2n2c16 - six-cube suggested palette (2 bytes) in true-color image -fails == ps2n2c16.png ps2n2c16.png diff --git a/image/test/reftest/pngsuite-transparency/reftest-stylo.list b/image/test/reftest/pngsuite-transparency/reftest-stylo.list deleted file mode 100644 index 90543ab950..0000000000 --- a/image/test/reftest/pngsuite-transparency/reftest-stylo.list +++ /dev/null @@ -1,27 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# PngSuite - Transparency - -# tbbn1g04 - transparent, black background chunk -skip == wrapper.html?tbbn1g04.png wrapper.html?tbbn1g04.png -# tbbn2c16 - transparent, blue background chunk -skip == wrapper.html?tbbn2c16.png wrapper.html?tbbn2c16.png -# tbbn3p08 - transparent, black background chunk -skip == wrapper.html?tbbn3p08.png wrapper.html?tbbn3p08.png -# tbgn2c16 - transparent, green background chunk -skip == wrapper.html?tbgn2c16.png wrapper.html?tbgn2c16.png -# tbgn3p08 - transparent, light-gray background chunk -skip == wrapper.html?tbgn3p08.png wrapper.html?tbgn3p08.png -# tbrn2c08 - transparent, red background chunk -skip == wrapper.html?tbrn2c08.png wrapper.html?tbrn2c08.png -# tbwn1g16 - transparent, white background chunk -skip == wrapper.html?tbwn1g16.png wrapper.html?tbwn1g16.png -# tbwn3p08 - transparent, white background chunk -skip == wrapper.html?tbwn3p08.png wrapper.html?tbwn3p08.png -# tbyn3p08 - transparent, yellow background chunk -skip == wrapper.html?tbyn3p08.png wrapper.html?tbyn3p08.png -# tp0n1g08 - not transparent for reference (logo on gray) -# tp0n2c08 - not transparent for reference (logo on gray) -# tp0n3p08 - not transparent for reference (logo on gray) -# ...these 3 not tested because they're not transparent. -# tp1n3p08 - transparent, but no background chunk -skip == wrapper.html?tp1n3p08.png wrapper.html?tp1n3p08.png diff --git a/image/test/reftest/pngsuite-zlib/reftest-stylo.list b/image/test/reftest/pngsuite-zlib/reftest-stylo.list deleted file mode 100644 index 35753fa4e3..0000000000 --- a/image/test/reftest/pngsuite-zlib/reftest-stylo.list +++ /dev/null @@ -1,9 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# z00n2c08 - color, no interlacing, compression level 0 (none) -fails == z00n2c08.png z00n2c08.png -# z03n2c08 - color, no interlacing, compression level 3 -fails == z03n2c08.png z03n2c08.png -# z06n2c08 - color, no interlacing, compression level 6 (default) -fails == z06n2c08.png z06n2c08.png -# z09n2c08 - color, no interlacing, compression level 9 (maximum) -fails == z09n2c08.png z09n2c08.png diff --git a/image/test/reftest/reftest-stylo.list b/image/test/reftest/reftest-stylo.list deleted file mode 100644 index 8c76cce799..0000000000 --- a/image/test/reftest/reftest-stylo.list +++ /dev/null @@ -1,65 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Check for 24-bit color mode (test for bug 414720) -skip-if(Android) == colordepth.html colordepth.html - -# "PngSuite, the official set of PNG test images" -# Images by Willem van Schaik -# -# http://www.schaik.com/pngsuite/pngsuite.html -# http://www.libpng.org/pub/png/pngsuite.html -skip-if(B2G) include pngsuite-basic-n/reftest-stylo.list -# bug 783632 -skip-if(B2G) include pngsuite-basic-i/reftest-stylo.list -# bug 783632 -skip-if(B2G) include pngsuite-ancillary/reftest-stylo.list -# bug 783632 -skip-if(B2G) include pngsuite-background/reftest-stylo.list -# bug 783632 -skip-if(B2G) include pngsuite-chunkorder/reftest-stylo.list -# bug 783632 -skip-if(B2G) include pngsuite-corrupted/reftest-stylo.list -# bug 783632 -skip-if(B2G) include pngsuite-filtering/reftest-stylo.list -# bug 783632 -skip-if(B2G) include pngsuite-gamma/reftest-stylo.list -# bug 783632 -skip-if(B2G) include pngsuite-oddsizes/reftest-stylo.list -# bug 783632 -skip-if(B2G) include pngsuite-palettes/reftest-stylo.list -# bug 783632 -skip-if(B2G) include pngsuite-transparency/reftest-stylo.list -# bug 783632 -skip-if(B2G) include pngsuite-zlib/reftest-stylo.list -# bug 783632 - -# Disabled, lots of intermittents here -# BMP tests -#skip-if(Android) include bmp/reftest-stylo.list - -# ICO tests -#skip-if(Android) include ico/reftest-stylo.list - -# JPEG tests -# include jpeg/reftest-stylo.list - -# GIF tests -# include gif/reftest-stylo.list - -# APNG tests -include apng/reftest-stylo.list - -# Generic image tests -include generic/reftest-stylo.list - -# Color management test -include color-management/reftest-stylo.list - -# Downscaling tests -# include downscaling/reftest-stylo.list - -# Blob URI tests -include blob/reftest-stylo.list - -# Lossless encoders -# skip-if(Android||B2G) include encoders-lossless/reftest-stylo.list -# bug 783621 diff --git a/layout/reftests/position-dynamic-changes/horizontal/reftest_border_abspos-stylo.list b/layout/reftests/position-dynamic-changes/horizontal/reftest_border_abspos-stylo.list deleted file mode 100644 index 2dec3bb4e9..0000000000 --- a/layout/reftests/position-dynamic-changes/horizontal/reftest_border_abspos-stylo.list +++ /dev/null @@ -1,27 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Please see the comment at the beginning of reftest-stylo.list -== leftN-widthA-rightA.html?border_abspos leftN-widthA-rightA.html?border_abspos -== leftN-widthA-rightA-2.html?border_abspos leftN-widthA-rightA-2.html?border_abspos -== leftN-widthA-rightN.html?border_abspos leftN-widthA-rightN.html?border_abspos -== leftN-widthA-rightN-2.html?border_abspos leftN-widthA-rightN-2.html?border_abspos -== leftA-widthN-rightA.html?border_abspos leftA-widthN-rightA.html?border_abspos -== leftN-widthN-rightA.html?border_abspos leftN-widthN-rightA.html?border_abspos -== leftA-widthN-rightN.html?border_abspos leftA-widthN-rightN.html?border_abspos -== leftA-widthA-rightN.html?border_abspos leftA-widthA-rightN.html?border_abspos -== toauto-leftN-widthA-rightA.html?border_abspos toauto-leftN-widthA-rightA.html?border_abspos -== toauto-leftN-widthA-rightA-2.html?border_abspos toauto-leftN-widthA-rightA-2.html?border_abspos -== toauto-leftN-widthA-rightN.html?border_abspos toauto-leftN-widthA-rightN.html?border_abspos -== toauto-leftN-widthA-rightN-2.html?border_abspos toauto-leftN-widthA-rightN-2.html?border_abspos -== toauto-leftA-widthN-rightA.html?border_abspos toauto-leftA-widthN-rightA.html?border_abspos -== toauto-leftN-widthN-rightA.html?border_abspos toauto-leftN-widthN-rightA.html?border_abspos -== toauto-leftA-widthN-rightN.html?border_abspos toauto-leftA-widthN-rightN.html?border_abspos -== toauto-leftA-widthA-rightN.html?border_abspos toauto-leftA-widthA-rightN.html?border_abspos -== fromauto-leftN-widthA-rightA.html?border_abspos fromauto-leftN-widthA-rightA.html?border_abspos -random-if(cocoaWidget) == fromauto-leftN-widthA-rightA-2.html?border_abspos fromauto-leftN-widthA-rightA-2.html?border_abspos -# Bug 688545 -== fromauto-leftN-widthA-rightN.html?border_abspos fromauto-leftN-widthA-rightN.html?border_abspos -== fromauto-leftN-widthA-rightN-2.html?border_abspos fromauto-leftN-widthA-rightN-2.html?border_abspos -== fromauto-leftA-widthN-rightA.html?border_abspos fromauto-leftA-widthN-rightA.html?border_abspos -== fromauto-leftN-widthN-rightA.html?border_abspos fromauto-leftN-widthN-rightA.html?border_abspos -== fromauto-leftA-widthN-rightN.html?border_abspos fromauto-leftA-widthN-rightN.html?border_abspos -== fromauto-leftA-widthA-rightN.html?border_abspos fromauto-leftA-widthA-rightN.html?border_abspos diff --git a/layout/reftests/position-dynamic-changes/horizontal/reftest_border_parent-stylo.list b/layout/reftests/position-dynamic-changes/horizontal/reftest_border_parent-stylo.list deleted file mode 100644 index 92ac24f977..0000000000 --- a/layout/reftests/position-dynamic-changes/horizontal/reftest_border_parent-stylo.list +++ /dev/null @@ -1,28 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Please see the comment at the beginning of reftest-stylo.list - -== leftN-widthA-rightA.html?border_parent leftN-widthA-rightA.html?border_parent -== leftN-widthA-rightA-2.html?border_parent leftN-widthA-rightA-2.html?border_parent -== leftN-widthA-rightN.html?border_parent leftN-widthA-rightN.html?border_parent -== leftN-widthA-rightN-2.html?border_parent leftN-widthA-rightN-2.html?border_parent -== leftA-widthN-rightA.html?border_parent leftA-widthN-rightA.html?border_parent -== leftN-widthN-rightA.html?border_parent leftN-widthN-rightA.html?border_parent -== leftA-widthN-rightN.html?border_parent leftA-widthN-rightN.html?border_parent -== leftA-widthA-rightN.html?border_parent leftA-widthA-rightN.html?border_parent -== toauto-leftN-widthA-rightA.html?border_parent toauto-leftN-widthA-rightA.html?border_parent -== toauto-leftN-widthA-rightA-2.html?border_parent toauto-leftN-widthA-rightA-2.html?border_parent -== toauto-leftN-widthA-rightN.html?border_parent toauto-leftN-widthA-rightN.html?border_parent -== toauto-leftN-widthA-rightN-2.html?border_parent toauto-leftN-widthA-rightN-2.html?border_parent -== toauto-leftA-widthN-rightA.html?border_parent toauto-leftA-widthN-rightA.html?border_parent -== toauto-leftN-widthN-rightA.html?border_parent toauto-leftN-widthN-rightA.html?border_parent -== toauto-leftA-widthN-rightN.html?border_parent toauto-leftA-widthN-rightN.html?border_parent -== toauto-leftA-widthA-rightN.html?border_parent toauto-leftA-widthA-rightN.html?border_parent -== fromauto-leftN-widthA-rightA.html?border_parent fromauto-leftN-widthA-rightA.html?border_parent -random-if(cocoaWidget) == fromauto-leftN-widthA-rightA-2.html?border_parent fromauto-leftN-widthA-rightA-2.html?border_parent -# Bug 688545 -== fromauto-leftN-widthA-rightN.html?border_parent fromauto-leftN-widthA-rightN.html?border_parent -== fromauto-leftN-widthA-rightN-2.html?border_parent fromauto-leftN-widthA-rightN-2.html?border_parent -== fromauto-leftA-widthN-rightA.html?border_parent fromauto-leftA-widthN-rightA.html?border_parent -== fromauto-leftN-widthN-rightA.html?border_parent fromauto-leftN-widthN-rightA.html?border_parent -== fromauto-leftA-widthN-rightN.html?border_parent fromauto-leftA-widthN-rightN.html?border_parent -== fromauto-leftA-widthA-rightN.html?border_parent fromauto-leftA-widthA-rightN.html?border_parent diff --git a/layout/reftests/position-dynamic-changes/horizontal/reftest_margin_abspos-stylo.list b/layout/reftests/position-dynamic-changes/horizontal/reftest_margin_abspos-stylo.list deleted file mode 100644 index 76d19515ea..0000000000 --- a/layout/reftests/position-dynamic-changes/horizontal/reftest_margin_abspos-stylo.list +++ /dev/null @@ -1,28 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Please see the comment at the beginning of reftest-stylo.list - -== leftN-widthA-rightA.html?margin_abspos leftN-widthA-rightA.html?margin_abspos -== leftN-widthA-rightA-2.html?margin_abspos leftN-widthA-rightA-2.html?margin_abspos -== leftN-widthA-rightN.html?margin_abspos leftN-widthA-rightN.html?margin_abspos -== leftN-widthA-rightN-2.html?margin_abspos leftN-widthA-rightN-2.html?margin_abspos -== leftA-widthN-rightA.html?margin_abspos leftA-widthN-rightA.html?margin_abspos -== leftN-widthN-rightA.html?margin_abspos leftN-widthN-rightA.html?margin_abspos -== leftA-widthN-rightN.html?margin_abspos leftA-widthN-rightN.html?margin_abspos -== leftA-widthA-rightN.html?margin_abspos leftA-widthA-rightN.html?margin_abspos -== toauto-leftN-widthA-rightA.html?margin_abspos toauto-leftN-widthA-rightA.html?margin_abspos -== toauto-leftN-widthA-rightA-2.html?margin_abspos toauto-leftN-widthA-rightA-2.html?margin_abspos -== toauto-leftN-widthA-rightN.html?margin_abspos toauto-leftN-widthA-rightN.html?margin_abspos -== toauto-leftN-widthA-rightN-2.html?margin_abspos toauto-leftN-widthA-rightN-2.html?margin_abspos -== toauto-leftA-widthN-rightA.html?margin_abspos toauto-leftA-widthN-rightA.html?margin_abspos -== toauto-leftN-widthN-rightA.html?margin_abspos toauto-leftN-widthN-rightA.html?margin_abspos -== toauto-leftA-widthN-rightN.html?margin_abspos toauto-leftA-widthN-rightN.html?margin_abspos -== toauto-leftA-widthA-rightN.html?margin_abspos toauto-leftA-widthA-rightN.html?margin_abspos -== fromauto-leftN-widthA-rightA.html?margin_abspos fromauto-leftN-widthA-rightA.html?margin_abspos -random-if(cocoaWidget) == fromauto-leftN-widthA-rightA-2.html?margin_abspos fromauto-leftN-widthA-rightA-2.html?margin_abspos -# Bug 688545 -== fromauto-leftN-widthA-rightN.html?margin_abspos fromauto-leftN-widthA-rightN.html?margin_abspos -== fromauto-leftN-widthA-rightN-2.html?margin_abspos fromauto-leftN-widthA-rightN-2.html?margin_abspos -== fromauto-leftA-widthN-rightA.html?margin_abspos fromauto-leftA-widthN-rightA.html?margin_abspos -== fromauto-leftN-widthN-rightA.html?margin_abspos fromauto-leftN-widthN-rightA.html?margin_abspos -== fromauto-leftA-widthN-rightN.html?margin_abspos fromauto-leftA-widthN-rightN.html?margin_abspos -== fromauto-leftA-widthA-rightN.html?margin_abspos fromauto-leftA-widthA-rightN.html?margin_abspos diff --git a/layout/reftests/position-dynamic-changes/horizontal/reftest_margin_parent-stylo.list b/layout/reftests/position-dynamic-changes/horizontal/reftest_margin_parent-stylo.list deleted file mode 100644 index 2ab61ff0a3..0000000000 --- a/layout/reftests/position-dynamic-changes/horizontal/reftest_margin_parent-stylo.list +++ /dev/null @@ -1,28 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Please see the comment at the beginning of reftest-stylo.list - -== leftN-widthA-rightA.html?margin_parent leftN-widthA-rightA.html?margin_parent -== leftN-widthA-rightA-2.html?margin_parent leftN-widthA-rightA-2.html?margin_parent -== leftN-widthA-rightN.html?margin_parent leftN-widthA-rightN.html?margin_parent -== leftN-widthA-rightN-2.html?margin_parent leftN-widthA-rightN-2.html?margin_parent -== leftA-widthN-rightA.html?margin_parent leftA-widthN-rightA.html?margin_parent -== leftN-widthN-rightA.html?margin_parent leftN-widthN-rightA.html?margin_parent -== leftA-widthN-rightN.html?margin_parent leftA-widthN-rightN.html?margin_parent -== leftA-widthA-rightN.html?margin_parent leftA-widthA-rightN.html?margin_parent -== toauto-leftN-widthA-rightA.html?margin_parent toauto-leftN-widthA-rightA.html?margin_parent -== toauto-leftN-widthA-rightA-2.html?margin_parent toauto-leftN-widthA-rightA-2.html?margin_parent -== toauto-leftN-widthA-rightN.html?margin_parent toauto-leftN-widthA-rightN.html?margin_parent -== toauto-leftN-widthA-rightN-2.html?margin_parent toauto-leftN-widthA-rightN-2.html?margin_parent -== toauto-leftA-widthN-rightA.html?margin_parent toauto-leftA-widthN-rightA.html?margin_parent -== toauto-leftN-widthN-rightA.html?margin_parent toauto-leftN-widthN-rightA.html?margin_parent -== toauto-leftA-widthN-rightN.html?margin_parent toauto-leftA-widthN-rightN.html?margin_parent -== toauto-leftA-widthA-rightN.html?margin_parent toauto-leftA-widthA-rightN.html?margin_parent -== fromauto-leftN-widthA-rightA.html?margin_parent fromauto-leftN-widthA-rightA.html?margin_parent -random-if(cocoaWidget) == fromauto-leftN-widthA-rightA-2.html?margin_parent fromauto-leftN-widthA-rightA-2.html?margin_parent -# Bug 688545 -== fromauto-leftN-widthA-rightN.html?margin_parent fromauto-leftN-widthA-rightN.html?margin_parent -skip == fromauto-leftN-widthA-rightN-2.html?margin_parent fromauto-leftN-widthA-rightN-2.html?margin_parent -== fromauto-leftA-widthN-rightA.html?margin_parent fromauto-leftA-widthN-rightA.html?margin_parent -== fromauto-leftN-widthN-rightA.html?margin_parent fromauto-leftN-widthN-rightA.html?margin_parent -== fromauto-leftA-widthN-rightN.html?margin_parent fromauto-leftA-widthN-rightN.html?margin_parent -== fromauto-leftA-widthA-rightN.html?margin_parent fromauto-leftA-widthA-rightN.html?margin_parent diff --git a/layout/reftests/position-dynamic-changes/horizontal/reftest_padding_abspos-stylo.list b/layout/reftests/position-dynamic-changes/horizontal/reftest_padding_abspos-stylo.list deleted file mode 100644 index 893e15fea8..0000000000 --- a/layout/reftests/position-dynamic-changes/horizontal/reftest_padding_abspos-stylo.list +++ /dev/null @@ -1,28 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Please see the comment at the beginning of reftest-stylo.list - -== leftN-widthA-rightA.html?padding_abspos leftN-widthA-rightA.html?padding_abspos -== leftN-widthA-rightA-2.html?padding_abspos leftN-widthA-rightA-2.html?padding_abspos -== leftN-widthA-rightN.html?padding_abspos leftN-widthA-rightN.html?padding_abspos -== leftN-widthA-rightN-2.html?padding_abspos leftN-widthA-rightN-2.html?padding_abspos -== leftA-widthN-rightA.html?padding_abspos leftA-widthN-rightA.html?padding_abspos -== leftN-widthN-rightA.html?padding_abspos leftN-widthN-rightA.html?padding_abspos -== leftA-widthN-rightN.html?padding_abspos leftA-widthN-rightN.html?padding_abspos -== leftA-widthA-rightN.html?padding_abspos leftA-widthA-rightN.html?padding_abspos -== toauto-leftN-widthA-rightA.html?padding_abspos toauto-leftN-widthA-rightA.html?padding_abspos -== toauto-leftN-widthA-rightA-2.html?padding_abspos toauto-leftN-widthA-rightA-2.html?padding_abspos -== toauto-leftN-widthA-rightN.html?padding_abspos toauto-leftN-widthA-rightN.html?padding_abspos -== toauto-leftN-widthA-rightN-2.html?padding_abspos toauto-leftN-widthA-rightN-2.html?padding_abspos -== toauto-leftA-widthN-rightA.html?padding_abspos toauto-leftA-widthN-rightA.html?padding_abspos -== toauto-leftN-widthN-rightA.html?padding_abspos toauto-leftN-widthN-rightA.html?padding_abspos -== toauto-leftA-widthN-rightN.html?padding_abspos toauto-leftA-widthN-rightN.html?padding_abspos -== toauto-leftA-widthA-rightN.html?padding_abspos toauto-leftA-widthA-rightN.html?padding_abspos -== fromauto-leftN-widthA-rightA.html?padding_abspos fromauto-leftN-widthA-rightA.html?padding_abspos -random-if(cocoaWidget) == fromauto-leftN-widthA-rightA-2.html?padding_abspos fromauto-leftN-widthA-rightA-2.html?padding_abspos -# Bug 688545 -== fromauto-leftN-widthA-rightN.html?padding_abspos fromauto-leftN-widthA-rightN.html?padding_abspos -== fromauto-leftN-widthA-rightN-2.html?padding_abspos fromauto-leftN-widthA-rightN-2.html?padding_abspos -== fromauto-leftA-widthN-rightA.html?padding_abspos fromauto-leftA-widthN-rightA.html?padding_abspos -== fromauto-leftN-widthN-rightA.html?padding_abspos fromauto-leftN-widthN-rightA.html?padding_abspos -== fromauto-leftA-widthN-rightN.html?padding_abspos fromauto-leftA-widthN-rightN.html?padding_abspos -== fromauto-leftA-widthA-rightN.html?padding_abspos fromauto-leftA-widthA-rightN.html?padding_abspos diff --git a/layout/reftests/position-dynamic-changes/horizontal/reftest_padding_parent-stylo.list b/layout/reftests/position-dynamic-changes/horizontal/reftest_padding_parent-stylo.list deleted file mode 100644 index 80b165f4a3..0000000000 --- a/layout/reftests/position-dynamic-changes/horizontal/reftest_padding_parent-stylo.list +++ /dev/null @@ -1,28 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Please see the comment at the beginning of reftest-stylo.list - -== leftN-widthA-rightA.html?padding_parent leftN-widthA-rightA.html?padding_parent -== leftN-widthA-rightA-2.html?padding_parent leftN-widthA-rightA-2.html?padding_parent -== leftN-widthA-rightN.html?padding_parent leftN-widthA-rightN.html?padding_parent -== leftN-widthA-rightN-2.html?padding_parent leftN-widthA-rightN-2.html?padding_parent -== leftA-widthN-rightA.html?padding_parent leftA-widthN-rightA.html?padding_parent -== leftN-widthN-rightA.html?padding_parent leftN-widthN-rightA.html?padding_parent -== leftA-widthN-rightN.html?padding_parent leftA-widthN-rightN.html?padding_parent -== leftA-widthA-rightN.html?padding_parent leftA-widthA-rightN.html?padding_parent -== toauto-leftN-widthA-rightA.html?padding_parent toauto-leftN-widthA-rightA.html?padding_parent -== toauto-leftN-widthA-rightA-2.html?padding_parent toauto-leftN-widthA-rightA-2.html?padding_parent -== toauto-leftN-widthA-rightN.html?padding_parent toauto-leftN-widthA-rightN.html?padding_parent -== toauto-leftN-widthA-rightN-2.html?padding_parent toauto-leftN-widthA-rightN-2.html?padding_parent -== toauto-leftA-widthN-rightA.html?padding_parent toauto-leftA-widthN-rightA.html?padding_parent -== toauto-leftN-widthN-rightA.html?padding_parent toauto-leftN-widthN-rightA.html?padding_parent -== toauto-leftA-widthN-rightN.html?padding_parent toauto-leftA-widthN-rightN.html?padding_parent -skip == toauto-leftA-widthA-rightN.html?padding_parent toauto-leftA-widthA-rightN.html?padding_parent -== fromauto-leftN-widthA-rightA.html?padding_parent fromauto-leftN-widthA-rightA.html?padding_parent -random-if(cocoaWidget) == fromauto-leftN-widthA-rightA-2.html?padding_parent fromauto-leftN-widthA-rightA-2.html?padding_parent -# Bug 688545 -== fromauto-leftN-widthA-rightN.html?padding_parent fromauto-leftN-widthA-rightN.html?padding_parent -== fromauto-leftN-widthA-rightN-2.html?padding_parent fromauto-leftN-widthA-rightN-2.html?padding_parent -== fromauto-leftA-widthN-rightA.html?padding_parent fromauto-leftA-widthN-rightA.html?padding_parent -== fromauto-leftN-widthN-rightA.html?padding_parent fromauto-leftN-widthN-rightA.html?padding_parent -== fromauto-leftA-widthN-rightN.html?padding_parent fromauto-leftA-widthN-rightN.html?padding_parent -== fromauto-leftA-widthA-rightN.html?padding_parent fromauto-leftA-widthA-rightN.html?padding_parent diff --git a/layout/reftests/position-dynamic-changes/horizontal/reftest_plain-stylo.list b/layout/reftests/position-dynamic-changes/horizontal/reftest_plain-stylo.list deleted file mode 100644 index 9aecff8556..0000000000 --- a/layout/reftests/position-dynamic-changes/horizontal/reftest_plain-stylo.list +++ /dev/null @@ -1,28 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Please see the comment at the beginning of reftest-stylo.list - -== leftN-widthA-rightA.html leftN-widthA-rightA.html -== leftN-widthA-rightA-2.html leftN-widthA-rightA-2.html -== leftN-widthA-rightN.html leftN-widthA-rightN.html -== leftN-widthA-rightN-2.html leftN-widthA-rightN-2.html -== leftA-widthN-rightA.html leftA-widthN-rightA.html -== leftN-widthN-rightA.html leftN-widthN-rightA.html -== leftA-widthN-rightN.html leftA-widthN-rightN.html -== leftA-widthA-rightN.html leftA-widthA-rightN.html -== toauto-leftN-widthA-rightA.html toauto-leftN-widthA-rightA.html -== toauto-leftN-widthA-rightA-2.html toauto-leftN-widthA-rightA-2.html -== toauto-leftN-widthA-rightN.html toauto-leftN-widthA-rightN.html -== toauto-leftN-widthA-rightN-2.html toauto-leftN-widthA-rightN-2.html -== toauto-leftA-widthN-rightA.html toauto-leftA-widthN-rightA.html -== toauto-leftN-widthN-rightA.html toauto-leftN-widthN-rightA.html -== toauto-leftA-widthN-rightN.html toauto-leftA-widthN-rightN.html -== toauto-leftA-widthA-rightN.html toauto-leftA-widthA-rightN.html -== fromauto-leftN-widthA-rightA.html fromauto-leftN-widthA-rightA.html -random-if(cocoaWidget) == fromauto-leftN-widthA-rightA-2.html fromauto-leftN-widthA-rightA-2.html -# Bug 688545 -== fromauto-leftN-widthA-rightN.html fromauto-leftN-widthA-rightN.html -== fromauto-leftN-widthA-rightN-2.html fromauto-leftN-widthA-rightN-2.html -== fromauto-leftA-widthN-rightA.html fromauto-leftA-widthN-rightA.html -== fromauto-leftN-widthN-rightA.html fromauto-leftN-widthN-rightA.html -== fromauto-leftA-widthN-rightN.html fromauto-leftA-widthN-rightN.html -== fromauto-leftA-widthA-rightN.html fromauto-leftA-widthA-rightN.html diff --git a/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_border_abspos-stylo.list b/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_border_abspos-stylo.list deleted file mode 100644 index 16be2a7466..0000000000 --- a/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_border_abspos-stylo.list +++ /dev/null @@ -1,5 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Please see the comment at the beginning of reftest-stylo.list - -== mixed-dimentionN.html?border_abspos mixed-dimentionN.html?border_abspos -== mixed-dimentionA.html?border_abspos mixed-dimentionA.html?border_abspos diff --git a/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_border_parent-stylo.list b/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_border_parent-stylo.list deleted file mode 100644 index 18837423c7..0000000000 --- a/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_border_parent-stylo.list +++ /dev/null @@ -1,5 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Please see the comment at the beginning of reftest-stylo.list - -== mixed-dimentionN.html?border_parent mixed-dimentionN.html?border_parent -== mixed-dimentionA.html?border_parent mixed-dimentionA.html?border_parent diff --git a/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_margin_abspos-stylo.list b/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_margin_abspos-stylo.list deleted file mode 100644 index 6fd1d12984..0000000000 --- a/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_margin_abspos-stylo.list +++ /dev/null @@ -1,5 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Please see the comment at the beginning of reftest-stylo.list - -== mixed-dimentionN.html?margin_abspos mixed-dimentionN.html?margin_abspos -== mixed-dimentionA.html?margin_abspos mixed-dimentionA.html?margin_abspos diff --git a/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_margin_parent-stylo.list b/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_margin_parent-stylo.list deleted file mode 100644 index 694b02ac52..0000000000 --- a/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_margin_parent-stylo.list +++ /dev/null @@ -1,5 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Please see the comment at the beginning of reftest-stylo.list - -== mixed-dimentionN.html?margin_parent mixed-dimentionN.html?margin_parent -== mixed-dimentionA.html?margin_parent mixed-dimentionA.html?margin_parent diff --git a/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_padding_abspos-stylo.list b/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_padding_abspos-stylo.list deleted file mode 100644 index ee39bf65b1..0000000000 --- a/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_padding_abspos-stylo.list +++ /dev/null @@ -1,5 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Please see the comment at the beginning of reftest-stylo.list - -== mixed-dimentionN.html?padding_abspos mixed-dimentionN.html?padding_abspos -== mixed-dimentionA.html?padding_abspos mixed-dimentionA.html?padding_abspos diff --git a/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_padding_parent-stylo.list b/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_padding_parent-stylo.list deleted file mode 100644 index 684d3eec62..0000000000 --- a/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_padding_parent-stylo.list +++ /dev/null @@ -1,5 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Please see the comment at the beginning of reftest-stylo.list - -== mixed-dimentionN.html?padding_parent mixed-dimentionN.html?padding_parent -== mixed-dimentionA.html?padding_parent mixed-dimentionA.html?padding_parent diff --git a/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_plain-stylo.list b/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_plain-stylo.list deleted file mode 100644 index d439f50299..0000000000 --- a/layout/reftests/position-dynamic-changes/mixed-abspos-root/reftest_plain-stylo.list +++ /dev/null @@ -1,5 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Please see the comment at the beginning of reftest-stylo.list - -== mixed-dimentionN.html mixed-dimentionN.html -== mixed-dimentionA.html mixed-dimentionA.html diff --git a/layout/reftests/position-dynamic-changes/mixed/reftest_border_abspos-stylo.list b/layout/reftests/position-dynamic-changes/mixed/reftest_border_abspos-stylo.list deleted file mode 100644 index 16be2a7466..0000000000 --- a/layout/reftests/position-dynamic-changes/mixed/reftest_border_abspos-stylo.list +++ /dev/null @@ -1,5 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Please see the comment at the beginning of reftest-stylo.list - -== mixed-dimentionN.html?border_abspos mixed-dimentionN.html?border_abspos -== mixed-dimentionA.html?border_abspos mixed-dimentionA.html?border_abspos diff --git a/layout/reftests/position-dynamic-changes/mixed/reftest_border_parent-stylo.list b/layout/reftests/position-dynamic-changes/mixed/reftest_border_parent-stylo.list deleted file mode 100644 index 18837423c7..0000000000 --- a/layout/reftests/position-dynamic-changes/mixed/reftest_border_parent-stylo.list +++ /dev/null @@ -1,5 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Please see the comment at the beginning of reftest-stylo.list - -== mixed-dimentionN.html?border_parent mixed-dimentionN.html?border_parent -== mixed-dimentionA.html?border_parent mixed-dimentionA.html?border_parent diff --git a/layout/reftests/position-dynamic-changes/mixed/reftest_margin_abspos-stylo.list b/layout/reftests/position-dynamic-changes/mixed/reftest_margin_abspos-stylo.list deleted file mode 100644 index 6fd1d12984..0000000000 --- a/layout/reftests/position-dynamic-changes/mixed/reftest_margin_abspos-stylo.list +++ /dev/null @@ -1,5 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Please see the comment at the beginning of reftest-stylo.list - -== mixed-dimentionN.html?margin_abspos mixed-dimentionN.html?margin_abspos -== mixed-dimentionA.html?margin_abspos mixed-dimentionA.html?margin_abspos diff --git a/layout/reftests/position-dynamic-changes/mixed/reftest_margin_parent-stylo.list b/layout/reftests/position-dynamic-changes/mixed/reftest_margin_parent-stylo.list deleted file mode 100644 index 694b02ac52..0000000000 --- a/layout/reftests/position-dynamic-changes/mixed/reftest_margin_parent-stylo.list +++ /dev/null @@ -1,5 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Please see the comment at the beginning of reftest-stylo.list - -== mixed-dimentionN.html?margin_parent mixed-dimentionN.html?margin_parent -== mixed-dimentionA.html?margin_parent mixed-dimentionA.html?margin_parent diff --git a/layout/reftests/position-dynamic-changes/mixed/reftest_padding_abspos-stylo.list b/layout/reftests/position-dynamic-changes/mixed/reftest_padding_abspos-stylo.list deleted file mode 100644 index ee39bf65b1..0000000000 --- a/layout/reftests/position-dynamic-changes/mixed/reftest_padding_abspos-stylo.list +++ /dev/null @@ -1,5 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Please see the comment at the beginning of reftest-stylo.list - -== mixed-dimentionN.html?padding_abspos mixed-dimentionN.html?padding_abspos -== mixed-dimentionA.html?padding_abspos mixed-dimentionA.html?padding_abspos diff --git a/layout/reftests/position-dynamic-changes/mixed/reftest_padding_parent-stylo.list b/layout/reftests/position-dynamic-changes/mixed/reftest_padding_parent-stylo.list deleted file mode 100644 index 684d3eec62..0000000000 --- a/layout/reftests/position-dynamic-changes/mixed/reftest_padding_parent-stylo.list +++ /dev/null @@ -1,5 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Please see the comment at the beginning of reftest-stylo.list - -== mixed-dimentionN.html?padding_parent mixed-dimentionN.html?padding_parent -== mixed-dimentionA.html?padding_parent mixed-dimentionA.html?padding_parent diff --git a/layout/reftests/position-dynamic-changes/mixed/reftest_plain-stylo.list b/layout/reftests/position-dynamic-changes/mixed/reftest_plain-stylo.list deleted file mode 100644 index d439f50299..0000000000 --- a/layout/reftests/position-dynamic-changes/mixed/reftest_plain-stylo.list +++ /dev/null @@ -1,5 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Please see the comment at the beginning of reftest-stylo.list - -== mixed-dimentionN.html mixed-dimentionN.html -== mixed-dimentionA.html mixed-dimentionA.html diff --git a/layout/reftests/position-dynamic-changes/vertical/reftest_border_abspos-stylo.list b/layout/reftests/position-dynamic-changes/vertical/reftest_border_abspos-stylo.list deleted file mode 100644 index c58e38818a..0000000000 --- a/layout/reftests/position-dynamic-changes/vertical/reftest_border_abspos-stylo.list +++ /dev/null @@ -1,22 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Please see the comment at the beginning of reftest-stylo.list - -== topN-heightA-bottomA.html?border_abspos topN-heightA-bottomA.html?border_abspos -== topN-heightA-bottomN.html?border_abspos topN-heightA-bottomN.html?border_abspos -== topA-heightN-bottomA.html?border_abspos topA-heightN-bottomA.html?border_abspos -== topN-heightN-bottomA.html?border_abspos topN-heightN-bottomA.html?border_abspos -== topA-heightN-bottomN.html?border_abspos topA-heightN-bottomN.html?border_abspos -== topA-heightA-bottomN.html?border_abspos topA-heightA-bottomN.html?border_abspos -skip == toauto-topN-heightA-bottomA.html?border_abspos toauto-topN-heightA-bottomA.html?border_abspos -== toauto-topN-heightA-bottomN.html?border_abspos toauto-topN-heightA-bottomN.html?border_abspos -== toauto-topA-heightN-bottomA.html?border_abspos toauto-topA-heightN-bottomA.html?border_abspos -== toauto-topN-heightN-bottomA.html?border_abspos toauto-topN-heightN-bottomA.html?border_abspos -== toauto-topA-heightN-bottomN.html?border_abspos toauto-topA-heightN-bottomN.html?border_abspos -== toauto-topA-heightA-bottomN.html?border_abspos toauto-topA-heightA-bottomN.html?border_abspos -== fromauto-topN-heightA-bottomA.html?border_abspos fromauto-topN-heightA-bottomA.html?border_abspos -skip-if(B2G||Mulet) == fromauto-topN-heightA-bottomN.html?border_abspos fromauto-topN-heightA-bottomN.html?border_abspos -# Initial mulet triage: parity with B2G/B2G Desktop -== fromauto-topA-heightN-bottomA.html?border_abspos fromauto-topA-heightN-bottomA.html?border_abspos -== fromauto-topN-heightN-bottomA.html?border_abspos fromauto-topN-heightN-bottomA.html?border_abspos -== fromauto-topA-heightN-bottomN.html?border_abspos fromauto-topA-heightN-bottomN.html?border_abspos -== fromauto-topA-heightA-bottomN.html?border_abspos fromauto-topA-heightA-bottomN.html?border_abspos diff --git a/layout/reftests/position-dynamic-changes/vertical/reftest_border_parent-stylo.list b/layout/reftests/position-dynamic-changes/vertical/reftest_border_parent-stylo.list deleted file mode 100644 index 662d5c5eae..0000000000 --- a/layout/reftests/position-dynamic-changes/vertical/reftest_border_parent-stylo.list +++ /dev/null @@ -1,21 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Please see the comment at the beginning of reftest-stylo.list - -== topN-heightA-bottomA.html?border_parent topN-heightA-bottomA.html?border_parent -== topN-heightA-bottomN.html?border_parent topN-heightA-bottomN.html?border_parent -== topA-heightN-bottomA.html?border_parent topA-heightN-bottomA.html?border_parent -== topN-heightN-bottomA.html?border_parent topN-heightN-bottomA.html?border_parent -== topA-heightN-bottomN.html?border_parent topA-heightN-bottomN.html?border_parent -== topA-heightA-bottomN.html?border_parent topA-heightA-bottomN.html?border_parent -skip == toauto-topN-heightA-bottomA.html?border_parent toauto-topN-heightA-bottomA.html?border_parent -== toauto-topN-heightA-bottomN.html?border_parent toauto-topN-heightA-bottomN.html?border_parent -== toauto-topA-heightN-bottomA.html?border_parent toauto-topA-heightN-bottomA.html?border_parent -== toauto-topN-heightN-bottomA.html?border_parent toauto-topN-heightN-bottomA.html?border_parent -== toauto-topA-heightN-bottomN.html?border_parent toauto-topA-heightN-bottomN.html?border_parent -== toauto-topA-heightA-bottomN.html?border_parent toauto-topA-heightA-bottomN.html?border_parent -== fromauto-topN-heightA-bottomA.html?border_parent fromauto-topN-heightA-bottomA.html?border_parent -== fromauto-topN-heightA-bottomN.html?border_parent fromauto-topN-heightA-bottomN.html?border_parent -== fromauto-topA-heightN-bottomA.html?border_parent fromauto-topA-heightN-bottomA.html?border_parent -== fromauto-topN-heightN-bottomA.html?border_parent fromauto-topN-heightN-bottomA.html?border_parent -== fromauto-topA-heightN-bottomN.html?border_parent fromauto-topA-heightN-bottomN.html?border_parent -== fromauto-topA-heightA-bottomN.html?border_parent fromauto-topA-heightA-bottomN.html?border_parent diff --git a/layout/reftests/position-dynamic-changes/vertical/reftest_margin_abspos-stylo.list b/layout/reftests/position-dynamic-changes/vertical/reftest_margin_abspos-stylo.list deleted file mode 100644 index 232bcad441..0000000000 --- a/layout/reftests/position-dynamic-changes/vertical/reftest_margin_abspos-stylo.list +++ /dev/null @@ -1,21 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Please see the comment at the beginning of reftest-stylo.list - -== topN-heightA-bottomA.html?margin_abspos topN-heightA-bottomA.html?margin_abspos -== topN-heightA-bottomN.html?margin_abspos topN-heightA-bottomN.html?margin_abspos -== topA-heightN-bottomA.html?margin_abspos topA-heightN-bottomA.html?margin_abspos -== topN-heightN-bottomA.html?margin_abspos topN-heightN-bottomA.html?margin_abspos -== topA-heightN-bottomN.html?margin_abspos topA-heightN-bottomN.html?margin_abspos -== topA-heightA-bottomN.html?margin_abspos topA-heightA-bottomN.html?margin_abspos -skip == toauto-topN-heightA-bottomA.html?margin_abspos toauto-topN-heightA-bottomA.html?margin_abspos -== toauto-topN-heightA-bottomN.html?margin_abspos toauto-topN-heightA-bottomN.html?margin_abspos -== toauto-topA-heightN-bottomA.html?margin_abspos toauto-topA-heightN-bottomA.html?margin_abspos -== toauto-topN-heightN-bottomA.html?margin_abspos toauto-topN-heightN-bottomA.html?margin_abspos -== toauto-topA-heightN-bottomN.html?margin_abspos toauto-topA-heightN-bottomN.html?margin_abspos -== toauto-topA-heightA-bottomN.html?margin_abspos toauto-topA-heightA-bottomN.html?margin_abspos -== fromauto-topN-heightA-bottomA.html?margin_abspos fromauto-topN-heightA-bottomA.html?margin_abspos -== fromauto-topN-heightA-bottomN.html?margin_abspos fromauto-topN-heightA-bottomN.html?margin_abspos -== fromauto-topA-heightN-bottomA.html?margin_abspos fromauto-topA-heightN-bottomA.html?margin_abspos -== fromauto-topN-heightN-bottomA.html?margin_abspos fromauto-topN-heightN-bottomA.html?margin_abspos -== fromauto-topA-heightN-bottomN.html?margin_abspos fromauto-topA-heightN-bottomN.html?margin_abspos -== fromauto-topA-heightA-bottomN.html?margin_abspos fromauto-topA-heightA-bottomN.html?margin_abspos diff --git a/layout/reftests/position-dynamic-changes/vertical/reftest_margin_parent-stylo.list b/layout/reftests/position-dynamic-changes/vertical/reftest_margin_parent-stylo.list deleted file mode 100644 index 4d02c2da91..0000000000 --- a/layout/reftests/position-dynamic-changes/vertical/reftest_margin_parent-stylo.list +++ /dev/null @@ -1,21 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Please see the comment at the beginning of reftest-stylo.list - -== topN-heightA-bottomA.html?margin_parent topN-heightA-bottomA.html?margin_parent -== topN-heightA-bottomN.html?margin_parent topN-heightA-bottomN.html?margin_parent -== topA-heightN-bottomA.html?margin_parent topA-heightN-bottomA.html?margin_parent -== topN-heightN-bottomA.html?margin_parent topN-heightN-bottomA.html?margin_parent -== topA-heightN-bottomN.html?margin_parent topA-heightN-bottomN.html?margin_parent -== topA-heightA-bottomN.html?margin_parent topA-heightA-bottomN.html?margin_parent -skip == toauto-topN-heightA-bottomA.html?margin_parent toauto-topN-heightA-bottomA.html?margin_parent -== toauto-topN-heightA-bottomN.html?margin_parent toauto-topN-heightA-bottomN.html?margin_parent -== toauto-topA-heightN-bottomA.html?margin_parent toauto-topA-heightN-bottomA.html?margin_parent -== toauto-topN-heightN-bottomA.html?margin_parent toauto-topN-heightN-bottomA.html?margin_parent -== toauto-topA-heightN-bottomN.html?margin_parent toauto-topA-heightN-bottomN.html?margin_parent -== toauto-topA-heightA-bottomN.html?margin_parent toauto-topA-heightA-bottomN.html?margin_parent -== fromauto-topN-heightA-bottomA.html?margin_parent fromauto-topN-heightA-bottomA.html?margin_parent -== fromauto-topN-heightA-bottomN.html?margin_parent fromauto-topN-heightA-bottomN.html?margin_parent -== fromauto-topA-heightN-bottomA.html?margin_parent fromauto-topA-heightN-bottomA.html?margin_parent -== fromauto-topN-heightN-bottomA.html?margin_parent fromauto-topN-heightN-bottomA.html?margin_parent -== fromauto-topA-heightN-bottomN.html?margin_parent fromauto-topA-heightN-bottomN.html?margin_parent -== fromauto-topA-heightA-bottomN.html?margin_parent fromauto-topA-heightA-bottomN.html?margin_parent diff --git a/layout/reftests/position-dynamic-changes/vertical/reftest_padding_abspos-stylo.list b/layout/reftests/position-dynamic-changes/vertical/reftest_padding_abspos-stylo.list deleted file mode 100644 index b4d4ee3f28..0000000000 --- a/layout/reftests/position-dynamic-changes/vertical/reftest_padding_abspos-stylo.list +++ /dev/null @@ -1,21 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Please see the comment at the beginning of reftest-stylo.list - -== topN-heightA-bottomA.html?padding_abspos topN-heightA-bottomA.html?padding_abspos -== topN-heightA-bottomN.html?padding_abspos topN-heightA-bottomN.html?padding_abspos -== topA-heightN-bottomA.html?padding_abspos topA-heightN-bottomA.html?padding_abspos -== topN-heightN-bottomA.html?padding_abspos topN-heightN-bottomA.html?padding_abspos -== topA-heightN-bottomN.html?padding_abspos topA-heightN-bottomN.html?padding_abspos -== topA-heightA-bottomN.html?padding_abspos topA-heightA-bottomN.html?padding_abspos -skip == toauto-topN-heightA-bottomA.html?padding_abspos toauto-topN-heightA-bottomA.html?padding_abspos -== toauto-topN-heightA-bottomN.html?padding_abspos toauto-topN-heightA-bottomN.html?padding_abspos -== toauto-topA-heightN-bottomA.html?padding_abspos toauto-topA-heightN-bottomA.html?padding_abspos -== toauto-topN-heightN-bottomA.html?padding_abspos toauto-topN-heightN-bottomA.html?padding_abspos -== toauto-topA-heightN-bottomN.html?padding_abspos toauto-topA-heightN-bottomN.html?padding_abspos -== toauto-topA-heightA-bottomN.html?padding_abspos toauto-topA-heightA-bottomN.html?padding_abspos -== fromauto-topN-heightA-bottomA.html?padding_abspos fromauto-topN-heightA-bottomA.html?padding_abspos -== fromauto-topN-heightA-bottomN.html?padding_abspos fromauto-topN-heightA-bottomN.html?padding_abspos -== fromauto-topA-heightN-bottomA.html?padding_abspos fromauto-topA-heightN-bottomA.html?padding_abspos -== fromauto-topN-heightN-bottomA.html?padding_abspos fromauto-topN-heightN-bottomA.html?padding_abspos -== fromauto-topA-heightN-bottomN.html?padding_abspos fromauto-topA-heightN-bottomN.html?padding_abspos -== fromauto-topA-heightA-bottomN.html?padding_abspos fromauto-topA-heightA-bottomN.html?padding_abspos diff --git a/layout/reftests/position-dynamic-changes/vertical/reftest_padding_parent-stylo.list b/layout/reftests/position-dynamic-changes/vertical/reftest_padding_parent-stylo.list deleted file mode 100644 index 4cf9a1139c..0000000000 --- a/layout/reftests/position-dynamic-changes/vertical/reftest_padding_parent-stylo.list +++ /dev/null @@ -1,21 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Please see the comment at the beginning of reftest-stylo.list - -== topN-heightA-bottomA.html?padding_parent topN-heightA-bottomA.html?padding_parent -== topN-heightA-bottomN.html?padding_parent topN-heightA-bottomN.html?padding_parent -== topA-heightN-bottomA.html?padding_parent topA-heightN-bottomA.html?padding_parent -== topN-heightN-bottomA.html?padding_parent topN-heightN-bottomA.html?padding_parent -== topA-heightN-bottomN.html?padding_parent topA-heightN-bottomN.html?padding_parent -skip == topA-heightA-bottomN.html?padding_parent topA-heightA-bottomN.html?padding_parent -skip == toauto-topN-heightA-bottomA.html?padding_parent toauto-topN-heightA-bottomA.html?padding_parent -== toauto-topN-heightA-bottomN.html?padding_parent toauto-topN-heightA-bottomN.html?padding_parent -== toauto-topA-heightN-bottomA.html?padding_parent toauto-topA-heightN-bottomA.html?padding_parent -== toauto-topN-heightN-bottomA.html?padding_parent toauto-topN-heightN-bottomA.html?padding_parent -== toauto-topA-heightN-bottomN.html?padding_parent toauto-topA-heightN-bottomN.html?padding_parent -skip == toauto-topA-heightA-bottomN.html?padding_parent toauto-topA-heightA-bottomN.html?padding_parent -== fromauto-topN-heightA-bottomA.html?padding_parent fromauto-topN-heightA-bottomA.html?padding_parent -== fromauto-topN-heightA-bottomN.html?padding_parent fromauto-topN-heightA-bottomN.html?padding_parent -== fromauto-topA-heightN-bottomA.html?padding_parent fromauto-topA-heightN-bottomA.html?padding_parent -== fromauto-topN-heightN-bottomA.html?padding_parent fromauto-topN-heightN-bottomA.html?padding_parent -== fromauto-topA-heightN-bottomN.html?padding_parent fromauto-topA-heightN-bottomN.html?padding_parent -skip == fromauto-topA-heightA-bottomN.html?padding_parent fromauto-topA-heightA-bottomN.html?padding_parent diff --git a/layout/reftests/position-dynamic-changes/vertical/reftest_plain-stylo.list b/layout/reftests/position-dynamic-changes/vertical/reftest_plain-stylo.list deleted file mode 100644 index 54aaec4ddf..0000000000 --- a/layout/reftests/position-dynamic-changes/vertical/reftest_plain-stylo.list +++ /dev/null @@ -1,21 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# Please see the comment at the beginning of reftest-stylo.list - -== topN-heightA-bottomA.html topN-heightA-bottomA.html -== topN-heightA-bottomN.html topN-heightA-bottomN.html -== topA-heightN-bottomA.html topA-heightN-bottomA.html -== topN-heightN-bottomA.html topN-heightN-bottomA.html -== topA-heightN-bottomN.html topA-heightN-bottomN.html -== topA-heightA-bottomN.html topA-heightA-bottomN.html -skip == toauto-topN-heightA-bottomA.html toauto-topN-heightA-bottomA.html -== toauto-topN-heightA-bottomN.html toauto-topN-heightA-bottomN.html -== toauto-topA-heightN-bottomA.html toauto-topA-heightN-bottomA.html -== toauto-topN-heightN-bottomA.html toauto-topN-heightN-bottomA.html -== toauto-topA-heightN-bottomN.html toauto-topA-heightN-bottomN.html -== toauto-topA-heightA-bottomN.html toauto-topA-heightA-bottomN.html -== fromauto-topN-heightA-bottomA.html fromauto-topN-heightA-bottomA.html -== fromauto-topN-heightA-bottomN.html fromauto-topN-heightA-bottomN.html -== fromauto-topA-heightN-bottomA.html fromauto-topA-heightN-bottomA.html -== fromauto-topN-heightN-bottomA.html fromauto-topN-heightN-bottomA.html -== fromauto-topA-heightN-bottomN.html fromauto-topA-heightN-bottomN.html -== fromauto-topA-heightA-bottomN.html fromauto-topA-heightA-bottomN.html diff --git a/layout/reftests/reftest-sanity/default-preferences-tests-stylo.list b/layout/reftests/reftest-sanity/default-preferences-tests-stylo.list deleted file mode 100644 index 907f56c8f9..0000000000 --- a/layout/reftests/reftest-sanity/default-preferences-tests-stylo.list +++ /dev/null @@ -1,29 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# test default-preferences - -# test default-preferences with a pref() -default-preferences pref(font.size.variable.x-western,24) -skip == font-default.html font-default.html -skip == font-default.html font-default.html - -# test that a default preference can be overridden -skip pref(font.size.variable.x-western,16) == font-default.html font-default.html -skip pref(font.size.variable.x-western,16) == font-default.html font-default.html - -# test that default preferences are kept when other test-specific preferences are set -skip pref(font.size.variable.zh-HK,36) == font-default.html font-default.html -skip pref(font.size.variable.zh-HK,36) == font-default.html font-default.html - -# test default-preferences with test-pref() and ref-pref() -default-preferences test-pref(font.size.variable.x-western,16) ref-pref(font.size.variable.x-western,24) -skip == font-default.html font-default.html -skip == font-default.html font-default.html -== font-size-24.html font-size-24.html - -# test that default-preferences does not apply to include commands -include default-preferences-include.list - -# test resetting default-preferences -default-preferences -skip == font-default.html font-default.html - diff --git a/layout/reftests/reftest-sanity/scripttests-stylo.list b/layout/reftests/reftest-sanity/scripttests-stylo.list deleted file mode 100644 index e6d0fce27d..0000000000 --- a/layout/reftests/reftest-sanity/scripttests-stylo.list +++ /dev/null @@ -1,11 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# test script keyword. - -# cases where the test does not include an appropriate getTestCases() function, -# or where getTestCases() does not return an array of objects with methods -# testPassed() and testDescription() can not be included since they always -# produce unexpected failures. - -script scripttest-pass.html -skip script scripttest-fail.html -fails script scripttest-pass-fail.html diff --git a/layout/reftests/reftest-sanity/urlprefixtests-stylo.list b/layout/reftests/reftest-sanity/urlprefixtests-stylo.list deleted file mode 100644 index fd02628ef5..0000000000 --- a/layout/reftests/reftest-sanity/urlprefixtests-stylo.list +++ /dev/null @@ -1,24 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -# test url-prefix - -# test that url-prefix is not be applied to absolute uris. -url-prefix absolute - -== data:text/html, data:text/html, -skip == data:text/plain, data:text/plain, -skip == data:text/plain,HELLO data:text/plain,HELLO - -# test that url-prefix is applied to test items. -url-prefix prefix- - -script suffix.html - -# test if url-prefix containing / works. -url-prefix prefix/ - -script suffix.html - -# test that url-prefix should not be applied to include commands. - -include urlprefixtests-include.list - diff --git a/layout/tables/reftests/reftest-stylo.list b/layout/tables/reftests/reftest-stylo.list deleted file mode 100644 index b1315a657f..0000000000 --- a/layout/tables/reftests/reftest-stylo.list +++ /dev/null @@ -1,10 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -== 1031934.html 1031934.html -== 1220621-1a.html 1220621-1a.html -== 1220621-1b.html 1220621-1b.html -== 1220621-1c.html 1220621-1c.html -== 1220621-1d.html 1220621-1d.html -== 1220621-1e.html 1220621-1e.html -== 1220621-1f.html 1220621-1f.html -== 1220621-2a.html 1220621-2a.html -== 1220621-2b.html 1220621-2b.html diff --git a/layout/xul/grid/reftests/reftest-stylo.list b/layout/xul/grid/reftests/reftest-stylo.list deleted file mode 100644 index eb73955c9a..0000000000 --- a/layout/xul/grid/reftests/reftest-stylo.list +++ /dev/null @@ -1,38 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -skip-if((B2G&&browserIsRemote)||Mulet) == row-sizing-1.xul row-sizing-1.xul -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if((B2G&&browserIsRemote)||Mulet) == column-sizing-1.xul column-sizing-1.xul -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if((B2G&&browserIsRemote)||Mulet) == row-or-column-sizing-1.xul row-or-column-sizing-1.xul -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if((B2G&&browserIsRemote)||Mulet) == row-or-column-sizing-1.xul row-or-column-sizing-1.xul -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if((B2G&&browserIsRemote)||Mulet) == row-or-column-sizing-1.xul row-or-column-sizing-1.xul -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if((B2G&&browserIsRemote)||Mulet) fuzzy-if(skiaContent,1,60000) == z-order-1.xul z-order-1.xul -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if((B2G&&browserIsRemote)||Mulet) fuzzy-if(skiaContent,1,60000) == z-order-2.xul z-order-2.xul -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if((B2G&&browserIsRemote)||Mulet) fuzzy-if(skiaContent,1,60000) == not-full-basic.xul not-full-basic.xul -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if((B2G&&browserIsRemote)||Mulet) fuzzy-if(skiaContent,1,110000) == not-full-grid-pack-align.xul not-full-grid-pack-align.xul -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if((B2G&&browserIsRemote)||Mulet) fuzzy-if(skiaContent,1,30000) == not-full-row-group-align.xul not-full-row-group-align.xul -# does anyone want/need this behavior? -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if((B2G&&browserIsRemote)||Mulet) fuzzy-if(skiaContent,1,10000) == not-full-row-group-pack.xul not-full-row-group-pack.xul -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if((B2G&&browserIsRemote)||Mulet) fuzzy-if(skiaContent,1,50000) == not-full-row-group-direction.xul not-full-row-group-direction.xul -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if((B2G&&browserIsRemote)||Mulet) fuzzy-if(skiaContent,1,60000) == not-full-row-leaf-align.xul not-full-row-leaf-align.xul -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if((B2G&&browserIsRemote)||Mulet) fuzzy-if(skiaContent,1,50000) == not-full-row-leaf-pack.xul not-full-row-leaf-pack.xul -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if((B2G&&browserIsRemote)||Mulet) fuzzy-if(skiaContent,1,80000) == not-full-row-leaf-direction.xul not-full-row-leaf-direction.xul -skip-if(B2G||Mulet) random-if(transparentScrollbars) fuzzy-if(OSX==1010,1,565) == scrollable-columns.xul scrollable-columns.xul -# bug 650597 -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if((B2G&&browserIsRemote)||Mulet) == scrollable-rows.xul scrollable-rows.xul -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if((B2G&&browserIsRemote)||Mulet) == sizing-2d.xul sizing-2d.xul -# Initial mulet triage: parity with B2G/B2G Desktop diff --git a/layout/xul/reftest/reftest-stylo.list b/layout/xul/reftest/reftest-stylo.list deleted file mode 100644 index 5a96bfb117..0000000000 --- a/layout/xul/reftest/reftest-stylo.list +++ /dev/null @@ -1,14 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -fails-if(Android||B2G) skip-if((B2G&&browserIsRemote)||Mulet) == textbox-multiline-noresize.xul textbox-multiline-noresize.xul -# reference is blank on Android (due to no native theme support?) -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if((B2G&&browserIsRemote)||Mulet) == textbox-multiline-resize.xul textbox-multiline-resize.xul -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if((B2G&&browserIsRemote)||Mulet) == popup-explicit-size.xul popup-explicit-size.xul -# Initial mulet triage: parity with B2G/B2G Desktop -random-if(Android) skip-if((B2G&&browserIsRemote)||Mulet) == image-size.xul image-size.xul -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if((B2G&&browserIsRemote)||Mulet) == image-scaling-min-height-1.xul image-scaling-min-height-1.xul -# Initial mulet triage: parity with B2G/B2G Desktop -skip-if((B2G&&browserIsRemote)||Mulet) == textbox-text-transform.xul textbox-text-transform.xul -# Initial mulet triage: parity with B2G/B2G Desktop diff --git a/netwerk/test/reftest/reftest-stylo.list b/netwerk/test/reftest/reftest-stylo.list deleted file mode 100644 index d96477f0d5..0000000000 --- a/netwerk/test/reftest/reftest-stylo.list +++ /dev/null @@ -1,3 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -== bug565432-1.html bug565432-1.html -== 658949-1.html 658949-1.html diff --git a/parser/htmlparser/tests/reftest/reftest-stylo.list b/parser/htmlparser/tests/reftest/reftest-stylo.list deleted file mode 100644 index 30686c95d1..0000000000 --- a/parser/htmlparser/tests/reftest/reftest-stylo.list +++ /dev/null @@ -1,26 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -== bug535530-1.html bug535530-1.html -skip == view-source:bug535530-2.html view-source:bug535530-2.html -== bug566280-1.html bug566280-1.html -== bug577418-1.html bug577418-1.html -== bug582788-1.html bug582788-1.html -skip-if(B2G) fuzzy-if(skiaContent,2,5) == bug582940-1.html bug582940-1.html -random == bug592656-1.html bug592656-1.html -# skip fuzzy-if(skiaContent,1,5) == bug599320-1.html bug599320-1.html -skip fuzzy-if(skiaContent,2,5) == bug608373-1.html bug608373-1.html -fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,73,1) == view-source:bug482921-1.html view-source:bug482921-1.html -== view-source:bug482921-2.xhtml view-source:bug482921-2.xhtml -fuzzy-if(skiaContent,2,5) == bug659763-1.html bug659763-1.html -fuzzy-if(skiaContent,1,5) == bug659763-2.html bug659763-2.html -skip fuzzy-if(skiaContent,1,5) == bug659763-3.html bug659763-3.html -fails fuzzy-if(skiaContent,2,3) == bug659763-4.html bug659763-4.html -fails fuzzy-if(skiaContent,1,5) == bug659763-5.html bug659763-5.html -fails fuzzy-if(skiaContent,1,5) == bug659763-6.html bug659763-6.html -skip skip-if(B2G) == view-source:bug673094-1.html view-source:bug673094-1.html -random == bug696651-1.html bug696651-1.html -skip-if(B2G) == bug696651-2.html bug696651-2.html -== view-source:bug700260-1.html view-source:bug700260-1.html -== view-source:bug704667-1.html view-source:bug704667-1.html -== view-source:bug731234-1.html view-source:bug731234-1.html -== bug820508-1.html bug820508-1.html -skip == view-source:bug910588-1.html view-source:bug910588-1.html diff --git a/python/mozbuild/mozbuild/test/frontend/data/files-test-metadata/default/tests/reftests/reftest-stylo.list b/python/mozbuild/mozbuild/test/frontend/data/files-test-metadata/default/tests/reftests/reftest-stylo.list deleted file mode 100644 index 252a5b9862..0000000000 --- a/python/mozbuild/mozbuild/test/frontend/data/files-test-metadata/default/tests/reftests/reftest-stylo.list +++ /dev/null @@ -1,2 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -== test1.html test1.html diff --git a/python/mozbuild/mozbuild/test/frontend/data/test-manifest-emitted-includes/reftest-stylo.list b/python/mozbuild/mozbuild/test/frontend/data/test-manifest-emitted-includes/reftest-stylo.list deleted file mode 100644 index 237aea0e09..0000000000 --- a/python/mozbuild/mozbuild/test/frontend/data/test-manifest-emitted-includes/reftest-stylo.list +++ /dev/null @@ -1,3 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -== reftest1.html reftest1.html -include included-reftest-stylo.list diff --git a/python/mozbuild/mozbuild/test/frontend/data/test-manifest-keys-extracted/reftest-stylo.list b/python/mozbuild/mozbuild/test/frontend/data/test-manifest-keys-extracted/reftest-stylo.list deleted file mode 100644 index bd7b4f9cb8..0000000000 --- a/python/mozbuild/mozbuild/test/frontend/data/test-manifest-keys-extracted/reftest-stylo.list +++ /dev/null @@ -1,2 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -== reftest1.html reftest1.html diff --git a/toolkit/content/tests/reftests/reftest-stylo.list b/toolkit/content/tests/reftests/reftest-stylo.list deleted file mode 100644 index 77caaabfcb..0000000000 --- a/toolkit/content/tests/reftests/reftest-stylo.list +++ /dev/null @@ -1,6 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -skip-if(B2G&&browserIsRemote) random-if(cocoaWidget) == bug-442419-progressmeter-max.xul bug-442419-progressmeter-max.xul -# fails most of the time on Mac because progress meter animates -# Bug 974780 -skip-if(B2G&&browserIsRemote) == textbox-multiline-default-value.xul textbox-multiline-default-value.xul -# Bug 974780 diff --git a/toolkit/themes/osx/reftests/reftest-stylo.list b/toolkit/themes/osx/reftests/reftest-stylo.list deleted file mode 100644 index 82df4273dc..0000000000 --- a/toolkit/themes/osx/reftests/reftest-stylo.list +++ /dev/null @@ -1,6 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -skip-if(!cocoaWidget) == 482681.xul 482681.xul -skip-if(!cocoaWidget) == radiosize.xul radiosize.xul -skip-if(!cocoaWidget) == checkboxsize.xul checkboxsize.xul -skip-if(!cocoaWidget) == baseline.xul baseline.xul -skip-if(!cocoaWidget) == nostretch.xul nostretch.xul diff --git a/widget/reftests/reftest-stylo.list b/widget/reftests/reftest-stylo.list deleted file mode 100644 index 86ac4e30eb..0000000000 --- a/widget/reftests/reftest-stylo.list +++ /dev/null @@ -1,8 +0,0 @@ -# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing -skip-if(!cocoaWidget) == 507947.html 507947.html -== progressbar-fallback-default-style.html progressbar-fallback-default-style.html -fuzzy-if(Android,17,1120) == meter-native-style.html meter-native-style.html -fails skip-if(!cocoaWidget) == meter-vertical-native-style.html meter-vertical-native-style.html -# dithering -== meter-fallback-default-style.html meter-fallback-default-style.html -load 664925.xhtml From 88ac168f96b1c6b95d5de48ee101713df2bbb290 Mon Sep 17 00:00:00 2001 From: FranklinDM Date: Sun, 24 Mar 2024 20:28:40 +0800 Subject: [PATCH 05/33] Issue #2112 - Part 2: Stub out Servo functions --- layout/base/ServoRestyleManager.cpp | 442 +---------------------- layout/base/ServoRestyleManager.h | 8 +- layout/style/ServoBindings.cpp | 463 +++---------------------- layout/style/ServoDeclarationBlock.cpp | 41 +-- layout/style/ServoElementSnapshot.cpp | 19 - layout/style/ServoElementSnapshot.h | 36 +- layout/style/ServoStyleSet.cpp | 255 +------------- layout/style/ServoStyleSheet.cpp | 41 +-- 8 files changed, 77 insertions(+), 1228 deletions(-) diff --git a/layout/base/ServoRestyleManager.cpp b/layout/base/ServoRestyleManager.cpp index 9ff3f4e886..c71524254a 100644 --- a/layout/base/ServoRestyleManager.cpp +++ b/layout/base/ServoRestyleManager.cpp @@ -26,66 +26,28 @@ ServoRestyleManager::PostRestyleEvent(Element* aElement, nsRestyleHint aRestyleHint, nsChangeHint aMinChangeHint) { - if (MOZ_UNLIKELY(IsDisconnected()) || - MOZ_UNLIKELY(PresContext()->PresShell()->IsDestroying())) { - return; - } - - if (aRestyleHint == 0 && !aMinChangeHint && !HasPendingRestyles()) { - return; // Nothing to do. - } - - // XXX This is a temporary hack to make style attribute change works. - // In the future, we should be able to use this hint directly. - if (aRestyleHint & eRestyle_StyleAttribute) { - aRestyleHint &= ~eRestyle_StyleAttribute; - aRestyleHint |= eRestyle_Self | eRestyle_Subtree; - } - - // Note that unlike in Servo, we don't mark elements as dirty until we process - // the restyle hints in ProcessPendingRestyles. - if (aRestyleHint || aMinChangeHint) { - ServoElementSnapshot* snapshot = SnapshotForElement(aElement); - snapshot->AddExplicitRestyleHint(aRestyleHint); - snapshot->AddExplicitChangeHint(aMinChangeHint); - } - - PostRestyleEventInternal(false); } void ServoRestyleManager::PostRestyleEventForLazyConstruction() { - PostRestyleEventInternal(true); } void ServoRestyleManager::RebuildAllStyleData(nsChangeHint aExtraHint, nsRestyleHint aRestyleHint) { - NS_WARNING("stylo: ServoRestyleManager::RebuildAllStyleData not implemented"); } void ServoRestyleManager::PostRebuildAllStyleDataEvent(nsChangeHint aExtraHint, nsRestyleHint aRestyleHint) { - NS_WARNING("stylo: ServoRestyleManager::PostRebuildAllStyleDataEvent not implemented"); } static void MarkSelfAndDescendantsAsNotDirtyForServo(nsIContent* aContent) { - aContent->UnsetIsDirtyForServo(); - - if (aContent->HasDirtyDescendantsForServo()) { - aContent->UnsetHasDirtyDescendantsForServo(); - - StyleChildrenIterator it(aContent); - for (nsIContent* n = it.GetNextChild(); n; n = it.GetNextChild()) { - MarkSelfAndDescendantsAsNotDirtyForServo(n); - } - } } void @@ -94,408 +56,51 @@ ServoRestyleManager::RecreateStyleContexts(nsIContent* aContent, ServoStyleSet* aStyleSet, nsStyleChangeList& aChangeListToProcess) { - MOZ_ASSERT(aContent->IsElement() || aContent->IsNodeOfType(nsINode::eTEXT)); - - nsIFrame* primaryFrame = aContent->GetPrimaryFrame(); - if (!primaryFrame && !aContent->IsDirtyForServo()) { - // This happens when, for example, a display: none child of a - // HAS_DIRTY_DESCENDANTS content is reached as part of the traversal. - MarkSelfAndDescendantsAsNotDirtyForServo(aContent); - return; - } - - // Work on text before. - if (!aContent->IsElement()) { - if (primaryFrame) { - RefPtr oldStyleContext = primaryFrame->StyleContext(); - RefPtr newContext = - aStyleSet->ResolveStyleForText(aContent, aParentContext); - - for (nsIFrame* f = primaryFrame; f; - f = GetNextContinuationWithSameStyle(f, oldStyleContext)) { - f->SetStyleContext(newContext); - } - } - - aContent->UnsetIsDirtyForServo(); - return; - } - - Element* element = aContent->AsElement(); - if (element->IsDirtyForServo()) { - RefPtr computedValues = - Servo_ComputedValues_Get(aContent).Consume(); - MOZ_ASSERT(computedValues); - - nsChangeHint changeHint = nsChangeHint(0); - - // Add an explicit change hint if appropriate. - ServoElementSnapshot* snapshot; - if (mModifiedElements.Get(element, &snapshot)) { - changeHint |= snapshot->ExplicitChangeHint(); - } - - // Add the stored change hint if there's a frame. If there isn't a frame, - // generate a ReconstructFrame change hint if the new display value - // (which we can get from the ComputedValues stored on the node) is not - // none. - if (primaryFrame) { - changeHint |= primaryFrame->StyleContext()->ConsumeStoredChangeHint(); - } else { - const nsStyleDisplay* currentDisplay = - Servo_GetStyleDisplay(computedValues); - if (currentDisplay->mDisplay != StyleDisplay::None) { - changeHint |= nsChangeHint_ReconstructFrame; - } - } - - // Add the new change hint to the list of elements to process if - // we need to do any work. - if (changeHint) { - aChangeListToProcess.AppendChange(primaryFrame, element, changeHint); - } - - // The frame reconstruction step (if needed) will ask for the descendants' - // style correctly. If not needed, we're done too. - // - // Note that we must leave the old style on an existing frame that is - // about to be reframed, since some frame constructor code wants to - // inspect the old style to work out what to do. - if (changeHint & nsChangeHint_ReconstructFrame) { - // Since we might still have some dirty bits set on descendants, - // inconsistent with the clearing of HasDirtyDescendants we will do as - // we return from these recursive RecreateStyleContexts calls, we - // explicitly clear them here. Otherwise we will trigger assertions - // when we soon process the frame reconstruction. - MarkSelfAndDescendantsAsNotDirtyForServo(element); - return; - } - - // If there is no frame, and we didn't generate a ReconstructFrame change - // hint, then we don't need to do any more work. - if (!primaryFrame) { - aContent->UnsetIsDirtyForServo(); - return; - } - - // Hold the old style context alive, because it could become a dangling - // pointer during the replacement. In practice it's not a huge deal (on - // GetNextContinuationWithSameStyle the pointer is not dereferenced, only - // compared), but better not playing with dangling pointers if not needed. - RefPtr oldStyleContext = primaryFrame->StyleContext(); - MOZ_ASSERT(oldStyleContext); - - RefPtr newContext = - aStyleSet->GetContext(computedValues.forget(), aParentContext, nullptr, - CSSPseudoElementType::NotPseudo); - - // XXX This could not always work as expected: there are kinds of content - // with the first split and the last sharing style, but others not. We - // should handle those properly. - for (nsIFrame* f = primaryFrame; f; - f = GetNextContinuationWithSameStyle(f, oldStyleContext)) { - f->SetStyleContext(newContext); - } - - // Update pseudo-elements state if appropriate. - const static CSSPseudoElementType pseudosToRestyle[] = { - CSSPseudoElementType::before, - CSSPseudoElementType::after, - }; - - for (CSSPseudoElementType pseudoType : pseudosToRestyle) { - nsIAtom* pseudoTag = nsCSSPseudoElements::GetPseudoAtom(pseudoType); - - if (nsIFrame* pseudoFrame = FrameForPseudoElement(element, pseudoTag)) { - // TODO: we could maybe make this more performant via calling into - // Servo just once to know which pseudo-elements we've got to restyle? - RefPtr pseudoContext = - aStyleSet->ProbePseudoElementStyle(element, pseudoType, newContext); - - // If pseudoContext is null here, it means the frame is going away, so - // our change hint computation should have already indicated we need - // to reframe. - MOZ_ASSERT_IF(!pseudoContext, - changeHint & nsChangeHint_ReconstructFrame); - if (pseudoContext) { - pseudoFrame->SetStyleContext(pseudoContext); - - // We only care restyling text nodes, since other type of nodes - // (images), are still not supported. If that eventually changes, we - // may have to write more code here... Or not, I don't think too - // many inherited properties can affect those other frames. - StyleChildrenIterator it(pseudoFrame->GetContent()); - for (nsIContent* n = it.GetNextChild(); n; n = it.GetNextChild()) { - if (n->IsNodeOfType(nsINode::eTEXT)) { - RefPtr childContext = - aStyleSet->ResolveStyleForText(n, pseudoContext); - MOZ_ASSERT(n->GetPrimaryFrame(), - "How? This node is created at FC time!"); - n->GetPrimaryFrame()->SetStyleContext(childContext); - } - } - } - } - } - - aContent->UnsetIsDirtyForServo(); - } - - if (aContent->HasDirtyDescendantsForServo()) { - MOZ_ASSERT(primaryFrame, - "Frame construction should be scheduled, and it takes the " - "correct style for the children, so no need to be here."); - StyleChildrenIterator it(aContent); - for (nsIContent* n = it.GetNextChild(); n; n = it.GetNextChild()) { - if (n->IsElement() || n->IsNodeOfType(nsINode::eTEXT)) { - RecreateStyleContexts(n, primaryFrame->StyleContext(), - aStyleSet, aChangeListToProcess); - } - } - aContent->UnsetHasDirtyDescendantsForServo(); - } } static void MarkChildrenAsDirtyForServo(nsIContent* aContent) { - StyleChildrenIterator it(aContent); - - nsIContent* n = it.GetNextChild(); - bool hadChildren = bool(n); - for (; n; n = it.GetNextChild()) { - n->SetIsDirtyForServo(); - } - - if (hadChildren) { - aContent->SetHasDirtyDescendantsForServo(); - } } /* static */ nsIFrame* ServoRestyleManager::FrameForPseudoElement(const nsIContent* aContent, nsIAtom* aPseudoTagOrNull) { - MOZ_ASSERT_IF(aPseudoTagOrNull, aContent->IsElement()); - - if (!aPseudoTagOrNull) { - return aContent->GetPrimaryFrame(); - } - - if (aPseudoTagOrNull == nsCSSPseudoElements::before) { - return nsLayoutUtils::GetBeforeFrame(aContent); - } - - if (aPseudoTagOrNull == nsCSSPseudoElements::after) { - return nsLayoutUtils::GetAfterFrame(aContent); - } - - MOZ_CRASH("Unkown pseudo-element given to " - "ServoRestyleManager::FrameForPseudoElement"); return nullptr; } /* static */ void ServoRestyleManager::NoteRestyleHint(Element* aElement, nsRestyleHint aHint) { - const nsRestyleHint HANDLED_RESTYLE_HINTS = eRestyle_Self | - eRestyle_Subtree | - eRestyle_LaterSiblings | - eRestyle_SomeDescendants; - // NB: For Servo, at least for now, restyling and running selector-matching - // against the subtree is necessary as part of restyling the element, so - // processing eRestyle_Self will perform at least as much work as - // eRestyle_Subtree. - if (aHint & (eRestyle_Self | eRestyle_Subtree)) { - aElement->SetIsDirtyForServo(); - aElement->MarkAncestorsAsHavingDirtyDescendantsForServo(); - // NB: Servo gives us a eRestyle_SomeDescendants when it expects us to run - // selector matching on all the descendants. There's a bug on Servo to align - // meanings here (#12710) to avoid this potential source of confusion. - } else if (aHint & eRestyle_SomeDescendants) { - MarkChildrenAsDirtyForServo(aElement); - aElement->MarkAncestorsAsHavingDirtyDescendantsForServo(); - } - - if (aHint & eRestyle_LaterSiblings) { - aElement->MarkAncestorsAsHavingDirtyDescendantsForServo(); - for (nsIContent* cur = aElement->GetNextSibling(); cur; - cur = cur->GetNextSibling()) { - cur->SetIsDirtyForServo(); - } - } - - // TODO: Handle all other nsRestyleHint values. - if (aHint & ~HANDLED_RESTYLE_HINTS) { - NS_WARNING(nsPrintfCString("stylo: Unhandled restyle hint %s", - RestyleManagerBase::RestyleHintToString(aHint).get()).get()); - } } void ServoRestyleManager::ProcessPendingRestyles() { - MOZ_ASSERT(PresContext()->Document(), "No document? Pshaw!"); - MOZ_ASSERT(!nsContentUtils::IsSafeToRunScript(), "Missing a script blocker!"); - - if (MOZ_UNLIKELY(!PresContext()->PresShell()->DidInitialize())) { - // PresShell::FlushPendingNotifications doesn't early-return in the case - // where the PreShell hasn't yet been initialized (and therefore we haven't - // yet done the initial style traversal of the DOM tree). We should arguably - // fix up the callers and assert against this case, but we just detect and - // handle it for now. - return; - } - - if (!HasPendingRestyles()) { - return; - } - - ServoStyleSet* styleSet = StyleSet(); - nsIDocument* doc = PresContext()->Document(); - Element* root = doc->GetRootElement(); - if (root) { - // ProcessPendingRestyles can generate new restyles (e.g. from the - // frame constructor if it decides that a ReconstructFrame change must - // apply to the parent of the element that generated that hint). So - // we loop while mModifiedElements still has some restyles in it, clearing - // it after each RecreateStyleContexts call below. - while (!mModifiedElements.IsEmpty()) { - for (auto iter = mModifiedElements.Iter(); !iter.Done(); iter.Next()) { - ServoElementSnapshot* snapshot = iter.UserData(); - Element* element = iter.Key(); - - // The element is no longer in the document, so don't bother computing - // a final restyle hint for it. - // - // XXXheycam RestyleTracker checks that the element's GetComposedDoc() - // matches the document we're restyling. Do we need to do that too? - if (!element->IsInComposedDoc()) { - continue; - } - - // TODO: avoid the ComputeRestyleHint call if we already have the highest - // explicit restyle hint? - nsRestyleHint hint = styleSet->ComputeRestyleHint(element, snapshot); - hint |= snapshot->ExplicitRestyleHint(); - - if (hint) { - NoteRestyleHint(element, hint); - } - } - - if (!root->IsDirtyForServo() && !root->HasDirtyDescendantsForServo()) { - mModifiedElements.Clear(); - break; - } - - mInStyleRefresh = true; - styleSet->StyleDocument(/* aLeaveDirtyBits = */ true); - - // First do any queued-up frame creation. (see bugs 827239 and 997506). - // - // XXXEmilio I'm calling this to avoid random behavior changes, since we - // delay frame construction after styling we should re-check once our - // model is more stable whether we can skip this call. - // - // Note this has to be *after* restyling, because otherwise frame - // construction will find unstyled nodes, and that's not funny. - PresContext()->FrameConstructor()->CreateNeededFrames(); - - nsStyleChangeList changeList; - RecreateStyleContexts(root, nullptr, styleSet, changeList); - - mModifiedElements.Clear(); - ProcessRestyledFrames(changeList); - - mInStyleRefresh = false; - } - } - - MOZ_ASSERT(!doc->IsDirtyForServo()); - doc->UnsetHasDirtyDescendantsForServo(); - - IncrementRestyleGeneration(); } void ServoRestyleManager::RestyleForInsertOrChange(nsINode* aContainer, nsIContent* aChild) { - // - // XXXbholley: We need the Gecko logic here to correctly restyle for things - // like :empty and positional selectors (though we may not need to post - // restyle events as agressively as the Gecko path does). - // - // Bug 1297899 tracks this work. - // } void ServoRestyleManager::ContentInserted(nsINode* aContainer, nsIContent* aChild) { - if (aContainer == aContainer->OwnerDoc()) { - // If we're getting this notification for the insertion of a root element, - // that means either: - // (a) We initialized the PresShell before the root element existed, or - // (b) The root element was removed and it or another root is being - // inserted. - // - // Either way the whole tree is dirty, so we should style the document. - MOZ_ASSERT(aChild == aChild->OwnerDoc()->GetRootElement()); - MOZ_ASSERT(aChild->IsDirtyForServo()); - StyleSet()->StyleDocument(/* aLeaveDirtyBits = */ false); - return; - } - - if (!aContainer->HasServoData()) { - // This can happen with display:none. Bug 1297249 tracks more investigation - // and assertions here. - return; - } - - // Style the new subtree because we will most likely need it during subsequent - // frame construction. Bug 1298281 tracks deferring this work in the lazy - // frame construction case. - StyleSet()->StyleNewSubtree(aChild); - - RestyleForInsertOrChange(aContainer, aChild); } void ServoRestyleManager::RestyleForAppend(nsIContent* aContainer, nsIContent* aFirstNewContent) { - // - // XXXbholley: We need the Gecko logic here to correctly restyle for things - // like :empty and positional selectors (though we may not need to post - // restyle events as agressively as the Gecko path does). - // - // Bug 1297899 tracks this work. - // } void ServoRestyleManager::ContentAppended(nsIContent* aContainer, nsIContent* aFirstNewContent) { - if (!aContainer->HasServoData()) { - // This can happen with display:none. Bug 1297249 tracks more investigation - // and assertions here. - return; - } - - // Style the new subtree because we will most likely need it during subsequent - // frame construction. Bug 1298281 tracks deferring this work in the lazy - // frame construction case. - if (aFirstNewContent->GetNextSibling()) { - aContainer->SetHasDirtyDescendantsForServo(); - StyleSet()->StyleNewChildren(aContainer); - } else { - StyleSet()->StyleNewSubtree(aFirstNewContent); - } - - RestyleForAppend(aContainer, aFirstNewContent); } void @@ -503,48 +108,12 @@ ServoRestyleManager::ContentRemoved(nsINode* aContainer, nsIContent* aOldChild, nsIContent* aFollowingSibling) { - NS_WARNING("stylo: ServoRestyleManager::ContentRemoved not implemented"); } void ServoRestyleManager::ContentStateChanged(nsIContent* aContent, EventStates aChangedBits) { - if (!aContent->IsElement()) { - return; - } - - Element* aElement = aContent->AsElement(); - nsChangeHint changeHint; - nsRestyleHint restyleHint; - - // NOTE: restyleHint here is effectively always 0, since that's what - // ServoStyleSet::HasStateDependentStyle returns. Servo computes on - // ProcessPendingRestyles using the ElementSnapshot, but in theory could - // compute it sequentially easily. - // - // Determine what's the best way to do it, and how much work do we save - // processing the restyle hint early (i.e., computing the style hint here - // sequentially, potentially saving the snapshot), vs lazily (snapshot - // approach). - // - // If we take the sequential approach we need to specialize Servo's restyle - // hints system a bit more, and mesure whether we save something storing the - // restyle hint in the table and deferring the dirtiness setting until - // ProcessPendingRestyles (that's a requirement if we store snapshots though), - // vs processing the restyle hint in-place, dirtying the nodes on - // PostRestyleEvent. - // - // If we definitely take the snapshot approach, we should take rid of - // HasStateDependentStyle, etc (though right now they're no-ops). - ContentStateChangedInternal(aElement, aChangedBits, &changeHint, - &restyleHint); - - EventStates previousState = aElement->StyleState() ^ aChangedBits; - ServoElementSnapshot* snapshot = SnapshotForElement(aElement); - snapshot->AddState(previousState); - - PostRestyleEvent(aElement, restyleHint, changeHint); } void @@ -553,8 +122,6 @@ ServoRestyleManager::AttributeWillChange(Element* aElement, nsIAtom* aAttribute, int32_t aModType, const nsAttrValue* aNewValue) { - ServoElementSnapshot* snapshot = SnapshotForElement(aElement); - snapshot->AddAttrs(aElement); } void @@ -562,25 +129,18 @@ ServoRestyleManager::AttributeChanged(Element* aElement, int32_t aNameSpaceID, nsIAtom* aAttribute, int32_t aModType, const nsAttrValue* aOldValue) { - MOZ_ASSERT(SnapshotForElement(aElement)->HasAttrs()); - if (aAttribute == nsGkAtoms::style) { - PostRestyleEvent(aElement, eRestyle_StyleAttribute, nsChangeHint(0)); - } } nsresult ServoRestyleManager::ReparentStyleContext(nsIFrame* aFrame) { - NS_WARNING("stylo: ServoRestyleManager::ReparentStyleContext not implemented"); return NS_OK; } ServoElementSnapshot* ServoRestyleManager::SnapshotForElement(Element* aElement) { - // NB: aElement is the argument for the construction of the snapshot in the - // not found case. - return mModifiedElements.LookupOrAdd(aElement, aElement); + return nullptr; } } // namespace mozilla diff --git a/layout/base/ServoRestyleManager.h b/layout/base/ServoRestyleManager.h index 855b3cab1d..8e52e193ee 100644 --- a/layout/base/ServoRestyleManager.h +++ b/layout/base/ServoRestyleManager.h @@ -77,8 +77,7 @@ public: bool HasPendingRestyles() { - return !mModifiedElements.IsEmpty() || - PresContext()->Document()->HasDirtyDescendantsForServo(); + return false; } @@ -119,10 +118,7 @@ private: inline ServoStyleSet* StyleSet() const { - MOZ_ASSERT(PresContext()->StyleSet()->IsServo(), - "ServoRestyleManager should only be used with a Servo-flavored " - "style backend"); - return PresContext()->StyleSet()->AsServo(); + return nullptr; } }; diff --git a/layout/style/ServoBindings.cpp b/layout/style/ServoBindings.cpp index 5f6842da6b..0433cab914 100644 --- a/layout/style/ServoBindings.cpp +++ b/layout/style/ServoBindings.cpp @@ -52,330 +52,219 @@ IMPL_STRONG_REF_TYPE_FOR(RawServoDeclarationBlock) uint32_t Gecko_ChildrenCount(RawGeckoNodeBorrowed aNode) { - return aNode->GetChildCount(); + return 0; } bool Gecko_NodeIsElement(RawGeckoNodeBorrowed aNode) { - return aNode->IsElement(); + return false; } RawGeckoNodeBorrowedOrNull Gecko_GetParentNode(RawGeckoNodeBorrowed aNode) { - return aNode->GetFlattenedTreeParentNode(); + return nullptr; } RawGeckoNodeBorrowedOrNull Gecko_GetFirstChild(RawGeckoNodeBorrowed aNode) { - return aNode->GetFirstChild(); + return nullptr; } RawGeckoNodeBorrowedOrNull Gecko_GetLastChild(RawGeckoNodeBorrowed aNode) { - return aNode->GetLastChild(); + return nullptr; } RawGeckoNodeBorrowedOrNull Gecko_GetPrevSibling(RawGeckoNodeBorrowed aNode) { - return aNode->GetPreviousSibling(); + return nullptr; } RawGeckoNodeBorrowedOrNull Gecko_GetNextSibling(RawGeckoNodeBorrowed aNode) { - return aNode->GetNextSibling(); + return nullptr; } RawGeckoElementBorrowedOrNull Gecko_GetParentElement(RawGeckoElementBorrowed aElement) { - nsINode* parentNode = aElement->GetFlattenedTreeParentNode(); - return parentNode->IsElement() ? parentNode->AsElement() : nullptr; + return nullptr; } RawGeckoElementBorrowedOrNull Gecko_GetFirstChildElement(RawGeckoElementBorrowed aElement) { - return aElement->GetFirstElementChild(); + return nullptr; } RawGeckoElementBorrowedOrNull Gecko_GetLastChildElement(RawGeckoElementBorrowed aElement) { - return aElement->GetLastElementChild(); + return nullptr; } RawGeckoElementBorrowedOrNull Gecko_GetPrevSiblingElement(RawGeckoElementBorrowed aElement) { - return aElement->GetPreviousElementSibling(); + return nullptr; } RawGeckoElementBorrowedOrNull Gecko_GetNextSiblingElement(RawGeckoElementBorrowed aElement) { - return aElement->GetNextElementSibling(); + return nullptr; } RawGeckoElementBorrowedOrNull Gecko_GetDocumentElement(RawGeckoDocumentBorrowed aDoc) { - return aDoc->GetDocumentElement(); + return nullptr; } StyleChildrenIteratorOwnedOrNull Gecko_MaybeCreateStyleChildrenIterator(RawGeckoNodeBorrowed aNode) { - if (!aNode->IsElement()) { - return nullptr; - } - - const Element* el = aNode->AsElement(); - return StyleChildrenIterator::IsNeeded(el) ? new StyleChildrenIterator(el) - : nullptr; + return nullptr; } void Gecko_DropStyleChildrenIterator(StyleChildrenIteratorOwned aIterator) { - MOZ_ASSERT(aIterator); - delete aIterator; } RawGeckoNodeBorrowed Gecko_GetNextStyleChild(StyleChildrenIteratorBorrowedMut aIterator) { - MOZ_ASSERT(aIterator); - return aIterator->GetNextChild(); + return nullptr; } EventStates::ServoType Gecko_ElementState(RawGeckoElementBorrowed aElement) { - return aElement->StyleState().ServoValue(); + return 0; } bool Gecko_IsHTMLElementInHTMLDocument(RawGeckoElementBorrowed aElement) { - return aElement->IsHTMLElement() && aElement->OwnerDoc()->IsHTMLDocument(); + return false; } bool Gecko_IsLink(RawGeckoElementBorrowed aElement) { - return nsCSSRuleProcessor::IsLink(aElement); + return false; } bool Gecko_IsTextNode(RawGeckoNodeBorrowed aNode) { - return aNode->NodeInfo()->NodeType() == nsIDOMNode::TEXT_NODE; + return false; } bool Gecko_IsVisitedLink(RawGeckoElementBorrowed aElement) { - return aElement->StyleState().HasState(NS_EVENT_STATE_VISITED); + return false; } bool Gecko_IsUnvisitedLink(RawGeckoElementBorrowed aElement) { - return aElement->StyleState().HasState(NS_EVENT_STATE_UNVISITED); + return false; } bool Gecko_IsRootElement(RawGeckoElementBorrowed aElement) { - return aElement->OwnerDoc()->GetRootElement() == aElement; + return false; } nsIAtom* Gecko_LocalName(RawGeckoElementBorrowed aElement) { - return aElement->NodeInfo()->NameAtom(); + return nullptr; } nsIAtom* Gecko_Namespace(RawGeckoElementBorrowed aElement) { - int32_t id = aElement->NodeInfo()->NamespaceID(); - return nsContentUtils::NameSpaceManager()->NameSpaceURIAtomForServo(id); + return nullptr; } nsIAtom* Gecko_GetElementId(RawGeckoElementBorrowed aElement) { - const nsAttrValue* attr = aElement->GetParsedAttr(nsGkAtoms::id); - return attr ? attr->GetAtomValue() : nullptr; + return nullptr; } // Dirtiness tracking. uint32_t Gecko_GetNodeFlags(RawGeckoNodeBorrowed aNode) { - return aNode->GetFlags(); + return 0; } void Gecko_SetNodeFlags(RawGeckoNodeBorrowed aNode, uint32_t aFlags) { - const_cast(aNode)->SetFlags(aFlags); } void Gecko_UnsetNodeFlags(RawGeckoNodeBorrowed aNode, uint32_t aFlags) { - const_cast(aNode)->UnsetFlags(aFlags); } nsStyleContext* Gecko_GetStyleContext(RawGeckoNodeBorrowed aNode, nsIAtom* aPseudoTagOrNull) { - MOZ_ASSERT(aNode->IsContent()); - nsIFrame* relevantFrame = - ServoRestyleManager::FrameForPseudoElement(aNode->AsContent(), - aPseudoTagOrNull); - if (!relevantFrame) { - return nullptr; - } - - return relevantFrame->StyleContext(); + return nullptr; } nsChangeHint Gecko_CalcStyleDifference(nsStyleContext* aOldStyleContext, ServoComputedValuesBorrowed aComputedValues) { - MOZ_ASSERT(aOldStyleContext); - MOZ_ASSERT(aComputedValues); - - // Pass the safe thing, which causes us to miss a potential optimization. See - // bug 1289863. - nsChangeHint forDescendants = nsChangeHint_Hints_NotHandledForDescendants; - - // Eventually, we should compute things out of these flags like - // ElementRestyler::RestyleSelf does and pass the result to the caller to - // potentially halt traversal. See bug 1289868. - uint32_t equalStructs, samePointerStructs; - nsChangeHint result = - aOldStyleContext->CalcStyleDifference(aComputedValues, - forDescendants, - &equalStructs, - &samePointerStructs); - - return result; + return nsChangeHint(0); } void Gecko_StoreStyleDifference(RawGeckoNodeBorrowed aNode, nsChangeHint aChangeHintToStore) { -#ifdef MOZ_STYLO - MOZ_ASSERT(aNode->IsElement()); - MOZ_ASSERT(aNode->IsDirtyForServo(), - "Change hint stored in a not-dirty node"); - - const Element* aElement = aNode->AsElement(); - nsIFrame* primaryFrame = aElement->GetPrimaryFrame(); - if (!primaryFrame) { - // If there's no primary frame, that means that either this content is - // undisplayed (so we only need to check at the restyling phase for the - // display value on the element), or is a display: contents element. - // - // In this second case, we should store it in the frame constructor display - // contents map. Note that while this operation looks hairy, this would be - // thread-safe because the content should be there already (we'd only need - // to read the map and modify our entry). - // - // That being said, we still don't support display: contents anyway, so it's - // probably not worth it to do all the roundtrip just yet until we have a - // more concrete plan. - return; - } - - if ((aChangeHintToStore & nsChangeHint_ReconstructFrame) && - aNode->IsInNativeAnonymousSubtree()) - { - NS_WARNING("stylo: Removing forbidden frame reconstruction hint on native " - "anonymous content. Fix this in bug 1297857!"); - aChangeHintToStore &= ~nsChangeHint_ReconstructFrame; - } - - primaryFrame->StyleContext()->StoreChangeHint(aChangeHintToStore); -#else - MOZ_CRASH("stylo: Shouldn't call Gecko_StoreStyleDifference in " - "non-stylo build"); -#endif } RawServoDeclarationBlockStrongBorrowedOrNull Gecko_GetServoDeclarationBlock(RawGeckoElementBorrowed aElement) { - const nsAttrValue* attr = aElement->GetParsedAttr(nsGkAtoms::style); - if (!attr || attr->Type() != nsAttrValue::eCSSDeclaration) { - return nullptr; - } - DeclarationBlock* decl = attr->GetCSSDeclarationValue(); - if (!decl) { - return nullptr; - } - if (decl->IsGecko()) { - // XXX This can happen at least when script sets style attribute - // since we haven't implemented Element.style for stylo. But - // we may want to turn it into an assertion after that's done. - NS_WARNING("stylo: requesting a Gecko declaration block?"); - return nullptr; - } - return reinterpret_cast - (decl->AsServo()->RefRaw()); + return nullptr; } void Gecko_FillAllBackgroundLists(nsStyleImageLayers* aLayers, uint32_t aMaxLen) { - nsRuleNode::FillAllBackgroundLists(*aLayers, aMaxLen); } void Gecko_FillAllMaskLists(nsStyleImageLayers* aLayers, uint32_t aMaxLen) { - nsRuleNode::FillAllMaskLists(*aLayers, aMaxLen); } template static nsIAtom* AtomAttrValue(Implementor* aElement, nsIAtom* aName) { - const nsAttrValue* attr = aElement->GetParsedAttr(aName); - return attr ? attr->GetAtomValue() : nullptr; + return nullptr; } template static bool DoMatch(Implementor* aElement, nsIAtom* aNS, nsIAtom* aName, MatchFn aMatch) { - if (aNS) { - int32_t ns = nsContentUtils::NameSpaceManager()->GetNameSpaceID(aNS, - aElement->IsInChromeDocument()); - NS_ENSURE_TRUE(ns != kNameSpaceID_Unknown, false); - const nsAttrValue* value = aElement->GetParsedAttr(aName, ns); - return value && aMatch(value); - } - // No namespace means any namespace - we have to check them all. :-( - BorrowedAttrInfo attrInfo; - for (uint32_t i = 0; (attrInfo = aElement->GetAttrInfoAt(i)); ++i) { - if (attrInfo.mName->LocalName() != aName) { - continue; - } - if (aMatch(attrInfo.mValue)) { - return true; - } - } return false; } @@ -383,8 +272,7 @@ template static bool HasAttr(Implementor* aElement, nsIAtom* aNS, nsIAtom* aName) { - auto match = [](const nsAttrValue* aValue) { return true; }; - return DoMatch(aElement, aNS, aName, match); + return false; } template @@ -392,10 +280,7 @@ static bool AttrEquals(Implementor* aElement, nsIAtom* aNS, nsIAtom* aName, nsIAtom* aStr, bool aIgnoreCase) { - auto match = [aStr, aIgnoreCase](const nsAttrValue* aValue) { - return aValue->Equals(aStr, aIgnoreCase ? eIgnoreCase : eCaseMatters); - }; - return DoMatch(aElement, aNS, aName, match); + return false; } template @@ -403,13 +288,7 @@ static bool AttrDashEquals(Implementor* aElement, nsIAtom* aNS, nsIAtom* aName, nsIAtom* aStr) { - auto match = [aStr](const nsAttrValue* aValue) { - nsAutoString str; - aValue->ToString(str); - const nsDefaultStringComparator c; - return nsStyleUtil::DashMatchCompare(str, nsDependentAtomString(aStr), c); - }; - return DoMatch(aElement, aNS, aName, match); + return false; } template @@ -417,13 +296,7 @@ static bool AttrIncludes(Implementor* aElement, nsIAtom* aNS, nsIAtom* aName, nsIAtom* aStr) { - auto match = [aStr](const nsAttrValue* aValue) { - nsAutoString str; - aValue->ToString(str); - const nsDefaultStringComparator c; - return nsStyleUtil::ValueIncludes(str, nsDependentAtomString(aStr), c); - }; - return DoMatch(aElement, aNS, aName, match); + return false; } template @@ -431,12 +304,7 @@ static bool AttrHasSubstring(Implementor* aElement, nsIAtom* aNS, nsIAtom* aName, nsIAtom* aStr) { - auto match = [aStr](const nsAttrValue* aValue) { - nsAutoString str; - aValue->ToString(str); - return FindInReadable(str, nsDependentAtomString(aStr)); - }; - return DoMatch(aElement, aNS, aName, match); + return false; } template @@ -444,12 +312,7 @@ static bool AttrHasPrefix(Implementor* aElement, nsIAtom* aNS, nsIAtom* aName, nsIAtom* aStr) { - auto match = [aStr](const nsAttrValue* aValue) { - nsAutoString str; - aValue->ToString(str); - return StringBeginsWith(str, nsDependentAtomString(aStr)); - }; - return DoMatch(aElement, aNS, aName, match); + return false; } template @@ -457,12 +320,7 @@ static bool AttrHasSuffix(Implementor* aElement, nsIAtom* aNS, nsIAtom* aName, nsIAtom* aStr) { - auto match = [aStr](const nsAttrValue* aValue) { - nsAutoString str; - aValue->ToString(str); - return StringEndsWith(str, nsDependentAtomString(aStr)); - }; - return DoMatch(aElement, aNS, aName, match); + return false; } /** @@ -482,54 +340,7 @@ template static uint32_t ClassOrClassList(Implementor* aElement, nsIAtom** aClass, nsIAtom*** aClassList) { - const nsAttrValue* attr = aElement->GetParsedAttr(nsGkAtoms::_class); - if (!attr) { - return 0; - } - - // For class values with only whitespace, Gecko just stores a string. For the - // purposes of the style system, there is no class in this case. - if (attr->Type() == nsAttrValue::eString) { - MOZ_ASSERT(nsContentUtils::TrimWhitespace( - attr->GetStringValue()).IsEmpty()); - return 0; - } - - // Single tokens are generally stored as an atom. Check that case. - if (attr->Type() == nsAttrValue::eAtom) { - *aClass = attr->GetAtomValue(); - return 1; - } - - // At this point we should have an atom array. It is likely, but not - // guaranteed, that we have two or more elements in the array. - MOZ_ASSERT(attr->Type() == nsAttrValue::eAtomArray); - nsTArray>* atomArray = attr->GetAtomArrayValue(); - uint32_t length = atomArray->Length(); - - // Special case: zero elements. - if (length == 0) { - return 0; - } - - // Special case: one element. - if (length == 1) { - *aClass = atomArray->ElementAt(0); - return 1; - } - - // General case: Two or more elements. - // - // Note: We could also expose this array as an array of nsCOMPtrs, since - // bindgen knows what those look like, and eliminate the reinterpret_cast. - // But it's not obvious that that would be preferable. - static_assert(sizeof(nsCOMPtr) == sizeof(nsIAtom*), "Bad simplification"); - static_assert(alignof(nsCOMPtr) == alignof(nsIAtom*), "Bad simplification"); - - nsCOMPtr* elements = atomArray->Elements(); - nsIAtom** rawElements = reinterpret_cast(elements); - *aClassList = rawElements; - return atomArray->Length(); + return 0; } #define SERVO_IMPL_ELEMENT_ATTR_MATCHING_FUNCTIONS(prefix_, implementor_) \ @@ -585,51 +396,35 @@ SERVO_IMPL_ELEMENT_ATTR_MATCHING_FUNCTIONS(Gecko_Snapshot, ServoElementSnapshot* nsIAtom* Gecko_Atomize(const char* aString, uint32_t aLength) { - return NS_Atomize(nsDependentCSubstring(aString, aLength)).take(); + return nullptr; } void Gecko_AddRefAtom(nsIAtom* aAtom) { - NS_ADDREF(aAtom); } void Gecko_ReleaseAtom(nsIAtom* aAtom) { - NS_RELEASE(aAtom); } const uint16_t* Gecko_GetAtomAsUTF16(nsIAtom* aAtom, uint32_t* aLength) { - static_assert(sizeof(char16_t) == sizeof(uint16_t), "Servo doesn't know what a char16_t is"); - MOZ_ASSERT(aAtom); - *aLength = aAtom->GetLength(); - - // We need to manually cast from char16ptr_t to const char16_t* to handle the - // MOZ_USE_CHAR16_WRAPPER we use on WIndows. - return reinterpret_cast(static_cast(aAtom->GetUTF16String())); + return nullptr; } bool Gecko_AtomEqualsUTF8(nsIAtom* aAtom, const char* aString, uint32_t aLength) { - // XXXbholley: We should be able to do this without converting, I just can't - // find the right thing to call. - nsDependentAtomString atomStr(aAtom); - NS_ConvertUTF8toUTF16 inStr(nsDependentCSubstring(aString, aLength)); - return atomStr.Equals(inStr); + return false; } bool Gecko_AtomEqualsUTF8IgnoreCase(nsIAtom* aAtom, const char* aString, uint32_t aLength) { - // XXXbholley: We should be able to do this without converting, I just can't - // find the right thing to call. - nsDependentAtomString atomStr(aAtom); - NS_ConvertUTF8toUTF16 inStr(nsDependentCSubstring(aString, aLength)); - return nsContentUtils::EqualsIgnoreASCIICase(atomStr, inStr); + return false; } void @@ -637,53 +432,35 @@ Gecko_Utf8SliceToString(nsString* aString, const uint8_t* aBuffer, size_t aBufferLen) { - MOZ_ASSERT(aString); - MOZ_ASSERT(aBuffer); - - aString->Truncate(); - AppendUTF8toUTF16(Substring(reinterpret_cast(aBuffer), - aBufferLen), *aString); } void Gecko_FontFamilyList_Clear(FontFamilyList* aList) { - aList->Clear(); } void Gecko_FontFamilyList_AppendNamed(FontFamilyList* aList, nsIAtom* aName) { - // Servo doesn't record whether the name was quoted or unquoted, so just - // assume unquoted for now. - FontFamilyName family; - aName->ToString(family.mName); - aList->Append(family); } void Gecko_FontFamilyList_AppendGeneric(FontFamilyList* aList, FontFamilyType aType) { - aList->Append(FontFamilyName(aType)); } void Gecko_CopyFontFamilyFrom(nsFont* dst, const nsFont* src) { - dst->fontlist = src->fontlist; } void Gecko_SetListStyleType(nsStyleList* style_struct, uint32_t type) { - // Builtin counter styles are static and use no-op refcounting, and thus are - // safe to use off-main-thread. - style_struct->SetCounterStyle(CounterStyleManager::GetBuiltinStyle(type)); } void Gecko_CopyListStyleTypeFrom(nsStyleList* dst, const nsStyleList* src) { - dst->SetCounterStyle(src->GetCounterStyle()); } NS_IMPL_HOLDER_FFI_REFCOUNTING(nsIPrincipal, Principal) @@ -696,42 +473,22 @@ Gecko_SetMozBinding(nsStyleDisplay* aDisplay, ThreadSafeURIHolder* aReferrer, ThreadSafePrincipalHolder* aPrincipal) { - MOZ_ASSERT(aDisplay); - MOZ_ASSERT(aURLString); - MOZ_ASSERT(aBaseURI); - MOZ_ASSERT(aReferrer); - MOZ_ASSERT(aPrincipal); - - nsString url; - nsDependentCSubstring urlString(reinterpret_cast(aURLString), - aURLStringLength); - AppendUTF8toUTF16(urlString, url); - RefPtr urlBuffer = nsCSSValue::BufferFromString(url); - - aDisplay->mBinding = - new css::URLValue(urlBuffer, do_AddRef(aBaseURI), - do_AddRef(aReferrer), do_AddRef(aPrincipal)); } void Gecko_CopyMozBindingFrom(nsStyleDisplay* aDest, const nsStyleDisplay* aSrc) { - aDest->mBinding = aSrc->mBinding; } void Gecko_SetNullImageValue(nsStyleImage* aImage) { - MOZ_ASSERT(aImage); - aImage->SetNull(); } void Gecko_SetGradientImageValue(nsStyleImage* aImage, nsStyleGradient* aGradient) { - MOZ_ASSERT(aImage); - aImage->SetGradientData(aGradient); } static already_AddRefed @@ -741,21 +498,7 @@ CreateStyleImageRequest(nsStyleImageRequest::Mode aModeFlags, ThreadSafeURIHolder* aReferrer, ThreadSafePrincipalHolder* aPrincipal) { - MOZ_ASSERT(aURLString); - MOZ_ASSERT(aBaseURI); - MOZ_ASSERT(aReferrer); - MOZ_ASSERT(aPrincipal); - - nsString url; - nsDependentCSubstring urlString(reinterpret_cast(aURLString), - aURLStringLength); - AppendUTF8toUTF16(urlString, url); - RefPtr urlBuffer = nsCSSValue::BufferFromString(url); - - RefPtr req = - new nsStyleImageRequest(aModeFlags, urlBuffer, do_AddRef(aBaseURI), - do_AddRef(aReferrer), do_AddRef(aPrincipal)); - return req.forget(); + return nullptr; } void @@ -765,20 +508,11 @@ Gecko_SetUrlImageValue(nsStyleImage* aImage, ThreadSafeURIHolder* aReferrer, ThreadSafePrincipalHolder* aPrincipal) { - RefPtr req = - CreateStyleImageRequest(nsStyleImageRequest::Mode::Track, - aURLString, aURLStringLength, - aBaseURI, aReferrer, aPrincipal); - aImage->SetImageRequest(req.forget()); } void Gecko_CopyImageValueFrom(nsStyleImage* aImage, const nsStyleImage* aOther) { - MOZ_ASSERT(aImage); - MOZ_ASSERT(aOther); - - *aImage = *aOther; } nsStyleGradient* @@ -788,35 +522,12 @@ Gecko_CreateGradient(uint8_t aShape, bool aLegacySyntax, uint32_t aStopCount) { - nsStyleGradient* result = new nsStyleGradient(); - - result->mShape = aShape; - result->mSize = aSize; - result->mRepeating = aRepeating; - result->mLegacySyntax = aLegacySyntax; - - result->mAngle.SetNoneValue(); - result->mBgPosX.SetNoneValue(); - result->mBgPosY.SetNoneValue(); - result->mRadiusX.SetNoneValue(); - result->mRadiusY.SetNoneValue(); - - nsStyleGradientStop dummyStop; - dummyStop.mLocation.SetNoneValue(); - dummyStop.mColor = NS_RGB(0, 0, 0); - dummyStop.mIsInterpolationHint = 0; - - for (uint32_t i = 0; i < aStopCount; i++) { - result->mStops.AppendElement(dummyStop); - } - - return result; + return nullptr; } void Gecko_SetListStyleImageNone(nsStyleList* aList) { - aList->mListStyleImage = nullptr; } void @@ -826,123 +537,73 @@ Gecko_SetListStyleImage(nsStyleList* aList, ThreadSafeURIHolder* aReferrer, ThreadSafePrincipalHolder* aPrincipal) { - aList->mListStyleImage = - CreateStyleImageRequest(nsStyleImageRequest::Mode(0), - aURLString, aURLStringLength, - aBaseURI, aReferrer, aPrincipal); } void Gecko_CopyListStyleImageFrom(nsStyleList* aList, const nsStyleList* aSource) { - aList->mListStyleImage = aSource->mListStyleImage; } void Gecko_EnsureTArrayCapacity(void* aArray, size_t aCapacity, size_t aElemSize) { - auto base = - reinterpret_cast*>(aArray); - - base->EnsureCapacity(aCapacity, aElemSize); } void Gecko_ClearPODTArray(void* aArray, size_t aElementSize, size_t aElementAlign) { - auto base = - reinterpret_cast*>(aArray); - - base->template ShiftData(0, base->Length(), 0, - aElementSize, aElementAlign); } void Gecko_ClearStyleContents(nsStyleContent* aContent) { - aContent->AllocateContents(0); } void Gecko_CopyStyleContentsFrom(nsStyleContent* aContent, const nsStyleContent* aOther) { - uint32_t count = aOther->ContentCount(); - - aContent->AllocateContents(count); - - for (uint32_t i = 0; i < count; ++i) { - aContent->ContentAt(i) = aOther->ContentAt(i); - } } void Gecko_EnsureImageLayersLength(nsStyleImageLayers* aLayers, size_t aLen, nsStyleImageLayers::LayerType aLayerType) { - size_t oldLength = aLayers->mLayers.Length(); - - aLayers->mLayers.EnsureLengthAtLeast(aLen); - - for (size_t i = oldLength; i < aLen; ++i) { - aLayers->mLayers[i].Initialize(aLayerType); - } } void Gecko_ResetStyleCoord(nsStyleUnit* aUnit, nsStyleUnion* aValue) { - nsStyleCoord::Reset(*aUnit, *aValue); } void Gecko_SetStyleCoordCalcValue(nsStyleUnit* aUnit, nsStyleUnion* aValue, nsStyleCoord::CalcValue aCalc) { - // Calc units should be cleaned up first - MOZ_ASSERT(*aUnit != nsStyleUnit::eStyleUnit_Calc); - nsStyleCoord::Calc* calcRef = new nsStyleCoord::Calc(); - calcRef->mLength = aCalc.mLength; - calcRef->mPercent = aCalc.mPercent; - calcRef->mHasPercent = aCalc.mHasPercent; - *aUnit = nsStyleUnit::eStyleUnit_Calc; - aValue->mPointer = calcRef; - calcRef->AddRef(); } void Gecko_CopyClipPathValueFrom(mozilla::StyleClipPath* aDst, const mozilla::StyleClipPath* aSrc) { - MOZ_ASSERT(aDst); - MOZ_ASSERT(aSrc); - - *aDst = *aSrc; } void Gecko_DestroyClipPath(mozilla::StyleClipPath* aClip) { - aClip->~StyleClipPath(); } mozilla::StyleBasicShape* Gecko_NewBasicShape(mozilla::StyleBasicShapeType aType) { - RefPtr ptr = new mozilla::StyleBasicShape(aType); - return ptr.forget().take(); + return nullptr; } void Gecko_ResetFilters(nsStyleEffects* effects, size_t new_len) { - effects->mFilters.Clear(); - effects->mFilters.SetLength(new_len); } void Gecko_CopyFiltersFrom(nsStyleEffects* aSrc, nsStyleEffects* aDest) { - aDest->mFilters = aSrc->mFilters; } NS_IMPL_THREADSAFE_FFI_REFCOUNTING(nsStyleCoord::Calc, Calc); @@ -950,8 +611,7 @@ NS_IMPL_THREADSAFE_FFI_REFCOUNTING(nsStyleCoord::Calc, Calc); nsCSSShadowArray* Gecko_NewCSSShadowArray(uint32_t aLen) { - RefPtr arr = new(aLen) nsCSSShadowArray(aLen); - return arr.forget().take(); + return nullptr; } NS_IMPL_THREADSAFE_FFI_REFCOUNTING(nsCSSShadowArray, CSSShadowArray); @@ -959,9 +619,7 @@ NS_IMPL_THREADSAFE_FFI_REFCOUNTING(nsCSSShadowArray, CSSShadowArray); nsStyleQuoteValues* Gecko_NewStyleQuoteValues(uint32_t aLen) { - RefPtr values = new nsStyleQuoteValues; - values->mQuotePairs.SetLength(aLen); - return values.forget().take(); + return nullptr; } NS_IMPL_THREADSAFE_FFI_REFCOUNTING(nsStyleQuoteValues, QuoteValues); @@ -969,68 +627,48 @@ NS_IMPL_THREADSAFE_FFI_REFCOUNTING(nsStyleQuoteValues, QuoteValues); nsCSSValueSharedList* Gecko_NewCSSValueSharedList(uint32_t aLen) { - RefPtr list = new nsCSSValueSharedList; - if (aLen == 0) { - return list.forget().take(); - } - - list->mHead = new nsCSSValueList; - nsCSSValueList* cur = list->mHead; - for (uint32_t i = 0; i < aLen - 1; i++) { - cur->mNext = new nsCSSValueList; - cur = cur->mNext; - } - - return list.forget().take(); + return nullptr; } void Gecko_CSSValue_SetAbsoluteLength(nsCSSValueBorrowedMut aCSSValue, nscoord aLen) { - aCSSValue->SetIntegerCoordValue(aLen); } void Gecko_CSSValue_SetNumber(nsCSSValueBorrowedMut aCSSValue, float aNumber) { - aCSSValue->SetFloatValue(aNumber, eCSSUnit_Number); } void Gecko_CSSValue_SetKeyword(nsCSSValueBorrowedMut aCSSValue, nsCSSKeyword aKeyword) { - aCSSValue->SetIntValue(aKeyword, eCSSUnit_Enumerated); } void Gecko_CSSValue_SetPercentage(nsCSSValueBorrowedMut aCSSValue, float aPercent) { - aCSSValue->SetFloatValue(aPercent, eCSSUnit_Number); } void Gecko_CSSValue_SetAngle(nsCSSValueBorrowedMut aCSSValue, float aRadians) { - aCSSValue->SetFloatValue(aRadians, eCSSUnit_Radian); } void Gecko_CSSValue_SetCalc(nsCSSValueBorrowedMut aCSSValue, nsStyleCoord::CalcValue aCalc) { - aCSSValue->SetCalcValue(&aCalc); } void Gecko_CSSValue_SetFunction(nsCSSValueBorrowedMut aCSSValue, int32_t aLen) { - nsCSSValue::Array* arr = nsCSSValue::Array::Create(aLen); - aCSSValue->SetArrayValue(arr, eCSSUnit_Function); } nsCSSValueBorrowedMut Gecko_CSSValue_GetArrayItem(nsCSSValueBorrowedMut aCSSValue, int32_t aIndex) { - return &aCSSValue->GetArrayValue()->Item(aIndex); + return nullptr; } NS_IMPL_THREADSAFE_FFI_REFCOUNTING(nsCSSValueSharedList, CSSValueSharedList); @@ -1040,20 +678,17 @@ NS_IMPL_THREADSAFE_FFI_REFCOUNTING(nsCSSValueSharedList, CSSValueSharedList); void \ Gecko_Construct_nsStyle##name(nsStyle##name* ptr) \ { \ - new (ptr) nsStyle##name(StyleStructContext::ServoContext()); \ } \ \ void \ Gecko_CopyConstruct_nsStyle##name(nsStyle##name* ptr, \ const nsStyle##name* other) \ { \ - new (ptr) nsStyle##name(*other); \ } \ \ void \ Gecko_Destroy_nsStyle##name(nsStyle##name* ptr) \ { \ - ptr->~nsStyle##name(); \ } #include "nsStyleStructList.h" diff --git a/layout/style/ServoDeclarationBlock.cpp b/layout/style/ServoDeclarationBlock.cpp index 1dc691bfb1..219050e930 100644 --- a/layout/style/ServoDeclarationBlock.cpp +++ b/layout/style/ServoDeclarationBlock.cpp @@ -14,11 +14,7 @@ namespace mozilla { /* static */ already_AddRefed ServoDeclarationBlock::FromCssText(const nsAString& aCssText) { - NS_ConvertUTF16toUTF8 value(aCssText); - RefPtr - raw = Servo_ParseStyleAttribute(&value).Consume(); - RefPtr decl = new ServoDeclarationBlock(raw.forget()); - return decl.forget(); + return nullptr; } /** @@ -29,27 +25,10 @@ class MOZ_STACK_CLASS PropertyAtomHolder public: explicit PropertyAtomHolder(const nsAString& aProperty) { - nsCSSPropertyID propID = - nsCSSProps::LookupProperty(aProperty, CSSEnabledState::eForAllContent); - if (propID == eCSSPropertyExtra_variable) { - mIsCustomProperty = true; - mAtom = NS_Atomize( - Substring(aProperty, CSS_CUSTOM_NAME_PREFIX_LENGTH)).take(); - } else { - mIsCustomProperty = false; - if (propID != eCSSProperty_UNKNOWN) { - mAtom = nsCSSProps::AtomForProperty(propID); - } else { - mAtom = nullptr; - } - } } ~PropertyAtomHolder() { - if (mIsCustomProperty) { - NS_RELEASE(mAtom); - } } explicit operator bool() const { return !!mAtom; } @@ -65,46 +44,28 @@ void ServoDeclarationBlock::GetPropertyValue(const nsAString& aProperty, nsAString& aValue) const { - if (PropertyAtomHolder holder{aProperty}) { - Servo_DeclarationBlock_GetPropertyValue( - mRaw, holder.Atom(), holder.IsCustomProperty(), &aValue); - } } void ServoDeclarationBlock::GetPropertyValueByID(nsCSSPropertyID aPropID, nsAString& aValue) const { - nsIAtom* atom = nsCSSProps::AtomForProperty(aPropID); - Servo_DeclarationBlock_GetPropertyValue(mRaw, atom, false, &aValue); } bool ServoDeclarationBlock::GetPropertyIsImportant(const nsAString& aProperty) const { - if (PropertyAtomHolder holder{aProperty}) { - return Servo_DeclarationBlock_GetPropertyIsImportant( - mRaw, holder.Atom(), holder.IsCustomProperty()); - } return false; } void ServoDeclarationBlock::RemoveProperty(const nsAString& aProperty) { - AssertMutable(); - if (PropertyAtomHolder holder{aProperty}) { - Servo_DeclarationBlock_RemoveProperty(mRaw, holder.Atom(), - holder.IsCustomProperty()); - } } void ServoDeclarationBlock::RemovePropertyByID(nsCSSPropertyID aPropID) { - AssertMutable(); - nsIAtom* atom = nsCSSProps::AtomForProperty(aPropID); - Servo_DeclarationBlock_RemoveProperty(mRaw, atom, false); } } // namespace mozilla diff --git a/layout/style/ServoElementSnapshot.cpp b/layout/style/ServoElementSnapshot.cpp index ed40ea0f12..83a462c5d4 100644 --- a/layout/style/ServoElementSnapshot.cpp +++ b/layout/style/ServoElementSnapshot.cpp @@ -16,30 +16,11 @@ ServoElementSnapshot::ServoElementSnapshot(Element* aElement) , mExplicitRestyleHint(nsRestyleHint(0)) , mExplicitChangeHint(nsChangeHint(0)) { - mIsHTMLElementInHTMLDocument = - aElement->IsHTMLElement() && aElement->IsInHTMLDocument(); - mIsInChromeDocument = - nsContentUtils::IsChromeDoc(aElement->OwnerDoc()); } void ServoElementSnapshot::AddAttrs(Element* aElement) { - MOZ_ASSERT(aElement); - - if (HasAny(Flags::Attributes)) { - return; - } - - uint32_t attrCount = aElement->GetAttrCount(); - const nsAttrName* attrName; - for (uint32_t i = 0; i < attrCount; ++i) { - attrName = aElement->GetAttrNameAt(i); - const nsAttrValue* attrValue = - aElement->GetParsedAttr(attrName->LocalName(), attrName->NamespaceID()); - mAttrs.AppendElement(ServoAttrSnapshot(*attrName, *attrValue)); - } - mContains |= Flags::Attributes; } } // namespace mozilla diff --git a/layout/style/ServoElementSnapshot.h b/layout/style/ServoElementSnapshot.h index 5f157f8178..15b6b9c490 100644 --- a/layout/style/ServoElementSnapshot.h +++ b/layout/style/ServoElementSnapshot.h @@ -77,10 +77,6 @@ public: */ void AddState(EventStates aState) { - if (!HasAny(Flags::State)) { - mState = aState.ServoValue(); - mContains |= Flags::State; - } } /** @@ -90,12 +86,10 @@ public: void AddExplicitChangeHint(nsChangeHint aMinChangeHint) { - mExplicitChangeHint |= aMinChangeHint; } void AddExplicitRestyleHint(nsRestyleHint aRestyleHint) { - mExplicitRestyleHint |= aRestyleHint; } nsRestyleHint ExplicitRestyleHint() { return mExplicitRestyleHint; } @@ -107,10 +101,7 @@ public: */ BorrowedAttrInfo GetAttrInfoAt(uint32_t aIndex) const { - if (aIndex >= mAttrs.Length()) { - return BorrowedAttrInfo(nullptr, nullptr); - } - return BorrowedAttrInfo(&mAttrs[aIndex].mName, &mAttrs[aIndex].mValue); + return BorrowedAttrInfo(nullptr, nullptr); } const nsAttrValue* GetParsedAttr(nsIAtom* aLocalName) const @@ -121,33 +112,18 @@ public: const nsAttrValue* GetParsedAttr(nsIAtom* aLocalName, int32_t aNamespaceID) const { - uint32_t i, len = mAttrs.Length(); - if (aNamespaceID == kNameSpaceID_None) { - // This should be the common case so lets make an optimized loop - for (i = 0; i < len; ++i) { - if (mAttrs[i].mName.Equals(aLocalName)) { - return &mAttrs[i].mValue; - } - } - - return nullptr; - } - - for (i = 0; i < len; ++i) { - if (mAttrs[i].mName.Equals(aLocalName, aNamespaceID)) { - return &mAttrs[i].mValue; - } - } - return nullptr; } bool IsInChromeDocument() const { - return mIsInChromeDocument; + return false; } - bool HasAny(Flags aFlags) { return bool(mContains & aFlags); } + bool HasAny(Flags aFlags) + { + return false; + } private: // TODO: Profile, a 1 or 2 element AutoTArray could be worth it, given we know diff --git a/layout/style/ServoStyleSet.cpp b/layout/style/ServoStyleSet.cpp index 38752bcc9a..6b40e3f520 100644 --- a/layout/style/ServoStyleSet.cpp +++ b/layout/style/ServoStyleSet.cpp @@ -51,24 +51,17 @@ ServoStyleSet::GetAuthorStyleDisabled() const nsresult ServoStyleSet::SetAuthorStyleDisabled(bool aStyleDisabled) { - MOZ_CRASH("stylo: not implemented"); + return NS_OK; } void ServoStyleSet::BeginUpdate() { - ++mBatching; } nsresult ServoStyleSet::EndUpdate() { - MOZ_ASSERT(mBatching > 0); - if (--mBatching > 0) { - return NS_OK; - } - - // ... do something ... return NS_OK; } @@ -76,8 +69,7 @@ already_AddRefed ServoStyleSet::ResolveStyleFor(Element* aElement, nsStyleContext* aParentContext) { - return GetContext(aElement, aParentContext, nullptr, - CSSPseudoElementType::NotPseudo); + return nullptr; } already_AddRefed @@ -86,10 +78,7 @@ ServoStyleSet::GetContext(nsIContent* aContent, nsIAtom* aPseudoTag, CSSPseudoElementType aPseudoType) { - RefPtr computedValues = - Servo_ComputedValues_Get(aContent).Consume(); - MOZ_ASSERT(computedValues); - return GetContext(computedValues.forget(), aParentContext, aPseudoTag, aPseudoType); + return nullptr; } already_AddRefed @@ -98,14 +87,7 @@ ServoStyleSet::GetContext(already_AddRefed aComputedValues, nsIAtom* aPseudoTag, CSSPseudoElementType aPseudoType) { - // XXXbholley: nsStyleSet does visited handling here. - - // XXXbholley: Figure out the correct thing to pass here. Does this fixup - // duplicate something that servo already does? - bool skipFixup = false; - - return NS_NewStyleContext(aParentContext, mPresContext, aPseudoTag, - aPseudoType, Move(aComputedValues), skipFixup); + return nullptr; } already_AddRefed @@ -113,47 +95,20 @@ ServoStyleSet::ResolveStyleFor(Element* aElement, nsStyleContext* aParentContext, TreeMatchContext& aTreeMatchContext) { - // aTreeMatchContext is used to speed up selector matching, - // but if the element already has a ServoComputedValues computed in - // advance, then we shouldn't need to use it. - return ResolveStyleFor(aElement, aParentContext); + return nullptr; } already_AddRefed ServoStyleSet::ResolveStyleForText(nsIContent* aTextNode, nsStyleContext* aParentContext) { - MOZ_ASSERT(aTextNode && aTextNode->IsNodeOfType(nsINode::eTEXT)); - MOZ_ASSERT(aTextNode->GetParent()); - MOZ_ASSERT(aParentContext); - - // Gecko expects text node style contexts to be like elements that match no - // rules: inherit the inherit structs, reset the reset structs. This is cheap - // enough to do on the main thread, which means that the parallel style system - // can avoid worrying about text nodes. - const ServoComputedValues* parentComputedValues = - aParentContext->StyleSource().AsServoComputedValues(); - RefPtr computedValues = - Servo_ComputedValues_Inherit(parentComputedValues).Consume(); - - return GetContext(computedValues.forget(), aParentContext, - nsCSSAnonBoxes::mozText, CSSPseudoElementType::AnonBox); + return nullptr; } already_AddRefed ServoStyleSet::ResolveStyleForOtherNonElement(nsStyleContext* aParentContext) { - // The parent context can be null if the non-element share a style context - // with the root of an anonymous subtree. - const ServoComputedValues* parent = - aParentContext ? aParentContext->StyleSource().AsServoComputedValues() : nullptr; - RefPtr computedValues = - Servo_ComputedValues_Inherit(parent).Consume(); - MOZ_ASSERT(computedValues); - - return GetContext(computedValues.forget(), aParentContext, - nsCSSAnonBoxes::mozOtherNonElement, - CSSPseudoElementType::AnonBox); + return nullptr; } already_AddRefed @@ -162,20 +117,7 @@ ServoStyleSet::ResolvePseudoElementStyle(Element* aParentElement, nsStyleContext* aParentContext, Element* aPseudoElement) { - if (aPseudoElement) { - NS_ERROR("stylo: We don't support CSS_PSEUDO_ELEMENT_SUPPORTS_USER_ACTION_STATE yet"); - } - MOZ_ASSERT(aParentContext); - MOZ_ASSERT(aType < CSSPseudoElementType::Count); - nsIAtom* pseudoTag = nsCSSPseudoElements::GetPseudoAtom(aType); - - RefPtr computedValues = - Servo_ComputedValues_GetForPseudoElement( - aParentContext->StyleSource().AsServoComputedValues(), - aParentElement, pseudoTag, mRawSet.get(), /* is_probe = */ false).Consume(); - MOZ_ASSERT(computedValues); - - return GetContext(computedValues.forget(), aParentContext, pseudoTag, aType); + return nullptr; } // aFlags is an nsStyleSet flags bitfield @@ -184,31 +126,7 @@ ServoStyleSet::ResolveAnonymousBoxStyle(nsIAtom* aPseudoTag, nsStyleContext* aParentContext, uint32_t aFlags) { - MOZ_ASSERT(nsCSSAnonBoxes::IsAnonBox(aPseudoTag)); - - MOZ_ASSERT(aFlags == 0 || - aFlags == nsStyleSet::eSkipParentDisplayBasedStyleFixup); - bool skipFixup = aFlags & nsStyleSet::eSkipParentDisplayBasedStyleFixup; - - const ServoComputedValues* parentStyle = - aParentContext ? aParentContext->StyleSource().AsServoComputedValues() - : nullptr; - RefPtr computedValues = - Servo_ComputedValues_GetForAnonymousBox(parentStyle, aPseudoTag, - mRawSet.get()).Consume(); -#ifdef DEBUG - if (!computedValues) { - nsString pseudo; - aPseudoTag->ToString(pseudo); - NS_ERROR(nsPrintfCString("stylo: could not get anon-box: %s", - NS_ConvertUTF16toUTF8(pseudo).get()).get()); - MOZ_CRASH(); - } -#endif - - return NS_NewStyleContext(aParentContext, mPresContext, aPseudoTag, - CSSPseudoElementType::AnonBox, - computedValues.forget(), skipFixup); + return nullptr; } // manage the set of style sheets in the style set @@ -216,16 +134,6 @@ nsresult ServoStyleSet::AppendStyleSheet(SheetType aType, ServoStyleSheet* aSheet) { - MOZ_ASSERT(aSheet); - MOZ_ASSERT(aSheet->IsApplicable()); - MOZ_ASSERT(nsStyleSet::IsCSSSheetType(aType)); - - mSheets[aType].RemoveElement(aSheet); - mSheets[aType].AppendElement(aSheet); - - // Maintain a mirrored list of sheets on the servo side. - Servo_StyleSet_AppendStyleSheet(mRawSet.get(), aSheet->RawSheet()); - return NS_OK; } @@ -233,16 +141,6 @@ nsresult ServoStyleSet::PrependStyleSheet(SheetType aType, ServoStyleSheet* aSheet) { - MOZ_ASSERT(aSheet); - MOZ_ASSERT(aSheet->IsApplicable()); - MOZ_ASSERT(nsStyleSet::IsCSSSheetType(aType)); - - mSheets[aType].RemoveElement(aSheet); - mSheets[aType].InsertElementAt(0, aSheet); - - // Maintain a mirrored list of sheets on the servo side. - Servo_StyleSet_PrependStyleSheet(mRawSet.get(), aSheet->RawSheet()); - return NS_OK; } @@ -250,15 +148,6 @@ nsresult ServoStyleSet::RemoveStyleSheet(SheetType aType, ServoStyleSheet* aSheet) { - MOZ_ASSERT(aSheet); - MOZ_ASSERT(aSheet->IsApplicable()); - MOZ_ASSERT(nsStyleSet::IsCSSSheetType(aType)); - - mSheets[aType].RemoveElement(aSheet); - - // Maintain a mirrored list of sheets on the servo side. - Servo_StyleSet_RemoveStyleSheet(mRawSet.get(), aSheet->RawSheet()); - return NS_OK; } @@ -266,22 +155,6 @@ nsresult ServoStyleSet::ReplaceSheets(SheetType aType, const nsTArray>& aNewSheets) { - // Gecko uses a two-dimensional array keyed by sheet type, whereas Servo - // stores a flattened list. This makes ReplaceSheets a pretty clunky thing - // to express. If the need ever arises, we can easily make this more efficent, - // probably by aligning the representations better between engines. - - for (ServoStyleSheet* sheet : mSheets[aType]) { - Servo_StyleSet_RemoveStyleSheet(mRawSet.get(), sheet->RawSheet()); - } - - mSheets[aType].Clear(); - mSheets[aType].AppendElements(aNewSheets); - - for (ServoStyleSheet* sheet : mSheets[aType]) { - Servo_StyleSet_AppendStyleSheet(mRawSet.get(), sheet->RawSheet()); - } - return NS_OK; } @@ -290,68 +163,32 @@ ServoStyleSet::InsertStyleSheetBefore(SheetType aType, ServoStyleSheet* aNewSheet, ServoStyleSheet* aReferenceSheet) { - MOZ_ASSERT(aNewSheet); - MOZ_ASSERT(aReferenceSheet); - MOZ_ASSERT(aNewSheet->IsApplicable()); - - mSheets[aType].RemoveElement(aNewSheet); - size_t idx = mSheets[aType].IndexOf(aReferenceSheet); - if (idx == mSheets[aType].NoIndex) { - return NS_ERROR_INVALID_ARG; - } - - mSheets[aType].InsertElementAt(idx, aNewSheet); - - // Maintain a mirrored list of sheets on the servo side. - Servo_StyleSet_InsertStyleSheetBefore(mRawSet.get(), aNewSheet->RawSheet(), - aReferenceSheet->RawSheet()); - return NS_OK; } int32_t ServoStyleSet::SheetCount(SheetType aType) const { - MOZ_ASSERT(nsStyleSet::IsCSSSheetType(aType)); - return mSheets[aType].Length(); + return 0; } ServoStyleSheet* ServoStyleSet::StyleSheetAt(SheetType aType, int32_t aIndex) const { - MOZ_ASSERT(nsStyleSet::IsCSSSheetType(aType)); - return mSheets[aType][aIndex]; + return nullptr; } nsresult ServoStyleSet::RemoveDocStyleSheet(ServoStyleSheet* aSheet) { - return RemoveStyleSheet(SheetType::Doc, aSheet); + return NS_OK; } nsresult ServoStyleSet::AddDocStyleSheet(ServoStyleSheet* aSheet, nsIDocument* aDocument) { - RefPtr strong(aSheet); - - mSheets[SheetType::Doc].RemoveElement(aSheet); - - size_t index = - aDocument->FindDocStyleSheetInsertionPoint(mSheets[SheetType::Doc], *aSheet); - mSheets[SheetType::Doc].InsertElementAt(index, aSheet); - - // Maintain a mirrored list of sheets on the servo side. - ServoStyleSheet* followingSheet = - mSheets[SheetType::Doc].SafeElementAt(index + 1); - if (followingSheet) { - Servo_StyleSet_InsertStyleSheetBefore(mRawSet.get(), aSheet->RawSheet(), - followingSheet->RawSheet()); - } else { - Servo_StyleSet_AppendStyleSheet(mRawSet.get(), aSheet->RawSheet()); - } - return NS_OK; } @@ -360,35 +197,7 @@ ServoStyleSet::ProbePseudoElementStyle(Element* aParentElement, CSSPseudoElementType aType, nsStyleContext* aParentContext) { - MOZ_ASSERT(aParentContext); - MOZ_ASSERT(aType < CSSPseudoElementType::Count); - nsIAtom* pseudoTag = nsCSSPseudoElements::GetPseudoAtom(aType); - - RefPtr computedValues = - Servo_ComputedValues_GetForPseudoElement( - aParentContext->StyleSource().AsServoComputedValues(), - aParentElement, pseudoTag, mRawSet.get(), /* is_probe = */ true).Consume(); - - if (!computedValues) { - return nullptr; - } - - // For :before and :after pseudo-elements, having display: none or no - // 'content' property is equivalent to not having the pseudo-element - // at all. - if (computedValues && - (pseudoTag == nsCSSPseudoElements::before || - pseudoTag == nsCSSPseudoElements::after)) { - const nsStyleDisplay *display = Servo_GetStyleDisplay(computedValues); - const nsStyleContent *content = Servo_GetStyleContent(computedValues); - // XXXldb What is contentCount for |content: ""|? - if (display->mDisplay == StyleDisplay::None || - content->ContentCount() == 0) { - return nullptr; - } - } - - return GetContext(computedValues.forget(), aParentContext, pseudoTag, aType); + return nullptr; } already_AddRefed @@ -398,17 +207,13 @@ ServoStyleSet::ProbePseudoElementStyle(Element* aParentElement, TreeMatchContext& aTreeMatchContext, Element* aPseudoElement) { - if (aPseudoElement) { - NS_ERROR("stylo: We don't support CSS_PSEUDO_ELEMENT_SUPPORTS_USER_ACTION_STATE yet"); - } - return ProbePseudoElementStyle(aParentElement, aType, aParentContext); + return nullptr; } nsRestyleHint ServoStyleSet::HasStateDependentStyle(dom::Element* aElement, EventStates aStateMask) { - NS_WARNING("stylo: HasStateDependentStyle always returns zero!"); return nsRestyleHint(0); } @@ -418,7 +223,6 @@ ServoStyleSet::HasStateDependentStyle(dom::Element* aElement, dom::Element* aPseudoElement, EventStates aStateMask) { - NS_WARNING("stylo: HasStateDependentStyle always returns zero!"); return nsRestyleHint(0); } @@ -426,54 +230,25 @@ nsRestyleHint ServoStyleSet::ComputeRestyleHint(dom::Element* aElement, ServoElementSnapshot* aSnapshot) { - return Servo_ComputeRestyleHint(aElement, aSnapshot, mRawSet.get()); + return nsRestyleHint(0); } static void ClearDirtyBits(nsIContent* aContent) { - bool traverseDescendants = aContent->HasDirtyDescendantsForServo(); - aContent->UnsetIsDirtyAndHasDirtyDescendantsForServo(); - if (!traverseDescendants) { - return; - } - - StyleChildrenIterator it(aContent); - for (nsIContent* n = it.GetNextChild(); n; n = it.GetNextChild()) { - ClearDirtyBits(n); - } } void ServoStyleSet::StyleDocument(bool aLeaveDirtyBits) { - // Grab the root. - nsIDocument* doc = mPresContext->Document(); - nsIContent* root = doc->GetRootElement(); - MOZ_ASSERT(root); - - // Restyle the document, clearing the dirty bits if requested. - Servo_RestyleSubtree(root, mRawSet.get()); - if (!aLeaveDirtyBits) { - ClearDirtyBits(root); - doc->UnsetHasDirtyDescendantsForServo(); - } } void ServoStyleSet::StyleNewSubtree(nsIContent* aContent) { - MOZ_ASSERT(aContent->IsDirtyForServo()); - if (aContent->IsElement() || aContent->IsNodeOfType(nsINode::eTEXT)) { - Servo_RestyleSubtree(aContent, mRawSet.get()); - } - ClearDirtyBits(aContent); } void ServoStyleSet::StyleNewChildren(nsIContent* aParent) { - MOZ_ASSERT(aParent->HasDirtyDescendantsForServo()); - Servo_RestyleSubtree(aParent, mRawSet.get()); - ClearDirtyBits(aParent); } diff --git a/layout/style/ServoStyleSheet.cpp b/layout/style/ServoStyleSheet.cpp index 8b6decb4f5..dc9fc344b5 100644 --- a/layout/style/ServoStyleSheet.cpp +++ b/layout/style/ServoStyleSheet.cpp @@ -23,44 +23,29 @@ ServoStyleSheet::ServoStyleSheet(css::SheetParsingMode aParsingMode, ServoStyleSheet::~ServoStyleSheet() { - DropSheet(); } bool ServoStyleSheet::HasRules() const { - return mSheet && Servo_StyleSheet_HasRules(mSheet); + return false; } void ServoStyleSheet::SetAssociatedDocument(nsIDocument* aDocument, DocumentAssociationMode aAssociationMode) { - MOZ_ASSERT_IF(!aDocument, aAssociationMode == NotOwnedByDocument); - - // XXXheycam: Traverse to child ServoStyleSheets to set this, like - // CSSStyleSheet::SetAssociatedDocument does. - - mDocument = aDocument; - mDocumentAssociationMode = aAssociationMode; } ServoStyleSheet* ServoStyleSheet::GetParentSheet() const { - // XXXheycam: When we implement support for child sheets, we'll have - // to fix SetAssociatedDocument to propagate the associated document down - // to the children. - MOZ_CRASH("stylo: not implemented"); + return nullptr; } void ServoStyleSheet::AppendStyleSheet(ServoStyleSheet* aSheet) { - // XXXheycam: When we implement support for child sheets, we'll have - // to fix SetOwningDocument to propagate the owning document down - // to the children. - MOZ_CRASH("stylo: not implemented"); } nsresult @@ -70,40 +55,23 @@ ServoStyleSheet::ParseSheet(const nsAString& aInput, nsIPrincipal* aSheetPrincipal, uint32_t aLineNumber) { - DropSheet(); - - RefPtr base = new ThreadSafeURIHolder(aBaseURI); - RefPtr referrer = new ThreadSafeURIHolder(aSheetURI); - RefPtr principal = - new ThreadSafePrincipalHolder(aSheetPrincipal); - - nsCString baseString; - nsresult rv = aBaseURI->GetSpec(baseString); - NS_ENSURE_SUCCESS(rv, rv); - - NS_ConvertUTF16toUTF8 input(aInput); - mSheet = Servo_StyleSheet_FromUTF8Bytes(&input, mParsingMode, &baseString, - base, referrer, principal).Consume(); - return NS_OK; } void ServoStyleSheet::LoadFailed() { - mSheet = Servo_StyleSheet_Empty(mParsingMode).Consume(); } void ServoStyleSheet::DropSheet() { - mSheet = nullptr; } size_t ServoStyleSheet::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const { - MOZ_CRASH("stylo: not implemented"); + return 0; } #ifdef DEBUG @@ -129,7 +97,6 @@ ServoStyleSheet::GetDOMOwnerRule() const CSSRuleList* ServoStyleSheet::GetCssRulesInternal(ErrorResult& aRv) { - aRv.Throw(NS_ERROR_NOT_IMPLEMENTED); return nullptr; } @@ -137,14 +104,12 @@ uint32_t ServoStyleSheet::InsertRuleInternal(const nsAString& aRule, uint32_t aIndex, ErrorResult& aRv) { - aRv.Throw(NS_ERROR_NOT_IMPLEMENTED); return 0; } void ServoStyleSheet::DeleteRuleInternal(uint32_t aIndex, ErrorResult& aRv) { - aRv.Throw(NS_ERROR_NOT_IMPLEMENTED); } } // namespace mozilla From e777ae5a3cf3eff7c7b5544afa0a3722fe43fa0b Mon Sep 17 00:00:00 2001 From: FranklinDM Date: Mon, 23 May 2022 23:05:22 +0800 Subject: [PATCH 06/33] Issue #2112 - Part 3: Remove --enable-stylo config and conditionals --- dom/base/Element.cpp | 4 --- dom/base/nsDocument.cpp | 15 -------- dom/base/nsGenericDOMDataNode.cpp | 4 --- dom/base/nsINode.cpp | 15 -------- dom/base/nsINode.h | 13 ------- layout/base/RestyleManagerBase.h | 4 --- layout/base/RestyleManagerHandle.h | 12 ------- layout/base/nsLayoutUtils.cpp | 7 ---- layout/base/nsLayoutUtils.h | 7 ---- layout/style/ServoBindings.cpp | 14 -------- layout/style/ServoUtils.h | 6 ---- layout/style/StyleContextSource.h | 4 --- layout/style/StyleSetHandle.h | 12 ------- layout/style/StyleStructContext.h | 4 --- layout/style/nsRuleNode.cpp | 7 ---- layout/style/nsStyleContext.cpp | 17 --------- layout/style/nsStyleContext.h | 58 ------------------------------ modules/libpref/init/all.js | 5 --- toolkit/library/moz.build | 6 ---- toolkit/moz.configure | 25 ------------- toolkit/xre/nsAppRunner.cpp | 15 -------- 21 files changed, 254 deletions(-) diff --git a/dom/base/Element.cpp b/dom/base/Element.cpp index b299d3849e..37878eaa20 100644 --- a/dom/base/Element.cpp +++ b/dom/base/Element.cpp @@ -1908,10 +1908,6 @@ Element::UnbindFromTree(bool aDeep, bool aNullParent) // recomputed it anyway if we ever insert the nodes back into a document. if (IsStyledByServo()) { ClearServoData(); - } else { -#ifdef MOZ_STYLO - MOZ_ASSERT(!HasServoData()); -#endif } // Editable descendant count only counts descendants that diff --git a/dom/base/nsDocument.cpp b/dom/base/nsDocument.cpp index ab9f2419a1..19e23cb6eb 100644 --- a/dom/base/nsDocument.cpp +++ b/dom/base/nsDocument.cpp @@ -12302,21 +12302,6 @@ nsIDocument::UpdateStyleBackendType() // Assume Gecko by default. mStyleBackendType = StyleBackendType::Gecko; - -#ifdef MOZ_STYLO - // XXX For now we use a Servo-backed style set only for (X)HTML documents - // in content docshells. This should let us avoid implementing XUL-specific - // CSS features. And apart from not supporting SVG properties in Servo - // yet, the root SVG element likes to create a style sheet for an SVG - // document before we have a pres shell (i.e. before we make the decision - // here about whether to use a Gecko- or Servo-backed style system), so - // we avoid Servo-backed style sets for SVG documents. - if (!mDocumentContainer) { - NS_WARNING("stylo: No docshell yet, assuming Gecko style system"); - } else if (nsLayoutUtils::SupportsServoStyleBackend(this)) { - mStyleBackendType = StyleBackendType::Servo; - } -#endif } Selection* diff --git a/dom/base/nsGenericDOMDataNode.cpp b/dom/base/nsGenericDOMDataNode.cpp index 6aedebcc18..d045c0424e 100644 --- a/dom/base/nsGenericDOMDataNode.cpp +++ b/dom/base/nsGenericDOMDataNode.cpp @@ -602,10 +602,6 @@ nsGenericDOMDataNode::UnbindFromTree(bool aDeep, bool aNullParent) // recomputed it anyway if we ever insert the nodes back into a document. if (IsStyledByServo()) { ClearServoData(); - } else { -#ifdef MOZ_STYLO - MOZ_ASSERT(!HasServoData()); -#endif } if (aNullParent || !mParent->IsInShadowTree()) { diff --git a/dom/base/nsINode.cpp b/dom/base/nsINode.cpp index d4129171cb..03ea679880 100644 --- a/dom/base/nsINode.cpp +++ b/dom/base/nsINode.cpp @@ -152,9 +152,6 @@ nsINode::~nsINode() { MOZ_ASSERT(!HasSlots(), "nsNodeUtils::LastRelease was not called?"); MOZ_ASSERT(mSubtreeRoot == this, "Didn't restore state properly?"); -#ifdef MOZ_STYLO - ClearServoData(); -#endif } void* @@ -1445,11 +1442,7 @@ nsINode::UnoptimizableCCNode() const void nsINode::ClearServoData() { -#ifdef MOZ_STYLO - Servo_Node_ClearNodeData(this); -#else MOZ_CRASH("Accessing servo node data in non-stylo build"); -#endif } /* static */ @@ -3193,14 +3186,6 @@ nsINode::IsNodeApzAwareInternal() const return EventTarget::IsApzAware(); } -#ifdef MOZ_STYLO -bool -nsINode::IsStyledByServo() const -{ - return OwnerDoc()->IsStyledByServo(); -} -#endif - DocGroup* nsINode::GetDocGroup() const { diff --git a/dom/base/nsINode.h b/dom/base/nsINode.h index 5268767a3e..a33c088928 100644 --- a/dom/base/nsINode.h +++ b/dom/base/nsINode.h @@ -1022,11 +1022,7 @@ public: * Returns true if this is a node belonging to a document that uses the Servo * style system. */ -#ifdef MOZ_STYLO - bool IsStyledByServo() const; -#else bool IsStyledByServo() const { return false; } -#endif bool IsDirtyForServo() const { @@ -2139,11 +2135,7 @@ public: #undef EVENT bool HasServoData() { -#ifdef MOZ_STYLO - return !!mServoData.Get(); -#else MOZ_CRASH("Accessing servo node data in non-stylo build"); -#endif } void ClearServoData(); @@ -2185,11 +2177,6 @@ protected: // Storage for more members that are usually not needed; allocated lazily. nsSlots* mSlots; - -#ifdef MOZ_STYLO - // Per-node data managed by Servo. - mozilla::ServoCell mServoData; -#endif }; inline nsIDOMNode* GetAsDOMNode(nsINode* aNode) diff --git a/layout/base/RestyleManagerBase.h b/layout/base/RestyleManagerBase.h index 8b8bf4170e..c3fc2f8a5a 100644 --- a/layout/base/RestyleManagerBase.h +++ b/layout/base/RestyleManagerBase.h @@ -120,11 +120,7 @@ protected: } inline bool IsServo() const { -#ifdef MOZ_STYLO - return PresContext()->StyleSet()->IsServo(); -#else return false; -#endif } private: diff --git a/layout/base/RestyleManagerHandle.h b/layout/base/RestyleManagerHandle.h index 5cc26e41e1..30702c5a5e 100644 --- a/layout/base/RestyleManagerHandle.h +++ b/layout/base/RestyleManagerHandle.h @@ -52,11 +52,7 @@ public: bool IsServo() const { MOZ_ASSERT(mValue, "RestyleManagerHandle null pointer dereference"); -#ifdef MOZ_STYLO - return mValue & SERVO_BIT; -#else return false; -#endif } StyleBackendType BackendType() const @@ -186,16 +182,8 @@ public: RestyleManagerHandle& operator=(ServoRestyleManager* aManager) { -#ifdef MOZ_STYLO - MOZ_ASSERT(!(reinterpret_cast(aManager) & SERVO_BIT), - "least significant bit shouldn't be set; we use it for state"); - mPtr.mValue = - aManager ? (reinterpret_cast(aManager) | SERVO_BIT) : 0; - return *this; -#else MOZ_CRASH("should not have a ServoRestyleManager object when MOZ_STYLO is " "disabled"); -#endif } // Make RestyleManagerHandle usable in boolean contexts. diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp index 613dd0b304..79ab52aaa6 100644 --- a/layout/base/nsLayoutUtils.cpp +++ b/layout/base/nsLayoutUtils.cpp @@ -181,9 +181,6 @@ typedef nsStyleTransformMatrix::TransformReferenceBox TransformReferenceBox; /* static */ bool nsLayoutUtils::sInterruptibleReflowEnabled; /* static */ bool nsLayoutUtils::sSVGTransformBoxEnabled; /* static */ bool nsLayoutUtils::sTextCombineUprightDigitsEnabled; -#ifdef MOZ_STYLO -/* static */ bool nsLayoutUtils::sStyloEnabled; -#endif /* static */ uint32_t nsLayoutUtils::sIdlePeriodDeadlineLimit; /* static */ uint32_t nsLayoutUtils::sQuiescentFramesBeforeIdlePeriod; @@ -7632,10 +7629,6 @@ nsLayoutUtils::Initialize() "svg.transform-box.enabled"); Preferences::AddBoolVarCache(&sTextCombineUprightDigitsEnabled, "layout.css.text-combine-upright-digits.enabled"); -#ifdef MOZ_STYLO - Preferences::AddBoolVarCache(&sStyloEnabled, - "layout.css.servo.enabled"); -#endif Preferences::AddUintVarCache(&sIdlePeriodDeadlineLimit, "layout.idle_period.time_limit", DEFAULT_IDLE_PERIOD_TIME_LIMIT); diff --git a/layout/base/nsLayoutUtils.h b/layout/base/nsLayoutUtils.h index f8724d69d3..29cd655660 100644 --- a/layout/base/nsLayoutUtils.h +++ b/layout/base/nsLayoutUtils.h @@ -2383,11 +2383,7 @@ public: // or disabled at compile-time. However, we provide the additional capability // to disable it dynamically in stylo-enabled builds via a pref. static bool StyloEnabled() { -#ifdef MOZ_STYLO - return sStyloEnabled; -#else return false; -#endif } static uint32_t IdlePeriodDeadlineLimit() { @@ -2910,9 +2906,6 @@ private: static bool sInterruptibleReflowEnabled; static bool sSVGTransformBoxEnabled; static bool sTextCombineUprightDigitsEnabled; -#ifdef MOZ_STYLO - static bool sStyloEnabled; -#endif static uint32_t sIdlePeriodDeadlineLimit; static uint32_t sQuiescentFramesBeforeIdlePeriod; diff --git a/layout/style/ServoBindings.cpp b/layout/style/ServoBindings.cpp index 0433cab914..ed21093ba3 100644 --- a/layout/style/ServoBindings.cpp +++ b/layout/style/ServoBindings.cpp @@ -695,23 +695,9 @@ Gecko_Destroy_nsStyle##name(nsStyle##name* ptr) \ #undef STYLE_STRUCT -#ifndef MOZ_STYLO #define SERVO_BINDING_FUNC(name_, return_, ...) \ return_ name_(__VA_ARGS__) { \ MOZ_CRASH("stylo: shouldn't be calling " #name_ "in a non-stylo build"); \ } #include "ServoBindingList.h" #undef SERVO_BINDING_FUNC -#endif - -#ifdef MOZ_STYLO -const nsStyleVariables* -Servo_GetStyleVariables(ServoComputedValuesBorrowed aComputedValues) -{ - // Servo can't provide us with Variables structs yet, so instead of linking - // to a Servo_GetStyleVariables defined in Servo we define one here that - // always returns the same, empty struct. - static nsStyleVariables variables(StyleStructContext::ServoContext()); - return &variables; -} -#endif diff --git a/layout/style/ServoUtils.h b/layout/style/ServoUtils.h index 047cbb7a05..8c8dbebcc1 100644 --- a/layout/style/ServoUtils.h +++ b/layout/style/ServoUtils.h @@ -10,15 +10,9 @@ #include "mozilla/TypeTraits.h" -#ifdef MOZ_STYLO -# define MOZ_DECL_STYLO_CHECK_METHODS \ - bool IsGecko() const { return !IsServo(); } \ - bool IsServo() const { return mType == StyleBackendType::Servo; } -#else # define MOZ_DECL_STYLO_CHECK_METHODS \ bool IsGecko() const { return true; } \ bool IsServo() const { return false; } -#endif /** * Macro used in a base class of |geckotype_| and |servotype_|. diff --git a/layout/style/StyleContextSource.h b/layout/style/StyleContextSource.h index 7c6a007304..9911dd8aa2 100644 --- a/layout/style/StyleContextSource.h +++ b/layout/style/StyleContextSource.h @@ -53,11 +53,7 @@ struct NonOwningStyleContextSource bool IsNull() const { return !mBits; } bool IsGeckoRuleNodeOrNull() const { return !IsServoComputedValues(); } bool IsServoComputedValues() const { -#ifdef MOZ_STYLO - return mBits & 1; -#else return false; -#endif } nsRuleNode* AsGeckoRuleNode() const { diff --git a/layout/style/StyleSetHandle.h b/layout/style/StyleSetHandle.h index 6c67a058df..e5e4af800a 100644 --- a/layout/style/StyleSetHandle.h +++ b/layout/style/StyleSetHandle.h @@ -54,11 +54,7 @@ public: bool IsServo() const { MOZ_ASSERT(mValue, "StyleSetHandle null pointer dereference"); -#ifdef MOZ_STYLO - return mValue & SERVO_BIT; -#else return false; -#endif } StyleBackendType BackendType() const @@ -187,16 +183,8 @@ public: StyleSetHandle& operator=(ServoStyleSet* aStyleSet) { -#ifdef MOZ_STYLO - MOZ_ASSERT(!(reinterpret_cast(aStyleSet) & SERVO_BIT), - "least significant bit shouldn't be set; we use it for state"); - mPtr.mValue = - aStyleSet ? (reinterpret_cast(aStyleSet) | SERVO_BIT) : 0; - return *this; -#else MOZ_CRASH("should not have a ServoStyleSet object when MOZ_STYLO is " "disabled"); -#endif } // Make StyleSetHandle usable in boolean contexts. diff --git a/layout/style/StyleStructContext.h b/layout/style/StyleStructContext.h index f4b59972ec..d8273049ab 100644 --- a/layout/style/StyleStructContext.h +++ b/layout/style/StyleStructContext.h @@ -35,11 +35,7 @@ class nsDeviceContext; * We don't put the type in namespace mozilla, since we expect it to be * temporary, and the namespacing would clutter up nsStyleStruct.h. */ -#ifdef MOZ_STYLO -#define SERVO_DEFAULT(default_val) { if (!mPresContext) { return default_val; } } -#else #define SERVO_DEFAULT(default_val) { MOZ_ASSERT(mPresContext); } -#endif class StyleStructContext { public: MOZ_IMPLICIT StyleStructContext(nsPresContext* aPresContext) diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp index e57b552ebb..1fa6166f27 100644 --- a/layout/style/nsRuleNode.cpp +++ b/layout/style/nsRuleNode.cpp @@ -10507,13 +10507,6 @@ nsRuleNode::HasAuthorSpecifiedRules(nsStyleContext* aStyleContext, uint32_t ruleTypeMask, bool aAuthorColorsAllowed) { -#ifdef MOZ_STYLO - if (aStyleContext->StyleSource().IsServoComputedValues()) { - NS_WARNING("stylo: nsRuleNode::HasAuthorSpecifiedRules not implemented"); - return true; - } -#endif - uint32_t inheritBits = 0; if (ruleTypeMask & NS_AUTHOR_SPECIFIED_BACKGROUND) { inheritBits |= NS_STYLE_INHERIT_BIT(Background); diff --git a/layout/style/nsStyleContext.cpp b/layout/style/nsStyleContext.cpp index 38b422bd73..1c40245425 100644 --- a/layout/style/nsStyleContext.cpp +++ b/layout/style/nsStyleContext.cpp @@ -88,18 +88,9 @@ nsStyleContext::nsStyleContext(nsStyleContext* aParent, , mEmptyChild(nullptr) , mPseudoTag(aPseudoTag) , mSource(Move(aSource)) -#ifdef MOZ_STYLO - , mPresContext(nullptr) -#endif , mCachedResetData(nullptr) , mBits(((uint64_t)aPseudoType) << NS_STYLE_CONTEXT_TYPE_SHIFT) , mRefCnt(0) -#ifdef MOZ_STYLO - , mStoredChangeHint(nsChangeHint(0)) -#ifdef DEBUG - , mConsumedChangeHint(false) -#endif -#endif #ifdef DEBUG , mFrameRefCnt(0) , mComputingStruct(nsStyleStructID_None) @@ -116,10 +107,6 @@ nsStyleContext::nsStyleContext(nsStyleContext* aParent, : nsStyleContext(aParent, OwningStyleContextSource(Move(aRuleNode)), aPseudoTag, aPseudoType) { -#ifdef MOZ_STYLO - mPresContext = mSource.AsGeckoRuleNode()->PresContext(); -#endif - if (aParent) { #ifdef DEBUG nsRuleNode *r1 = mParent->RuleNode(), *r2 = mSource.AsGeckoRuleNode(); @@ -146,10 +133,6 @@ nsStyleContext::nsStyleContext(nsStyleContext* aParent, : nsStyleContext(aParent, OwningStyleContextSource(Move(aComputedValues)), aPseudoTag, aPseudoType) { -#ifdef MOZ_STYLO - mPresContext = aPresContext; -#endif - FinishConstruction(aSkipParentDisplayBasedStyleFixup); } diff --git a/layout/style/nsStyleContext.h b/layout/style/nsStyleContext.h index b0b4896a3d..404240b16e 100644 --- a/layout/style/nsStyleContext.h +++ b/layout/style/nsStyleContext.h @@ -154,11 +154,7 @@ public: } nsPresContext* PresContext() const { -#ifdef MOZ_STYLO - return mPresContext; -#else return mSource.AsGeckoRuleNode()->PresContext(); -#endif } nsStyleContext* GetParent() const { return mParent; } @@ -512,45 +508,6 @@ public: mozilla::NonOwningStyleContextSource StyleSource() const { return mSource.AsRaw(); } -#ifdef MOZ_STYLO - // NOTE: It'd be great to assert here that the previous change hint is always - // consumed. - // - // This is not the case right now, since the changes of childs of frames that - // go through frame construction are not consumed. - void StoreChangeHint(nsChangeHint aHint) - { - MOZ_ASSERT(!IsShared()); - mStoredChangeHint = aHint; -#ifdef DEBUG - mConsumedChangeHint = false; -#endif - } - - nsChangeHint ConsumeStoredChangeHint() - { - MOZ_ASSERT(!mConsumedChangeHint, "Re-consuming the same change hint!"); - nsChangeHint result = mStoredChangeHint; - mStoredChangeHint = nsChangeHint(0); -#ifdef DEBUG - mConsumedChangeHint = true; -#endif - return result; - } -#else - void StoreChangeHint(nsChangeHint aHint) - { - MOZ_CRASH("stylo: Called nsStyleContext::StoreChangeHint in a non MOZ_STYLO " - "build."); - } - - nsChangeHint ConsumeStoredChangeHint() - { - MOZ_CRASH("stylo: Called nsStyleContext::ComsumeStoredChangeHint in a non " - "MOZ_STYLO build."); - } -#endif - private: // Private destructor, to discourage deletion outside of Release(): ~nsStyleContext(); @@ -781,12 +738,6 @@ private: // when it's released and nulled out during teardown. const mozilla::OwningStyleContextSource mSource; -#ifdef MOZ_STYLO - // In Gecko, we can get this off the rule node. We make this conditional - // on stylo builds to avoid the memory bloat on release. - nsPresContext* mPresContext; -#endif - // mCachedInheritedData and mCachedResetData point to both structs that // are owned by this style context and structs that are owned by one of // this style context's ancestors (which are indirectly owned since this @@ -809,15 +760,6 @@ private: uint32_t mRefCnt; - // For now we store change hints on the style context during parallel traversal. - // We should improve this - see bug 1289861. -#ifdef MOZ_STYLO - nsChangeHint mStoredChangeHint; -#ifdef DEBUG - bool mConsumedChangeHint; -#endif -#endif - #ifdef DEBUG uint32_t mFrameRefCnt; // number of frames that use this // as their style context diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index dfa0fd0caa..17c6021044 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -5258,11 +5258,6 @@ pref("dom.webkitBlink.filesystem.enabled", true); pref("media.block-autoplay-until-in-foreground", true); -#ifdef MOZ_STYLO -// Is the Servo-backed style system enabled? -pref("layout.css.servo.enabled", true); -#endif - // Block toplevel data: URI navigations // If true, all toplevel data: URI navigations will be blocked. // Please note that manually entering a data: URI in the diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build index 69b207d77a..49ff260b47 100644 --- a/toolkit/library/moz.build +++ b/toolkit/library/moz.build @@ -185,12 +185,6 @@ if CONFIG['OS_ARCH'] == 'Linux': OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS'] OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS'] -if CONFIG['SERVO_TARGET_DIR']: - if CONFIG['_MSC_VER']: - OS_LIBS += ['%s/geckoservo' % CONFIG['SERVO_TARGET_DIR']] - else: - OS_LIBS += ['-L%s' % CONFIG['SERVO_TARGET_DIR'], '-lgeckoservo'] - if CONFIG['MOZ_SYSTEM_JPEG']: OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] diff --git a/toolkit/moz.configure b/toolkit/moz.configure index fbd728fdc8..edf2a78fb8 100644 --- a/toolkit/moz.configure +++ b/toolkit/moz.configure @@ -387,31 +387,6 @@ id_and_secret_keyfile('Bing API') simple_keyfile('Adjust SDK') -# Servo integration -# ============================================================== -option('--enable-stylo', env='STYLO_ENABLED', nargs=0, - help='Enables experimental integration with the servo style system. ' - 'This requires either building servo within Gecko\'s cargo phase ' - 'or passing --with-servo') - -@depends('--enable-stylo') -def stylo(value): - if value: - return True - -set_define('MOZ_STYLO', stylo) -imply_option('--enable-jemalloc', depends_if('--enable-stylo')(lambda _: 'moz')) - -option('--with-servo', env='SERVO_TARGET_DIR', nargs=1, - help='Absolute path of the target directory where libgeckoservo can ' - 'be found. This is generally servo_src_dir/target/release.') - -@depends_if('--with-servo') -def servo_target_dir(value): - return value[0] - -set_config('SERVO_TARGET_DIR', servo_target_dir) - # Gecko integrated IPC fuzzer # ============================================================== option('--enable-ipc-fuzzer', env='MOZ_FAULTY', diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 74850e17e2..54922ae894 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -3767,15 +3767,6 @@ XREMain::XRE_mainRun() rv = appStartup->CreateHiddenWindow(); NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE); -#ifdef MOZ_STYLO - // We initialize Servo here so that the hidden DOM window is available, - // since initializing Servo calls style struct constructors, and the - // HackilyFindDeviceContext stuff we have right now depends on the hidden - // DOM window. When we fix that, this should move back to - // nsLayoutStatics.cpp - Servo_Initialize(); -#endif - #if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK) nsGTKToolkit* toolkit = nsGTKToolkit::GetToolkit(); if (toolkit && !mDesktopStartupID.IsEmpty()) { @@ -3848,12 +3839,6 @@ XREMain::XRE_mainRun() } } -#ifdef MOZ_STYLO - // This, along with the call to Servo_Initialize, should eventually move back - // to nsLayoutStatics.cpp. - Servo_Shutdown(); -#endif - return rv; } From b1c920605196f6e3fab07b150fec84a2fa25cb49 Mon Sep 17 00:00:00 2001 From: FranklinDM Date: Tue, 20 Jun 2023 20:01:52 +0800 Subject: [PATCH 07/33] Issue #2112 - Part 4: Remove Stylo support for mask-image --- layout/style/ServoBindings.cpp | 10 ------- layout/style/nsRuleNode.cpp | 52 +++------------------------------- layout/style/nsRuleNode.h | 3 -- 3 files changed, 4 insertions(+), 61 deletions(-) diff --git a/layout/style/ServoBindings.cpp b/layout/style/ServoBindings.cpp index ed21093ba3..e0aeba4135 100644 --- a/layout/style/ServoBindings.cpp +++ b/layout/style/ServoBindings.cpp @@ -244,16 +244,6 @@ Gecko_GetServoDeclarationBlock(RawGeckoElementBorrowed aElement) return nullptr; } -void -Gecko_FillAllBackgroundLists(nsStyleImageLayers* aLayers, uint32_t aMaxLen) -{ -} - -void -Gecko_FillAllMaskLists(nsStyleImageLayers* aLayers, uint32_t aMaxLen) -{ -} - template static nsIAtom* AtomAttrValue(Implementor* aElement, nsIAtom* aName) diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp index 1fa6166f27..8540726079 100644 --- a/layout/style/nsRuleNode.cpp +++ b/layout/style/nsRuleNode.cpp @@ -7404,8 +7404,8 @@ FillImageLayerPositionCoordList( /* static */ void -nsRuleNode::FillAllBackgroundLists(nsStyleImageLayers& aImage, - uint32_t aMaxItemCount) +nsRuleNode::FillAllMaskLists(nsStyleImageLayers& aImage, + uint32_t aMaxItemCount) { // Delete any extra items. We need to keep layers in which any // property was specified. @@ -7560,7 +7560,7 @@ nsRuleNode::ComputeBackgroundData(void* aStartStruct, conditions); if (rebuild) { - FillAllBackgroundLists(bg->mImage, maxItemCount); + FillAllMaskLists(bg->mImage, maxItemCount); } COMPUTE_END_RESET(Background, bg) @@ -9479,50 +9479,6 @@ SetSVGOpacity(const nsCSSValue& aValue, } } -/* static */ -void -nsRuleNode::FillAllMaskLists(nsStyleImageLayers& aMask, - uint32_t aMaxItemCount) -{ - - // Delete any extra items. We need to keep layers in which any - // property was specified. - aMask.mLayers.TruncateLengthNonZero(aMaxItemCount); - - uint32_t fillCount = aMask.mImageCount; - - FillImageLayerList(aMask.mLayers, - &nsStyleImageLayers::Layer::mImage, - aMask.mImageCount, fillCount); - FillImageLayerList(aMask.mLayers, - &nsStyleImageLayers::Layer::mSourceURI, - aMask.mImageCount, fillCount); - FillImageLayerList(aMask.mLayers, - &nsStyleImageLayers::Layer::mRepeat, - aMask.mRepeatCount, fillCount); - FillImageLayerList(aMask.mLayers, - &nsStyleImageLayers::Layer::mClip, - aMask.mClipCount, fillCount); - FillImageLayerList(aMask.mLayers, - &nsStyleImageLayers::Layer::mOrigin, - aMask.mOriginCount, fillCount); - FillImageLayerPositionCoordList(aMask.mLayers, - &Position::mXPosition, - aMask.mPositionXCount, fillCount); - FillImageLayerPositionCoordList(aMask.mLayers, - &Position::mYPosition, - aMask.mPositionYCount, fillCount); - FillImageLayerList(aMask.mLayers, - &nsStyleImageLayers::Layer::mSize, - aMask.mSizeCount, fillCount); - FillImageLayerList(aMask.mLayers, - &nsStyleImageLayers::Layer::mMaskMode, - aMask.mMaskModeCount, fillCount); - FillImageLayerList(aMask.mLayers, - &nsStyleImageLayers::Layer::mComposite, - aMask.mCompositeCount, fillCount); -} - const void* nsRuleNode::ComputeSVGData(void* aStartStruct, const nsRuleData* aRuleData, @@ -10257,7 +10213,7 @@ nsRuleNode::ComputeSVGResetData(void* aStartStruct, svgReset->mMask.mCompositeCount, maxItemCount, rebuild, conditions); if (rebuild) { - FillAllBackgroundLists(svgReset->mMask, maxItemCount); + FillAllMaskLists(svgReset->mMask, maxItemCount); } COMPUTE_END_RESET(SVGReset, svgReset) diff --git a/layout/style/nsRuleNode.h b/layout/style/nsRuleNode.h index f9e71618b0..49fa8a027b 100644 --- a/layout/style/nsRuleNode.h +++ b/layout/style/nsRuleNode.h @@ -1067,9 +1067,6 @@ public: // Fill unspecified layers by cycling through their values // till they all are of length aMaxItemCount - static void FillAllBackgroundLists(nsStyleImageLayers& aLayers, - uint32_t aMaxItemCount); - static void FillAllMaskLists(nsStyleImageLayers& aLayers, uint32_t aMaxItemCount); From a93a7bed4794a5bd6c40bb69394e5e9ce29febaf Mon Sep 17 00:00:00 2001 From: FranklinDM Date: Mon, 25 Mar 2024 02:02:08 +0800 Subject: [PATCH 08/33] Issue #2112 - Part 5: Remove Servo from forwarding code used by magic pointer classes --- dom/animation/EffectCompositor.cpp | 6 -- dom/animation/EffectSet.cpp | 3 - dom/animation/KeyframeEffectReadOnly.cpp | 11 +- dom/animation/KeyframeUtils.cpp | 96 ++++------------- dom/base/nsAttrValue.cpp | 12 +-- dom/base/nsDocument.cpp | 89 +++++----------- dom/base/nsStyleLinkElement.cpp | 13 +-- dom/svg/nsSVGElement.cpp | 3 - dom/xbl/nsXBLBinding.cpp | 9 -- dom/xbl/nsXBLPrototypeResources.cpp | 4 - editor/libeditor/CSSEditUtils.cpp | 4 - editor/libeditor/HTMLEditor.cpp | 10 -- layout/base/RestyleManager.cpp | 3 - layout/base/RestyleManager.h | 3 - layout/base/RestyleManagerBase.h | 8 -- layout/base/RestyleManagerHandle.h | 29 +----- layout/base/RestyleManagerHandleInlines.h | 65 +++++------- layout/base/nsCSSFrameConstructor.cpp | 22 +--- layout/base/nsDocumentViewer.cpp | 27 ++--- layout/base/nsPresContext.cpp | 23 ++-- layout/base/nsPresShell.cpp | 48 +-------- layout/base/nsStyleSheetService.cpp | 27 ++--- layout/generic/nsFrame.cpp | 27 ++--- layout/inspector/inDOMUtils.cpp | 20 ++-- layout/style/AnimationCollection.cpp | 4 - layout/style/CSSStyleSheet.cpp | 3 - layout/style/CounterStyleManager.cpp | 14 +-- layout/style/DeclarationBlock.h | 2 +- layout/style/DeclarationBlockInlines.h | 35 +++---- layout/style/Loader.cpp | 121 +++++++--------------- layout/style/ServoUtils.h | 47 +-------- layout/style/StyleAnimationValue.cpp | 42 -------- layout/style/StyleAnimationValue.h | 12 --- layout/style/StyleContextSource.h | 50 +-------- layout/style/StyleSetHandle.h | 52 ++-------- layout/style/StyleSetHandleInlines.h | 110 +++++++------------- layout/style/StyleSheet.cpp | 24 ++--- layout/style/StyleSheet.h | 2 +- layout/style/StyleSheetInlines.h | 28 ++--- layout/style/nsAnimationManager.cpp | 9 -- layout/style/nsComputedDOMStyle.cpp | 10 +- layout/style/nsDOMCSSDeclaration.cpp | 54 ++++------ layout/style/nsHTMLCSSStyleSheet.cpp | 3 - layout/style/nsLayoutStylesheetCache.cpp | 21 +--- layout/style/nsRuleNode.cpp | 4 - layout/style/nsStyleContext.cpp | 56 ++-------- layout/style/nsStyleContext.h | 98 +----------------- layout/style/nsStyleSet.cpp | 13 --- layout/style/nsStyleSet.h | 4 - layout/style/nsStyleStruct.cpp | 4 - layout/style/nsTransitionManager.cpp | 10 -- layout/xul/tree/nsTreeStyleCache.cpp | 4 - 52 files changed, 278 insertions(+), 1120 deletions(-) diff --git a/dom/animation/EffectCompositor.cpp b/dom/animation/EffectCompositor.cpp index 30df27a012..802cbbb1e3 100644 --- a/dom/animation/EffectCompositor.cpp +++ b/dom/animation/EffectCompositor.cpp @@ -202,9 +202,6 @@ EffectCompositor::RequestRestyle(dom::Element* aElement, if (aRestyleType == RestyleType::Layer) { // Prompt layers to re-sync their animations. - MOZ_ASSERT(mPresContext->RestyleManager()->IsGecko(), - "stylo: Servo-backed style system should not be using " - "EffectCompositor"); mPresContext->RestyleManager()->AsGecko()->IncrementAnimationGeneration(); EffectSet* effectSet = EffectSet::GetEffectSet(aElement, aPseudoType); @@ -317,9 +314,6 @@ EffectCompositor::GetAnimationRule(dom::Element* aElement, return nullptr; } - MOZ_ASSERT(mPresContext->RestyleManager()->IsGecko(), - "stylo: Servo-backed style system should not be using " - "EffectCompositor"); if (mPresContext->RestyleManager()->AsGecko()->SkipAnimationRules()) { // We don't need to worry about updating mElementsToRestyle in this case // since this is not the animation restyle we requested when we called diff --git a/dom/animation/EffectSet.cpp b/dom/animation/EffectSet.cpp index 55dbe353b2..3731e47bae 100644 --- a/dom/animation/EffectSet.cpp +++ b/dom/animation/EffectSet.cpp @@ -110,9 +110,6 @@ EffectSet::DestroyEffectSet(dom::Element* aElement, void EffectSet::UpdateAnimationGeneration(nsPresContext* aPresContext) { - MOZ_ASSERT(aPresContext->RestyleManager()->IsGecko(), - "stylo: Servo-backed style system should not be using " - "EffectSet"); mAnimationGeneration = aPresContext->RestyleManager()->AsGecko()->GetAnimationGeneration(); } diff --git a/dom/animation/KeyframeEffectReadOnly.cpp b/dom/animation/KeyframeEffectReadOnly.cpp index 2efc747f09..62dddd2d4b 100644 --- a/dom/animation/KeyframeEffectReadOnly.cpp +++ b/dom/animation/KeyframeEffectReadOnly.cpp @@ -296,10 +296,7 @@ KeyframeEffectReadOnly::UpdateProperties(nsStyleContext* aStyleContext) runningOnCompositorProperties.HasProperty(property.mProperty); } - // FIXME (bug 1303235): Do this for Servo too - if (aStyleContext->PresContext()->StyleSet()->IsGecko()) { - CalculateCumulativeChangeHint(aStyleContext); - } + CalculateCumulativeChangeHint(aStyleContext); MarkCascadeNeedsUpdate(); @@ -1286,8 +1283,6 @@ CreateStyleContextForAnimationValue(nsCSSPropertyID aProperty, nsCOMArray rules; rules.AppendObject(styleRule); - MOZ_ASSERT(aBaseStyleContext->PresContext()->StyleSet()->IsGecko(), - "ServoStyleSet should not use StyleAnimationValue for animations"); nsStyleSet* styleSet = aBaseStyleContext->PresContext()->StyleSet()->AsGecko(); @@ -1362,10 +1357,8 @@ KeyframeEffectReadOnly::CanIgnoreIfNotVisible() const return false; } - // FIXME (bug 1303235): We don't calculate mCumulativeChangeHint for - // the Servo backend yet nsPresContext* presContext = GetPresContext(); - if (!presContext || presContext->StyleSet()->IsServo()) { + if (!presContext) { return false; } diff --git a/dom/animation/KeyframeUtils.cpp b/dom/animation/KeyframeUtils.cpp index 540f892d57..a89e954235 100644 --- a/dom/animation/KeyframeUtils.cpp +++ b/dom/animation/KeyframeUtils.cpp @@ -9,7 +9,6 @@ #include "mozilla/Move.h" #include "mozilla/Preferences.h" #include "mozilla/RangedArray.h" -#include "mozilla/ServoBindings.h" #include "mozilla/StyleAnimationValue.h" #include "mozilla/TimingParams.h" #include "mozilla/dom/BaseKeyframeTypesBinding.h" // For FastBaseKeyframe etc. @@ -321,10 +320,6 @@ public: inline bool IsInvalidValuePair(const PropertyValuePair& aPair, StyleBackendType aBackend) { - if (aBackend == StyleBackendType::Servo) { - return !aPair.mServoDeclarationBlock; - } - // There are three types of values we store as token streams: // // * Shorthand values (where we manually extract the token stream's string @@ -610,11 +605,6 @@ KeyframeUtils::GetComputedKeyframeValues(const nsTArray& aKeyframes, ComputedKeyframeValues* computedValues = result.AppendElement(); for (const PropertyValuePair& pair : PropertyPriorityIterator(frame.mPropertyValues)) { - MOZ_ASSERT(!pair.mServoDeclarationBlock || - styleBackend == StyleBackendType::Servo, - "Animation values were parsed using Servo backend but target" - " element is not using Servo backend?"); - if (IsInvalidValuePair(pair, styleBackend)) { continue; } @@ -623,33 +613,25 @@ KeyframeUtils::GetComputedKeyframeValues(const nsTArray& aKeyframes, // a KeyframeValueEntry for each value. nsTArray values; - if (styleBackend == StyleBackendType::Servo) { + // For shorthands, we store the string as a token stream so we need to + // extract that first. + if (nsCSSProps::IsShorthand(pair.mProperty)) { + nsCSSValueTokenStream* tokenStream = pair.mValue.GetTokenStreamValue(); if (!StyleAnimationValue::ComputeValues(pair.mProperty, - CSSEnabledState::eForAllContent, aStyleContext, - *pair.mServoDeclarationBlock, values)) { + CSSEnabledState::eForAllContent, aElement, aStyleContext, + tokenStream->mTokenStream, /* aUseSVGMode */ false, values) || + IsComputeValuesFailureKey(pair)) { continue; } } else { - // For shorthands, we store the string as a token stream so we need to - // extract that first. - if (nsCSSProps::IsShorthand(pair.mProperty)) { - nsCSSValueTokenStream* tokenStream = pair.mValue.GetTokenStreamValue(); - if (!StyleAnimationValue::ComputeValues(pair.mProperty, - CSSEnabledState::eForAllContent, aElement, aStyleContext, - tokenStream->mTokenStream, /* aUseSVGMode */ false, values) || - IsComputeValuesFailureKey(pair)) { - continue; - } - } else { - if (!StyleAnimationValue::ComputeValues(pair.mProperty, - CSSEnabledState::eForAllContent, aElement, aStyleContext, - pair.mValue, /* aUseSVGMode */ false, values)) { - continue; - } - MOZ_ASSERT(values.Length() == 1, - "Longhand properties should produce a single" - " StyleAnimationValue"); + if (!StyleAnimationValue::ComputeValues(pair.mProperty, + CSSEnabledState::eForAllContent, aElement, aStyleContext, + pair.mValue, /* aUseSVGMode */ false, values)) { + continue; } + MOZ_ASSERT(values.Length() == 1, + "Longhand properties should produce a single" + " StyleAnimationValue"); } for (auto& value : values) { @@ -999,30 +981,6 @@ MakePropertyValuePair(nsCSSPropertyID aProperty, const nsAString& aStringValue, result.mProperty = aProperty; - if (aDocument->GetStyleBackendType() == StyleBackendType::Servo) { - nsCString name = nsCSSProps::GetStringValue(aProperty); - - NS_ConvertUTF16toUTF8 value(aStringValue); - RefPtr base = - new ThreadSafeURIHolder(aDocument->GetDocumentURI()); - RefPtr referrer = - new ThreadSafeURIHolder(aDocument->GetDocumentURI()); - RefPtr principal = - new ThreadSafePrincipalHolder(aDocument->NodePrincipal()); - - nsCString baseString; - aDocument->GetDocumentURI()->GetSpec(baseString); - - RefPtr servoDeclarationBlock = - Servo_ParseProperty(&name, &value, &baseString, - base, referrer, principal).Consume(); - - if (servoDeclarationBlock) { - result.mServoDeclarationBlock = servoDeclarationBlock.forget(); - return result; - } - } - nsCSSValue value; if (!nsCSSProps::IsShorthand(aProperty)) { aParser.ParseLonghandProperty(aProperty, @@ -1054,13 +1012,6 @@ MakePropertyValuePair(nsCSSPropertyID aProperty, const nsAString& aStringValue, "The shorthand property of a token stream should be initialized" " to unknown"); value.SetTokenStreamValue(tokenStream); - } else { - // If we succeeded in parsing with Gecko, but not Servo the animation is - // not going to work since, for the purposes of animation, we're going to - // ignore |mValue| when the backend is Servo. - NS_WARNING_ASSERTION(aDocument->GetStyleBackendType() != - StyleBackendType::Servo, - "Gecko succeeded in parsing where Servo failed"); } result.mValue = value; @@ -1434,20 +1385,13 @@ HasImplicitKeyframeValues(const nsTArray& aKeyframes, } if (nsCSSProps::IsShorthand(pair.mProperty)) { - if (styleBackend == StyleBackendType::Gecko) { - nsCSSValueTokenStream* tokenStream = - pair.mValue.GetTokenStreamValue(); - nsCSSParser parser(aDocument->CSSLoader()); - if (!parser.IsValueValidForProperty(pair.mProperty, - tokenStream->mTokenStream)) { - continue; - } + nsCSSValueTokenStream* tokenStream = + pair.mValue.GetTokenStreamValue(); + nsCSSParser parser(aDocument->CSSLoader()); + if (!parser.IsValueValidForProperty(pair.mProperty, + tokenStream->mTokenStream)) { + continue; } - // For the Servo backend, invalid shorthand values are represented by - // a null mServoDeclarationBlock member which we skip above in - // IsInvalidValuePair. - MOZ_ASSERT(styleBackend != StyleBackendType::Servo || - pair.mServoDeclarationBlock); CSSPROPS_FOR_SHORTHAND_SUBPROPERTIES( prop, pair.mProperty, CSSEnabledState::eForAllContent) { addToPropertySets(*prop, offsetToUse); diff --git a/dom/base/nsAttrValue.cpp b/dom/base/nsAttrValue.cpp index 711a695b78..c2dec154c7 100644 --- a/dom/base/nsAttrValue.cpp +++ b/dom/base/nsAttrValue.cpp @@ -1749,14 +1749,10 @@ nsAttrValue::ParseStyleAttribute(const nsAString& aString, } RefPtr decl; - if (ownerDoc->GetStyleBackendType() == StyleBackendType::Servo) { - decl = ServoDeclarationBlock::FromCssText(aString); - } else { - css::Loader* cssLoader = ownerDoc->CSSLoader(); - nsCSSParser cssParser(cssLoader); - decl = cssParser.ParseStyleAttribute(aString, docURI, baseURI, - aElement->NodePrincipal()); - } + css::Loader* cssLoader = ownerDoc->CSSLoader(); + nsCSSParser cssParser(cssLoader); + decl = cssParser.ParseStyleAttribute(aString, docURI, baseURI, + aElement->NodePrincipal()); if (!decl) { return false; } diff --git a/dom/base/nsDocument.cpp b/dom/base/nsDocument.cpp index 19e23cb6eb..39d5c6447b 100644 --- a/dom/base/nsDocument.cpp +++ b/dom/base/nsDocument.cpp @@ -1153,10 +1153,6 @@ nsDOMStyleSheetSetList::EnsureFresh() StyleSheet* sheet = mDocument->SheetAt(index); NS_ASSERTION(sheet, "Null sheet in sheet list!"); // XXXheycam ServoStyleSheets don't expose their title yet. - if (sheet->IsServo()) { - NS_ERROR("stylo: ServoStyleSets don't expose their title yet"); - continue; - } sheet->AsGecko()->GetTitle(title); if (!title.IsEmpty() && !mNames.Contains(title) && !Add(title)) { return; @@ -2193,23 +2189,18 @@ nsDocument::FillStyleSet(StyleSetHandle aStyleSet) } } - if (aStyleSet->IsGecko()) { - nsStyleSheetService *sheetService = nsStyleSheetService::GetInstance(); - if (sheetService) { - for (StyleSheet* sheet : *sheetService->AuthorStyleSheets()) { - aStyleSet->AppendStyleSheet(SheetType::Doc, sheet); - } + nsStyleSheetService *sheetService = nsStyleSheetService::GetInstance(); + if (sheetService) { + for (StyleSheet* sheet : *sheetService->AuthorStyleSheets()) { + aStyleSet->AppendStyleSheet(SheetType::Doc, sheet); } + } - // Iterate backwards to maintain order - for (StyleSheet* sheet : Reversed(mOnDemandBuiltInUASheets)) { - if (sheet->IsApplicable()) { - aStyleSet->PrependStyleSheet(SheetType::Agent, sheet); - } + // Iterate backwards to maintain order + for (StyleSheet* sheet : Reversed(mOnDemandBuiltInUASheets)) { + if (sheet->IsApplicable()) { + aStyleSet->PrependStyleSheet(SheetType::Agent, sheet); } - } else { - NS_WARNING("stylo: Not yet checking nsStyleSheetService for Servo-backed " - "documents. See bug 1290224"); } AppendSheetsToStyleSet(aStyleSet, mAdditionalSheets[eAgentSheet], @@ -3850,11 +3841,7 @@ nsDocument::AddStyleSheetToStyleSets(StyleSheet* aSheet) className##Init init; \ init.mBubbles = true; \ init.mCancelable = true; \ - /* XXXheycam ServoStyleSheet doesn't implement DOM interfaces yet */ \ - if (aSheet->IsServo()) { \ - NS_ERROR("stylo: can't dispatch events for ServoStyleSheets yet"); \ - } \ - init.mStylesheet = aSheet->IsGecko() ? aSheet->AsGecko() : nullptr; \ + init.mStylesheet = aSheet->AsGecko(); \ init.memberName = argName; \ \ RefPtr event = \ @@ -5623,12 +5610,6 @@ nsIDocument::GetSelectedStyleSheetSet(nsAString& aSheetSet) StyleSheet* sheet = SheetAt(index); NS_ASSERTION(sheet, "Null sheet in sheet list!"); - // XXXheycam Make this work with ServoStyleSheets. - if (sheet->IsServo()) { - NS_ERROR("stylo: can't handle alternate ServoStyleSheets yet"); - continue; - } - bool disabled; sheet->AsGecko()->GetDisabled(&disabled); if (disabled) { @@ -5743,12 +5724,6 @@ nsDocument::EnableStyleSheetsForSetInternal(const nsAString& aSheetSet, StyleSheet* sheet = SheetAt(index); NS_ASSERTION(sheet, "Null sheet in sheet list!"); - // XXXheycam Make this work with ServoStyleSheets. - if (sheet->IsServo()) { - NS_ERROR("stylo: can't handle alternate ServoStyleSheets yet"); - continue; - } - sheet->AsGecko()->GetTitle(title); if (!title.IsEmpty()) { sheet->AsGecko()->SetEnabled(title.Equals(aSheetSet)); @@ -9471,17 +9446,12 @@ nsIDocument::CreateStaticClone(nsIDocShell* aCloneContainer) RefPtr sheet = SheetAt(i); if (sheet) { if (sheet->IsApplicable()) { - // XXXheycam Need to make ServoStyleSheet cloning work. - if (sheet->IsGecko()) { - RefPtr clonedSheet = - sheet->AsGecko()->Clone(nullptr, nullptr, clonedDoc, nullptr); - NS_WARNING_ASSERTION(clonedSheet, - "Cloning a stylesheet didn't work!"); - if (clonedSheet) { - clonedDoc->AddStyleSheet(clonedSheet); - } - } else { - NS_ERROR("stylo: ServoStyleSheet doesn't support cloning"); + RefPtr clonedSheet = + sheet->AsGecko()->Clone(nullptr, nullptr, clonedDoc, nullptr); + NS_WARNING_ASSERTION(clonedSheet, + "Cloning a stylesheet didn't work!"); + if (clonedSheet) { + clonedDoc->AddStyleSheet(clonedSheet); } } } @@ -9491,17 +9461,12 @@ nsIDocument::CreateStaticClone(nsIDocShell* aCloneContainer) for (StyleSheet* sheet : Reversed(thisAsDoc->mOnDemandBuiltInUASheets)) { if (sheet) { if (sheet->IsApplicable()) { - // XXXheycam Need to make ServoStyleSheet cloning work. - if (sheet->IsGecko()) { - RefPtr clonedSheet = - sheet->AsGecko()->Clone(nullptr, nullptr, clonedDoc, nullptr); - NS_WARNING_ASSERTION(clonedSheet, - "Cloning a stylesheet didn't work!"); - if (clonedSheet) { - clonedDoc->AddOnDemandBuiltInUASheet(clonedSheet); - } - } else { - NS_ERROR("stylo: ServoStyleSheet doesn't support cloning"); + RefPtr clonedSheet = + sheet->AsGecko()->Clone(nullptr, nullptr, clonedDoc, nullptr); + NS_WARNING_ASSERTION(clonedSheet, + "Cloning a stylesheet didn't work!"); + if (clonedSheet) { + clonedDoc->AddOnDemandBuiltInUASheet(clonedSheet); } } } @@ -12203,14 +12168,8 @@ nsIDocument::FlushUserFontSet() nsTArray rules; nsIPresShell* shell = GetShell(); if (shell) { - // XXXheycam ServoStyleSets don't support exposing @font-face rules yet. - if (shell->StyleSet()->IsGecko()) { - if (!shell->StyleSet()->AsGecko()->AppendFontFaceRules(rules)) { - return; - } - } else { - NS_WARNING("stylo: ServoStyleSets cannot handle @font-face rules yet. " - "See bug 1290237."); + if (!shell->StyleSet()->AsGecko()->AppendFontFaceRules(rules)) { + return; } } diff --git a/dom/base/nsStyleLinkElement.cpp b/dom/base/nsStyleLinkElement.cpp index cfc074ba28..707d36a510 100644 --- a/dom/base/nsStyleLinkElement.cpp +++ b/dom/base/nsStyleLinkElement.cpp @@ -319,14 +319,9 @@ nsStyleLinkElement::DoUpdateStyleSheet(nsIDocument* aOldDocument, return NS_OK; } - // XXXheycam ServoStyleSheets do not support