Merge 119742 - Plumb CORS attribute information from HTMLMediaElement to media players so it can be…

Source/WebCore/html/canvas/CanvasRenderingContext.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 59 matching lines @@
 bool CanvasRenderingContext::wouldTaintOrigin(const HTMLVideoElement* video)
 {
 #if ENABLE(VIDEO)
     // FIXME: This check is likely wrong when a redirect is involved. We need
     // to test the finalURL. Please be careful when fixing this issue not to
     // make currentSrc be the final URL because then the
     // HTMLMediaElement.currentSrc DOM API would leak redirect destinations!
     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
 
     return false;
 }
 
 bool CanvasRenderingContext::wouldTaintOrigin(const KURL& url)
 {
     if (!canvas()->originClean() || m_cleanURLs.contains(url.string()))
         return false;
 
     if (canvas()->securityOrigin()->taintsCanvas(url))
         return true;
 
     if (url.protocolIsData())
         return false;
 
     m_cleanURLs.add(url.string());
     return false;
 }
 
 void CanvasRenderingContext::checkOrigin(const KURL& url)
 {
     if (wouldTaintOrigin(url))
         canvas()->setOriginTainted();
 }
 
 } // namespace WebCore