From 93f07dbc620b468fe98b72a93f0d0e84c40353cd Mon Sep 17 00:00:00 2001 From: Steve Block Date: Thu, 9 Sep 2010 11:56:25 +0100 Subject: Cherry-pick security fix in WebKit change 65826 See http://trac.webkit.org/changeset/65826 Bug: 2986936 Change-Id: Ie69df8dfa6314d46e5dbf51663ebb207995b8d3b --- WebCore/html/canvas/CanvasRenderingContext2D.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'WebCore/html/canvas/CanvasRenderingContext2D.cpp') diff --git a/WebCore/html/canvas/CanvasRenderingContext2D.cpp b/WebCore/html/canvas/CanvasRenderingContext2D.cpp index 6fe74f9..45717e9 100644 --- a/WebCore/html/canvas/CanvasRenderingContext2D.cpp +++ b/WebCore/html/canvas/CanvasRenderingContext2D.cpp @@ -1211,7 +1211,7 @@ PassRefPtr CanvasRenderingContext2D::createPattern(HTMLImageEleme if (!cachedImage || !image->cachedImage()->image()) return CanvasPattern::create(Image::nullImage(), repeatX, repeatY, true); - bool originClean = !canvas()->document()->securityOrigin()->taintsCanvas(KURL(KURL(), cachedImage->url())) && cachedImage->image()->hasSingleSecurityOrigin(); + bool originClean = !canvas()->document()->securityOrigin()->taintsCanvas(KURL(KURL(), cachedImage->response().url())) && cachedImage->image()->hasSingleSecurityOrigin(); return CanvasPattern::create(cachedImage->image(), repeatX, repeatY, originClean); } -- cgit v1.1