work-in-progress patch to fix context lost black video

content/renderer/media/android/stream_texture_factory_impl.cc

Index: content/renderer/media/android/stream_texture_factory_impl.cc
diff --git a/content/renderer/media/android/stream_texture_factory_impl.cc b/content/renderer/media/android/stream_texture_factory_impl.cc
index da9a70f4ba732222b0af8b9adad6228310af8d78..1a6221858f76606649585d8387f939e4756bd656 100644
--- a/content/renderer/media/android/stream_texture_factory_impl.cc
+++ b/content/renderer/media/android/stream_texture_factory_impl.cc
@@ -22,8 +22,9 @@ class StreamTextureProxyImpl : public StreamTextureProxy,
   virtual ~StreamTextureProxyImpl();
 
   // StreamTextureProxy implementation:
-  virtual void BindToCurrentThread(int32 stream_id) OVERRIDE;
-  virtual void SetClient(cc::VideoFrameProvider::Client* client) OVERRIDE;
+  virtual void Bind(int32 stream_id,
+                    cc::VideoFrameProvider::Client* client,
+                    scoped_refptr<base::MessageLoopProxy> loop) OVERRIDE;
   virtual void Release() OVERRIDE;
 
   // StreamTextureHost::Listener implementation:
@@ -31,10 +32,12 @@ class StreamTextureProxyImpl : public StreamTextureProxy,
   virtual void OnMatrixChanged(const float matrix[16]) OVERRIDE;
 
  private:
-  scoped_ptr<StreamTextureHost> host_;
-  scoped_refptr<base::MessageLoopProxy> loop_;
+  void SetClient(cc::VideoFrameProvider::Client* client);
+  void BindOnThread(int32 stream_id, cc::VideoFrameProvider::Client* client);
+  const scoped_ptr<StreamTextureHost> host_;
 
-  base::Lock client_lock_;
+  base::Lock lock_;
+  scoped_refptr<base::MessageLoopProxy> loop_;
   cc::VideoFrameProvider::Client* client_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(StreamTextureProxyImpl);
@@ -46,31 +49,53 @@ StreamTextureProxyImpl::StreamTextureProxyImpl(StreamTextureHost* host)
 StreamTextureProxyImpl::~StreamTextureProxyImpl() {}
 
 void StreamTextureProxyImpl::Release() {
-  SetClient(NULL);
-  if (loop_.get() && loop_.get() != base::MessageLoopProxy::current())
-    loop_->DeleteSoon(FROM_HERE, this);
-  else
+  base::AutoLock lock(lock_);
+  client_ = NULL;
+  if (!loop_.get() || loop_.get() != base::MessageLoopProxy::current() ||
+      !loop_->DeleteSoon(FROM_HERE, this)) {
     delete this;
+  }
 }
 
-void StreamTextureProxyImpl::SetClient(cc::VideoFrameProvider::Client* client) {
-  base::AutoLock lock(client_lock_);
-  client_ = client;
+void StreamTextureProxyImpl::Bind(int32 stream_id,
+                  cc::VideoFrameProvider::Client* client,
+                  scoped_refptr<base::MessageLoopProxy> loop) {
+  base::AutoLock lock(lock_);
+  DCHECK(loop.get());
+  loop_ = loop;
+
+  if (loop.get() != base::MessageLoopProxy::current()) {
+    // Unretained is safe here only because the object is deleted on |loop_|
+    // thread.
+    loop->PostTask(FROM_HERE,
+                   base::Bind(&StreamTextureProxyImpl::BindOnThread,
+                              base::Unretained(this),
+                              stream_id,
+                              client));
+  } else {
+    client_ = client;
+    host_->BindToCurrentThread(stream_id, this);
+  }
 }
 
-void StreamTextureProxyImpl::BindToCurrentThread(int stream_id) {
-  loop_ = base::MessageLoopProxy::current();
+void StreamTextureProxyImpl::BindOnThread(
+    int32 stream_id,
+    cc::VideoFrameProvider::Client* client) {
+  {
+    base::AutoLock lock(lock_);
+    client_ = client;
+  }
   host_->BindToCurrentThread(stream_id, this);
 }
 
 void StreamTextureProxyImpl::OnFrameAvailable() {
-  base::AutoLock lock(client_lock_);
+  base::AutoLock lock(lock_);
   if (client_)
     client_->DidReceiveFrame();
 }
 
 void StreamTextureProxyImpl::OnMatrixChanged(const float matrix[16]) {
-  base::AutoLock lock(client_lock_);
+  base::AutoLock lock(lock_);
   if (client_)
     client_->DidUpdateMatrix(matrix);
 }
@@ -134,4 +159,12 @@ gpu::gles2::GLES2Interface* StreamTextureFactoryImpl::ContextGL() {
   return context_provider_->ContextGL();
 }
 
+void StreamTextureFactoryImpl::AddObserver(
+    StreamTextureFactoryContextObserver* obs) {
+}
+
+void StreamTextureFactoryImpl::RemoveObserver(
+    StreamTextureFactoryContextObserver* obs) {
+}
+
 }  // namespace content