WebCore:
2008-08-26 Sam Weinig <sam@webkit.org>
Reviewed by Oliver Hunt.
Fix https://bugs.webkit.org/show_bug.cgi?id=20479
<rdar://problem/6167660>
Take image redirects into account when tainting the canvas.
Test: http/tests/security/canvas-remote-read-redirect-to-remote-image.html
* html/CanvasRenderingContext2D.cpp:
(WebCore::CanvasRenderingContext2D::drawImage):
(WebCore::CanvasRenderingContext2D::drawImageFromRect):
LayoutTests:
2008-08-26 Sam Weinig <sam@webkit.org>
Reviewed by Oliver Hunt.
Test for https://bugs.webkit.org/show_bug.cgi?id=20479
* http/tests/security/canvas-remote-read-redirect-to-remote-image-expected.txt: Added.
* http/tests/security/canvas-remote-read-redirect-to-remote-image.html: Added.
* http/tests/security/canvas-remote-read-svg-image-expected.txt:
* http/tests/security/canvas-remote-read-svg-image.html: Fix incorrect log message.
* http/tests/security/resources/redir.php: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@35935 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ff66be0..c058755 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,19 @@
2008-08-26 Sam Weinig <sam@webkit.org>
+ Reviewed by Oliver Hunt.
+
+ Fix https://bugs.webkit.org/show_bug.cgi?id=20479
+ <rdar://problem/6167660>
+ Take image redirects into account when tainting the canvas.
+
+ Test: http/tests/security/canvas-remote-read-redirect-to-remote-image.html
+
+ * html/CanvasRenderingContext2D.cpp:
+ (WebCore::CanvasRenderingContext2D::drawImage):
+ (WebCore::CanvasRenderingContext2D::drawImageFromRect):
+
+2008-08-26 Sam Weinig <sam@webkit.org>
+
Reviewed by Darin Adler.
Change canvas tainting logic to ask the image if it contains
