Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(114)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/WebCore/html/canvas/CanvasRenderingContext.cpp

Issue 10536097: Merge 119742 - Plumb CORS attribute information from HTMLMediaElement to media players so it can be… (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/html/HTMLMediaElement.cpp ('k') | Source/WebCore/platform/graphics/MediaPlayer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/html/canvas/CanvasRenderingContext.cpp
===================================================================
--- Source/WebCore/html/canvas/CanvasRenderingContext.cpp (revision 119992)
+++ Source/WebCore/html/canvas/CanvasRenderingContext.cpp (working copy)
@@ -77,11 +77,12 @@
if (!video || !canvas()->originClean())
return false;
- if (wouldTaintOrigin(video->currentSrc()))
+ if (!video->hasSingleSecurityOrigin())
return true;
- if (!video->hasSingleSecurityOrigin())
+ if (!(video->player() && video->player()->didPassCORSAccessCheck()) && wouldTaintOrigin(video->currentSrc()))
return true;
+
#else
UNUSED_PARAM(video);
#endif
« no previous file with comments | « Source/WebCore/html/HTMLMediaElement.cpp ('k') | Source/WebCore/platform/graphics/MediaPlayer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698