From 80a81f2774c756863d97efa7d518f242a5f0ef2b Mon Sep 17 00:00:00 2001 From: tigercosmos Date: Tue, 5 Dec 2017 15:10:55 +0800 Subject: [PATCH] use entry global's origin in `is_origin_clean` check for canvas rendering --- components/script/dom/canvasrenderingcontext2d.rs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs index cf6b92bc404..93d4981d2bb 100644 --- a/components/script/dom/canvasrenderingcontext2d.rs +++ b/components/script/dom/canvasrenderingcontext2d.rs @@ -30,7 +30,7 @@ use dom::canvaspattern::CanvasPattern; use dom::globalscope::GlobalScope; use dom::htmlcanvaselement::HTMLCanvasElement; use dom::imagedata::ImageData; -use dom::node::{document_from_node, Node, NodeDamage, window_from_node}; +use dom::node::{Node, NodeDamage, window_from_node}; use dom_struct::dom_struct; use euclid::{Transform2D, Point2D, Vector2D, Rect, Size2D, vec2}; use ipc_channel::ipc::{self, IpcSender}; @@ -249,13 +249,8 @@ impl CanvasRenderingContext2D { CanvasImageSource::CanvasRenderingContext2D(image) => image.origin_is_clean(), CanvasImageSource::HTMLImageElement(image) => { - let canvas = match self.canvas { - Some(ref canvas) => canvas, - None => return false, - }; let image_origin = image.get_origin().expect("Image's origin is missing"); - let document = document_from_node(&**canvas); - document.url().clone().origin() == image_origin + image_origin.same_origin(GlobalScope::entry().origin()) } CanvasImageSource::CSSStyleValue(_) => true, }