Fullscreen video in Android WebView

content/renderer/media/android/stream_texture_factory_android.h

Index: content/renderer/media/android/stream_texture_factory_android.h
diff --git a/content/renderer/media/android/stream_texture_factory_android.h b/content/renderer/media/android/stream_texture_factory_android.h
index f496348bd4c7e1d52912a28015361335fd163067..5c3e451b6abbc13f110970b9e5a11e157b3c6a16 100644
--- a/content/renderer/media/android/stream_texture_factory_android.h
+++ b/content/renderer/media/android/stream_texture_factory_android.h
@@ -5,10 +5,12 @@
 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_ANDROID_H_
 #define CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_ANDROID_H_
 
+// TODO(boliu): move headers

[joth, 2013/08/10 01:43:44]

don't understand comment? ah, to common or somethign.

[boliu, 2013/08/10 04:17:04]

Meant moving to the impl.h header. Done in PS2.

+
 #include "base/memory/scoped_ptr.h"
 #include "cc/layers/video_frame_provider.h"
-#include "content/renderer/gpu/stream_texture_host_android.h"
 #include "gpu/command_buffer/common/mailbox.h"
+#include "ui/gfx/size.h"
 
 namespace WebKit {
 class WebGraphicsContext3D;
@@ -18,24 +20,19 @@ namespace content {
 
 // The proxy class for the gpu thread to notify the compositor thread
 // when a new video frame is available.
-class StreamTextureProxy : public StreamTextureHost::Listener {
+class StreamTextureProxy {
  public:
-  explicit StreamTextureProxy(StreamTextureHost* host);
-  virtual ~StreamTextureProxy();
+  virtual ~StreamTextureProxy() {}

[joth, 2013/08/10 01:43:44]

gives a clang warning? Or not if it's pure interface?

[boliu, 2013/08/10 04:17:04]

This is allowed by chromium style guide for inlining destructor of abstract base
classes with no members:
http://www.chromium.org/developers/coding-style/cpp-dos-and-donts#TOC-When-yo....

Also compiled locally with clang and it didn't complain.

 
   // Initialize and bind to the current thread, which becomes the thread that
   // a connected client will receive callbacks on.
-  void BindToCurrentThread(int32 stream_id);
+  virtual void BindToCurrentThread(int32 stream_id) = 0;
 
-  bool IsBoundToThread() { return loop_.get() != NULL; }
+  virtual bool IsBoundToThread() = 0;
 
   // Setting the target for callback when a frame is available. This function
   // could be called on both the main thread and the compositor thread.
-  void SetClient(cc::VideoFrameProvider::Client* client);
-
-  // StreamTextureHost::Listener implementation:
-  virtual void OnFrameAvailable() OVERRIDE;
-  virtual void OnMatrixChanged(const float matrix[16]) OVERRIDE;
+  virtual void SetClient(cc::VideoFrameProvider::Client* client) = 0;
 
   struct Deleter {
     inline void operator()(StreamTextureProxy* ptr) const { ptr->Release(); }
@@ -43,15 +40,7 @@ class StreamTextureProxy : public StreamTextureHost::Listener {
 
  private:
   // Causes this instance to be deleted on the thread it is bound to.
-  void Release();
-
-  scoped_ptr<StreamTextureHost> host_;
-  scoped_refptr<base::MessageLoopProxy> loop_;
-
-  base::Lock client_lock_;
-  cc::VideoFrameProvider::Client* client_;
-
-  DISALLOW_IMPLICIT_CONSTRUCTORS(StreamTextureProxy);
+  virtual void Release() = 0;
 };
 
 typedef scoped_ptr<StreamTextureProxy, StreamTextureProxy::Deleter>
@@ -60,43 +49,34 @@ typedef scoped_ptr<StreamTextureProxy, StreamTextureProxy::Deleter>
 // Factory class for managing stream textures.
 class StreamTextureFactory {
  public:
-  StreamTextureFactory(WebKit::WebGraphicsContext3D* context,
-                       GpuChannelHost* channel,
-                       int view_id);
-  ~StreamTextureFactory();
+  virtual ~StreamTextureFactory() {}

[qinmin, 2013/08/10 02:45:43]

nit: move to cc file

[boliu, 2013/08/10 04:17:04]

Again, this is allowed by the style guide:
http://www.chromium.org/developers/coding-style/cpp-dos-and-donts#TOC-When-yo....

Also if we do move this to separate cc file, it would only contain two empty
destructors, too much churn.

 
   // Create the StreamTextureProxy object.
-  StreamTextureProxy* CreateProxy();
+  virtual StreamTextureProxy* CreateProxy() = 0;
 
   // Send an IPC message to the browser process to request a java surface
   // object for the given stream_id. After the the surface is created,
   // it will be passed back to the WebMediaPlayerAndroid object identified by
   // the player_id.
-  void EstablishPeer(int32 stream_id, int player_id);
+  virtual void EstablishPeer(int32 stream_id, int player_id) = 0;
 
   // Create the streamTexture and return the stream Id and create a client-side
   // texture id to refer to the streamTexture. The texture id is produced into
   // a mailbox so it can be used to ship in a VideoFrame, with a sync point for
   // when the mailbox can be accessed.
-  unsigned CreateStreamTexture(
+  virtual unsigned CreateStreamTexture(
       unsigned texture_target,
       unsigned* texture_id,
       gpu::Mailbox* texture_mailbox,
-      unsigned* texture_mailbox_sync_point);
+      unsigned* texture_mailbox_sync_point) = 0;
 
   // Destroy the streamTexture for the given texture id, as well as the
   // client side texture.
-  void DestroyStreamTexture(unsigned texture_id);
+  virtual void DestroyStreamTexture(unsigned texture_id) = 0;
 
   // Set the streamTexture size for the given stream Id.
-  void SetStreamTextureSize(int32 texture_id, const gfx::Size& size);
-
- private:
-  WebKit::WebGraphicsContext3D* context_;
-  scoped_refptr<GpuChannelHost> channel_;
-  int view_id_;
-
-  DISALLOW_IMPLICIT_CONSTRUCTORS(StreamTextureFactory);
+  virtual void SetStreamTextureSize(int32 texture_id,
+                                    const gfx::Size& size) = 0;
 };
 
 }  // namespace content