Fix an issue that an invalid surface could be passed to MediaPlayerBridge

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 91 matching lines @@
     SetVolume(volume_);
 
   AttachListener(j_media_player_bridge_.obj());
 }
 
 void MediaPlayerBridge::SetDuration(base::TimeDelta duration) {
   duration_ = duration;
 }
 
 void MediaPlayerBridge::SetVideoSurface(gfx::ScopedJavaSurface surface) {
-  if (j_media_player_bridge_.is_null()) {
-    if (!surface.IsEmpty())
-      surface_ =  surface.Pass();
+  surface_ =  surface.IsValid() ? surface.Pass() : gfx::ScopedJavaSurface();

[no sievers, 2015/10/08 23:00:27]

Should we just make ScopedJavaSurface::MoveFrom() work for null surfaces? Since
it works for scoped_ptr, for example, right?

Also, less verbose, 'surface_ = surface' should work, I think.

[qinmin, 2015/10/08 23:47:23]

with the move-only type, the right hand side has to have a .Pass().

+
+  if (j_media_player_bridge_.is_null())
     return;
-  }
 
   JNIEnv* env = base::android::AttachCurrentThread();
   CHECK(env);
 
   Java_MediaPlayerBridge_setSurface(
-      env, j_media_player_bridge_.obj(), surface.j_surface().obj());
+      env, j_media_player_bridge_.obj(), surface_.j_surface().obj());
 }
 
 void MediaPlayerBridge::Prepare() {
   DCHECK(j_media_player_bridge_.is_null());
   CreateJavaMediaPlayerBridge();
   if (url_.SchemeIsFileSystem() || url_.SchemeIsBlob()) {
     manager()->GetMediaResourceGetter()->GetPlatformPathFromURL(
         url_,
         base::Bind(&MediaPlayerBridge::SetDataSource,
                    weak_factory_.GetWeakPtr()));
@@ skipping 395 matching lines @@
 
 GURL MediaPlayerBridge::GetUrl() {
   return url_;
 }
 
 GURL MediaPlayerBridge::GetFirstPartyForCookies() {
   return first_party_for_cookies_;
 }
 
 }  // namespace media