diff options
| author | Andrei Popescu <andreip@google.com> | 2010-04-12 19:45:23 +0100 |
|---|---|---|
| committer | Andrei Popescu <andreip@google.com> | 2010-04-12 19:45:23 +0100 |
| commit | 285b474734e82bc42b25e48ea4824f8050badb4f (patch) | |
| tree | af3b97a99efe3f65d262b9fb87ad961fe48af09e /WebCore | |
| parent | 411a8ae3907d3288c7e8ed008d61303f08fe265a (diff) | |
| download | external_webkit-285b474734e82bc42b25e48ea4824f8050badb4f.zip external_webkit-285b474734e82bc42b25e48ea4824f8050badb4f.tar.gz external_webkit-285b474734e82bc42b25e48ea4824f8050badb4f.tar.bz2 | |
Cherry pick http://codereview.chromium.org/1560007
Fix bug: 2588946
Change-Id: I80d144dd735e367bde8ba91ef0ab4ba3090da9d6
Diffstat (limited to 'WebCore')
| -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 8add19c..6fe74f9 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())); + bool originClean = !canvas()->document()->securityOrigin()->taintsCanvas(KURL(KURL(), cachedImage->url())) && cachedImage->image()->hasSingleSecurityOrigin(); return CanvasPattern::create(cachedImage->image(), repeatX, repeatY, originClean); } |