diff options
| author | Andrei Popescu <andreip@google.com> | 2010-04-12 12:04:56 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-04-12 12:04:56 -0700 |
| commit | ac90fdd70d8a2f6051fdc959dac8edf5819f38bd (patch) | |
| tree | fa0cc330acafa679b658715d7769101141ac684f /WebCore | |
| parent | d71ec47fc759286ee28567b4ff2a6dd67fc89dcd (diff) | |
| parent | 285b474734e82bc42b25e48ea4824f8050badb4f (diff) | |
| download | external_webkit-ac90fdd70d8a2f6051fdc959dac8edf5819f38bd.zip external_webkit-ac90fdd70d8a2f6051fdc959dac8edf5819f38bd.tar.gz external_webkit-ac90fdd70d8a2f6051fdc959dac8edf5819f38bd.tar.bz2 | |
Merge "Cherry pick http://codereview.chromium.org/1560007" into froyo
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); } |