aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--components/canvas/raqote_backend.rs1
-rw-r--r--components/canvas_traits/canvas.rs3
-rw-r--r--tests/wpt/metadata/2dcontext/compositing/2d.composite.operation.clear.html.ini5
-rw-r--r--tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.clear.html.ini4
-rw-r--r--tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.clear.worker.js.ini4
5 files changed, 4 insertions, 13 deletions
diff --git a/components/canvas/raqote_backend.rs b/components/canvas/raqote_backend.rs
index ec8f0f8e4a8..362ad1c5c57 100644
--- a/components/canvas/raqote_backend.rs
+++ b/components/canvas/raqote_backend.rs
@@ -1002,6 +1002,7 @@ impl ToRaqoteStyle for CompositionStyle {
CompositionStyle::Copy => raqote::BlendMode::Src,
CompositionStyle::Lighter => raqote::BlendMode::Add,
CompositionStyle::Xor => raqote::BlendMode::Xor,
+ CompositionStyle::Clear => raqote::BlendMode::Clear,
}
}
}
diff --git a/components/canvas_traits/canvas.rs b/components/canvas_traits/canvas.rs
index b203399a200..45920674863 100644
--- a/components/canvas_traits/canvas.rs
+++ b/components/canvas_traits/canvas.rs
@@ -254,6 +254,7 @@ pub enum CompositionStyle {
Copy,
Lighter,
Xor,
+ Clear,
}
impl FromStr for CompositionStyle {
@@ -272,6 +273,7 @@ impl FromStr for CompositionStyle {
"copy" => Ok(CompositionStyle::Copy),
"lighter" => Ok(CompositionStyle::Lighter),
"xor" => Ok(CompositionStyle::Xor),
+ "clear" => Ok(CompositionStyle::Clear),
_ => Err(()),
}
}
@@ -291,6 +293,7 @@ impl CompositionStyle {
CompositionStyle::Copy => "copy",
CompositionStyle::Lighter => "lighter",
CompositionStyle::Xor => "xor",
+ CompositionStyle::Clear => "clear",
}
}
}
diff --git a/tests/wpt/metadata/2dcontext/compositing/2d.composite.operation.clear.html.ini b/tests/wpt/metadata/2dcontext/compositing/2d.composite.operation.clear.html.ini
deleted file mode 100644
index 8ddda3e4602..00000000000
--- a/tests/wpt/metadata/2dcontext/compositing/2d.composite.operation.clear.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[2d.composite.operation.clear.html]
- type: testharness
- [Canvas test: 2d.composite.operation.clear]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.clear.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.clear.html.ini
deleted file mode 100644
index de667d420b0..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.clear.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.operation.clear.html]
- [OffscreenCanvas test: 2d.composite.operation.clear]
- expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.clear.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.clear.worker.js.ini
deleted file mode 100644
index 9b0ed482eba..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.operation.clear.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.operation.clear.worker.html]
- [2d]
- expected: FAIL
-