Android: Add support for CompositorFrame swaps

content/browser/renderer_host/image_transport_factory_android.cc

Index: content/browser/renderer_host/image_transport_factory_android.cc
diff --git a/content/browser/renderer_host/image_transport_factory_android.cc b/content/browser/renderer_host/image_transport_factory_android.cc
index 7ef1e3a5506b024c5f83af8e4695ffb479bfaf8b..96489700c384003a55f5d28941869f8acd25d15b 100644
--- a/content/browser/renderer_host/image_transport_factory_android.cc
+++ b/content/browser/renderer_host/image_transport_factory_android.cc
@@ -26,6 +26,7 @@ class DirectGLImageTransportFactory : public ImageTransportFactoryAndroid {
   virtual ~DirectGLImageTransportFactory();
 
   virtual uint32_t InsertSyncPoint() OVERRIDE { return 0; }
+  virtual void WaitSyncPoint(uint32_t sync_point) OVERRIDE {}
   virtual uint32_t CreateTexture() OVERRIDE {
     return context_->createTexture();
   }
@@ -67,6 +68,7 @@ class CmdBufferImageTransportFactory : public ImageTransportFactoryAndroid {
   virtual ~CmdBufferImageTransportFactory();
 
   virtual uint32_t InsertSyncPoint() OVERRIDE;
+  virtual void WaitSyncPoint(uint32_t sync_point) OVERRIDE;
   virtual uint32_t CreateTexture() OVERRIDE;
   virtual void DeleteTexture(uint32_t id) OVERRIDE;
   virtual void AcquireTexture(
@@ -105,9 +107,21 @@ CmdBufferImageTransportFactory::~CmdBufferImageTransportFactory() {
 }
 
 uint32_t CmdBufferImageTransportFactory::InsertSyncPoint() {
+  if (!context_->makeContextCurrent()) {

[Sami, 2013/03/05 17:44:42]

Tempted to suggest something like makeHelperContextCurrent() to avoid a 5th and
6th copy of the same code :) It wouldn't be that much less code so this way is
fine too.

[no sievers, 2013/03/05 21:58:05]

I wish I could eliminate the helper context...

+    LOG(ERROR) << "Failed to make helper context current.";
+    return 0;
+  }
   return context_->insertSyncPoint();
 }
 
+void CmdBufferImageTransportFactory::WaitSyncPoint(uint32_t sync_point) {
+  if (!context_->makeContextCurrent()) {
+    LOG(ERROR) << "Failed to make helper context current.";
+    return;
+  }
+  context_->waitSyncPoint(sync_point);
+}
+
 uint32_t CmdBufferImageTransportFactory::CreateTexture() {
   if (!context_->makeContextCurrent()) {
     LOG(ERROR) << "Failed to make helper context current.";