android: Implement single origin and CORS check for video

webkit/media/android/webmediaplayer_android.cc

 // Copyright (c) 2012 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/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 83 matching lines @@
     main_loop_->RemoveDestructionObserver(this);
 }
 
 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";
-
   if (media_source) {
     media_source_delegate_.reset(
         new MediaSourceDelegate(
             frame_, client_, proxy_, player_id_, media_log_));
-    // |media_source_delegate_| is owned, so Unretained() is safe here.
-    media_source_delegate_->Initialize(
-        media_source,
-        base::Bind(&WebMediaPlayerAndroid::UpdateNetworkState,
-                   base::Unretained(this)));
   }
 
   url_ = url;
-  GURL first_party_url = frame_->document().firstPartyForCookies();
-  if (proxy_) {
-    proxy_->Initialize(player_id_, url_, media_source != NULL, first_party_url);
-    if (manager_->IsInFullscreen(frame_))
-      proxy_->EnterFullscreen(player_id_);
-  }
+  pending_media_source_.reset(media_source);

[qinmin, 2013/06/03 16:55:59]

if you split MSE/non-MSE load() call, you don't need this pending_media_source

[Sami, 2013/06/03 17:12:56]

Sorry, I don't know what MSE stands for :) Do you mean that whenever we have a
media source we don't need to care about CORS/single-origin? I've now change
this to work like that.

+
+  info_loader_.reset(

[qinmin, 2013/06/03 16:55:59]

I don't think CORS is needed for MSE. 
You might want to split this for MSE and non-MSE case using if(media_source).
Check webmediaplayer_impl.cc.

[Sami, 2013/06/03 17:12:56]

Done.

+      new MediaInfoLoaderAndroid(
+          url_,
+          cors_mode,
+          base::Bind(&WebMediaPlayerAndroid::DidLoadMediaInfo,
+                        base::Unretained(this))));

[qinmin, 2013/06/03 16:55:59]

nit: indent

[Sami, 2013/06/03 17:12:56]

Done.

+  info_loader_->Start(frame_);
 
   UpdateNetworkState(WebMediaPlayer::NetworkStateLoading);
   UpdateReadyState(WebMediaPlayer::ReadyStateHaveNothing);
 }
 
+void WebMediaPlayerAndroid::DidLoadMediaInfo(
+    MediaInfoLoaderAndroid::Status status) {
+  if (status == MediaInfoLoaderAndroid::kFailed) {
+    info_loader_.reset();
+    media_source_delegate_.reset();
+    pending_media_source_.reset();
+    return;
+  }
+
+  bool is_media_source = pending_media_source_;
+  if (pending_media_source_) {
+    // |media_source_delegate_| is owned, so Unretained() is safe here.
+    media_source_delegate_->Initialize(
+        pending_media_source_.release(),
+        base::Bind(&WebMediaPlayerAndroid::UpdateNetworkState,
+                   base::Unretained(this)));
+  }
+
+  GURL first_party_url = frame_->document().firstPartyForCookies();
+  if (proxy_) {
+    proxy_->Initialize(player_id_, url_, is_media_source, first_party_url);
+    if (manager_->IsInFullscreen(frame_))
+      proxy_->EnterFullscreen(player_id_);
+  }
+}
+
 void WebMediaPlayerAndroid::cancelLoad() {
-  NOTIMPLEMENTED();
+  pending_media_source_.reset();
+  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_);
   }
 #endif
@@ skipping 173 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 false;
 }
 
 bool WebMediaPlayerAndroid::didPassCORSAccessCheck() const {
+  if (info_loader_)
+    return info_loader_->DidPassCORSAccessCheck();
   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 {
@@ skipping 386 matching lines @@
 void WebMediaPlayerAndroid::exitFullscreen() {
   if (proxy_)
     proxy_->ExitFullscreen(player_id_);
 }
 
 bool WebMediaPlayerAndroid::canEnterFullscreen() const {
   return manager_->CanEnterFullscreen(frame_);
 }
 
 }  // namespace webkit_media