diff options
| author | Steve Block <steveblock@google.com> | 2010-09-09 11:56:25 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-09-09 12:20:26 +0100 |
| commit | 93f07dbc620b468fe98b72a93f0d0e84c40353cd (patch) | |
| tree | 9f10d3b2d12e71d1ca1f1aae6fb6196285f9e30c /WebCore/html | |
| parent | badca5a6d49b048c5dc9c5a847ab2d729b936b09 (diff) | |
| download | external_webkit-93f07dbc620b468fe98b72a93f0d0e84c40353cd.zip external_webkit-93f07dbc620b468fe98b72a93f0d0e84c40353cd.tar.gz external_webkit-93f07dbc620b468fe98b72a93f0d0e84c40353cd.tar.bz2 | |
Cherry-pick security fix in WebKit change 65826
See http://trac.webkit.org/changeset/65826
Bug: 2986936
Change-Id: Ie69df8dfa6314d46e5dbf51663ebb207995b8d3b
Diffstat (limited to 'WebCore/html')
| -rw-r--r-- | WebCore/html/canvas/CanvasRenderingContext2D.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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<CanvasPattern> 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); } |