Upstream implementation for embedded video for WebMediaPlayerAndroid

content/renderer/render_view_impl.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/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 165 matching lines @@
 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h"
 #include "webkit/media/webmediaplayer_impl.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/npapi/webplugin_delegate.h"
 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 #include "webkit/plugins/npapi/webplugin_impl.h"
 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h"
 
 #if defined(OS_ANDROID)
 #include "webkit/media/android/webmediaplayer_android.h"
+#include "webkit/media/android/webmediaplayer_manager_android.h"
 #elif defined(OS_WIN)
 // TODO(port): these files are currently Windows only because they concern:
 //   * theming
 #include "ui/base/native_theme/native_theme_win.h"
 #elif defined(USE_X11)
 #include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebRenderTheme.h"
 #include "ui/base/native_theme/native_theme.h"
 #elif defined(OS_MACOSX)
 #include "skia/ext/skia_utils_mac.h"
 #endif
@@ skipping 362 matching lines @@
 #if defined(ENABLE_WEBRTC)
   if (!media_stream_dispatcher_)
     media_stream_dispatcher_ = new MediaStreamDispatcher(this);
 #endif
 
   new MHTMLGenerator(this);
 #if defined(OS_MACOSX)
   new TextInputClientObserver(this);
 #endif  // defined(OS_MACOSX)
 
+#if defined(OS_ANDROID)
+  media_player_manager_.reset(
+      new webkit_media::WebMediaPlayerManagerAndroid(routing_id_));
+#endif
+
   // The next group of objects all implement RenderViewObserver, so are deleted
   // along with the RenderView automatically.
   devtools_agent_ = new DevToolsAgent(this);
   renderer_accessibility_ = new RendererAccessibility(this, accessibility_mode);
   mouse_lock_dispatcher_ = new MouseLockDispatcher(this);
   intents_host_ = new WebIntentsHost(this);
 
   new IdleUserDetector(this);
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
@@ skipping 1622 matching lines @@
                                     routing_id_);
   }
 }
 
 WebMediaPlayer* RenderViewImpl::createMediaPlayer(
     WebFrame* frame, WebMediaPlayerClient* client) {
   FOR_EACH_OBSERVER(
       RenderViewObserver, observers_, WillCreateMediaPlayer(frame, client));
 
 #if defined(OS_ANDROID)
+  // TODO(qinmin): upstream the implementation of StreamTextureFactoryImpl
+  // to replace the NULL param here.
   return new webkit_media::WebMediaPlayerAndroid(
-      client, cookieJar(frame));
+      client, cookieJar(frame), media_player_manager_.get(), NULL);
 #endif
 
   media::MessageLoopFactory* message_loop_factory =
       new media::MessageLoopFactory();
   media::FilterCollection* collection = new media::FilterCollection();
   RenderMediaLog* render_media_log = new RenderMediaLog();
 
   RenderAudioSourceProvider* audio_source_provider = NULL;
 
   // Add in any custom filter factories first.
@@ skipping 2668 matching lines @@
   FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidHandleMouseEvent(event));
 }
 
 void RenderViewImpl::DidHandleTouchEvent(const WebTouchEvent& event) {
   FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidHandleTouchEvent(event));
 }
 
 void RenderViewImpl::OnWasHidden() {
   RenderWidget::OnWasHidden();
 
+#if defined(OS_ANDROID)
+  // Inform WebMediaPlayerManagerAndroid to release all media player resources.
+  media_player_manager_->ReleaseMediaResources();

[scherkus (not reviewing), 2012/05/23 22:45:46]

do we not want to do anything when we're restored?

[qinmin, 2012/05/24 20:30:28]

I will address this when upstreaming the next patch, basically all the
information including currentTime, duration, size will be recorded

On 2012/05/23 22:45:46, scherkus wrote:

+#endif
+
   if (webview()) {
     webview()->settings()->setMinimumTimerInterval(
         webkit_glue::kBackgroundTabTimerInterval);
     webview()->setVisibilityState(visibilityState(), false);
   }
 
   // Inform PPAPI plugins that their page is no longer visible.
   pepper_delegate_.PageVisibilityChanged(false);
 
 #if defined(OS_MACOSX)
@@ skipping 480 matching lines @@
 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
   return !!RenderThreadImpl::current()->compositor_thread();
 }
 
 void RenderViewImpl::OnJavaBridgeInit() {
   DCHECK(!java_bridge_dispatcher_);
 #if defined(ENABLE_JAVA_BRIDGE)
   java_bridge_dispatcher_ = new JavaBridgeDispatcher(this);
 #endif
 }