ContentShell rendering support on Android.

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
new file mode 100644
index 0000000000000000000000000000000000000000..9b9334aed2370dfffc5fc04c94a0f5217b30edc5
--- /dev/null
+++ b/content/browser/android/graphics_context.cc
@@ -0,0 +1,119 @@
+// 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.
+
+#include "content/public/browser/android/graphics_context.h"
+
+#include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
+#include "content/browser/gpu/browser_gpu_channel_host_factory.h"
+#include "content/browser/gpu/gpu_surface_tracker.h"
+#include "content/common/gpu/client/gpu_channel_host.h"
+#include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
+#include "content/common/gpu/gpu_process_launch_causes.h"
+#include "content/public/browser/android/draw_delegate.h"
+#include "ui/gfx/native_widget_types.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsContext3D.h"
+
+#include <android/native_window_jni.h>
+
+using content::BrowserGpuChannelHostFactory;
+
+namespace {
+  class CmdBufferGraphicsContext : public content::GraphicsContext {

[Satish, 2012/07/27 09:49:24]

code within namespace{} isn't indented to the right, so you can indent all this
by 2 spaces to the left. also add a newline above and a class level comment

[no sievers, 2012/07/31 01:28:44]

Done.

+   public:
+    CmdBufferGraphicsContext(WebGraphicsContext3DCommandBufferImpl* context,
+                             int surface_id,
+                             ANativeWindow* window,
+                             int texture_id1,
+                             int texture_id2)
+        : context_(context),
+          surface_id_(surface_id),
+          window_(window) {
+      texture_id_[0] = texture_id1;
+      texture_id_[1] = texture_id2;
+    }
+
+    virtual ~CmdBufferGraphicsContext() {
+      context_->makeContextCurrent();
+      context_->deleteTexture(texture_id_[0]);
+      context_->deleteTexture(texture_id_[1]);
+      context_->finish();
+      GpuSurfaceTracker* tracker = GpuSurfaceTracker::Get();
+      tracker->RemoveSurface(surface_id_);
+      ANativeWindow_release(window_);
+    }
+
+    virtual WebKit::WebGraphicsContext3D* GetContext3D() {
+      return context_.get();
+    }
+    virtual uint32 InsertSyncPoint() {
+      return context_->insertSyncPoint();
+    }
+   private:
+    scoped_ptr<WebGraphicsContext3DCommandBufferImpl> context_;
+    int surface_id_;
+    ANativeWindow* window_;
+    int texture_id_[2];
+  };
+} // anonymous namespace

[Ted C, 2012/07/27 20:31:15]

two spaces between the } and //

[no sievers, 2012/07/31 01:28:44]

Done.

+
+namespace content {
+
+GraphicsContext::GraphicsContext() {
+}
+
+GraphicsContext::~GraphicsContext() {
+}
+
+// static
+GraphicsContext* GraphicsContext::CreateForUI(
+    ANativeWindow* window) {
+  DCHECK(window);
+  LOG(INFO) << "Creating context for window " << window;

[Ted C, 2012/07/27 20:31:15]

remove?

[no sievers, 2012/07/31 01:28:44]

Done.

+  GpuSurfaceTracker* tracker = GpuSurfaceTracker::Get();
+
+  ANativeWindow_acquire(window);
+  int surface_id = tracker->AddSurfaceForNativeWidget(window);
+
+  tracker->SetSurfaceHandle(
+      surface_id,
+      gfx::GLSurfaceHandle(gfx::kDummyPluginWindow, false));
+
+  WebKit::WebGraphicsContext3D::Attributes attrs;
+  attrs.shareResources = true;
+  GpuChannelHostFactory* factory = BrowserGpuChannelHostFactory::instance();
+  GURL url("chrome://gpu/GpuProcessTransportHelper::CreateContext");
+  base::WeakPtr<WebGraphicsContext3DSwapBuffersClient> swap_client;
+  scoped_ptr<WebGraphicsContext3DCommandBufferImpl> context(
+      new WebGraphicsContext3DCommandBufferImpl(
+          surface_id,
+          url,
+          factory,
+          swap_client));
+  if (!context->Initialize(

[Satish, 2012/07/27 09:49:24]

suggest using braces for if statements that span multiple lines like this one
(and not just when the body is multiple lines

[no sievers, 2012/07/31 01:28:44]

Done.

+      attrs,
+      false,
+      content::CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE))

[Ted C, 2012/07/27 20:31:15]

this is in fact the longest constant known to man...that is all.

actually can you drop the content:: as you are in the content namespace to maybe
fit it on one line?

[no sievers, 2012/07/31 01:28:44]

Done.

+    return NULL;
+
+  context->makeContextCurrent();
+
+  gfx::GLSurfaceHandle handle = gfx::GLSurfaceHandle(
+      gfx::kNullPluginWindow, true);
+  handle.parent_gpu_process_id = context->GetGPUProcessID();
+  handle.parent_client_id = context->GetChannelID();
+  handle.parent_context_id = context->GetContextID();
+  handle.parent_texture_id[0] = context->createTexture();
+  handle.parent_texture_id[1] = context->createTexture();
+  handle.sync_point = context->insertSyncPoint();
+
+  DrawDelegate::GetInstance()->SetDrawSurface(handle);
+
+  return new CmdBufferGraphicsContext(
+      context.release(), surface_id, window,
+      handle.parent_texture_id[0],
+      handle.parent_texture_id[1]);
+}
+
+} // namespace content

[Ted C, 2012/07/27 20:31:15]

one more space here too

[no sievers, 2012/07/31 01:28:44]

Done.