android: Implement single origin and CORS check for video

webkit/renderer/media/android/webmediaplayer_android.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/renderer/media/android/webmediaplayer_android.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ skipping 130 matching lines @@
 #endif
 }
 
 void WebMediaPlayerAndroid::load(const WebURL& url, CORSMode cors_mode) {
   load(url, NULL, 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;
 #if defined(GOOGLE_TV)
   if (media_stream_client_) {
     DCHECK(!media_source);
     source_type = MediaPlayerAndroid::SOURCE_TYPE_STREAM;
   }
 #endif
 
@@ skipping 12 matching lines @@
     if (source_type == MediaPlayerAndroid::SOURCE_TYPE_STREAM) {
       media_source_delegate_->InitializeMediaStream(
           demuxer_,
           base::Bind(&WebMediaPlayerAndroid::UpdateNetworkState,
                      base::Unretained(this)));
       audio_renderer_ = media_stream_client_->GetAudioRenderer(url);
       if (audio_renderer_)
         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_);
   }
-
-  InitializeMediaPlayer(url, source_type);
-}
-
-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);
-    if (manager_->IsInFullscreen(frame_))
-      proxy_->EnterFullscreen(player_id_);
-  }
-
   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(MediaPlayerAndroid::SOURCE_TYPE_URL);
+}
+
+void WebMediaPlayerAndroid::InitializeMediaPlayer(
+    MediaPlayerAndroid::SourceType source_type) {
+  GURL first_party_url = frame_->document().firstPartyForCookies();
+  if (proxy_) {
+    proxy_->Initialize(player_id_, url_, source_type, first_party_url);
+    if (manager_->IsInFullscreen(frame_))
+      proxy_->EnterFullscreen(player_id_);
+  }
+}
+
 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() {
 #if defined(GOOGLE_TV)
   if (hasVideo() && needs_external_surface_) {
     DCHECK(!needs_establish_peer_);
     if (proxy_)
       proxy_->RequestExternalSurface(player_id_, last_computed_rect_);
   }
   if (audio_renderer_ && paused())
@@ skipping 179 matching lines @@
   web_graphics_context->copyTextureCHROMIUM(GL_TEXTURE_2D, texture_id_,
                                             texture, level, internal_format,
                                             type);
   web_graphics_context->pixelStorei(GL_UNPACK_FLIP_Y_CHROMIUM, false);
   web_graphics_context->pixelStorei(GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM,
                                     false);
   return true;
 }
 
 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;
+  if (info_loader_)
+    return info_loader_->HasSingleOrigin();
+  return true;
+}
+
+bool WebMediaPlayerAndroid::didPassCORSAccessCheck() const {
+  if (info_loader_)
+    return info_loader_->DidPassCORSAccessCheck();
   return false;
 }
 
-bool WebMediaPlayerAndroid::didPassCORSAccessCheck() const {
-  return false;
-}
-
 WebMediaPlayer::MovieLoadType WebMediaPlayerAndroid::movieLoadType() const {
   // Deprecated.
   // TODO(qinmin): Remove this from WebKit::WebMediaPlayer as it is never used.
   return WebMediaPlayer::MovieLoadTypeUnknown;
 }
 
 double WebMediaPlayerAndroid::mediaTimeForTimeValue(double timeValue) const {
   return ConvertSecondsToTimestamp(timeValue).InSecondsF();
 }
 
@@ skipping 638 matching lines @@
 void WebMediaPlayerAndroid::exitFullscreen() {
   if (proxy_)
     proxy_->ExitFullscreen(player_id_);
 }
 
 bool WebMediaPlayerAndroid::canEnterFullscreen() const {
   return manager_->CanEnterFullscreen(frame_);
 }
 
 }  // namespace webkit_media