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

Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp

Index: Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp
===================================================================
--- Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp	(revision 119992)
+++ Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp	(working copy)
@@ -301,7 +301,9 @@
         // Make sure if we create/re-create the WebMediaPlayer that we update our wrapper.
         m_audioSourceProvider.wrap(m_webMediaPlayer->audioSourceProvider());
 #endif
-        m_webMediaPlayer->load(KURL(ParsedURLString, m_url));
+        m_webMediaPlayer->load(
+            KURL(ParsedURLString, m_url),
+            static_cast<WebMediaPlayer::CORSMode>(m_mediaPlayer->mediaPlayerClient()->mediaPlayerCORSMode()));
     }
 }
 
@@ -623,6 +625,13 @@
     return false;
 }
 
+bool WebMediaPlayerClientImpl::didPassCORSAccessCheck() const
+{
+    if (m_webMediaPlayer)
+        return m_webMediaPlayer->didPassCORSAccessCheck();
+    return false;
+}
+
 MediaPlayer::MovieLoadType WebMediaPlayerClientImpl::movieLoadType() const
 {
     if (m_webMediaPlayer)