From c3f14e8b6e9baa89d15aa3f2389a80bb5f27ee65 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Gravel Date: Tue, 20 Aug 2024 22:14:41 +0000 Subject: [PATCH] Bug 1913975 [wpt PR 47687] - Apply ctx.filter to canvas 2d layers, a=testonly Automatic update from web-platform-tests Apply ctx.filter to canvas 2d layers WebKit and Blink agreed that the `filter` context state should apply to the output of layers. https://github.com/whatwg/html/pull/9537#issuecomment-2150951103 The context `filter` state is applied after the filter passed as argument to `beginLayer`. The context `filter` is now reset when entering layers. Bug: 40249439 Change-Id: I5daf82672c334cdc96a90af8e9fe5dd4466849cf Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5626086 Commit-Queue: Jean-Philippe Gravel Reviewed-by: Andres Ricardo Perez Cr-Commit-Position: refs/heads/main@{#1344173} -- wpt-commits: 1e726204a02d7e34e062774bd1c6baabffa142c7 wpt-pr: 47687 --- .../2d.layer.ctm.ctx-filter-expected.html | 27 + .../layers/2d.layer.ctm.ctx-filter.html | 38 + .../2d.layer.global-filter-expected.html | 17 - .../layers/2d.layer.global-filter.html | 26 - ...ates.ctx-filter.no-transform-expected.html | 578 +++++++++++ ...global-states.ctx-filter.no-transform.html | 611 ++++++++++++ ...l-states.ctx-filter.rotation-expected.html | 610 ++++++++++++ ...yer.global-states.ctx-filter.rotation.html | 643 ++++++++++++ ...lter.ctx-filter.no-transform-expected.html | 786 +++++++++++++++ ...states.filter.ctx-filter.no-transform.html | 611 ++++++++++++ ...s.filter.ctx-filter.rotation-expected.html | 818 +++++++++++++++ ...bal-states.filter.ctx-filter.rotation.html | 643 ++++++++++++ ....layer-rendering-state-reset-in-layer.html | 8 +- .../2d.layer.nested-ctx-filter-expected.html | 25 + .../layers/2d.layer.nested-ctx-filter.html | 23 + .../canvas/element/layers/2d.layer.reset.html | 2 + .../2d.layer.ctm.ctx-filter-expected.html | 27 + .../layers/2d.layer.ctm.ctx-filter.html | 41 + .../layers/2d.layer.ctm.ctx-filter.w.html | 55 ++ .../2d.layer.global-filter-expected.html | 17 - .../layers/2d.layer.global-filter.html | 29 - ...ates.ctx-filter.no-transform-expected.html | 578 +++++++++++ ...global-states.ctx-filter.no-transform.html | 675 +++++++++++++ ...obal-states.ctx-filter.no-transform.w.html | 902 +++++++++++++++++ ...l-states.ctx-filter.rotation-expected.html | 610 ++++++++++++ ...yer.global-states.ctx-filter.rotation.html | 707 +++++++++++++ ...r.global-states.ctx-filter.rotation.w.html | 934 ++++++++++++++++++ ...lter.ctx-filter.no-transform-expected.html | 786 +++++++++++++++ ...states.filter.ctx-filter.no-transform.html | 675 +++++++++++++ ...ates.filter.ctx-filter.no-transform.w.html | 902 +++++++++++++++++ ...s.filter.ctx-filter.rotation-expected.html | 818 +++++++++++++++ ...bal-states.filter.ctx-filter.rotation.html | 707 +++++++++++++ ...l-states.filter.ctx-filter.rotation.w.html | 934 ++++++++++++++++++ ....layer-rendering-state-reset-in-layer.html | 8 +- ...r-rendering-state-reset-in-layer.worker.js | 8 +- .../2d.layer.nested-ctx-filter-expected.html | 25 + .../layers/2d.layer.nested-ctx-filter.html | 26 + ...html => 2d.layer.nested-ctx-filter.w.html} | 27 +- .../offscreen/layers/2d.layer.reset.html | 2 + .../offscreen/layers/2d.layer.reset.w.html | 2 + .../html/canvas/tools/yaml-new/layers.yaml | 103 +- 41 files changed, 14931 insertions(+), 133 deletions(-) create mode 100644 testing/web-platform/tests/html/canvas/element/layers/2d.layer.ctm.ctx-filter-expected.html create mode 100644 testing/web-platform/tests/html/canvas/element/layers/2d.layer.ctm.ctx-filter.html delete mode 100644 testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-filter-expected.html delete mode 100644 testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-filter.html create mode 100644 testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-states.ctx-filter.no-transform-expected.html create mode 100644 testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-states.ctx-filter.no-transform.html create mode 100644 testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-states.ctx-filter.rotation-expected.html create mode 100644 testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-states.ctx-filter.rotation.html create mode 100644 testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-states.filter.ctx-filter.no-transform-expected.html create mode 100644 testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-states.filter.ctx-filter.no-transform.html create mode 100644 testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-states.filter.ctx-filter.rotation-expected.html create mode 100644 testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-states.filter.ctx-filter.rotation.html create mode 100644 testing/web-platform/tests/html/canvas/element/layers/2d.layer.nested-ctx-filter-expected.html create mode 100644 testing/web-platform/tests/html/canvas/element/layers/2d.layer.nested-ctx-filter.html create mode 100644 testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.ctm.ctx-filter-expected.html create mode 100644 testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.ctm.ctx-filter.html create mode 100644 testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.ctm.ctx-filter.w.html delete mode 100644 testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-filter-expected.html delete mode 100644 testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-filter.html create mode 100644 testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.ctx-filter.no-transform-expected.html create mode 100644 testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.ctx-filter.no-transform.html create mode 100644 testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.ctx-filter.no-transform.w.html create mode 100644 testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.ctx-filter.rotation-expected.html create mode 100644 testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.ctx-filter.rotation.html create mode 100644 testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.ctx-filter.rotation.w.html create mode 100644 testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.ctx-filter.no-transform-expected.html create mode 100644 testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.ctx-filter.no-transform.html create mode 100644 testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.ctx-filter.no-transform.w.html create mode 100644 testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.ctx-filter.rotation-expected.html create mode 100644 testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.ctx-filter.rotation.html create mode 100644 testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.ctx-filter.rotation.w.html create mode 100644 testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.nested-ctx-filter-expected.html create mode 100644 testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.nested-ctx-filter.html rename testing/web-platform/tests/html/canvas/offscreen/layers/{2d.layer.global-filter.w.html => 2d.layer.nested-ctx-filter.w.html} (61%) diff --git a/testing/web-platform/tests/html/canvas/element/layers/2d.layer.ctm.ctx-filter-expected.html b/testing/web-platform/tests/html/canvas/element/layers/2d.layer.ctm.ctx-filter-expected.html new file mode 100644 index 000000000000..fd5b51f7deaa --- /dev/null +++ b/testing/web-platform/tests/html/canvas/element/layers/2d.layer.ctm.ctx-filter-expected.html @@ -0,0 +1,27 @@ + + +Canvas test: 2d.layer.ctm.ctx-filter +

2d.layer.ctm.ctx-filter

+

Checks that parent transforms don't affect context filters.

+ +

FAIL (fallback content)

+ + diff --git a/testing/web-platform/tests/html/canvas/element/layers/2d.layer.ctm.ctx-filter.html b/testing/web-platform/tests/html/canvas/element/layers/2d.layer.ctm.ctx-filter.html new file mode 100644 index 000000000000..66d57624bdc7 --- /dev/null +++ b/testing/web-platform/tests/html/canvas/element/layers/2d.layer.ctm.ctx-filter.html @@ -0,0 +1,38 @@ + + + +Canvas test: 2d.layer.ctm.ctx-filter +

2d.layer.ctm.ctx-filter

+

Checks that parent transforms don't affect context filters.

+ +

FAIL (fallback content)

+ + diff --git a/testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-filter-expected.html b/testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-filter-expected.html deleted file mode 100644 index 88057fc354a4..000000000000 --- a/testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-filter-expected.html +++ /dev/null @@ -1,17 +0,0 @@ - - -Canvas test: 2d.layer.global-filter -

2d.layer.global-filter

-

Tests that layers ignore the global context filter.

- -

FAIL (fallback content)

- - diff --git a/testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-filter.html b/testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-filter.html deleted file mode 100644 index cf46f41b9749..000000000000 --- a/testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-filter.html +++ /dev/null @@ -1,26 +0,0 @@ - - - -Canvas test: 2d.layer.global-filter -

2d.layer.global-filter

-

Tests that layers ignore the global context filter.

- -

FAIL (fallback content)

- - diff --git a/testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-states.ctx-filter.no-transform-expected.html b/testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-states.ctx-filter.no-transform-expected.html new file mode 100644 index 000000000000..611fb758e710 --- /dev/null +++ b/testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-states.ctx-filter.no-transform-expected.html @@ -0,0 +1,578 @@ + + +Canvas test: 2d.layer.global-states.ctx-filter.no-transform +

2d.layer.global-states.ctx-filter.no-transform

+

Checks that layers correctly use global render states.

+ +
+ +
no-globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + +
diff --git a/testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-states.ctx-filter.no-transform.html b/testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-states.ctx-filter.no-transform.html new file mode 100644 index 000000000000..a7636efcef75 --- /dev/null +++ b/testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-states.ctx-filter.no-transform.html @@ -0,0 +1,611 @@ + + + +Canvas test: 2d.layer.global-states.ctx-filter.no-transform +

2d.layer.global-states.ctx-filter.no-transform

+

Checks that layers correctly use global render states.

+ +
+ +
no-globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + +
diff --git a/testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-states.ctx-filter.rotation-expected.html b/testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-states.ctx-filter.rotation-expected.html new file mode 100644 index 000000000000..0460013c8566 --- /dev/null +++ b/testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-states.ctx-filter.rotation-expected.html @@ -0,0 +1,610 @@ + + +Canvas test: 2d.layer.global-states.ctx-filter.rotation +

2d.layer.global-states.ctx-filter.rotation

+

Checks that layers correctly use global render states.

+ +
+ +
no-globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + +
diff --git a/testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-states.ctx-filter.rotation.html b/testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-states.ctx-filter.rotation.html new file mode 100644 index 000000000000..677fb3bae758 --- /dev/null +++ b/testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-states.ctx-filter.rotation.html @@ -0,0 +1,643 @@ + + + +Canvas test: 2d.layer.global-states.ctx-filter.rotation +

2d.layer.global-states.ctx-filter.rotation

+

Checks that layers correctly use global render states.

+ +
+ +
no-globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + +
diff --git a/testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-states.filter.ctx-filter.no-transform-expected.html b/testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-states.filter.ctx-filter.no-transform-expected.html new file mode 100644 index 000000000000..a00b50b52ffd --- /dev/null +++ b/testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-states.filter.ctx-filter.no-transform-expected.html @@ -0,0 +1,786 @@ + + +Canvas test: 2d.layer.global-states.filter.ctx-filter.no-transform +

2d.layer.global-states.filter.ctx-filter.no-transform

+

Checks that layers with filters correctly use global render states.

+ +
+ +
no-globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + +
diff --git a/testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-states.filter.ctx-filter.no-transform.html b/testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-states.filter.ctx-filter.no-transform.html new file mode 100644 index 000000000000..6c327382eafc --- /dev/null +++ b/testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-states.filter.ctx-filter.no-transform.html @@ -0,0 +1,611 @@ + + + +Canvas test: 2d.layer.global-states.filter.ctx-filter.no-transform +

2d.layer.global-states.filter.ctx-filter.no-transform

+

Checks that layers with filters correctly use global render states.

+ +
+ +
no-globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + +
diff --git a/testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-states.filter.ctx-filter.rotation-expected.html b/testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-states.filter.ctx-filter.rotation-expected.html new file mode 100644 index 000000000000..b9cf004179a9 --- /dev/null +++ b/testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-states.filter.ctx-filter.rotation-expected.html @@ -0,0 +1,818 @@ + + +Canvas test: 2d.layer.global-states.filter.ctx-filter.rotation +

2d.layer.global-states.filter.ctx-filter.rotation

+

Checks that layers with filters correctly use global render states.

+ +
+ +
no-globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + +
diff --git a/testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-states.filter.ctx-filter.rotation.html b/testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-states.filter.ctx-filter.rotation.html new file mode 100644 index 000000000000..7a7ae56980ac --- /dev/null +++ b/testing/web-platform/tests/html/canvas/element/layers/2d.layer.global-states.filter.ctx-filter.rotation.html @@ -0,0 +1,643 @@ + + + +Canvas test: 2d.layer.global-states.filter.ctx-filter.rotation +

2d.layer.global-states.filter.ctx-filter.rotation

+

Checks that layers with filters correctly use global render states.

+ +
+ +
no-globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + +
diff --git a/testing/web-platform/tests/html/canvas/element/layers/2d.layer.layer-rendering-state-reset-in-layer.html b/testing/web-platform/tests/html/canvas/element/layers/2d.layer.layer-rendering-state-reset-in-layer.html index 5d755cfc4985..c7c520cff6fd 100644 --- a/testing/web-platform/tests/html/canvas/element/layers/2d.layer.layer-rendering-state-reset-in-layer.html +++ b/testing/web-platform/tests/html/canvas/element/layers/2d.layer.layer-rendering-state-reset-in-layer.html @@ -8,7 +8,7 @@

2d.layer.layer-rendering-state-reset-in-layer

-

Tests that layers ignore the global context filter.

+

Tests that rendering states are reset in layers and restored after.

Actual output:

@@ -26,6 +26,7 @@

2d.layer.layer-rendering-state-reset-in-layer

ctx.shadowOffsetX = 10; ctx.shadowOffsetY = 20; ctx.shadowBlur = 30; + ctx.filter = 'blur(5px)'; _assertSame(ctx.globalAlpha, 0.5, "ctx.globalAlpha", "0.5"); _assertSame(ctx.globalCompositeOperation, 'xor', "ctx.globalCompositeOperation", "'xor'"); @@ -33,6 +34,7 @@

2d.layer.layer-rendering-state-reset-in-layer

_assertSame(ctx.shadowOffsetX, 10, "ctx.shadowOffsetX", "10"); _assertSame(ctx.shadowOffsetY, 20, "ctx.shadowOffsetY", "20"); _assertSame(ctx.shadowBlur, 30, "ctx.shadowBlur", "30"); + _assertSame(ctx.filter, 'blur(5px)', "ctx.filter", "'blur(5px)'"); ctx.beginLayer(); @@ -42,6 +44,7 @@

2d.layer.layer-rendering-state-reset-in-layer

_assertSame(ctx.shadowOffsetX, 0, "ctx.shadowOffsetX", "0"); _assertSame(ctx.shadowOffsetY, 0, "ctx.shadowOffsetY", "0"); _assertSame(ctx.shadowBlur, 0, "ctx.shadowBlur", "0"); + _assertSame(ctx.filter, 'none', "ctx.filter", "'none'"); ctx.endLayer(); @@ -51,7 +54,8 @@

2d.layer.layer-rendering-state-reset-in-layer

_assertSame(ctx.shadowOffsetX, 10, "ctx.shadowOffsetX", "10"); _assertSame(ctx.shadowOffsetY, 20, "ctx.shadowOffsetY", "20"); _assertSame(ctx.shadowBlur, 30, "ctx.shadowBlur", "30"); + _assertSame(ctx.filter, 'blur(5px)', "ctx.filter", "'blur(5px)'"); -}, "Tests that layers ignore the global context filter."); +}, "Tests that rendering states are reset in layers and restored after."); diff --git a/testing/web-platform/tests/html/canvas/element/layers/2d.layer.nested-ctx-filter-expected.html b/testing/web-platform/tests/html/canvas/element/layers/2d.layer.nested-ctx-filter-expected.html new file mode 100644 index 000000000000..77d41f725eac --- /dev/null +++ b/testing/web-platform/tests/html/canvas/element/layers/2d.layer.nested-ctx-filter-expected.html @@ -0,0 +1,25 @@ + + +Canvas test: 2d.layer.nested-ctx-filter +

2d.layer.nested-ctx-filter

+

Tests nested canvas layers with context filters.

+ +

FAIL (fallback content)

+ + diff --git a/testing/web-platform/tests/html/canvas/element/layers/2d.layer.nested-ctx-filter.html b/testing/web-platform/tests/html/canvas/element/layers/2d.layer.nested-ctx-filter.html new file mode 100644 index 000000000000..68c8b06857bc --- /dev/null +++ b/testing/web-platform/tests/html/canvas/element/layers/2d.layer.nested-ctx-filter.html @@ -0,0 +1,23 @@ + + + +Canvas test: 2d.layer.nested-ctx-filter +

2d.layer.nested-ctx-filter

+

Tests nested canvas layers with context filters.

+ +

FAIL (fallback content)

+ + diff --git a/testing/web-platform/tests/html/canvas/element/layers/2d.layer.reset.html b/testing/web-platform/tests/html/canvas/element/layers/2d.layer.reset.html index 9ad779abfdda..ecb3903b008b 100644 --- a/testing/web-platform/tests/html/canvas/element/layers/2d.layer.reset.html +++ b/testing/web-platform/tests/html/canvas/element/layers/2d.layer.reset.html @@ -18,6 +18,7 @@

2d.layer.reset

ctx.shadowOffsetY = 3; ctx.shadowColor = 'rgba(0, 30, 0, 0.3)'; ctx.shadowBlur = 3; + ctx.filter = 'blur(5px)'; ctx.beginLayer({filter: {name: 'dropShadow', dx: -3, dy: 3}}); @@ -28,6 +29,7 @@

2d.layer.reset

ctx.shadowOffsetY = 6; ctx.shadowColor = 'rgba(0, 60, 0, 0.6)'; ctx.shadowBlur = 3; + ctx.filter = 'blur(15px)'; ctx.reset(); diff --git a/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.ctm.ctx-filter-expected.html b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.ctm.ctx-filter-expected.html new file mode 100644 index 000000000000..fd5b51f7deaa --- /dev/null +++ b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.ctm.ctx-filter-expected.html @@ -0,0 +1,27 @@ + + +Canvas test: 2d.layer.ctm.ctx-filter +

2d.layer.ctm.ctx-filter

+

Checks that parent transforms don't affect context filters.

+ +

FAIL (fallback content)

+ + diff --git a/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.ctm.ctx-filter.html b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.ctm.ctx-filter.html new file mode 100644 index 000000000000..8ef1bbee08f2 --- /dev/null +++ b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.ctm.ctx-filter.html @@ -0,0 +1,41 @@ + + + +Canvas test: 2d.layer.ctm.ctx-filter +

2d.layer.ctm.ctx-filter

+

Checks that parent transforms don't affect context filters.

+ +

FAIL (fallback content)

+ + diff --git a/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.ctm.ctx-filter.w.html b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.ctm.ctx-filter.w.html new file mode 100644 index 000000000000..8f9981a6fc54 --- /dev/null +++ b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.ctm.ctx-filter.w.html @@ -0,0 +1,55 @@ + + + + +Canvas test: 2d.layer.ctm.ctx-filter +

2d.layer.ctm.ctx-filter

+

Checks that parent transforms don't affect context filters.

+ +

FAIL (fallback content)

+ + + + diff --git a/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-filter-expected.html b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-filter-expected.html deleted file mode 100644 index 88057fc354a4..000000000000 --- a/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-filter-expected.html +++ /dev/null @@ -1,17 +0,0 @@ - - -Canvas test: 2d.layer.global-filter -

2d.layer.global-filter

-

Tests that layers ignore the global context filter.

- -

FAIL (fallback content)

- - diff --git a/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-filter.html b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-filter.html deleted file mode 100644 index 2388a06a9642..000000000000 --- a/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-filter.html +++ /dev/null @@ -1,29 +0,0 @@ - - - -Canvas test: 2d.layer.global-filter -

2d.layer.global-filter

-

Tests that layers ignore the global context filter.

- -

FAIL (fallback content)

- - diff --git a/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.ctx-filter.no-transform-expected.html b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.ctx-filter.no-transform-expected.html new file mode 100644 index 000000000000..611fb758e710 --- /dev/null +++ b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.ctx-filter.no-transform-expected.html @@ -0,0 +1,578 @@ + + +Canvas test: 2d.layer.global-states.ctx-filter.no-transform +

2d.layer.global-states.ctx-filter.no-transform

+

Checks that layers correctly use global render states.

+ +
+ +
no-globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + +
diff --git a/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.ctx-filter.no-transform.html b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.ctx-filter.no-transform.html new file mode 100644 index 000000000000..483cbd077f72 --- /dev/null +++ b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.ctx-filter.no-transform.html @@ -0,0 +1,675 @@ + + + +Canvas test: 2d.layer.global-states.ctx-filter.no-transform +

2d.layer.global-states.ctx-filter.no-transform

+

Checks that layers correctly use global render states.

+ +
+ +
no-globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + +
diff --git a/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.ctx-filter.no-transform.w.html b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.ctx-filter.no-transform.w.html new file mode 100644 index 000000000000..50cc215d852e --- /dev/null +++ b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.ctx-filter.no-transform.w.html @@ -0,0 +1,902 @@ + + + + +Canvas test: 2d.layer.global-states.ctx-filter.no-transform +

2d.layer.global-states.ctx-filter.no-transform

+

Checks that layers correctly use global render states.

+ + +
+ +
no-globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + + +
globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + + +
no-globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + + +
globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + + +
no-globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + + +
globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + + +
no-globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + + +
globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + + +
no-globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + + +
globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + + +
no-globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + + +
globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + + +
no-globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + + +
globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + + +
no-globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + + + +
globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
+ diff --git a/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.ctx-filter.rotation-expected.html b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.ctx-filter.rotation-expected.html new file mode 100644 index 000000000000..0460013c8566 --- /dev/null +++ b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.ctx-filter.rotation-expected.html @@ -0,0 +1,610 @@ + + +Canvas test: 2d.layer.global-states.ctx-filter.rotation +

2d.layer.global-states.ctx-filter.rotation

+

Checks that layers correctly use global render states.

+ +
+ +
no-globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + +
diff --git a/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.ctx-filter.rotation.html b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.ctx-filter.rotation.html new file mode 100644 index 000000000000..fde83b631e26 --- /dev/null +++ b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.ctx-filter.rotation.html @@ -0,0 +1,707 @@ + + + +Canvas test: 2d.layer.global-states.ctx-filter.rotation +

2d.layer.global-states.ctx-filter.rotation

+

Checks that layers correctly use global render states.

+ +
+ +
no-globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + +
diff --git a/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.ctx-filter.rotation.w.html b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.ctx-filter.rotation.w.html new file mode 100644 index 000000000000..3ba605488516 --- /dev/null +++ b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.ctx-filter.rotation.w.html @@ -0,0 +1,934 @@ + + + + +Canvas test: 2d.layer.global-states.ctx-filter.rotation +

2d.layer.global-states.ctx-filter.rotation

+

Checks that layers correctly use global render states.

+ + +
+ +
no-globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + + +
globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + + +
no-globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + + +
globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + + +
no-globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + + +
globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + + +
no-globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + + +
globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + + +
no-globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + + +
globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + + +
no-globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + + +
globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + + +
no-globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + + +
globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + + +
no-globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + + + +
globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
+ diff --git a/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.ctx-filter.no-transform-expected.html b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.ctx-filter.no-transform-expected.html new file mode 100644 index 000000000000..a00b50b52ffd --- /dev/null +++ b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.ctx-filter.no-transform-expected.html @@ -0,0 +1,786 @@ + + +Canvas test: 2d.layer.global-states.filter.ctx-filter.no-transform +

2d.layer.global-states.filter.ctx-filter.no-transform

+

Checks that layers with filters correctly use global render states.

+ +
+ +
no-globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + +
diff --git a/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.ctx-filter.no-transform.html b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.ctx-filter.no-transform.html new file mode 100644 index 000000000000..01a366f3f85a --- /dev/null +++ b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.ctx-filter.no-transform.html @@ -0,0 +1,675 @@ + + + +Canvas test: 2d.layer.global-states.filter.ctx-filter.no-transform +

2d.layer.global-states.filter.ctx-filter.no-transform

+

Checks that layers with filters correctly use global render states.

+ +
+ +
no-globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + +
diff --git a/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.ctx-filter.no-transform.w.html b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.ctx-filter.no-transform.w.html new file mode 100644 index 000000000000..e9a5d4265c76 --- /dev/null +++ b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.ctx-filter.no-transform.w.html @@ -0,0 +1,902 @@ + + + + +Canvas test: 2d.layer.global-states.filter.ctx-filter.no-transform +

2d.layer.global-states.filter.ctx-filter.no-transform

+

Checks that layers with filters correctly use global render states.

+ + +
+ +
no-globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + + +
globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + + +
no-globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + + +
globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + + +
no-globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + + +
globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + + +
no-globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + + +
globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + + +
no-globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + + +
globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + + +
no-globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + + +
globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + + +
no-globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + + +
globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + + +
no-globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + + + +
globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
+ diff --git a/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.ctx-filter.rotation-expected.html b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.ctx-filter.rotation-expected.html new file mode 100644 index 000000000000..b9cf004179a9 --- /dev/null +++ b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.ctx-filter.rotation-expected.html @@ -0,0 +1,818 @@ + + +Canvas test: 2d.layer.global-states.filter.ctx-filter.rotation +

2d.layer.global-states.filter.ctx-filter.rotation

+

Checks that layers with filters correctly use global render states.

+ +
+ +
no-globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + +
diff --git a/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.ctx-filter.rotation.html b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.ctx-filter.rotation.html new file mode 100644 index 000000000000..b3221ed51810 --- /dev/null +++ b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.ctx-filter.rotation.html @@ -0,0 +1,707 @@ + + + +Canvas test: 2d.layer.global-states.filter.ctx-filter.rotation +

2d.layer.global-states.filter.ctx-filter.rotation

+

Checks that layers with filters correctly use global render states.

+ +
+ +
no-globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
no-globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + +
diff --git a/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.ctx-filter.rotation.w.html b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.ctx-filter.rotation.w.html new file mode 100644 index 000000000000..3468b0020f31 --- /dev/null +++ b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.ctx-filter.rotation.w.html @@ -0,0 +1,934 @@ + + + + +Canvas test: 2d.layer.global-states.filter.ctx-filter.rotation +

2d.layer.global-states.filter.ctx-filter.rotation

+

Checks that layers with filters correctly use global render states.

+ + +
+ +
no-globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + + +
globalAlpha
+
no-composite-op
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + + +
no-globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + + +
globalAlpha
+
blending
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + + +
no-globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + + +
globalAlpha
+
composite
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + + +
no-globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + + +
globalAlpha
+
copy
+
no-shadow
+ +

FAIL (fallback content)

+ + + + + + +
no-globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + + +
globalAlpha
+
no-composite-op
+
shadow
+ +

FAIL (fallback content)

+ + + + + + +
no-globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + + +
globalAlpha
+
blending
+
shadow
+ +

FAIL (fallback content)

+ + + + + + +
no-globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + + +
globalAlpha
+
composite
+
shadow
+ +

FAIL (fallback content)

+ + + + + + +
no-globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + + + +
globalAlpha
+
copy
+
shadow
+ +

FAIL (fallback content)

+ + + + + +
+ diff --git a/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.layer-rendering-state-reset-in-layer.html b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.layer-rendering-state-reset-in-layer.html index cebdfd5f27ee..9788a72c680b 100644 --- a/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.layer-rendering-state-reset-in-layer.html +++ b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.layer-rendering-state-reset-in-layer.html @@ -6,7 +6,7 @@

2d.layer.layer-rendering-state-reset-in-layer

-

Tests that layers ignore the global context filter.

+

Tests that rendering states are reset in layers and restored after.

diff --git a/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.layer-rendering-state-reset-in-layer.worker.js b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.layer-rendering-state-reset-in-layer.worker.js index a566cccf14bc..715e7a5a9881 100644 --- a/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.layer-rendering-state-reset-in-layer.worker.js +++ b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.layer-rendering-state-reset-in-layer.worker.js @@ -1,6 +1,6 @@ // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. // OffscreenCanvas test in a worker:2d.layer.layer-rendering-state-reset-in-layer -// Description:Tests that layers ignore the global context filter. +// Description:Tests that rendering states are reset in layers and restored after. // Note: importScripts("/resources/testharness.js"); @@ -16,6 +16,7 @@ test(t => { ctx.shadowOffsetX = 10; ctx.shadowOffsetY = 20; ctx.shadowBlur = 30; + ctx.filter = 'blur(5px)'; _assertSame(ctx.globalAlpha, 0.5, "ctx.globalAlpha", "0.5"); _assertSame(ctx.globalCompositeOperation, 'xor', "ctx.globalCompositeOperation", "'xor'"); @@ -23,6 +24,7 @@ test(t => { _assertSame(ctx.shadowOffsetX, 10, "ctx.shadowOffsetX", "10"); _assertSame(ctx.shadowOffsetY, 20, "ctx.shadowOffsetY", "20"); _assertSame(ctx.shadowBlur, 30, "ctx.shadowBlur", "30"); + _assertSame(ctx.filter, 'blur(5px)', "ctx.filter", "'blur(5px)'"); ctx.beginLayer(); @@ -32,6 +34,7 @@ test(t => { _assertSame(ctx.shadowOffsetX, 0, "ctx.shadowOffsetX", "0"); _assertSame(ctx.shadowOffsetY, 0, "ctx.shadowOffsetY", "0"); _assertSame(ctx.shadowBlur, 0, "ctx.shadowBlur", "0"); + _assertSame(ctx.filter, 'none', "ctx.filter", "'none'"); ctx.endLayer(); @@ -41,5 +44,6 @@ test(t => { _assertSame(ctx.shadowOffsetX, 10, "ctx.shadowOffsetX", "10"); _assertSame(ctx.shadowOffsetY, 20, "ctx.shadowOffsetY", "20"); _assertSame(ctx.shadowBlur, 30, "ctx.shadowBlur", "30"); -}, "Tests that layers ignore the global context filter."); + _assertSame(ctx.filter, 'blur(5px)', "ctx.filter", "'blur(5px)'"); +}, "Tests that rendering states are reset in layers and restored after."); done(); diff --git a/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.nested-ctx-filter-expected.html b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.nested-ctx-filter-expected.html new file mode 100644 index 000000000000..77d41f725eac --- /dev/null +++ b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.nested-ctx-filter-expected.html @@ -0,0 +1,25 @@ + + +Canvas test: 2d.layer.nested-ctx-filter +

2d.layer.nested-ctx-filter

+

Tests nested canvas layers with context filters.

+ +

FAIL (fallback content)

+ + diff --git a/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.nested-ctx-filter.html b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.nested-ctx-filter.html new file mode 100644 index 000000000000..b48bf6b9b2b1 --- /dev/null +++ b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.nested-ctx-filter.html @@ -0,0 +1,26 @@ + + + +Canvas test: 2d.layer.nested-ctx-filter +

2d.layer.nested-ctx-filter

+

Tests nested canvas layers with context filters.

+ +

FAIL (fallback content)

+ + diff --git a/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-filter.w.html b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.nested-ctx-filter.w.html similarity index 61% rename from testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-filter.w.html rename to testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.nested-ctx-filter.w.html index 4c8f92d18a1d..9e1749b8bd08 100644 --- a/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.global-filter.w.html +++ b/testing/web-platform/tests/html/canvas/offscreen/layers/2d.layer.nested-ctx-filter.w.html @@ -1,30 +1,27 @@ - -Canvas test: 2d.layer.global-filter -

2d.layer.global-filter

-

Tests that layers ignore the global context filter.

- + +Canvas test: 2d.layer.nested-ctx-filter +

2d.layer.nested-ctx-filter

+

Tests nested canvas layers with context filters.

+

FAIL (fallback content)