Fix for cross-origin video check for webgl on android

media/base/android/media_player_bridge.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 "media/base/android/media_player_bridge.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 16 matching lines @@
 
 MediaPlayerBridge::MediaPlayerBridge(
     int player_id,
     const GURL& url,
     const GURL& first_party_for_cookies,
     const std::string& user_agent,
     bool hide_url_log,
     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,
                          release_media_resources_cb,
                          frame_url),
       prepared_(false),
       pending_play_(false),
       url_(url),
       first_party_for_cookies_(first_party_for_cookies),
       user_agent_(user_agent),
       hide_url_log_(hide_url_log),
       width_(0),
       height_(0),
       can_pause_(true),
       can_seek_forward_(true),
       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()));
 }
 
 MediaPlayerBridge::~MediaPlayerBridge() {
   if (!j_media_player_bridge_.is_null()) {
     JNIEnv* env = base::android::AttachCurrentThread();
     CHECK(env);
     Java_MediaPlayerBridge_destroy(env, j_media_player_bridge_.obj());
@@ skipping 11 matching lines @@
   media::MediaResourceGetter* resource_getter =
       manager()->GetMediaResourceGetter();
   if (url_.SchemeIsFileSystem() || url_.SchemeIs(kBlobScheme)) {
     resource_getter->GetPlatformPathFromURL(
         url_,
         base::Bind(&MediaPlayerBridge::ExtractMediaMetadata,
                    weak_factory_.GetWeakPtr()));
     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,
                                          weak_factory_.GetWeakPtr()));
 }
 
 void MediaPlayerBridge::CreateJavaMediaPlayerBridge() {
   JNIEnv* env = base::android::AttachCurrentThread();
   CHECK(env);
 
@@ skipping 81 matching lines @@
   if (StartsWithASCII(url, data_uri_prefix, true)) {
     if (!Java_MediaPlayerBridge_setDataUriDataSource(
         env, j_media_player_bridge_.obj(), j_context, j_url_string.obj())) {
       OnMediaError(MEDIA_ERROR_FORMAT);
     }
     return;
   }
 
   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;
   }
 
   request_media_resources_cb_.Run(player_id());
   if (!Java_MediaPlayerBridge_prepareAsync(env, j_media_player_bridge_.obj()))
     OnMediaError(MEDIA_ERROR_FORMAT);
 }
 
 void MediaPlayerBridge::OnDidSetDataUriDataSource(JNIEnv* env, jobject obj,
@@ skipping 297 matching lines @@
 
 GURL MediaPlayerBridge::GetFirstPartyForCookies() {
   return first_party_for_cookies_;
 }
 
 bool MediaPlayerBridge::IsSurfaceInUse() const {
   return is_surface_in_use_;
 }
 
 }  // namespace media