aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/canvasrenderingcontext2d.rs
diff options
context:
space:
mode:
authorAnthony Ramine <n.oxyde@gmail.com>2018-09-14 14:01:03 +0200
committerAnthony Ramine <n.oxyde@gmail.com>2018-09-14 14:48:42 +0200
commit3528ef30e56a1fce3e449eefa8f3c5bd06a595cd (patch)
tree83953f3b98286d7ef5c51b28668f0c930f79e453 /components/script/dom/canvasrenderingcontext2d.rs
parent2b574bbdf8f1306c4b31060fec54fee919cc3a18 (diff)
downloadservo-3528ef30e56a1fce3e449eefa8f3c5bd06a595cd.tar.gz
servo-3528ef30e56a1fce3e449eefa8f3c5bd06a595cd.zip
Update CanvasRenderingContext2D WebIDL definition
CanvasImageSource was never supposed to include CanvasRenderingContext2D.
Diffstat (limited to 'components/script/dom/canvasrenderingcontext2d.rs')
-rw-r--r--components/script/dom/canvasrenderingcontext2d.rs13
1 files changed, 0 insertions, 13 deletions
diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs
index 5ee0a4c2204..24d6af0282d 100644
--- a/components/script/dom/canvasrenderingcontext2d.rs
+++ b/components/script/dom/canvasrenderingcontext2d.rs
@@ -246,8 +246,6 @@ impl CanvasRenderingContext2D {
CanvasImageSource::HTMLCanvasElement(canvas) => {
canvas.origin_is_clean()
}
- CanvasImageSource::CanvasRenderingContext2D(image) =>
- image.origin_is_clean(),
CanvasImageSource::HTMLImageElement(image) => {
let image_origin = image.get_origin().expect("Image's origin is missing");
image_origin.same_origin(GlobalScope::entry().origin())
@@ -294,11 +292,6 @@ impl CanvasRenderingContext2D {
sx, sy, sw, sh,
dx, dy, dw, dh)
}
- CanvasImageSource::CanvasRenderingContext2D(ref image) => {
- self.draw_html_canvas_element(&image.Canvas(),
- sx, sy, sw, sh,
- dx, dy, dw, dh)
- }
CanvasImageSource::HTMLImageElement(ref image) => {
// https://html.spec.whatwg.org/multipage/#img-error
// If the image argument is an HTMLImageElement object that is in the broken state,
@@ -1216,12 +1209,6 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
canvas.fetch_all_data().ok_or(Error::InvalidState)?
},
- CanvasImageSource::CanvasRenderingContext2D(ref context) => {
- let canvas = context.Canvas();
- let _ = canvas.get_or_init_2d_context();
-
- canvas.fetch_all_data().ok_or(Error::InvalidState)?
- }
CanvasImageSource::CSSStyleValue(ref value) => {
value.get_url(self.base_url.clone())
.and_then(|url| self.fetch_image_data(url))