diff options
| author | Steve Block <steveblock@google.com> | 2010-09-10 04:32:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-10 04:32:57 -0700 |
| commit | d8a7ee4d40714f2434265e0f76549ef9ce79a036 (patch) | |
| tree | d2865fbdbc4898ca2dda25fbef9b4222a04f7b82 /WebCore/html | |
| parent | e21fd1b62f9e51013dcbdc28fdb35b7e5751397d (diff) | |
| parent | 93f07dbc620b468fe98b72a93f0d0e84c40353cd (diff) | |
| download | external_webkit-d8a7ee4d40714f2434265e0f76549ef9ce79a036.zip external_webkit-d8a7ee4d40714f2434265e0f76549ef9ce79a036.tar.gz external_webkit-d8a7ee4d40714f2434265e0f76549ef9ce79a036.tar.bz2 | |
am 93f07dbc: Cherry-pick security fix in WebKit change 65826
Merge commit '93f07dbc620b468fe98b72a93f0d0e84c40353cd' into gingerbread-plus-aosp
* commit '93f07dbc620b468fe98b72a93f0d0e84c40353cd':
Cherry-pick security fix in WebKit change 65826
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); } |