android: Implement single origin and CORS check for video

webkit/renderer/media/android/webmediaplayer_android.cc

Index: webkit/renderer/media/android/webmediaplayer_android.cc
diff --git a/webkit/renderer/media/android/webmediaplayer_android.cc b/webkit/renderer/media/android/webmediaplayer_android.cc
index 17017dbbb4c8ecc8cb26acfbb4dded33712d6f97..91c142df9f724b711563cbd403f491205a1a845b 100644
--- a/webkit/renderer/media/android/webmediaplayer_android.cc
+++ b/webkit/renderer/media/android/webmediaplayer_android.cc
@@ -148,11 +148,9 @@ void WebMediaPlayerAndroid::load(const WebURL& url, CORSMode cors_mode) {
 void WebMediaPlayerAndroid::load(const WebURL& url,
                                  WebMediaSource* media_source,
                                  CORSMode cors_mode) {
-  if (cors_mode != CORSModeUnspecified)
-    NOTIMPLEMENTED() << "No CORS support";
-
   MediaPlayerAndroid::SourceType source_type =
       MediaPlayerAndroid::SOURCE_TYPE_URL;
+  url_ = url;
 
   if (media_source)
     source_type = MediaPlayerAndroid::SOURCE_TYPE_MSE;
@@ -185,28 +183,43 @@ void WebMediaPlayerAndroid::load(const WebURL& url,
         audio_renderer_->Start();
     }
 #endif
+    InitializeMediaPlayer(source_type);
+  } else {
+    info_loader_.reset(
+        new MediaInfoLoaderAndroid(
+            url_,
+            cors_mode,
+            base::Bind(&WebMediaPlayerAndroid::DidLoadMediaInfo,
+                       base::Unretained(this))));
+    info_loader_->Start(frame_);
+  }
+  UpdateNetworkState(WebMediaPlayer::NetworkStateLoading);
+  UpdateReadyState(WebMediaPlayer::ReadyStateHaveNothing);
+}
+
+void WebMediaPlayerAndroid::DidLoadMediaInfo(
+    MediaInfoLoaderAndroid::Status status) {
+  DCHECK(!media_source_delegate_);
+  if (status == MediaInfoLoaderAndroid::kFailed) {
+    info_loader_.reset();

[acolwell GONE FROM CHROMIUM, 2013/06/10 19:17:32]

I think you need to add something like
UpdateNetworkState(WebMediaPlayer::NetworkStateNetworkError) here so that the
HTMLMediaElement can correctly report the error state.

[Sami, 2013/06/11 13:51:25]

Well spotted, thanks. Done.

+    return;
   }
 
-  InitializeMediaPlayer(url, source_type);
+  InitializeMediaPlayer(MediaPlayerAndroid::SOURCE_TYPE_URL);
 }
 
 void WebMediaPlayerAndroid::InitializeMediaPlayer(
-    const WebURL& url,
     MediaPlayerAndroid::SourceType source_type) {
-  url_ = url;
   GURL first_party_url = frame_->document().firstPartyForCookies();
   if (proxy_) {
-    proxy_->Initialize(player_id_, url, source_type, first_party_url);
+    proxy_->Initialize(player_id_, url_, source_type, first_party_url);
     if (manager_->IsInFullscreen(frame_))
       proxy_->EnterFullscreen(player_id_);
   }
-
-  UpdateNetworkState(WebMediaPlayer::NetworkStateLoading);
-  UpdateReadyState(WebMediaPlayer::ReadyStateHaveNothing);
 }
 
 void WebMediaPlayerAndroid::cancelLoad() {

[acolwell GONE FROM CHROMIUM, 2013/06/10 19:17:32]

nit: Please remove. This method is never called.

[Sami, 2013/06/11 13:51:25]

Done.

-  NOTIMPLEMENTED();
+  info_loader_.reset();
 }
 
 void WebMediaPlayerAndroid::play() {
@@ -406,14 +419,14 @@ bool WebMediaPlayerAndroid::copyVideoTextureToPlatformTexture(
 }
 
 bool WebMediaPlayerAndroid::hasSingleSecurityOrigin() const {
-  // TODO(qinmin): fix this for urls that are not file.
-  // https://code.google.com/p/chromium/issues/detail?id=234710
-  if (url_.SchemeIsFile())
-    return true;
-  return false;
+  if (info_loader_)
+    return info_loader_->HasSingleOrigin();
+  return true;
 }
 
 bool WebMediaPlayerAndroid::didPassCORSAccessCheck() const {
+  if (info_loader_)
+    return info_loader_->DidPassCORSAccessCheck();
   return false;
 }