Skip to content

Commit

Permalink
use entry global's origin in is_origin_clean check for canvas rende…
Browse files Browse the repository at this point in the history
…ring
  • Loading branch information
tigercosmos committed Dec 5, 2017
1 parent 5bfab78 commit 80a81f2
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions components/script/dom/canvasrenderingcontext2d.rs
Expand Up @@ -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};
Expand Down Expand Up @@ -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,
}
Expand Down

0 comments on commit 80a81f2

Please sign in to comment.