Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(747)

Unified Diff: content/renderer/render_view_impl.h

Issue 10919075: Move android mediaplayer from render process to browser process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressing comments Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_view_impl.h
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index f009b608d91a584c373b64876f2a90dff8772c59..ab4d0d4549585f0c160cf4c172acb3b0fc35c976 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -103,6 +103,9 @@ class RenderViewObserver;
class RenderViewTest;
class RendererAccessibility;
class RendererPpapiHost;
+#if defined(OS_ANDROID)
+class WebMediaPlayerProxyImplAndroid;
+#endif
struct CustomContextMenuContext;
struct FileChooserParams;
@@ -137,6 +140,7 @@ class ResourceFetcher;
#if defined(OS_ANDROID)
namespace webkit_media {
+class MediaPlayerBridgeManagerImpl;
class WebMediaPlayerManagerAndroid;
}
#endif
@@ -1402,6 +1406,18 @@ class RenderViewImpl : public RenderWidget,
typedef std::vector< linked_ptr<content::ContentDetector> >
ContentDetectorList;
ContentDetectorList content_detectors_;
+
+ // Proxy class for WebMediaPlayer to communicate with the real mediaplayer
scherkus (not reviewing) 2012/09/11 11:56:25 s/mediaplayer/media player/
qinmin 2012/09/12 23:12:52 Done.
+ // objects in browser process. This object is lazily initialized and will get
+ // deleted when RenderView is gone as it inherits from RenderViewObserver.
+ content::WebMediaPlayerProxyImplAndroid* media_player_proxy_;
+
+ // The media player manager for managing all the media players on this view.
+ scoped_ptr<webkit_media::WebMediaPlayerManagerAndroid> media_player_manager_;
+
+ // Resource manager for all the android mediaplayer objects if they are
scherkus (not reviewing) 2012/09/11 11:56:25 s/mediaplayer/media player/
qinmin 2012/09/12 23:12:52 Done.
+ // created in the renderer process. This object is lazily initialized.
+ scoped_ptr<webkit_media::MediaPlayerBridgeManagerImpl> media_bridge_manager_;
#endif
// Misc ----------------------------------------------------------------------
@@ -1460,11 +1476,6 @@ class RenderViewImpl : public RenderWidget,
// Wraps the |webwidget_| as a MouseLockDispatcher::LockTarget interface.
scoped_ptr<MouseLockDispatcher::LockTarget> webwidget_mouse_lock_target_;
-#if defined(OS_ANDROID)
- // The media player manager for managing all the media players on this view.
- scoped_ptr<webkit_media::WebMediaPlayerManagerAndroid> media_player_manager_;
-#endif
-
// Plugins -------------------------------------------------------------------
// All the currently active plugin delegates for this RenderView; kept so

Powered by Google App Engine
This is Rietveld 408576698