Fix for cross-origin video check for webgl on android

media/base/android/media_player_bridge.cc

Index: media/base/android/media_player_bridge.cc
diff --git a/media/base/android/media_player_bridge.cc b/media/base/android/media_player_bridge.cc
index f07f11e3851c62c2670cfd325f5ba0741bde8771..cfbc8bc1f3067aa091aa99d4fa0081d55331ca25 100644
--- a/media/base/android/media_player_bridge.cc
+++ b/media/base/android/media_player_bridge.cc
@@ -34,7 +34,9 @@ MediaPlayerBridge::MediaPlayerBridge(
     MediaPlayerManager* manager,
     const RequestMediaResourcesCB& request_media_resources_cb,
     const ReleaseMediaResourcesCB& release_media_resources_cb,
-    const GURL& frame_url)
+    const GURL& frame_url,
+    bool has_single_security_origin,
+    bool allow_credentials)
     : MediaPlayerAndroid(player_id,
                          manager,
                          request_media_resources_cb,
@@ -53,6 +55,8 @@ MediaPlayerBridge::MediaPlayerBridge(
       can_seek_backward_(true),
       is_surface_in_use_(false),
       volume_(-1.0),
+      has_single_security_origin_(has_single_security_origin),
+      allow_credentials_(allow_credentials),
       weak_factory_(this) {
   listener_.reset(new MediaPlayerListener(base::MessageLoopProxy::current(),
                                           weak_factory_.GetWeakPtr()));
@@ -84,6 +88,11 @@ void MediaPlayerBridge::Initialize() {
     return;
   }
 
+  if (!allow_credentials_) {

[Ken Russell (switch to Gerrit), 2014/07/30 20:44:05]

Please comment this block indicating why the short-circuit is OK.

[qinmin, 2014/07/30 23:46:05]

Done.

+    ExtractMediaMetadata(url_.spec());
+    return;
+  }
+
   resource_getter->GetCookies(url_,
                               first_party_for_cookies_,
                               base::Bind(&MediaPlayerBridge::OnCookiesRetrieved,
@@ -185,7 +194,8 @@ void MediaPlayerBridge::SetDataSource(const std::string& url) {
 
   if (!Java_MediaPlayerBridge_setDataSource(
       env, j_media_player_bridge_.obj(), j_context, j_url_string.obj(),
-      j_cookies.obj(), j_user_agent.obj(), hide_url_log_)) {
+      j_cookies.obj(), j_user_agent.obj(), hide_url_log_,
+      has_single_security_origin_)) {
     OnMediaError(MEDIA_ERROR_FORMAT);
     return;
   }