Very basic Android browser-side compositing support.

content/browser/android/graphics_context.cc

Index: content/browser/android/graphics_context.cc
diff --git a/content/browser/android/graphics_context.cc b/content/browser/android/graphics_context.cc
index 29b7ad6f16933ab171b5c6aae918dc12971e3760..abe3fc462592ccdae19dac53e9bd5ebbdc867e44 100644
--- a/content/browser/android/graphics_context.cc
+++ b/content/browser/android/graphics_context.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/public/browser/android/graphics_context.h"
+#include "content/browser/android/graphics_context.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/android/draw_delegate_impl.h"
@@ -45,13 +45,14 @@ class CmdBufferGraphicsContext : public content::GraphicsContext {
     ANativeWindow_release(window_);
   }
 
-  virtual WebKit::WebGraphicsContext3D* GetContext3D() {
-    return context_.get();
-  }
-  virtual uint32 InsertSyncPoint() {
+  virtual uint32 InsertSyncPoint() OVERRIDE {
     return context_->insertSyncPoint();
   }
 
+  virtual int GetSurfaceID() OVERRIDE {
+    return surface_id_;
+  }
+
  private:
   scoped_ptr<WebGraphicsContext3DCommandBufferImpl> context_;
   int surface_id_;
@@ -83,7 +84,7 @@ GraphicsContext* GraphicsContext::CreateForUI(
   base::WeakPtr<WebGraphicsContext3DSwapBuffersClient> swap_client;
   scoped_ptr<WebGraphicsContext3DCommandBufferImpl> context(
       new WebGraphicsContext3DCommandBufferImpl(
-          surface_id,
+          0,
           url,
           factory,
           swap_client));