From 9ae23f45d424c2de8c9e481b2eb996ca055f29a9 Mon Sep 17 00:00:00 2001 From: Mats Palmgren Date: Tue, 12 Nov 2019 19:09:13 +0000 Subject: [PATCH] Bug 1356712 - Remove bogus assertions. r=emilio Differential Revision: https://phabricator.services.mozilla.com/D52678 --HG-- extra : moz-landing-system : lando --- layout/painting/nsCSSRendering.cpp | 4 --- .../mask-image/mask-image-data-url-image.html | 27 ++++++++++++++++++ .../mask-image/mask-image-ib-split-2.html | 24 ++++++++++++++++ .../mask-image/mask-image-ib-split.html | 14 +++++++++ .../reference/1x1-black-30-alpha.png | Bin 0 -> 109 bytes .../mask-image-data-url-image-ref.html | 24 ++++++++++++++++ .../reference/mask-image-ib-split-2-ref.html | 21 ++++++++++++++ .../reference/mask-image-ib-split-ref.html | 11 +++++++ 8 files changed, 121 insertions(+), 4 deletions(-) create mode 100644 testing/web-platform/tests/css/css-masking/mask-image/mask-image-data-url-image.html create mode 100644 testing/web-platform/tests/css/css-masking/mask-image/mask-image-ib-split-2.html create mode 100644 testing/web-platform/tests/css/css-masking/mask-image/mask-image-ib-split.html create mode 100644 testing/web-platform/tests/css/css-masking/mask-image/reference/1x1-black-30-alpha.png create mode 100644 testing/web-platform/tests/css/css-masking/mask-image/reference/mask-image-data-url-image-ref.html create mode 100644 testing/web-platform/tests/css/css-masking/mask-image/reference/mask-image-ib-split-2-ref.html create mode 100644 testing/web-platform/tests/css/css-masking/mask-image/reference/mask-image-ib-split-ref.html diff --git a/layout/painting/nsCSSRendering.cpp b/layout/painting/nsCSSRendering.cpp index b2366d0ef2b0..69e32cd3f5b4 100644 --- a/layout/painting/nsCSSRendering.cpp +++ b/layout/painting/nsCSSRendering.cpp @@ -532,16 +532,12 @@ static nsRect JoinBoxesForBlockAxisSlice(nsIFrame* aFrame, auto wm = aFrame->GetWritingMode(); nsIFrame* f = aFrame->GetNextContinuation(); for (; f; f = f->GetNextContinuation()) { - MOZ_ASSERT(!(f->GetStateBits() & NS_FRAME_PART_OF_IBSPLIT), - "anonymous ib-split block shouldn't have border/background"); bSize += f->BSize(wm); } (wm.IsVertical() ? borderArea.width : borderArea.height) += bSize; bSize = 0; f = aFrame->GetPrevContinuation(); for (; f; f = f->GetPrevContinuation()) { - MOZ_ASSERT(!(f->GetStateBits() & NS_FRAME_PART_OF_IBSPLIT), - "anonymous ib-split block shouldn't have border/background"); bSize += f->BSize(wm); } (wm.IsVertical() ? borderArea.x : borderArea.y) -= bSize; diff --git a/testing/web-platform/tests/css/css-masking/mask-image/mask-image-data-url-image.html b/testing/web-platform/tests/css/css-masking/mask-image/mask-image-data-url-image.html new file mode 100644 index 000000000000..aac59f3c4aab --- /dev/null +++ b/testing/web-platform/tests/css/css-masking/mask-image/mask-image-data-url-image.html @@ -0,0 +1,27 @@ + +CSS Test: mask-image: url(data:...) + + + + + +

The test passes if there is a blue-ish square with a 20px green border around it and a 40px blue-green-ish border around that.

+
diff --git a/testing/web-platform/tests/css/css-masking/mask-image/mask-image-ib-split-2.html b/testing/web-platform/tests/css/css-masking/mask-image/mask-image-ib-split-2.html new file mode 100644 index 000000000000..94c653a5c471 --- /dev/null +++ b/testing/web-platform/tests/css/css-masking/mask-image/mask-image-ib-split-2.html @@ -0,0 +1,24 @@ + +CSS Test: mask-image on a fragmented inline + + + + + +
 + diff --git a/testing/web-platform/tests/css/css-masking/mask-image/mask-image-ib-split.html b/testing/web-platform/tests/css/css-masking/mask-image/mask-image-ib-split.html new file mode 100644 index 000000000000..dab941b11183 --- /dev/null +++ b/testing/web-platform/tests/css/css-masking/mask-image/mask-image-ib-split.html @@ -0,0 +1,14 @@ + +CSS Test: mask-image on an inline with a block inside split by a columnset + + + + + +
 + diff --git a/testing/web-platform/tests/css/css-masking/mask-image/reference/1x1-black-30-alpha.png b/testing/web-platform/tests/css/css-masking/mask-image/reference/1x1-black-30-alpha.png new file mode 100644 index 0000000000000000000000000000000000000000..e334f44a038408f6b608f9aca4582a9b61e7beb4 GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k8}blwj^(N7l!{JxM1({$v_d#0*}aI x1_o|n5N2eUHAey{$m{9i7{YNqIUyn81JH~>2H(6LEG0k*22WQ%mvv4FO#qK<7zqFX literal 0 HcmV?d00001 diff --git a/testing/web-platform/tests/css/css-masking/mask-image/reference/mask-image-data-url-image-ref.html b/testing/web-platform/tests/css/css-masking/mask-image/reference/mask-image-data-url-image-ref.html new file mode 100644 index 000000000000..c2e88b36571e --- /dev/null +++ b/testing/web-platform/tests/css/css-masking/mask-image/reference/mask-image-data-url-image-ref.html @@ -0,0 +1,24 @@ + +Reference: mask-image: url(data:...) + + +

The test passes if there is a blue-ish square with a 20px green border around it and a 40px blue-green-ish border around that.

+
diff --git a/testing/web-platform/tests/css/css-masking/mask-image/reference/mask-image-ib-split-2-ref.html b/testing/web-platform/tests/css/css-masking/mask-image/reference/mask-image-ib-split-2-ref.html new file mode 100644 index 000000000000..ee28190878ab --- /dev/null +++ b/testing/web-platform/tests/css/css-masking/mask-image/reference/mask-image-ib-split-2-ref.html @@ -0,0 +1,21 @@ + +CSS Test: mask-image on a fragmented inline + + +
 + diff --git a/testing/web-platform/tests/css/css-masking/mask-image/reference/mask-image-ib-split-ref.html b/testing/web-platform/tests/css/css-masking/mask-image/reference/mask-image-ib-split-ref.html new file mode 100644 index 000000000000..e5c09f9449d5 --- /dev/null +++ b/testing/web-platform/tests/css/css-masking/mask-image/reference/mask-image-ib-split-ref.html @@ -0,0 +1,11 @@ + +CSS Reference: mask-image on an inline with a block inside split by a columnset + + +
 +