Fix an issue that MediaController is disaled when entering fullscreen

content/browser/android/content_video_view.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 "content/browser/android/content_video_view.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "base/message_loop/message_loop.h"
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/media/android/browser_media_player_manager.h"
 #include "content/common/android/surface_texture_peer.h"
 #include "content/public/common/content_switches.h"
 #include "jni/ContentVideoView_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::CheckException;
 using base::android::ScopedJavaGlobalRef;
 
@@ skipping 17 matching lines @@
   return RegisterNativesImpl(env);
 }
 
 ContentVideoView* ContentVideoView::GetInstance() {
   return g_content_video_view;
 }
 
 ContentVideoView::ContentVideoView(
     BrowserMediaPlayerManager* manager)
     : manager_(manager),
-      fullscreen_state_(ENTERED) {
+      fullscreen_state_(ENTERED),
+      weak_this_(this) {
   DCHECK(!g_content_video_view);
   j_content_video_view_ = CreateJavaObject();
   g_content_video_view = this;
 }
 
 ContentVideoView::~ContentVideoView() {
   DCHECK(g_content_video_view);
   DestroyContentVideoView(true);
   g_content_video_view = NULL;
 }
@@ skipping 44 matching lines @@
   ScopedJavaLocalRef<jobject> content_video_view = GetJavaObject(env);
   if (!content_video_view.is_null()) {
     Java_ContentVideoView_onExitFullscreen(env, content_video_view.obj());
     j_content_video_view_.reset();
   }
 }
 
 void ContentVideoView::UpdateMediaMetadata() {
   JNIEnv *env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> content_video_view = GetJavaObject(env);
-  if (!content_video_view.is_null())
-    UpdateMediaMetadata(env, content_video_view.obj());
+  if (content_video_view.is_null())
+    return;
+
+  media::MediaPlayerAndroid* player = manager_->GetFullscreenPlayer();
+  if (player && player->IsPlayerReady()) {
+    Java_ContentVideoView_onUpdateMediaMetadata(
+        env, content_video_view.obj(), player->GetVideoWidth(),
+        player->GetVideoHeight(), player->GetDuration().InMilliseconds(),
+        player->CanPause(),player->CanSeekForward(), player->CanSeekBackward());
+  }
 }
 
 int ContentVideoView::GetVideoWidth(JNIEnv*, jobject obj) const {
   media::MediaPlayerAndroid* player = manager_->GetFullscreenPlayer();
   return player ? player->GetVideoWidth() : 0;
 }
 
 int ContentVideoView::GetVideoHeight(JNIEnv*, jobject obj) const {
   media::MediaPlayerAndroid* player = manager_->GetFullscreenPlayer();
   return player ? player->GetVideoHeight() : 0;
@@ skipping 57 matching lines @@
       gfx::ScopedJavaSurface::AcquireExternalSurface(surface);
   if (fullscreen_state_ == RESUME) {
     DCHECK(surface);
     manager_->ResumeFullscreen(scoped_surface.Pass());
     fullscreen_state_ = ENTERED;
   } else {
     manager_->SetVideoSurface(scoped_surface.Pass());
   }
 }
 
-void ContentVideoView::UpdateMediaMetadata(JNIEnv* env, jobject obj) {
-  media::MediaPlayerAndroid* player = manager_->GetFullscreenPlayer();
-  if (player && player->IsPlayerReady())
-    Java_ContentVideoView_onUpdateMediaMetadata(
-        env, obj, player->GetVideoWidth(), player->GetVideoHeight(),
-        player->GetDuration().InMilliseconds(), player->CanPause(),
-        player->CanSeekForward(), player->CanSeekBackward());
+void ContentVideoView::RequestMediaMetadata(JNIEnv* env, jobject obj) {
+  base::MessageLoop::current()->PostTask(
+      FROM_HERE,
+      base::Bind(&ContentVideoView::UpdateMediaMetadata,
+                 weak_this_.GetWeakPtr()));
 }
 
 ScopedJavaLocalRef<jobject> ContentVideoView::GetJavaObject(JNIEnv* env) {
   return j_content_video_view_.get(env);
 }
 
 JavaObjectWeakGlobalRef ContentVideoView::CreateJavaObject() {
   ContentViewCoreImpl* content_view_core = manager_->GetContentViewCore();
   JNIEnv *env = AttachCurrentThread();
   bool legacyMode = !CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 11 matching lines @@
 void ContentVideoView::DestroyContentVideoView(bool native_view_destroyed) {
   JNIEnv *env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> content_video_view = GetJavaObject(env);
   if (!content_video_view.is_null()) {
     Java_ContentVideoView_destroyContentVideoView(env,
         content_video_view.obj(), native_view_destroyed);
     j_content_video_view_.reset();
   }
 }
 }  // namespace content