Android: Remove Surface cruft

content/browser/android/surface_texture_peer_browser_impl.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/android/surface_texture_peer_browser_impl.h"
 
+#include "base/android/jni_android.h"
 #include "content/browser/android/media_player_manager_android.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
-#include "content/common/android/surface_callback.h"
+#include "content/common/android/surface.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
-#include "jni/BrowserProcessSurfaceTexture_jni.h"
 #include "media/base/android/media_player_bridge.h"
 
 using base::android::MethodID;
 
 namespace content {
 
 // Pass a java surface object to the MediaPlayerBridge object
 // identified by render process handle, render view ID and player ID.
 static void SetSurfacePeer(
     scoped_refptr<SurfaceTextureBridge> surface_texture_bridge,
@@ skipping 13 matching lines @@
   JNIEnv* env = base::android::AttachCurrentThread();
   DCHECK(env);
   if (renderer_id) {
     RenderViewHostImpl* host = RenderViewHostImpl::FromID(
         renderer_id, render_view_id);
     if (host) {
       media::MediaPlayerBridge* player =
           host->media_player_manager()->GetPlayer(player_id);
       if (player &&
           player != host->media_player_manager()->GetFullscreenPlayer()) {
-        base::android::ScopedJavaLocalRef<jclass> cls(
-            base::android::GetClass(env, "android/view/Surface"));
-        jmethodID constructor = MethodID::Get<MethodID::TYPE_INSTANCE>(
-            env, cls.obj(), "<init>", "(Landroid/graphics/SurfaceTexture;)V");
-        ScopedJavaLocalRef<jobject> j_surface(
-            env, env->NewObject(
-                cls.obj(), constructor,
-                surface_texture_bridge->j_surface_texture().obj()));
-        player->SetVideoSurface(j_surface.obj());
-        ReleaseSurface(j_surface.obj());
+        Surface surface(surface_texture_bridge->j_surface_texture());
+        player->SetVideoSurface(surface.j_surface().obj());

[bulach, 2013/03/04 10:44:51]

I don't quite understand your concerns here, my main point is to avoid crossing
language boundaries and these little wrappers everywhere :)

how about player->SetVideoSurfaceFromSurfaceTexture, would that be a good
compromise? and then SurfaceTextureBridge::CreateSurface() would be the only
place where it needs to call up to Surface.java, but then again, it's just two
extra lines compared to the current version in this patch set, rather than an
entire .h/.cc file :) wdyt?

+        surface.Release();

[bulach, 2013/03/04 10:44:51]

ok, so if you don't agree with the above :)

"Release" method seems redundant.. maybe call it "ScopedSurface" so that it's
more in line with the other ScopedJava(Global|Local) method, and then call Reset
in its dtor? (Release means ownership being transferred out, Reset means
destruction, which is what I think it means here..)

       }
     }
   }
 }
 
-SurfaceTexturePeerBrowserImpl::SurfaceTexturePeerBrowserImpl(
-    bool player_in_render_process)
-    : player_in_render_process_(player_in_render_process) {
+SurfaceTexturePeerBrowserImpl::SurfaceTexturePeerBrowserImpl() {
 }
 
 SurfaceTexturePeerBrowserImpl::~SurfaceTexturePeerBrowserImpl() {
-  if (surface_.obj())
-    ReleaseSurface(surface_.obj());
 }
 
 void SurfaceTexturePeerBrowserImpl::EstablishSurfaceTexturePeer(
     base::ProcessHandle render_process_handle,
     SurfaceTextureTarget type,
     scoped_refptr<SurfaceTextureBridge> surface_texture_bridge,
     int render_view_id,
     int player_id) {
   if (!surface_texture_bridge)
     return;
 
   JNIEnv* env = base::android::AttachCurrentThread();
   DCHECK(env);
-  if (player_in_render_process_) {
-    Java_BrowserProcessSurfaceTexture_establishSurfaceTexturePeer(
-        env, render_process_handle, type,
-        surface_texture_bridge->j_surface_texture().obj(),
-        render_view_id, player_id);
-  } else {
-    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(
-        &SetSurfacePeer, surface_texture_bridge, render_process_handle,
-        render_view_id, player_id));
-  }
-}
-
-bool SurfaceTexturePeerBrowserImpl::RegisterBrowserProcessSurfaceTexture(
-    JNIEnv* env) {
-  return RegisterNativesImpl(env);
+  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(
+      &SetSurfacePeer, surface_texture_bridge, render_process_handle,
+      render_view_id, player_id));
 }
 
 }  // namespace content