diff options
| author | Andrei Popescu <andreip@google.com> | 2010-04-12 17:02:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-12 17:02:12 -0700 |
| commit | e6fa2a29f3eada7555d732e7fefc5c7b098805ac (patch) | |
| tree | c6eb9c4f8b1acb740f169204d26088fa662ca239 /WebCore/html/canvas | |
| parent | f82f3c6e3b26bc3176d23de7ae7a744895b8d340 (diff) | |
| parent | 13aa9bd5f2bbe6e503e6789ed9fc331fe106b5ea (diff) | |
| download | external_webkit-e6fa2a29f3eada7555d732e7fefc5c7b098805ac.zip external_webkit-e6fa2a29f3eada7555d732e7fefc5c7b098805ac.tar.gz external_webkit-e6fa2a29f3eada7555d732e7fefc5c7b098805ac.tar.bz2 | |
am 13aa9bd5: am ac90fdd7: Merge "Cherry pick http://codereview.chromium.org/1560007" into froyo
Diffstat (limited to 'WebCore/html/canvas')
| -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); } |