Bug 1637452: Part 14 - Fix JNI includes in gfx; r=gfx-reviewers,jrmuizel

In this bug we're moving away from monolithic JNI headers to class-specific
headers so that we don't have to rebuild the world every time we make a change
to a JNI interface.

Differential Revision: https://phabricator.services.mozilla.com/D75377

gfx/gl/AndroidNativeWindow.h

@@ -11,7 +11,7 @@
 #  include <jni.h>
 #  include <android/native_window.h>
 #  include <android/native_window_jni.h>
-#  include "GeneratedJNIWrappers.h"
+#  include "mozilla/java/GeckoSurfaceWrappers.h"
 #  include "SurfaceTexture.h"
 
 namespace mozilla {

gfx/gl/AndroidSurfaceTexture.cpp

@@ -8,7 +8,7 @@
 
 #  include "AndroidSurfaceTexture.h"
 
-#  include "GeneratedJNINatives.h"
+#  include "mozilla/java/GeckoSurfaceTextureNatives.h"
 
 #  include "AndroidNativeWindow.h"
 #  include "GLContextEGL.h"

gfx/gl/GLBlitHelper.cpp

@@ -19,10 +19,10 @@
 #include "GPUVideoImage.h"
 
 #ifdef MOZ_WIDGET_ANDROID
-#  include "GeneratedJNIWrappers.h"
 #  include "AndroidSurfaceTexture.h"
 #  include "GLImages.h"
 #  include "GLLibraryEGL.h"
+#  include "mozilla/java/GeckoSurfaceTextureWrappers.h"
 #endif
 
 #ifdef XP_MACOSX

gfx/gl/SharedSurfaceEGL.cpp

@@ -13,6 +13,10 @@
 #include "mozilla/layers/LayersSurfaces.h"  // for SurfaceDescriptor, etc
 #include "SharedSurface.h"
 
+#if defined(MOZ_WIDGET_ANDROID)
+#  include "mozilla/java/SurfaceAllocatorWrappers.h"
+#endif  // defined(MOZ_WIDGET_ANDROID)
+
 namespace mozilla {
 namespace gl {
 

gfx/gl/SharedSurfaceEGL.h

@@ -12,7 +12,6 @@
 #include "SharedSurface.h"
 
 #ifdef MOZ_WIDGET_ANDROID
-#  include "GeneratedJNIWrappers.h"
 #  include "AndroidNativeWindow.h"
 #endif
 

gfx/layers/apz/src/AndroidAPZ.cpp

@@ -9,11 +9,11 @@
 #include "AndroidFlingPhysics.h"
 #include "AndroidVelocityTracker.h"
 #include "AsyncPanZoomController.h"
-#include "GeneratedJNIWrappers.h"
 #include "GenericFlingAnimation.h"
 #include "OverscrollHandoffState.h"
 #include "SimpleVelocityTracker.h"
 #include "ViewConfiguration.h"
+#include "mozilla/java/GeckoAppShellWrappers.h"
 #include "mozilla/StaticPrefs_apz.h"
 
 static mozilla::LazyLogModule sApzAndLog("apz.android");

gfx/layers/apz/src/AndroidAPZ.h

@@ -9,7 +9,7 @@
 
 #include "AsyncPanZoomAnimation.h"
 #include "AsyncPanZoomController.h"
-#include "GeneratedJNIWrappers.h"
+#include "mozilla/java/StackScrollerWrappers.h"
 
 namespace mozilla {
 namespace layers {

gfx/layers/opengl/CompositorOGL.cpp

@@ -57,7 +57,7 @@
 #  include "mozilla/widget/GtkCompositorWidget.h"
 #endif
 #if MOZ_WIDGET_ANDROID
-#  include "GeneratedJNIWrappers.h"
+#  include "mozilla/java/GeckoSurfaceTextureWrappers.h"
 #endif
 
 #include "GeckoProfiler.h"

gfx/layers/opengl/TextureClientOGL.cpp

@@ -16,6 +16,8 @@
 #  include <jni.h>
 #  include <android/native_window.h>
 #  include <android/native_window_jni.h>
+#  include "mozilla/java/GeckoSurfaceWrappers.h"
+#  include "mozilla/java/SurfaceAllocatorWrappers.h"
 #endif
 
 using namespace mozilla::gl;

gfx/layers/opengl/TextureClientOGL.h

@@ -19,7 +19,7 @@
 #include "AndroidSurfaceTexture.h"
 #include "AndroidNativeWindow.h"
 #ifdef MOZ_WIDGET_ANDROID
-#  include "GeneratedJNIWrappers.h"
+#  include "mozilla/java/GeckoSurfaceWrappers.h"
 #endif
 
 namespace mozilla {

gfx/layers/opengl/TextureHostOGL.h

@@ -33,8 +33,8 @@
 #include "nsRegionFwd.h"      // for nsIntRegion
 
 #ifdef MOZ_WIDGET_ANDROID
-#  include "GeneratedJNIWrappers.h"
 #  include "AndroidSurfaceTexture.h"
+#  include "mozilla/java/GeckoSurfaceTextureWrappers.h"
 #endif
 
 namespace mozilla {

gfx/thebes/gfxAndroidPlatform.cpp

@@ -29,7 +29,7 @@
 #include FT_FREETYPE_H
 #include FT_MODULE_H
 
-#include "GeneratedJNINatives.h"
+#include "mozilla/java/VsyncSourceNatives.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;

gfx/vr/VRManager.cpp

@@ -40,6 +40,7 @@
 #  include <string.h>
 #  include <pthread.h>
 #  include "GeckoVRManager.h"
+#  include "mozilla/java/GeckoSurfaceTextureWrappers.h"
 #  include "mozilla/layers/CompositorThread.h"
 #endif  // defined(MOZ_WIDGET_ANDROID)
 

gfx/webrender_bindings/RenderAndroidSurfaceTextureHostOGL.h

@@ -7,7 +7,7 @@
 #ifndef MOZILLA_GFX_RENDERANDROIDSURFACETEXTUREHOSTOGL_H
 #define MOZILLA_GFX_RENDERANDROIDSURFACETEXTUREHOSTOGL_H
 
-#include "GeneratedJNIWrappers.h"
+#include "mozilla/java/GeckoSurfaceTextureWrappers.h"
 #include "mozilla/layers/TextureHostOGL.h"
 #include "RenderTextureHostOGL.h"
 

gfx/webrender_bindings/RenderCompositorEGL.cpp

@@ -20,8 +20,8 @@
 #endif
 
 #ifdef MOZ_WIDGET_ANDROID
+#  include "mozilla/java/GeckoSurfaceTextureWrappers.h"
 #  include "mozilla/widget/AndroidCompositorWidget.h"
-#  include "GeneratedJNIWrappers.h"
 #  include <android/native_window.h>
 #  include <android/native_window_jni.h>
 #endif

gfx/webrender_bindings/RenderThread.cpp

@@ -31,7 +31,7 @@
 
 #ifdef MOZ_WIDGET_ANDROID
 #  include "GLLibraryEGL.h"
-#  include "GeneratedJNIWrappers.h"
+#  include "mozilla/webrender/RenderAndroidSurfaceTextureHostOGL.h"
 #endif
 
 #ifdef MOZ_WIDGET_GTK