Backed out changeset d6516a10c808 (bug 1322650)

dom/plugins/base/nsNPAPIPluginInstance.cpp

@@ -58,8 +58,6 @@ using namespace mozilla::dom;
 #include "TexturePoolOGL.h"
 #include "SurfaceTypes.h"
 #include "EGLUtils.h"
-#include "GeneratedJNIWrappers.h"
-#include "GeneratedJNINatives.h"
 
 using namespace mozilla;
 using namespace mozilla::gl;
@@ -108,7 +106,7 @@ static bool EnsureGLContext()
 
 static std::map<NPP, nsNPAPIPluginInstance*> sPluginNPPMap;
 
-#endif // MOZ_WIDGET_ANDROID
+#endif
 
 using namespace mozilla;
 using namespace mozilla::plugins::parent;
@@ -204,12 +202,14 @@ nsNPAPIPluginInstance::Destroy()
   mAudioChannelAgent = nullptr;
 
 #if MOZ_WIDGET_ANDROID
-  if (mContentSurface) {
+  if (mContentSurface)
-    java::SurfaceAllocator::DisposeSurface(mContentSurface);
+    mContentSurface->SetFrameAvailableCallback(nullptr);
-  }
+
+  mContentSurface = nullptr;
 
   std::map<void*, VideoInfo*>::iterator it;
   for (it = mVideos.begin(); it != mVideos.end(); it++) {
+    it->second->mSurfaceTexture->SetFrameAvailableCallback(nullptr);
     delete it->second;
   }
   mVideos.clear();
@@ -858,50 +858,24 @@ GLContext* nsNPAPIPluginInstance::GLContext()
   return sPluginContext;
 }
 
-class PluginTextureListener
+already_AddRefed<AndroidSurfaceTexture> nsNPAPIPluginInstance::CreateSurfaceTexture()
-  : public java::SurfaceTextureListener::Natives<PluginTextureListener>
 {
-  using Base = java::SurfaceTextureListener::Natives<PluginTextureListener>;
+  if (!EnsureGLContext())
+    return nullptr;
 
-  const nsCOMPtr<nsIRunnable> mCallback;
+  GLuint texture = TexturePoolOGL::AcquireTexture();
-public:
+  if (!texture)
-  using Base::AttachNative;
+    return nullptr;
-  using Base::DisposeNative;
 
-  PluginTextureListener(nsIRunnable* aCallback) : mCallback(aCallback) {}
+  RefPtr<AndroidSurfaceTexture> surface = AndroidSurfaceTexture::Create(TexturePoolOGL::GetGLContext(),
-
+                                                                        texture);
-  void OnFrameAvailable()
+  if (!surface) {
-  {
-    if (NS_IsMainThread()) {
-      mCallback->Run();
-      return;
-    }
-    NS_DispatchToMainThread(mCallback);
-  }
-};
-
-java::GeckoSurface::LocalRef nsNPAPIPluginInstance::CreateSurface()
-{
-  java::GeckoSurface::LocalRef surf = java::SurfaceAllocator::AcquireSurface(0, 0, false);
-  if (!surf) {
     return nullptr;
   }
 
   nsCOMPtr<nsIRunnable> frameCallback = NewRunnableMethod(this, &nsNPAPIPluginInstance::OnSurfaceTextureFrameAvailable);
-
+  surface->SetFrameAvailableCallback(frameCallback);
-  java::SurfaceTextureListener::LocalRef listener = java::SurfaceTextureListener::New();
+  return surface.forget();
-
-  PluginTextureListener::AttachNative(listener, MakeUnique<PluginTextureListener>(frameCallback.get()));
-
-  java::GeckoSurfaceTexture::LocalRef gst = java::GeckoSurfaceTexture::Lookup(surf->GetHandle());
-  if (!gst) {
-    return nullptr;
-  }
-
-  const auto& st = java::sdk::SurfaceTexture::Ref::From(gst);
-  st->SetOnFrameAvailableListener(listener);
-
-  return surf;
 }
 
 void nsNPAPIPluginInstance::OnSurfaceTextureFrameAvailable()
@@ -912,29 +886,35 @@ void nsNPAPIPluginInstance::OnSurfaceTextureFrameAvailable()
 
 void* nsNPAPIPluginInstance::AcquireContentWindow()
 {
-  if (!mContentWindow.NativeWindow()) {
+  if (!mContentSurface) {
-    mContentSurface = CreateSurface();
+    mContentSurface = CreateSurfaceTexture();
+
+    if (!mContentSurface)
+      return nullptr;
+  }
+
+  return mContentSurface->NativeWindow();
+}
+
+AndroidSurfaceTexture*
+nsNPAPIPluginInstance::AsSurfaceTexture()
+{
   if (!mContentSurface)
     return nullptr;
 
-    mContentWindow = AndroidNativeWindow(mContentSurface);
-  }
-
-  return mContentWindow.NativeWindow();
-}
-
-java::GeckoSurface::Param
-nsNPAPIPluginInstance::AsSurface()
-{
   return mContentSurface;
 }
 
 void* nsNPAPIPluginInstance::AcquireVideoWindow()
 {
-  java::GeckoSurface::LocalRef surface = CreateSurface();
+  RefPtr<AndroidSurfaceTexture> surface = CreateSurfaceTexture();
+  if (!surface) {
+    return nullptr;
+  }
+
   VideoInfo* info = new VideoInfo(surface);
 
-  void* window = info->mNativeWindow.NativeWindow();
+  void* window = info->mSurfaceTexture->NativeWindow();
   mVideos.insert(std::pair<void*, VideoInfo*>(window, info));
 
   return window;

dom/plugins/base/nsNPAPIPluginInstance.h

@@ -21,7 +21,7 @@
 #ifdef MOZ_WIDGET_ANDROID
 #include "nsIRunnable.h"
 #include "GLContextTypes.h"
-#include "AndroidNativeWindow.h"
+#include "AndroidSurfaceTexture.h"
 #include "AndroidBridge.h"
 #include <map>
 class PluginEventRunnable;
@@ -215,24 +215,22 @@ public:
   // For ANPNativeWindow
   void* AcquireContentWindow();
 
-  mozilla::java::GeckoSurface::Param AsSurface();
+  mozilla::gl::AndroidSurfaceTexture* AsSurfaceTexture();
 
   // For ANPVideo
   class VideoInfo {
   public:
-    VideoInfo(mozilla::java::GeckoSurface::Param aSurface)
+    VideoInfo(mozilla::gl::AndroidSurfaceTexture* aSurfaceTexture) :
-      : mSurface(aSurface)
+      mSurfaceTexture(aSurfaceTexture)
-      , mNativeWindow(aSurface)
     {
     }
 
     ~VideoInfo()
     {
-      mozilla::java::SurfaceAllocator::DisposeSurface(mSurface);
+      mSurfaceTexture = nullptr;
     }
 
-    mozilla::java::GeckoSurface::GlobalRef mSurface;
+    RefPtr<mozilla::gl::AndroidSurfaceTexture> mSurfaceTexture;
-    mozilla::gl::AndroidNativeWindow mNativeWindow;
     gfxRect mDimensions;
   };
 
@@ -361,8 +359,7 @@ protected:
   bool mFullScreen;
   mozilla::gl::OriginPos mOriginPos;
 
-  mozilla::java::GeckoSurface::GlobalRef mContentSurface;
+  RefPtr<mozilla::gl::AndroidSurfaceTexture> mContentSurface;
-  mozilla::gl::AndroidNativeWindow mContentWindow;
 #endif
 
   enum {
@@ -412,7 +409,8 @@ private:
   mozilla::TimeStamp mStopTime;
 
 #ifdef MOZ_WIDGET_ANDROID
-  mozilla::java::GeckoSurface::LocalRef CreateSurface();
+  already_AddRefed<mozilla::gl::AndroidSurfaceTexture> CreateSurfaceTexture();
+
   std::map<void*, VideoInfo*> mVideos;
   bool mOnScreen;
 

dom/plugins/base/nsPluginInstanceOwner.cpp

@@ -165,7 +165,7 @@ nsPluginInstanceOwner::NotifyPaintWaiter(nsDisplayListBuilder* aBuilder)
 
 #if MOZ_WIDGET_ANDROID
 static void
-AttachToContainerAsSurface(ImageContainer* container,
+AttachToContainerAsSurfaceTexture(ImageContainer* container,
                                   nsNPAPIPluginInstance* instance,
                                   const LayoutDeviceRect& rect,
                                   RefPtr<Image>* out_image)
@@ -173,15 +173,14 @@ AttachToContainerAsSurface(ImageContainer* container,
   MOZ_ASSERT(out_image);
   MOZ_ASSERT(!*out_image);
 
-  java::GeckoSurface::LocalRef surface = instance->AsSurface();
+  mozilla::gl::AndroidSurfaceTexture* surfTex = instance->AsSurfaceTexture();
-  if (!surface) {
+  if (!surfTex) {
     return;
   }
 
   RefPtr<Image> img = new SurfaceTextureImage(
-    surface->GetHandle(),
+    surfTex,
     gfx::IntSize::Truncate(rect.width, rect.height),
-    true, // continuously update without a transaction
     instance->OriginPos());
   *out_image = img;
 }
@@ -224,7 +223,7 @@ nsPluginInstanceOwner::GetImageContainer()
   if (r.width && r.height) {
     // Try to get it as an EGLImage first.
     RefPtr<Image> img;
-    AttachToContainerAsSurface(container, mInstance, r, &img);
+    AttachToContainerAsSurfaceTexture(container, mInstance, r, &img);
 
     if (img) {
       container->SetCurrentImageInTransaction(img);
@@ -1586,9 +1585,8 @@ nsPluginInstanceOwner::GetImageContainerForVideo(nsNPAPIPluginInstance::VideoInf
 
   if (aVideoInfo->mDimensions.width && aVideoInfo->mDimensions.height) {
     RefPtr<Image> img = new SurfaceTextureImage(
-      aVideoInfo->mSurface->GetHandle(),
+      aVideoInfo->mSurfaceTexture,
       gfx::IntSize::Truncate(aVideoInfo->mDimensions.width, aVideoInfo->mDimensions.height),
-      true, /* continuous */
       gl::OriginPos::BottomLeft);
     container->SetCurrentImageInTransaction(img);
   }

gfx/gl/AndroidNativeWindow.h

@@ -19,9 +19,6 @@ namespace gl {
 
 class AndroidNativeWindow {
 public:
-  AndroidNativeWindow() : mNativeWindow(nullptr) {
-  }
-
   AndroidNativeWindow(java::sdk::Surface::Param aSurface) {
     mNativeWindow = ANativeWindow_fromSurface(jni::GetEnvForThread(),
                                               aSurface.Get());

mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/SurfaceTextureListener.java

@@ -17,12 +17,10 @@ final class SurfaceTextureListener
     private SurfaceTextureListener() {
     }
 
-    @WrapForJNI(dispatchTo = "gecko") @Override // JNIObject
-    protected native void disposeNative();
-
     @Override
-    protected void finalize() {
+    protected void disposeNative() {
-        disposeNative();
+        // SurfaceTextureListener is disposed inside AndroidSurfaceTexture.
+        throw new IllegalStateException("unreachable code");
     }
 
     @WrapForJNI(stubName = "OnFrameAvailable")

mobile/android/geckoview/src/main/java/org/mozilla/gecko/mozglue/JNIObject.java

@@ -7,10 +7,5 @@ public abstract class JNIObject
     private long mHandle;
 
     // Dispose of any reference to a native object.
-    //
-    // If the native instance is destroyed from the native side, this should never be
-    // called, so you should throw an UnsupportedOperationException. If instead you
-    // want to destroy the native side from the Java end, make override this with
-    // a native call, and the right thing will be done in the native code.
     protected abstract void disposeNative();
 }

widget/android/jni/Natives.h

@@ -44,7 +44,7 @@ namespace jni {
  *
  *       void AttachTo(const MyJavaClass::LocalRef& instance)
  *       {
- *           MyJavaClass::Natives<MyClass>::AttachNative(
+ *           MyJavaClass::Natives<MyClass>::AttachInstance(
  *                   instance, static_cast<SupportsWeakPtr<MyClass>*>(this));
  *
  *           // "instance" does NOT own "this", so the C++ object
@@ -70,7 +70,7 @@ namespace jni {
  *
  *       void AttachTo(const MyJavaClass::LocalRef& instance)
  *       {
- *           MyJavaClass::Natives<MyClass>::AttachNative(instance, this);
+ *           MyJavaClass::Natives<MyClass>::AttachInstance(instance, this);
  *
  *           // "instance" owns "this" through the RefPtr, so the C++ object
  *           // may be destroyed as soon as instance.disposeNative() is called.
@@ -91,7 +91,7 @@ namespace jni {
  *
  *       static void AttachTo(const MyJavaClass::LocalRef& instance)
  *       {
- *           MyJavaClass::Natives<MyClass>::AttachNative(
+ *           MyJavaClass::Natives<MyClass>::AttachInstance(
  *                   instance, mozilla::MakeUnique<MyClass>());
  *
  *           // "instance" owns the newly created C++ object, so the C++