Upstream implementation for embedded video for WebMediaPlayerAndroid

content/renderer/render_view_impl.h

 // 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.
 
 #ifndef CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
 #pragma once
 
 #include <deque>
 #include <map>
@@ skipping 101 matching lines @@
 class PluginInstance;
 }  // namespace ppapi
 
 }  // namespace webkit
 
 namespace webkit_glue {
 class ImageResourceFetcher;
 class ResourceFetcher;
 }
 
+#if defined(OS_ANDROID)
+namespace webkit_media {
+class WebMediaPlayerManagerAndroid;
+}
+#endif
+
 namespace WebKit {
 class WebApplicationCacheHost;
 class WebApplicationCacheHostClient;
 class WebDOMMessageEvent;
 class WebDataSource;
 class WebDragData;
 class WebGeolocationClient;
 class WebIconURL;
 class WebImage;
 class WebPeerConnection00Handler;
@@ skipping 106 matching lines @@
 
   MouseLockDispatcher* mouse_lock_dispatcher() {
     return mouse_lock_dispatcher_;
   }
 
   WebKit::WebPeerConnectionHandler* CreatePeerConnectionHandler(
       WebKit::WebPeerConnectionHandlerClient* client);
   WebKit::WebPeerConnection00Handler* CreatePeerConnectionHandlerJsep(
       WebKit::WebPeerConnection00HandlerClient* client);
 
+#if defined(OS_ANDROID)
+  // Called when a video surface object is passed through the render thread to
+  // the designated WebMediaPlayerAndroid given by the player_id.
+  // TODO(qinmin): Upstream the code for passing Java surface object to the
+  // renderer thread.
+  void SetVideoSurface(jobject j_surface, int player_id);

[jamesr, 2012/05/18 23:10:24]

where does the "jobject" type come from? jni.h? feels pretty darn weird for
render_view_impl.h to have to #include jni.h if so, and I'm not sure how it is
doing that now

[qinmin, 2012/05/19 00:50:04]

I forgot to upload render_view.h in this patch, that file defines this function,
and includes "jni.h".
I have changed this function to return WebMediaPlayerManagerAndroid instead, So
that the caller (render_thread_impl.cc) can directly get the
WebMediaPlayerManagerAndroid and pass the video surface to it, instead of
relaying it through RenderViewImpl.


On 2012/05/18 23:10:24, jamesr wrote:

+#endif
+
   // Functions to add and remove observers for this object.
   void AddObserver(content::RenderViewObserver* observer);
   void RemoveObserver(content::RenderViewObserver* observer);
 
   // Adds the given file chooser request to the file_chooser_completion_ queue
   // (see that var for more) and requests the chooser be displayed if there are
   // no other waiting items in the queue.
   //
   // Returns true if the chooser was successfully scheduled. False means we
   // didn't schedule anything.
@@ skipping 1056 matching lines @@
   // is fine.
   ObserverList<content::RenderViewObserver> observers_;
 
   // Used to inform didChangeSelection() when it is called in the context
   // of handling a ViewMsg_SelectRange IPC.
   bool handling_select_range_;
 
   // 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
   // that we can enumerate them to send updates about things like window
   // location or tab focus and visibily. These are non-owning references.
   std::set<WebPluginDelegateProxy*> plugin_delegates_;
 
 #if defined(OS_WIN)
   // The ID of the focused NPAPI plug-in.
   int focused_plugin_id_;
@@ skipping 19 matching lines @@
   // bunch of stuff, you should probably create a helper class and put your
   // data and methods on that to avoid bloating RenderView more.  You can
   // use the Observer interface to filter IPC messages and receive frame change
   // notifications.
   // ---------------------------------------------------------------------------
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewImpl);
 };
 
 #endif  // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_