Chromium Code Reviews
Help | Chromium Project | Gerrit Changes | Sign in
(28)

Issue 7171012: Merge 88489 - 2011-06-09 Kenneth Russell <kbr@google.com> (Closed)

Created:
8 years ago by Ken Russell (switch to Gerrit)
Modified:
8 years ago
CC:
chromium-reviews
Base URL:
http://svn.webkit.org/repository/webkit/branches/chromium/782/
Visibility:
Public.

Description

Merge 88489 - 2011-06-09 Kenneth Russell <kbr@google.com>; Reviewed by Adam Barth. Disallow use of cross-domain media (images, video) in WebGL https://bugs.webkit.org/show_bug.cgi?id=62257 Updated WebGL implementation to track recent spec updates in this area. Tests: http/tests/security/webgl-remote-read-remote-image-allowed-with-credentials.html http/tests/security/webgl-remote-read-remote-image-allowed.html http/tests/security/webgl-remote-read-remote-image-blocked-no-crossorigin.html * html/canvas/CanvasRenderingContext.cpp: (WebCore::CanvasRenderingContext::wouldTaintOrigin): (WebCore::CanvasRenderingContext::checkOrigin): * html/canvas/CanvasRenderingContext.h: (WebCore::CanvasRenderingContext::checkOrigin): * html/canvas/WebGLRenderingContext.cpp: (WebCore::WebGLRenderingContext::readPixels): (WebCore::WebGLRenderingContext::texImage2D): (WebCore::WebGLRenderingContext::videoFrameToImage): (WebCore::WebGLRenderingContext::texSubImage2D): * html/canvas/WebGLRenderingContext.h: 2011-06-09 Kenneth Russell <kbr@google.com>; Reviewed by Adam Barth. Disallow use of cross-domain media (images, video) in WebGL https://bugs.webkit.org/show_bug.cgi?id=62257 Updated origin-clean-conformance.html to track upstream version in Khronos repository. Added new layout tests mirroring those added in bug 61015 which verify that new CORS support for images is working in the context of WebGL. Verified new tests in WebKit and Chromium. Skipped tests on platforms where WebGL is disabled. * http/tests/canvas/webgl/origin-clean-conformance-expected.txt: * http/tests/canvas/webgl/origin-clean-conformance.html: * http/tests/security/webgl-remote-read-remote-image-allowed-expected.txt: Added. * http/tests/security/webgl-remote-read-remote-image-allowed-with-credentials-expected.txt: Added. * http/tests/security/webgl-remote-read-remote-image-allowed-with-credentials.html: Added. * http/tests/security/webgl-remote-read-remote-image-allowed.html: Added. * http/tests/security/webgl-remote-read-remote-image-blocked-no-crossorigin-expected.txt: Added. * http/tests/security/webgl-remote-read-remote-image-blocked-no-crossorigin.html: Added. * platform/gtk/Skipped: * platform/mac-leopard/Skipped: * platform/mac-wk2/Skipped: * platform/qt/Skipped: TBR=kbr@google.com Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=88898

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+225 lines, -114 lines) Patch
M LayoutTests/ChangeLog View 1 chunk +28 lines, -0 lines 0 comments Download
M LayoutTests/http/tests/canvas/webgl/origin-clean-conformance.html View 5 chunks +57 lines, -58 lines 0 comments Download
M LayoutTests/http/tests/canvas/webgl/origin-clean-conformance-expected.txt View 1 chunk +20 lines, -22 lines 0 comments Download
A + LayoutTests/http/tests/security/webgl-remote-read-remote-image-allowed.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/http/tests/security/webgl-remote-read-remote-image-allowed-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/http/tests/security/webgl-remote-read-remote-image-allowed-with-credentials.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/http/tests/security/webgl-remote-read-remote-image-allowed-with-credentials-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/http/tests/security/webgl-remote-read-remote-image-blocked-no-crossorigin.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/http/tests/security/webgl-remote-read-remote-image-blocked-no-crossorigin-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M LayoutTests/platform/gtk/Skipped View 1 chunk +4 lines, -0 lines 0 comments Download
M LayoutTests/platform/mac-leopard/Skipped View 1 chunk +5 lines, -0 lines 0 comments Download
M LayoutTests/platform/mac-wk2/Skipped View 1 chunk +3 lines, -0 lines 0 comments Download
M LayoutTests/platform/qt/Skipped View 1 chunk +7 lines, -0 lines 0 comments Download
M Source/WebCore/ChangeLog View 1 chunk +25 lines, -0 lines 0 comments Download
M Source/WebCore/html/canvas/CanvasRenderingContext.h View 1 chunk +12 lines, -5 lines 0 comments Download
M Source/WebCore/html/canvas/CanvasRenderingContext.cpp View 1 chunk +39 lines, -19 lines 0 comments Download
M Source/WebCore/html/canvas/WebGLRenderingContext.h View 1 chunk +1 line, -1 line 0 comments Download
M Source/WebCore/html/canvas/WebGLRenderingContext.cpp View 9 chunks +30 lines, -15 lines 0 comments Download

Messages

Total messages: 1 (0 generated)
Ken Russell (switch to Gerrit)
8 years ago (2011-06-15 02:54:49 UTC) #1

          

Powered by Google App Engine
This is Rietveld 408576698