Add GL surface creation for Android.

content/browser/gpu/gpu_surface_tracker.cc

 // 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/browser/gpu/gpu_surface_tracker.h"
 
 #include "base/logging.h"
 
+#if defined(OS_ANDROID)
+#include "base/command_line.h"
+#include "content/public/common/content_switches.h"
+#include <android/native_window_jni.h>
+#endif
+
 GpuSurfaceTracker::GpuSurfaceTracker()
     : next_surface_id_(1) {
 }
 
 GpuSurfaceTracker::~GpuSurfaceTracker() {
+#if defined(OS_ANDROID)
+  // Handles should have been inserted with an extra ref, so release those now.
+  for (SurfaceMap::iterator it = surface_map_.begin(); it != surface_map_.end();
+       ++it) {
+    const SurfaceInfo& info = it->second;
+    if (info.native_widget)
+      ANativeWindow_release(info.native_widget);
+  }
+#endif
 }
 
 GpuSurfaceTracker* GpuSurfaceTracker::GetInstance() {
   return Singleton<GpuSurfaceTracker>::get();
 }
 
 int GpuSurfaceTracker::AddSurfaceForRenderer(int renderer_id,
                                              int render_widget_id) {
   base::AutoLock lock(lock_);
   SurfaceInfo info = {
@@ skipping 63 matching lines @@
 }
 
 gfx::PluginWindowHandle GpuSurfaceTracker::GetSurfaceWindowHandle(
     int surface_id) {
   base::AutoLock lock(lock_);
   SurfaceMap::iterator it = surface_map_.find(surface_id);
   if (it == surface_map_.end())
     return gfx::kNullPluginWindow;
   return it->second.handle.handle;
 }
+
+gfx::AcceleratedWidget GpuSurfaceTracker::GetNativeWidget(int surface_id) {
+  GpuSurfaceTracker* tracker = GpuSurfaceTracker::GetInstance();

[apatrick_chromium, 2012/07/24 18:34:16]

This member function is not static. Why is it getting "this" through
GetInstance?

[no sievers, 2012/07/26 21:21:17]

Done.

+  base::AutoLock lock(tracker->lock_);
+  DCHECK(tracker->surface_map_.find(surface_id) != tracker->surface_map_.end());
+  return tracker->surface_map_[surface_id].native_widget;

[apatrick_chromium, 2012/07/24 18:34:16]

How exactly does this differ from the handle returned by GetSurfaceWindowHandle?

[no sievers, 2012/07/26 21:21:17]

The native AcceleratedWidget on Android is a pointer type.
PluginWindowHandle is a serializable that gets sent in an IPC message. It's
basically unused on Android, since the pointer handle cannot be serialized.

On 2012/07/24 18:34:16, apatrick_chromium wrote:

+}
+
+#if defined(OS_ANDROID)
+gfx::AcceleratedWidget GetNativeWidgetAndroid(int surface_id) {
+  DCHECK(CommandLine::ForCurrentProcess()->HasSwitch(switches::kInProcessGPU));
+  GpuSurfaceTracker* tracker = GpuSurfaceTracker::GetInstance();
+  return tracker->GetNativeWidget(surface_id);
+}
+#endif