|
Merge 119742 - Plumb CORS attribute information from HTMLMediaElement to media players so it can be used
https://bugs.webkit.org/show_bug.cgi?id=88349
Reviewed by Adam Barth.
Source/WebCore:
Test: http/tests/security/video-cross-origin-readback.html
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::mediaPlayerCORSMode):
(WebCore):
* html/HTMLMediaElement.h:
(HTMLMediaElement):
* html/canvas/CanvasRenderingContext.cpp:
(WebCore::CanvasRenderingContext::wouldTaintOrigin):
* platform/graphics/MediaPlayer.cpp:
(WebCore::MediaPlayer::didPassCORSAccessCheck):
(WebCore):
* platform/graphics/MediaPlayer.h:
(WebCore::MediaPlayerClient::mediaPlayerCORSMode):
(MediaPlayer):
* platform/graphics/MediaPlayerPrivate.h:
(WebCore::MediaPlayerPrivateInterface::didPassCORSAccessCheck):
(MediaPlayerPrivateInterface):
Source/WebKit/chromium:
* public/WebMediaPlayer.h:
(WebMediaPlayer):
* src/AssertMatchingEnums.cpp:
* src/WebMediaPlayerClientImpl.cpp:
(WebKit::WebMediaPlayerClientImpl::loadInternal):
(WebKit::WebMediaPlayerClientImpl::didPassCORSAccessCheck):
(WebKit):
* src/WebMediaPlayerClientImpl.h:
(WebMediaPlayerClientImpl):
LayoutTests:
* http/tests/security/resources/video-cross-origin-allow.php: Added.
* http/tests/security/video-cross-origin-readback-expected.txt: Added.
* http/tests/security/video-cross-origin-readback.html: Added.
* platform/efl/Skipped:
* platform/gtk/TestExpectations:
* platform/mac/Skipped:
* platform/qt/Skipped:
* platform/win/Skipped:
* platform/wk2/Skipped:
TBR=fischman@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=119995
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+55 lines, -1 line) |
Patch |
|
A + |
LayoutTests/http/tests/security/resources/video-cross-origin-allow.php
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
|
A + |
LayoutTests/http/tests/security/video-cross-origin-readback.html
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
|
A + |
LayoutTests/http/tests/security/video-cross-origin-readback-expected.txt
|
View
|
|
0 chunks |
+-1 lines, --1 lines |
0 comments
|
Download
|
|
M |
LayoutTests/platform/efl/Skipped
|
View
|
|
1 chunk |
+3 lines, -0 lines |
0 comments
|
Download
|
|
M |
LayoutTests/platform/mac/Skipped
|
View
|
|
1 chunk |
+3 lines, -0 lines |
0 comments
|
Download
|
|
M |
LayoutTests/platform/qt/Skipped
|
View
|
|
1 chunk |
+3 lines, -0 lines |
0 comments
|
Download
|
|
M |
LayoutTests/platform/win/Skipped
|
View
|
|
1 chunk |
+3 lines, -0 lines |
0 comments
|
Download
|
|
M |
LayoutTests/platform/wk2/Skipped
|
View
|
|
1 chunk |
+3 lines, -0 lines |
0 comments
|
Download
|
|
M |
Source/WebCore/html/HTMLMediaElement.h
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
|
M |
Source/WebCore/html/HTMLMediaElement.cpp
|
View
|
|
1 chunk |
+9 lines, -0 lines |
0 comments
|
Download
|
|
M |
Source/WebCore/html/canvas/CanvasRenderingContext.cpp
|
View
|
|
1 chunk |
+3 lines, -2 lines |
0 comments
|
Download
|
|
M |
Source/WebCore/platform/graphics/MediaPlayer.h
|
View
|
|
3 chunks |
+5 lines, -0 lines |
0 comments
|
Download
|
|
M |
Source/WebCore/platform/graphics/MediaPlayer.cpp
|
View
|
|
1 chunk |
+5 lines, -0 lines |
0 comments
|
Download
|
|
M |
Source/WebCore/platform/graphics/MediaPlayerPrivate.h
|
View
|
|
1 chunk |
+2 lines, -0 lines |
0 comments
|
Download
|
|
M |
Source/WebKit/chromium/public/WebMediaPlayer.h
|
View
|
|
2 chunks |
+2 lines, -1 line |
0 comments
|
Download
|
|
M |
Source/WebKit/chromium/src/AssertMatchingEnums.cpp
|
View
|
|
1 chunk |
+5 lines, -0 lines |
0 comments
|
Download
|
|
M |
Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
|
M |
Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp
|
View
|
|
2 chunks |
+10 lines, -1 line |
0 comments
|
Download
|
Total messages: 1 (0 generated)
|