diff --git a/build/annotationProcessors/AnnotationProcessor.java b/build/annotationProcessors/AnnotationProcessor.java index 3c0d2c5e224..1408891a1df 100644 --- a/build/annotationProcessors/AnnotationProcessor.java +++ b/build/annotationProcessors/AnnotationProcessor.java @@ -15,15 +15,14 @@ import java.util.Arrays; import java.util.Iterator; public class AnnotationProcessor { - public static final String SOURCE_FILE = "GeneratedJNIWrappers.cpp"; - public static final String HEADER_FILE = "GeneratedJNIWrappers.h"; - public static final String NATIVES_FILE = "GeneratedJNINatives.h"; + public static final String OUTFILE = "GeneratedJNIWrappers.cpp"; + public static final String HEADERFILE = "GeneratedJNIWrappers.h"; public static final String GENERATED_COMMENT = "// GENERATED CODE\n" + "// Generated by the Java program at /build/annotationProcessors at compile time\n" + "// from annotations on Java methods. To update, change the annotations on the\n" + - "// corresponding Java methods and rerun the build. Manually updating this file\n" + + "// corresponding Javamethods and rerun the build. Manually updating this file\n" + "// will cause your build to fail.\n" + "\n"; @@ -48,8 +47,8 @@ public class AnnotationProcessor { StringBuilder headerFile = new StringBuilder(GENERATED_COMMENT); headerFile.append( - "#ifndef " + getHeaderGuardName(HEADER_FILE) + "\n" + - "#define " + getHeaderGuardName(HEADER_FILE) + "\n" + + "#ifndef GeneratedJNIWrappers_h__\n" + + "#define GeneratedJNIWrappers_h__\n" + "\n" + "#include \"mozilla/jni/Refs.h\"\n" + "\n" + @@ -66,18 +65,6 @@ public class AnnotationProcessor { "namespace widget {\n" + "\n"); - StringBuilder nativesFile = new StringBuilder(GENERATED_COMMENT); - nativesFile.append( - "#ifndef " + getHeaderGuardName(NATIVES_FILE) + "\n" + - "#define " + getHeaderGuardName(NATIVES_FILE) + "\n" + - "\n" + - "#include \"GeneratedJNIWrappers.h\"\n" + - "#include \"mozilla/jni/Natives.h\"\n" + - "\n" + - "namespace mozilla {\n" + - "namespace widget {\n" + - "\n"); - while (jarClassIterator.hasNext()) { ClassWithOptions aClassTuple = jarClassIterator.next(); @@ -98,9 +85,6 @@ public class AnnotationProcessor { case METHOD: generatorInstance.generateMethod(aElementTuple); break; - case NATIVE: - generatorInstance.generateNative(aElementTuple); - break; case FIELD: generatorInstance.generateField(aElementTuple); break; @@ -112,7 +96,6 @@ public class AnnotationProcessor { headerFile.append(generatorInstance.getHeaderFileContents()); implementationFile.append(generatorInstance.getWrapperFileContents()); - nativesFile.append(generatorInstance.getNativesFileContents()); } implementationFile.append( @@ -124,33 +107,38 @@ public class AnnotationProcessor { "\n" + "} /* widget */\n" + "} /* mozilla */\n" + - "#endif // " + getHeaderGuardName(HEADER_FILE) + "\n"); + "#endif // GeneratedJNIWrappers_h__\n"); - nativesFile.append( - "\n" + - "} /* widget */\n" + - "} /* mozilla */\n" + - "#endif // " + getHeaderGuardName(NATIVES_FILE) + "\n"); - - writeOutputFile(SOURCE_FILE, implementationFile); - writeOutputFile(HEADER_FILE, headerFile); - writeOutputFile(NATIVES_FILE, nativesFile); + writeOutputFiles(headerFile, implementationFile); long e = System.currentTimeMillis(); System.out.println("Annotation processing complete in " + (e - s) + "ms"); } - private static String getHeaderGuardName(final String name) { - return name.replaceAll("\\W", "_"); - } + private static void writeOutputFiles(StringBuilder aHeaderFile, StringBuilder aImplementationFile) { + FileOutputStream headerStream = null; + try { + headerStream = new FileOutputStream(OUTFILE); + headerStream.write(aImplementationFile.toString().getBytes()); + } catch (IOException e) { + System.err.println("Unable to write " + OUTFILE + ". Perhaps a permissions issue?"); + e.printStackTrace(System.err); + } finally { + if (headerStream != null) { + try { + headerStream.close(); + } catch (IOException e) { + System.err.println("Unable to close headerStream due to "+e); + e.printStackTrace(System.err); + } + } + } - private static void writeOutputFile(final String name, - final StringBuilder content) { FileOutputStream outStream = null; try { - outStream = new FileOutputStream(name); - outStream.write(content.toString().getBytes()); + outStream = new FileOutputStream(HEADERFILE); + outStream.write(aHeaderFile.toString().getBytes()); } catch (IOException e) { - System.err.println("Unable to write " + name + ". Perhaps a permissions issue?"); + System.err.println("Unable to write " + HEADERFILE + ". Perhaps a permissions issue?"); e.printStackTrace(System.err); } finally { if (outStream != null) { diff --git a/build/annotationProcessors/CodeGenerator.java b/build/annotationProcessors/CodeGenerator.java index 702e1beebad..9b965f1bc3d 100644 --- a/build/annotationProcessors/CodeGenerator.java +++ b/build/annotationProcessors/CodeGenerator.java @@ -22,8 +22,6 @@ public class CodeGenerator { // Buffers holding the strings to ultimately be written to the output files. private final StringBuilder cpp = new StringBuilder(); private final StringBuilder header = new StringBuilder(); - private final StringBuilder natives = new StringBuilder(); - private final StringBuilder nativesInits = new StringBuilder(); private final Class cls; private final String clsName; @@ -35,13 +33,13 @@ public class CodeGenerator { this.clsName = annotatedClass.generatedName; header.append( - "class " + clsName + " : public mozilla::jni::Class<" + clsName + ">\n" + - "{\n" + + "class " + clsName + " : public mozilla::jni::Class<" + clsName + "> {\n" + + "\n" + "public:\n" + " typedef mozilla::jni::Ref<" + clsName + "> Ref;\n" + " typedef mozilla::jni::LocalRef<" + clsName + "> LocalRef;\n" + " typedef mozilla::jni::GlobalRef<" + clsName + "> GlobalRef;\n" + - " typedef const mozilla::jni::Param<" + clsName + ">& Param;\n" + + " typedef const typename mozilla::jni::Param<" + clsName + ">::Type& Param;\n" + "\n" + " static constexpr char name[] =\n" + " \"" + cls.getName().replace('.', '/') + "\";\n" + @@ -53,12 +51,6 @@ public class CodeGenerator { cpp.append( "constexpr char " + clsName + "::name[];\n" + "\n"); - - natives.append( - "template\n" + - "class " + clsName + "::Natives : " + - "public mozilla::jni::NativeImpl<" + clsName + ", Impl>\n" + - "{\n"); } private String getTraitsName(String uniqueName, boolean includeScope) { @@ -80,30 +72,20 @@ public class CodeGenerator { } private void generateMember(AnnotationInfo info, Member member, - String uniqueName, Class type, Class[] argTypes) { - final StringBuilder args = new StringBuilder(); - for (Class argType : argTypes) { - args.append("\n " + getNativeParameterType(argType, info) + ","); - } - if (args.length() > 0) { - args.setLength(args.length() - 1); - } - + String uniqueName, Class type) { header.append( "public:\n" + " struct " + getTraitsName(uniqueName, /* includeScope */ false) + " {\n" + " typedef " + clsName + " Owner;\n" + " typedef " + getNativeReturnType(type, info) + " ReturnType;\n" + " typedef " + getNativeParameterType(type, info) + " SetterType;\n" + - " typedef mozilla::jni::Args<" + args + "> Args;\n" + " static constexpr char name[] = \"" + Utils.getMemberName(member) + "\";\n" + " static constexpr char signature[] =\n" + " \"" + Utils.getSignature(member) + "\";\n" + " static const bool isStatic = " + Utils.isStatic(member) + ";\n" + " static const bool isMultithreaded = " + info.isMultithreaded + ";\n" + - " static const mozilla::jni::ExceptionMode exceptionMode =\n" + - " " + ( + " static const mozilla::jni::ExceptionMode exceptionMode = " + ( info.catchException ? "mozilla::jni::ExceptionMode::NSRESULT" : info.noThrow ? "mozilla::jni::ExceptionMode::IGNORE" : "mozilla::jni::ExceptionMode::ABORT") + ";\n" + @@ -266,15 +248,15 @@ public class CodeGenerator { final Method method = annotatedMethod.getMethod(); final AnnotationInfo info = annotatedMethod.mAnnotationInfo; final String uniqueName = getUniqueMethodName(info.wrapperName); - final Class[] argTypes = method.getParameterTypes(); final Class returnType = method.getReturnType(); if (method.isSynthetic()) { return; } - generateMember(info, method, uniqueName, returnType, argTypes); + generateMember(info, method, uniqueName, returnType); + final Class[] argTypes = method.getParameterTypes(); final boolean isStatic = Utils.isStatic(method); header.append( @@ -290,35 +272,6 @@ public class CodeGenerator { "\n"); } - /** - * Append the appropriate generated code to the buffers for the native method provided. - * - * @param annotatedMethod The Java native method, plus annotation data. - */ - public void generateNative(AnnotatableEntity annotatedMethod) { - // Unpack the tuple and extract some useful fields from the Method.. - final Method method = annotatedMethod.getMethod(); - final AnnotationInfo info = annotatedMethod.mAnnotationInfo; - final String uniqueName = getUniqueMethodName(info.wrapperName); - final Class[] argTypes = method.getParameterTypes(); - final Class returnType = method.getReturnType(); - - generateMember(info, method, uniqueName, returnType, argTypes); - - final String traits = getTraitsName(uniqueName, /* includeScope */ true); - - if (nativesInits.length() > 0) { - nativesInits.append(','); - } - - nativesInits.append( - "\n" + - "\n" + - " mozilla::jni::MakeNativeMethod<" + traits + ">(\n" + - " mozilla::jni::NativeStub<" + traits + ", Impl>\n" + - " ::template Wrap<&Impl::" + info.wrapperName + ">)"); - } - private String getLiteral(Object val, AnnotationInfo info) { final Class type = val.getClass(); @@ -395,7 +348,7 @@ public class CodeGenerator { // Fall back to using accessors if we encounter an exception. } - generateMember(info, field, uniqueName, type, EMPTY_CLASS_ARRAY); + generateMember(info, field, uniqueName, type); final Class[] getterArgs = EMPTY_CLASS_ARRAY; @@ -436,14 +389,15 @@ public class CodeGenerator { final AnnotationInfo info = annotatedConstructor.mAnnotationInfo; final String wrapperName = "New"; final String uniqueName = getUniqueMethodName(wrapperName); - final Class[] argTypes = method.getParameterTypes(); final Class returnType = cls; if (method.isSynthetic()) { return; } - generateMember(info, method, uniqueName, returnType, argTypes); + generateMember(info, method, uniqueName, returnType); + + final Class[] argTypes = method.getParameterTypes(); header.append( " " + generateDeclaration(wrapperName, argTypes, @@ -500,34 +454,9 @@ public class CodeGenerator { * @return The bytes to be written to the header file. */ public String getHeaderFileContents() { - if (nativesInits.length() > 0) { - header.append( - "public:\n" + - " template class Natives;\n"); - } header.append( "};\n" + "\n"); return header.toString(); } - - /** - * Get the finalised bytes to go into the generated natives header file. - * - * @return The bytes to be written to the header file. - */ - public String getNativesFileContents() { - if (nativesInits.length() == 0) { - return ""; - } - natives.append( - "public:\n" + - " static constexpr JNINativeMethod methods[] = {" + nativesInits + '\n' + - " };\n" + - "};\n" + - "\n" + - "template\n" + - "constexpr JNINativeMethod " + clsName + "::Natives::methods[];\n"); - return natives.toString(); - } } diff --git a/build/annotationProcessors/classloader/AnnotatableEntity.java b/build/annotationProcessors/classloader/AnnotatableEntity.java index b11a6c49a6c..9dffe6033be 100644 --- a/build/annotationProcessors/classloader/AnnotatableEntity.java +++ b/build/annotationProcessors/classloader/AnnotatableEntity.java @@ -10,14 +10,13 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Member; import java.lang.reflect.Method; -import java.lang.reflect.Modifier; /** * Union type to hold either a method, field, or ctor. Allows us to iterate "The generatable stuff", despite * the fact that such things can be of either flavour. */ public class AnnotatableEntity { - public enum ENTITY_TYPE {METHOD, NATIVE, FIELD, CONSTRUCTOR} + public enum ENTITY_TYPE {METHOD, FIELD, CONSTRUCTOR} private final Member mMember; public final ENTITY_TYPE mEntityType; @@ -29,11 +28,7 @@ public class AnnotatableEntity { mAnnotationInfo = aAnnotationInfo; if (aObject instanceof Method) { - if (Modifier.isNative(aObject.getModifiers())) { - mEntityType = ENTITY_TYPE.NATIVE; - } else { - mEntityType = ENTITY_TYPE.METHOD; - } + mEntityType = ENTITY_TYPE.METHOD; } else if (aObject instanceof Field) { mEntityType = ENTITY_TYPE.FIELD; } else { @@ -42,7 +37,7 @@ public class AnnotatableEntity { } public Method getMethod() { - if (mEntityType != ENTITY_TYPE.METHOD && mEntityType != ENTITY_TYPE.NATIVE) { + if (mEntityType != ENTITY_TYPE.METHOD) { throw new UnsupportedOperationException("Attempt to cast to unsupported member type."); } return (Method) mMember; diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in index 0bcf18549d9..2171720486d 100644 --- a/mobile/android/base/Makefile.in +++ b/mobile/android/base/Makefile.in @@ -46,7 +46,6 @@ GARBAGE += \ .aapt.deps \ javah.out \ jni-stubs.inc \ - GeneratedJNINatives.h \ GeneratedJNIWrappers.cpp \ GeneratedJNIWrappers.h \ $(NULL) @@ -233,8 +232,6 @@ jni-stubs.inc: gecko-browser.jar gecko-mozglue.jar gecko-util.jar sync-thirdpart ANNOTATION_PROCESSOR_JAR_FILES := $(DEPTH)/build/annotationProcessors/annotationProcessors.jar -# This annotation processing step also generates -# GeneratedJNIWrappers.h and GeneratedJNINatives.h GeneratedJNIWrappers.cpp: $(ANNOTATION_PROCESSOR_JAR_FILES) GeneratedJNIWrappers.cpp: $(ALL_JARS) $(JAVA) -classpath gecko-mozglue.jar:$(JAVA_BOOTCLASSPATH):$(JAVA_CLASSPATH):$(ANNOTATION_PROCESSOR_JAR_FILES) org.mozilla.gecko.annotationProcessors.AnnotationProcessor $(ALL_JARS) @@ -466,9 +463,12 @@ $(eval $(call aapt_command,.aapt.nodeps,$(CURDIR)/AndroidManifest.xml FORCE,geck include $(topsrcdir)/config/android-common.mk update-generated-wrappers: + @mv $(topsrcdir)/widget/android/GeneratedJNIWrappers.cpp $(topsrcdir)/widget/android/GeneratedJNIWrappers.cpp.old + @mv $(topsrcdir)/widget/android/GeneratedJNIWrappers.h $(topsrcdir)/widget/android/GeneratedJNIWrappers.h.old + @echo old GeneratedJNIWrappers.cpp/h moved to GeneratedJNIWrappers.cpp/h.old @cp $(CURDIR)/jni-stubs.inc $(topsrcdir)/mozglue/android - @cp $(CURDIR)/GeneratedJNIWrappers.cpp $(CURDIR)/GeneratedJNIWrappers.h $(CURDIR)/GeneratedJNINatives.h $(topsrcdir)/widget/android - @echo Updated generated JNI code + @cp $(CURDIR)/GeneratedJNIWrappers.* $(topsrcdir)/widget/android + @echo Updated GeneratedJNIWrappers .PHONY: update-generated-wrappers @@ -500,14 +500,9 @@ libs:: geckoview_resources.zip $(INSTALL) geckoview_resources.zip $(FINAL_TARGET) endif -# GeneratedJNIWrappers.cpp target also generates -# GeneratedJNIWrappers.h and GeneratedJNINatives.h libs:: classes.dex jni-stubs.inc GeneratedJNIWrappers.cpp $(CURDIR)/fennec_ids.txt $(INSTALL) classes.dex $(FINAL_TARGET) - @(diff jni-stubs.inc $(topsrcdir)/mozglue/android/jni-stubs.inc >/dev/null && \ - diff GeneratedJNIWrappers.cpp $(topsrcdir)/widget/android/GeneratedJNIWrappers.cpp >/dev/null && \ - diff GeneratedJNIWrappers.h $(topsrcdir)/widget/android/GeneratedJNIWrappers.h >/dev/null && \ - diff GeneratedJNINatives.h $(topsrcdir)/widget/android/GeneratedJNINatives.h >/dev/null) || \ + @(diff jni-stubs.inc $(topsrcdir)/mozglue/android/jni-stubs.inc >/dev/null && diff GeneratedJNIWrappers.cpp $(topsrcdir)/widget/android/GeneratedJNIWrappers.cpp >/dev/null) || \ (echo '*****************************************************' && \ echo '*** Error: The generated JNI code has changed ***' && \ echo '* To update generated code in the tree, please run *' && \ diff --git a/widget/android/AndroidBridge.cpp b/widget/android/AndroidBridge.cpp index 002d51c09db..a4cec1b0189 100644 --- a/widget/android/AndroidBridge.cpp +++ b/widget/android/AndroidBridge.cpp @@ -79,7 +79,7 @@ jclass AndroidBridge::GetClassGlobalRef(JNIEnv* env, const char* className) classRef = ClassObject::LocalRef::Adopt(env, env->CallObjectMethod(sBridge->mClassLoader.Get(), sBridge->mClassLoaderLoadClass, - Param(className, env).Get())); + Param::Type(className, env).Get())); } if (!classRef) { diff --git a/widget/android/GeneratedJNINatives.h b/widget/android/GeneratedJNINatives.h deleted file mode 100644 index 484000c689f..00000000000 --- a/widget/android/GeneratedJNINatives.h +++ /dev/null @@ -1,19 +0,0 @@ -// GENERATED CODE -// Generated by the Java program at /build/annotationProcessors at compile time -// from annotations on Java methods. To update, change the annotations on the -// corresponding Java methods and rerun the build. Manually updating this file -// will cause your build to fail. - -#ifndef GeneratedJNINatives_h -#define GeneratedJNINatives_h - -#include "GeneratedJNIWrappers.h" -#include "mozilla/jni/Natives.h" - -namespace mozilla { -namespace widget { - - -} /* widget */ -} /* mozilla */ -#endif // GeneratedJNINatives_h diff --git a/widget/android/GeneratedJNIWrappers.cpp b/widget/android/GeneratedJNIWrappers.cpp index fddf93ef1dd..e2ec0314f87 100644 --- a/widget/android/GeneratedJNIWrappers.cpp +++ b/widget/android/GeneratedJNIWrappers.cpp @@ -1,7 +1,7 @@ // GENERATED CODE // Generated by the Java program at /build/annotationProcessors at compile time // from annotations on Java methods. To update, change the annotations on the -// corresponding Java methods and rerun the build. Manually updating this file +// corresponding Javamethods and rerun the build. Manually updating this file // will cause your build to fail. #include "GeneratedJNIWrappers.h" diff --git a/widget/android/GeneratedJNIWrappers.h b/widget/android/GeneratedJNIWrappers.h index ff2d6964e07..12ab1b9763a 100644 --- a/widget/android/GeneratedJNIWrappers.h +++ b/widget/android/GeneratedJNIWrappers.h @@ -1,24 +1,24 @@ // GENERATED CODE // Generated by the Java program at /build/annotationProcessors at compile time // from annotations on Java methods. To update, change the annotations on the -// corresponding Java methods and rerun the build. Manually updating this file +// corresponding Javamethods and rerun the build. Manually updating this file // will cause your build to fail. -#ifndef GeneratedJNIWrappers_h -#define GeneratedJNIWrappers_h +#ifndef GeneratedJNIWrappers_h__ +#define GeneratedJNIWrappers_h__ #include "mozilla/jni/Refs.h" namespace mozilla { namespace widget { -class DownloadsIntegration : public mozilla::jni::Class -{ +class DownloadsIntegration : public mozilla::jni::Class { + public: typedef mozilla::jni::Ref Ref; typedef mozilla::jni::LocalRef LocalRef; typedef mozilla::jni::GlobalRef GlobalRef; - typedef const mozilla::jni::Param& Param; + typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = "org/mozilla/gecko/DownloadsIntegration"; @@ -31,29 +31,25 @@ public: typedef DownloadsIntegration Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - mozilla::jni::String::Param, - mozilla::jni::String::Param> Args; static constexpr char name[] = "scanMedia"; static constexpr char signature[] = "(Ljava/lang/String;Ljava/lang/String;)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void ScanMedia(mozilla::jni::String::Param, mozilla::jni::String::Param); }; -class GeckoAppShell : public mozilla::jni::Class -{ +class GeckoAppShell : public mozilla::jni::Class { + public: typedef mozilla::jni::Ref Ref; typedef mozilla::jni::LocalRef LocalRef; typedef mozilla::jni::GlobalRef GlobalRef; - typedef const mozilla::jni::Param& Param; + typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = "org/mozilla/gecko/GeckoAppShell"; @@ -66,14 +62,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "acknowledgeEvent"; static constexpr char signature[] = "()V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void AcknowledgeEvent(); @@ -83,20 +77,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - mozilla::jni::Object::Param, - float, - float, - float, - float, - bool> Args; static constexpr char name[] = "addPluginView"; static constexpr char signature[] = "(Landroid/view/View;FFFFZ)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void AddPluginViewWrapper(mozilla::jni::Object::Param, float, float, float, float, bool); @@ -106,18 +92,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - mozilla::jni::String::Param, - int64_t, - int64_t, - mozilla::jni::String::Param> Args; static constexpr char name[] = "alertsProgressListener_OnProgress"; static constexpr char signature[] = "(Ljava/lang/String;JJLjava/lang/String;)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void AlertsProgressListener_OnProgress(mozilla::jni::String::Param, int64_t, int64_t, mozilla::jni::String::Param); @@ -127,14 +107,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "cancelVibrate"; static constexpr char signature[] = "()V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void CancelVibrate(); @@ -144,15 +122,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - mozilla::jni::String::Param> Args; static constexpr char name[] = "checkUriVisited"; static constexpr char signature[] = "(Ljava/lang/String;)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void CheckURIVisited(mozilla::jni::String::Param); @@ -162,15 +137,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - int32_t> Args; static constexpr char name[] = "clearMessageList"; static constexpr char signature[] = "(I)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void ClearMessageList(int32_t); @@ -180,14 +152,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "closeCamera"; static constexpr char signature[] = "()V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void CloseCamera(); @@ -197,15 +167,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - mozilla::jni::String::Param> Args; static constexpr char name[] = "closeNotification"; static constexpr char signature[] = "(Ljava/lang/String;)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void CloseNotification(mozilla::jni::String::Param); @@ -215,15 +182,12 @@ public: typedef GeckoAppShell Owner; typedef mozilla::jni::String::LocalRef ReturnType; typedef mozilla::jni::String::Param SetterType; - typedef mozilla::jni::Args< - mozilla::jni::Object::Param> Args; static constexpr char name[] = "connectionGetMimeType"; static constexpr char signature[] = "(Ljava/net/URLConnection;)Ljava/lang/String;"; static const bool isStatic = true; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static mozilla::jni::String::LocalRef ConnectionGetMimeType(mozilla::jni::Object::Param); @@ -233,15 +197,12 @@ public: typedef GeckoAppShell Owner; typedef mozilla::jni::Object::LocalRef ReturnType; typedef mozilla::jni::Object::Param SetterType; - typedef mozilla::jni::Args< - mozilla::jni::Object::Param> Args; static constexpr char name[] = "createInputStream"; static constexpr char signature[] = "(Ljava/net/URLConnection;)Ljava/io/InputStream;"; static const bool isStatic = true; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static mozilla::jni::Object::LocalRef CreateInputStream(mozilla::jni::Object::Param); @@ -251,24 +212,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - int64_t, - int64_t, - mozilla::jni::ObjectArray::Param, - int32_t, - mozilla::jni::String::Param, - bool, - bool, - int64_t, - bool, - int32_t> Args; static constexpr char name[] = "createMessageList"; static constexpr char signature[] = "(JJ[Ljava/lang/String;ILjava/lang/String;ZZJZI)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void CreateMessageListWrapper(int64_t, int64_t, mozilla::jni::ObjectArray::Param, int32_t, mozilla::jni::String::Param, bool, bool, int64_t, bool, int32_t); @@ -278,17 +227,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - mozilla::jni::String::Param, - mozilla::jni::String::Param, - mozilla::jni::String::Param> Args; static constexpr char name[] = "createShortcut"; static constexpr char signature[] = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void CreateShortcut(mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param); @@ -298,16 +242,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - int32_t, - int32_t> Args; static constexpr char name[] = "deleteMessage"; static constexpr char signature[] = "(II)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void DeleteMessageWrapper(int32_t, int32_t); @@ -317,14 +257,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "disableBatteryNotifications"; static constexpr char signature[] = "()V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void DisableBatteryNotifications(); @@ -334,14 +272,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "disableNetworkNotifications"; static constexpr char signature[] = "()V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void DisableNetworkNotifications(); @@ -351,14 +287,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "disableScreenOrientationNotifications"; static constexpr char signature[] = "()V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void DisableScreenOrientationNotifications(); @@ -368,15 +302,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - int32_t> Args; static constexpr char name[] = "disableSensor"; static constexpr char signature[] = "(I)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void DisableSensor(int32_t); @@ -386,14 +317,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "enableBatteryNotifications"; static constexpr char signature[] = "()V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void EnableBatteryNotifications(); @@ -403,15 +332,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - bool> Args; static constexpr char name[] = "enableLocation"; static constexpr char signature[] = "(Z)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void EnableLocation(bool); @@ -421,15 +347,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - bool> Args; static constexpr char name[] = "enableLocationHighAccuracy"; static constexpr char signature[] = "(Z)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void EnableLocationHighAccuracy(bool); @@ -439,14 +362,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "enableNetworkNotifications"; static constexpr char signature[] = "()V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void EnableNetworkNotifications(); @@ -456,14 +377,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "enableScreenOrientationNotifications"; static constexpr char signature[] = "()V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void EnableScreenOrientationNotifications(); @@ -473,15 +392,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - int32_t> Args; static constexpr char name[] = "enableSensor"; static constexpr char signature[] = "(I)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void EnableSensor(int32_t); @@ -491,16 +407,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - int32_t, - int32_t> Args; static constexpr char name[] = "gamepadAdded"; static constexpr char signature[] = "(II)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void GamepadAdded(int32_t, int32_t); @@ -510,15 +422,12 @@ public: typedef GeckoAppShell Owner; typedef mozilla::jni::Object::LocalRef ReturnType; typedef mozilla::jni::Object::Param SetterType; - typedef mozilla::jni::Args< - mozilla::jni::String::Param> Args; static constexpr char name[] = "getConnection"; static constexpr char signature[] = "(Ljava/lang/String;)Ljava/net/URLConnection;"; static const bool isStatic = true; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static mozilla::jni::Object::LocalRef GetConnection(mozilla::jni::String::Param); @@ -528,14 +437,12 @@ public: typedef GeckoAppShell Owner; typedef mozilla::jni::Object::LocalRef ReturnType; typedef mozilla::jni::Object::Param SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "getContext"; static constexpr char signature[] = "()Landroid/content/Context;"; static const bool isStatic = true; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static mozilla::jni::Object::LocalRef GetContext(); @@ -545,14 +452,12 @@ public: typedef GeckoAppShell Owner; typedef mozilla::jni::DoubleArray::LocalRef ReturnType; typedef mozilla::jni::DoubleArray::Param SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "getCurrentBatteryInformation"; static constexpr char signature[] = "()[D"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static mozilla::jni::DoubleArray::LocalRef GetCurrentBatteryInformationWrapper(); @@ -562,14 +467,12 @@ public: typedef GeckoAppShell Owner; typedef mozilla::jni::DoubleArray::LocalRef ReturnType; typedef mozilla::jni::DoubleArray::Param SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "getCurrentNetworkInformation"; static constexpr char signature[] = "()[D"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static mozilla::jni::DoubleArray::LocalRef GetCurrentNetworkInformationWrapper(); @@ -579,14 +482,12 @@ public: typedef GeckoAppShell Owner; typedef float ReturnType; typedef float SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "getDensity"; static constexpr char signature[] = "()F"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static float GetDensity(); @@ -596,14 +497,12 @@ public: typedef GeckoAppShell Owner; typedef int32_t ReturnType; typedef int32_t SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "getDpi"; static constexpr char signature[] = "()I"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static int32_t GetDpiWrapper(); @@ -613,15 +512,12 @@ public: typedef GeckoAppShell Owner; typedef mozilla::jni::String::LocalRef ReturnType; typedef mozilla::jni::String::Param SetterType; - typedef mozilla::jni::Args< - mozilla::jni::String::Param> Args; static constexpr char name[] = "getExtensionFromMimeType"; static constexpr char signature[] = "(Ljava/lang/String;)Ljava/lang/String;"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static mozilla::jni::String::LocalRef GetExtensionFromMimeTypeWrapper(mozilla::jni::String::Param); @@ -631,15 +527,12 @@ public: typedef GeckoAppShell Owner; typedef mozilla::jni::String::LocalRef ReturnType; typedef mozilla::jni::String::Param SetterType; - typedef mozilla::jni::Args< - mozilla::jni::String::Param> Args; static constexpr char name[] = "getExternalPublicDirectory"; static constexpr char signature[] = "(Ljava/lang/String;)Ljava/lang/String;"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static mozilla::jni::String::LocalRef GetExternalPublicDirectory(mozilla::jni::String::Param); @@ -649,16 +542,12 @@ public: typedef GeckoAppShell Owner; typedef mozilla::jni::ObjectArray::LocalRef ReturnType; typedef mozilla::jni::ObjectArray::Param SetterType; - typedef mozilla::jni::Args< - mozilla::jni::String::Param, - mozilla::jni::String::Param> Args; static constexpr char name[] = "getHandlersForMimeType"; static constexpr char signature[] = "(Ljava/lang/String;Ljava/lang/String;)[Ljava/lang/String;"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static mozilla::jni::ObjectArray::LocalRef GetHandlersForMimeTypeWrapper(mozilla::jni::String::Param, mozilla::jni::String::Param); @@ -668,16 +557,12 @@ public: typedef GeckoAppShell Owner; typedef mozilla::jni::ObjectArray::LocalRef ReturnType; typedef mozilla::jni::ObjectArray::Param SetterType; - typedef mozilla::jni::Args< - mozilla::jni::String::Param, - mozilla::jni::String::Param> Args; static constexpr char name[] = "getHandlersForURL"; static constexpr char signature[] = "(Ljava/lang/String;Ljava/lang/String;)[Ljava/lang/String;"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static mozilla::jni::ObjectArray::LocalRef GetHandlersForURLWrapper(mozilla::jni::String::Param, mozilla::jni::String::Param); @@ -687,16 +572,12 @@ public: typedef GeckoAppShell Owner; typedef mozilla::jni::ByteArray::LocalRef ReturnType; typedef mozilla::jni::ByteArray::Param SetterType; - typedef mozilla::jni::Args< - mozilla::jni::String::Param, - int32_t> Args; static constexpr char name[] = "getIconForExtension"; static constexpr char signature[] = "(Ljava/lang/String;I)[B"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static mozilla::jni::ByteArray::LocalRef GetIconForExtensionWrapper(mozilla::jni::String::Param, int32_t); @@ -706,14 +587,12 @@ public: typedef GeckoAppShell Owner; typedef int32_t ReturnType; typedef int32_t SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "getMaxTouchPoints"; static constexpr char signature[] = "()I"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static int32_t GetMaxTouchPoints(); @@ -723,16 +602,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - int32_t, - int32_t> Args; static constexpr char name[] = "getMessage"; static constexpr char signature[] = "(II)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void GetMessageWrapper(int32_t, int32_t); @@ -742,15 +617,12 @@ public: typedef GeckoAppShell Owner; typedef mozilla::jni::String::LocalRef ReturnType; typedef mozilla::jni::String::Param SetterType; - typedef mozilla::jni::Args< - mozilla::jni::String::Param> Args; static constexpr char name[] = "getMimeTypeFromExtensions"; static constexpr char signature[] = "(Ljava/lang/String;)Ljava/lang/String;"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static mozilla::jni::String::LocalRef GetMimeTypeFromExtensionsWrapper(mozilla::jni::String::Param); @@ -760,16 +632,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - int32_t, - int32_t> Args; static constexpr char name[] = "getNextMessageInList"; static constexpr char signature[] = "(II)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void GetNextMessageInListWrapper(int32_t, int32_t); @@ -779,18 +647,12 @@ public: typedef GeckoAppShell Owner; typedef mozilla::jni::String::LocalRef ReturnType; typedef mozilla::jni::String::Param SetterType; - typedef mozilla::jni::Args< - mozilla::jni::String::Param, - mozilla::jni::String::Param, - mozilla::jni::String::Param, - int32_t> Args; static constexpr char name[] = "getProxyForURI"; static constexpr char signature[] = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Ljava/lang/String;"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static mozilla::jni::String::LocalRef GetProxyForURIWrapper(mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, int32_t); @@ -800,14 +662,12 @@ public: typedef GeckoAppShell Owner; typedef int32_t ReturnType; typedef int32_t SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "getScreenDepth"; static constexpr char signature[] = "()I"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static int32_t GetScreenDepthWrapper(); @@ -817,14 +677,12 @@ public: typedef GeckoAppShell Owner; typedef int16_t ReturnType; typedef int16_t SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "getScreenOrientation"; static constexpr char signature[] = "()S"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static int16_t GetScreenOrientationWrapper(); @@ -834,14 +692,12 @@ public: typedef GeckoAppShell Owner; typedef bool ReturnType; typedef bool SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "getShowPasswordSetting"; static constexpr char signature[] = "()Z"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static bool GetShowPasswordSetting(); @@ -851,14 +707,12 @@ public: typedef GeckoAppShell Owner; typedef mozilla::jni::IntArray::LocalRef ReturnType; typedef mozilla::jni::IntArray::Param SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "getSystemColors"; static constexpr char signature[] = "()[I"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static mozilla::jni::IntArray::LocalRef GetSystemColoursWrapper(); @@ -868,15 +722,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - mozilla::jni::Object::Param> Args; static constexpr char name[] = "handleGeckoMessage"; static constexpr char signature[] = "(Lorg/mozilla/gecko/util/NativeJSContainer;)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void HandleGeckoMessageWrapper(mozilla::jni::Object::Param); @@ -886,16 +737,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - mozilla::jni::Object::Param, - mozilla::jni::Throwable::Param> Args; static constexpr char name[] = "handleUncaughtException"; static constexpr char signature[] = "(Ljava/lang/Thread;Ljava/lang/Throwable;)V"; static const bool isStatic = true; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::IGNORE; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::IGNORE; }; static void HandleUncaughtException(mozilla::jni::Object::Param, mozilla::jni::Throwable::Param); @@ -905,14 +752,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "hideProgressDialog"; static constexpr char signature[] = "()V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void HideProgressDialog(); @@ -922,18 +767,12 @@ public: typedef GeckoAppShell Owner; typedef mozilla::jni::IntArray::LocalRef ReturnType; typedef mozilla::jni::IntArray::Param SetterType; - typedef mozilla::jni::Args< - mozilla::jni::String::Param, - int32_t, - int32_t, - int32_t> Args; static constexpr char name[] = "initCamera"; static constexpr char signature[] = "(Ljava/lang/String;III)[I"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static mozilla::jni::IntArray::LocalRef InitCameraWrapper(mozilla::jni::String::Param, int32_t, int32_t, int32_t); @@ -943,14 +782,12 @@ public: typedef GeckoAppShell Owner; typedef bool ReturnType; typedef bool SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "isNetworkLinkKnown"; static constexpr char signature[] = "()Z"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static bool IsNetworkLinkKnown(); @@ -960,14 +797,12 @@ public: typedef GeckoAppShell Owner; typedef bool ReturnType; typedef bool SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "isNetworkLinkUp"; static constexpr char signature[] = "()Z"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static bool IsNetworkLinkUp(); @@ -977,14 +812,12 @@ public: typedef GeckoAppShell Owner; typedef bool ReturnType; typedef bool SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "isTablet"; static constexpr char signature[] = "()Z"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static bool IsTablet(); @@ -994,14 +827,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "killAnyZombies"; static constexpr char signature[] = "()V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void KillAnyZombies(); @@ -1011,16 +842,12 @@ public: typedef GeckoAppShell Owner; typedef mozilla::jni::ClassObject::LocalRef ReturnType; typedef mozilla::jni::ClassObject::Param SetterType; - typedef mozilla::jni::Args< - mozilla::jni::String::Param, - mozilla::jni::String::Param> Args; static constexpr char name[] = "loadPluginClass"; static constexpr char signature[] = "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Class;"; static const bool isStatic = true; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static mozilla::jni::ClassObject::LocalRef LoadPluginClass(mozilla::jni::String::Param, mozilla::jni::String::Param); @@ -1030,15 +857,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - int32_t> Args; static constexpr char name[] = "lockScreenOrientation"; static constexpr char signature[] = "(I)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void LockScreenOrientation(int32_t); @@ -1048,15 +872,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - mozilla::jni::String::Param> Args; static constexpr char name[] = "markUriVisited"; static constexpr char signature[] = "(Ljava/lang/String;)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void MarkURIVisited(mozilla::jni::String::Param); @@ -1066,14 +887,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "moveTaskToBack"; static constexpr char signature[] = "()V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void MoveTaskToBack(); @@ -1083,14 +902,12 @@ public: typedef GeckoAppShell Owner; typedef int32_t ReturnType; typedef int32_t SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "networkLinkType"; static constexpr char signature[] = "()I"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static int32_t NetworkLinkType(); @@ -1100,15 +917,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - bool> Args; static constexpr char name[] = "notifyDefaultPrevented"; static constexpr char signature[] = "(Z)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void NotifyDefaultPrevented(bool); @@ -1118,15 +932,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - int32_t> Args; static constexpr char name[] = "notifyIME"; static constexpr char signature[] = "(I)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void NotifyIME(int32_t); @@ -1136,18 +947,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - mozilla::jni::String::Param, - int32_t, - int32_t, - int32_t> Args; static constexpr char name[] = "notifyIMEChange"; static constexpr char signature[] = "(Ljava/lang/String;III)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void NotifyIMEChange(mozilla::jni::String::Param, int32_t, int32_t, int32_t); @@ -1157,18 +962,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - int32_t, - mozilla::jni::String::Param, - mozilla::jni::String::Param, - mozilla::jni::String::Param> Args; static constexpr char name[] = "notifyIMEContext"; static constexpr char signature[] = "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void NotifyIMEContext(int32_t, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param); @@ -1178,16 +977,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - mozilla::jni::String::Param, - mozilla::jni::String::Param> Args; static constexpr char name[] = "notifyWakeLockChanged"; static constexpr char signature[] = "(Ljava/lang/String;Ljava/lang/String;)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void NotifyWakeLockChanged(mozilla::jni::String::Param, mozilla::jni::String::Param); @@ -1197,20 +992,12 @@ public: typedef GeckoAppShell Owner; typedef bool ReturnType; typedef bool SetterType; - typedef mozilla::jni::Args< - mozilla::jni::String::Param, - mozilla::jni::String::Param, - mozilla::jni::String::Param, - mozilla::jni::String::Param, - mozilla::jni::String::Param, - mozilla::jni::String::Param> Args; static constexpr char name[] = "openUriExternal"; static constexpr char signature[] = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static bool OpenUriExternal(mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param); @@ -1220,15 +1007,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - bool> Args; static constexpr char name[] = "performHapticFeedback"; static constexpr char signature[] = "(Z)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void PerformHapticFeedback(bool); @@ -1238,15 +1022,12 @@ public: typedef GeckoAppShell Owner; typedef bool ReturnType; typedef bool SetterType; - typedef mozilla::jni::Args< - mozilla::jni::Object::Param> Args; static constexpr char name[] = "pumpMessageLoop"; static constexpr char signature[] = "(Landroid/os/Message;)Z"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static bool PumpMessageLoop(mozilla::jni::Object::Param); @@ -1256,16 +1037,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - mozilla::jni::Object::Param, - int32_t> Args; static constexpr char name[] = "registerSurfaceTextureFrameListener"; static constexpr char signature[] = "(Ljava/lang/Object;I)V"; static const bool isStatic = true; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void RegisterSurfaceTextureFrameListener(mozilla::jni::Object::Param, int32_t); @@ -1275,16 +1052,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - mozilla::jni::Object::Param, - bool> Args; static constexpr char name[] = "removePluginView"; static constexpr char signature[] = "(Landroid/view/View;Z)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void RemovePluginView(mozilla::jni::Object::Param, bool); @@ -1294,15 +1067,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - int64_t> Args; static constexpr char name[] = "requestUiThreadCallback"; static constexpr char signature[] = "(J)V"; static const bool isStatic = true; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void RequestUiThreadCallback(int64_t); @@ -1312,14 +1082,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "scheduleRestart"; static constexpr char signature[] = "()V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void ScheduleRestart(); @@ -1329,17 +1097,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - mozilla::jni::String::Param, - mozilla::jni::String::Param, - int32_t> Args; static constexpr char name[] = "sendMessage"; static constexpr char signature[] = "(Ljava/lang/String;Ljava/lang/String;I)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void SendMessageWrapper(mozilla::jni::String::Param, mozilla::jni::String::Param, int32_t); @@ -1349,15 +1112,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - bool> Args; static constexpr char name[] = "setFullScreen"; static constexpr char signature[] = "(Z)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void SetFullScreen(bool); @@ -1367,15 +1127,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - bool> Args; static constexpr char name[] = "setKeepScreenOn"; static constexpr char signature[] = "(Z)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void SetKeepScreenOn(bool); @@ -1385,16 +1142,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - mozilla::jni::String::Param, - mozilla::jni::String::Param> Args; static constexpr char name[] = "setUriTitle"; static constexpr char signature[] = "(Ljava/lang/String;Ljava/lang/String;)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void SetURITitle(mozilla::jni::String::Param, mozilla::jni::String::Param); @@ -1404,19 +1157,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - mozilla::jni::String::Param, - mozilla::jni::String::Param, - mozilla::jni::String::Param, - mozilla::jni::String::Param, - mozilla::jni::String::Param> Args; static constexpr char name[] = "showAlertNotification"; static constexpr char signature[] = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void ShowAlertNotificationWrapper(mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param); @@ -1426,14 +1172,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "showInputMethodPicker"; static constexpr char signature[] = "()V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void ShowInputMethodPicker(); @@ -1443,14 +1187,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "startMonitoringGamepad"; static constexpr char signature[] = "()V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void StartMonitoringGamepad(); @@ -1460,14 +1202,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "stopMonitoringGamepad"; static constexpr char signature[] = "()V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void StopMonitoringGamepad(); @@ -1477,14 +1217,12 @@ public: typedef GeckoAppShell Owner; typedef bool ReturnType; typedef bool SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "unlockProfile"; static constexpr char signature[] = "()Z"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static bool UnlockProfile(); @@ -1494,14 +1232,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "unlockScreenOrientation"; static constexpr char signature[] = "()V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void UnlockScreenOrientation(); @@ -1511,15 +1247,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - mozilla::jni::Object::Param> Args; static constexpr char name[] = "unregisterSurfaceTextureFrameListener"; static constexpr char signature[] = "(Ljava/lang/Object;)V"; static const bool isStatic = true; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void UnregisterSurfaceTextureFrameListener(mozilla::jni::Object::Param); @@ -1529,15 +1262,12 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - int64_t> Args; static constexpr char name[] = "vibrate"; static constexpr char signature[] = "(J)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void Vibrate1(int64_t); @@ -1547,29 +1277,25 @@ public: typedef GeckoAppShell Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - mozilla::jni::LongArray::Param, - int32_t> Args; static constexpr char name[] = "vibrate"; static constexpr char signature[] = "([JI)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void VibrateA(mozilla::jni::LongArray::Param, int32_t); }; -class GeckoJavaSampler : public mozilla::jni::Class -{ +class GeckoJavaSampler : public mozilla::jni::Class { + public: typedef mozilla::jni::Ref Ref; typedef mozilla::jni::LocalRef LocalRef; typedef mozilla::jni::GlobalRef GlobalRef; - typedef const mozilla::jni::Param& Param; + typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = "org/mozilla/gecko/GeckoJavaSampler"; @@ -1582,17 +1308,12 @@ public: typedef GeckoJavaSampler Owner; typedef mozilla::jni::String::LocalRef ReturnType; typedef mozilla::jni::String::Param SetterType; - typedef mozilla::jni::Args< - int32_t, - int32_t, - int32_t> Args; static constexpr char name[] = "getFrameName"; static constexpr char signature[] = "(III)Ljava/lang/String;"; static const bool isStatic = true; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static mozilla::jni::String::LocalRef GetFrameNameJavaProfilingWrapper(int32_t, int32_t, int32_t); @@ -1602,16 +1323,12 @@ public: typedef GeckoJavaSampler Owner; typedef double ReturnType; typedef double SetterType; - typedef mozilla::jni::Args< - int32_t, - int32_t> Args; static constexpr char name[] = "getSampleTime"; static constexpr char signature[] = "(II)D"; static const bool isStatic = true; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static double GetSampleTimeJavaProfiling(int32_t, int32_t); @@ -1621,15 +1338,12 @@ public: typedef GeckoJavaSampler Owner; typedef mozilla::jni::String::LocalRef ReturnType; typedef mozilla::jni::String::Param SetterType; - typedef mozilla::jni::Args< - int32_t> Args; static constexpr char name[] = "getThreadName"; static constexpr char signature[] = "(I)Ljava/lang/String;"; static const bool isStatic = true; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static mozilla::jni::String::LocalRef GetThreadNameJavaProfilingWrapper(int32_t); @@ -1639,14 +1353,12 @@ public: typedef GeckoJavaSampler Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "pause"; static constexpr char signature[] = "()V"; static const bool isStatic = true; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void PauseJavaProfiling(); @@ -1656,16 +1368,12 @@ public: typedef GeckoJavaSampler Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - int32_t, - int32_t> Args; static constexpr char name[] = "start"; static constexpr char signature[] = "(II)V"; static const bool isStatic = true; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void StartJavaProfiling(int32_t, int32_t); @@ -1675,14 +1383,12 @@ public: typedef GeckoJavaSampler Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "stop"; static constexpr char signature[] = "()V"; static const bool isStatic = true; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void StopJavaProfiling(); @@ -1692,27 +1398,25 @@ public: typedef GeckoJavaSampler Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "unpause"; static constexpr char signature[] = "()V"; static const bool isStatic = true; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void UnpauseJavaProfiling(); }; -class RestrictedProfiles : public mozilla::jni::Class -{ +class RestrictedProfiles : public mozilla::jni::Class { + public: typedef mozilla::jni::Ref Ref; typedef mozilla::jni::LocalRef LocalRef; typedef mozilla::jni::GlobalRef GlobalRef; - typedef const mozilla::jni::Param& Param; + typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = "org/mozilla/gecko/RestrictedProfiles"; @@ -1725,14 +1429,12 @@ public: typedef RestrictedProfiles Owner; typedef mozilla::jni::String::LocalRef ReturnType; typedef mozilla::jni::String::Param SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "getUserRestrictions"; static constexpr char signature[] = "()Ljava/lang/String;"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static mozilla::jni::String::LocalRef GetUserRestrictions(); @@ -1742,16 +1444,12 @@ public: typedef RestrictedProfiles Owner; typedef bool ReturnType; typedef bool SetterType; - typedef mozilla::jni::Args< - int32_t, - mozilla::jni::String::Param> Args; static constexpr char name[] = "isAllowed"; static constexpr char signature[] = "(ILjava/lang/String;)Z"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static bool IsAllowed(int32_t, mozilla::jni::String::Param); @@ -1761,27 +1459,25 @@ public: typedef RestrictedProfiles Owner; typedef bool ReturnType; typedef bool SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "isUserRestricted"; static constexpr char signature[] = "()Z"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static bool IsUserRestricted(); }; -class SurfaceBits : public mozilla::jni::Class -{ +class SurfaceBits : public mozilla::jni::Class { + public: typedef mozilla::jni::Ref Ref; typedef mozilla::jni::LocalRef LocalRef; typedef mozilla::jni::GlobalRef GlobalRef; - typedef const mozilla::jni::Param& Param; + typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = "org/mozilla/gecko/SurfaceBits"; @@ -1794,14 +1490,12 @@ public: typedef SurfaceBits Owner; typedef SurfaceBits::LocalRef ReturnType; typedef SurfaceBits::Param SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = ""; static constexpr char signature[] = "()V"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static SurfaceBits::LocalRef New(); @@ -1811,14 +1505,12 @@ public: typedef SurfaceBits Owner; typedef mozilla::jni::Object::LocalRef ReturnType; typedef mozilla::jni::Object::Param SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "buffer"; static constexpr char signature[] = "Ljava/nio/ByteBuffer;"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; mozilla::jni::Object::LocalRef Buffer() const; @@ -1830,14 +1522,12 @@ public: typedef SurfaceBits Owner; typedef int32_t ReturnType; typedef int32_t SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "format"; static constexpr char signature[] = "I"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; int32_t Format() const; @@ -1849,14 +1539,12 @@ public: typedef SurfaceBits Owner; typedef int32_t ReturnType; typedef int32_t SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "height"; static constexpr char signature[] = "I"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; int32_t Height() const; @@ -1868,14 +1556,12 @@ public: typedef SurfaceBits Owner; typedef int32_t ReturnType; typedef int32_t SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "width"; static constexpr char signature[] = "I"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; int32_t Width() const; @@ -1884,13 +1570,13 @@ public: }; -class ThumbnailHelper : public mozilla::jni::Class -{ +class ThumbnailHelper : public mozilla::jni::Class { + public: typedef mozilla::jni::Ref Ref; typedef mozilla::jni::LocalRef LocalRef; typedef mozilla::jni::GlobalRef GlobalRef; - typedef const mozilla::jni::Param& Param; + typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = "org/mozilla/gecko/ThumbnailHelper"; @@ -1903,31 +1589,25 @@ public: typedef ThumbnailHelper Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - mozilla::jni::Object::Param, - int32_t, - bool, - bool> Args; static constexpr char name[] = "notifyThumbnail"; static constexpr char signature[] = "(Ljava/nio/ByteBuffer;IZZ)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void SendThumbnail(mozilla::jni::Object::Param, int32_t, bool, bool); }; -class DisplayPortMetrics : public mozilla::jni::Class -{ +class DisplayPortMetrics : public mozilla::jni::Class { + public: typedef mozilla::jni::Ref Ref; typedef mozilla::jni::LocalRef LocalRef; typedef mozilla::jni::GlobalRef GlobalRef; - typedef const mozilla::jni::Param& Param; + typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = "org/mozilla/gecko/gfx/DisplayPortMetrics"; @@ -1940,19 +1620,12 @@ public: typedef DisplayPortMetrics Owner; typedef DisplayPortMetrics::LocalRef ReturnType; typedef DisplayPortMetrics::Param SetterType; - typedef mozilla::jni::Args< - float, - float, - float, - float, - float> Args; static constexpr char name[] = ""; static constexpr char signature[] = "(FFFFF)V"; static const bool isStatic = false; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static DisplayPortMetrics::LocalRef New(float, float, float, float, float); @@ -1962,14 +1635,12 @@ public: typedef DisplayPortMetrics Owner; typedef mozilla::jni::Object::LocalRef ReturnType; typedef mozilla::jni::Object::Param SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "mPosition"; static constexpr char signature[] = "Landroid/graphics/RectF;"; static const bool isStatic = false; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; mozilla::jni::Object::LocalRef MPosition() const; @@ -1979,27 +1650,25 @@ public: typedef DisplayPortMetrics Owner; typedef float ReturnType; typedef float SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "resolution"; static constexpr char signature[] = "F"; static const bool isStatic = false; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; float Resolution() const; }; -class GLController : public mozilla::jni::Class -{ +class GLController : public mozilla::jni::Class { + public: typedef mozilla::jni::Ref Ref; typedef mozilla::jni::LocalRef LocalRef; typedef mozilla::jni::GlobalRef GlobalRef; - typedef const mozilla::jni::Param& Param; + typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = "org/mozilla/gecko/gfx/GLController"; @@ -2012,27 +1681,25 @@ public: typedef GLController Owner; typedef mozilla::jni::Object::LocalRef ReturnType; typedef mozilla::jni::Object::Param SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "createEGLSurfaceForCompositor"; static constexpr char signature[] = "()Ljavax/microedition/khronos/egl/EGLSurface;"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; mozilla::jni::Object::LocalRef CreateEGLSurfaceForCompositorWrapper() const; }; -class GeckoLayerClient : public mozilla::jni::Class -{ +class GeckoLayerClient : public mozilla::jni::Class { + public: typedef mozilla::jni::Ref Ref; typedef mozilla::jni::LocalRef LocalRef; typedef mozilla::jni::GlobalRef GlobalRef; - typedef const mozilla::jni::Param& Param; + typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = "org/mozilla/gecko/gfx/GeckoLayerClient"; @@ -2045,14 +1712,12 @@ public: typedef GeckoLayerClient Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "activateProgram"; static constexpr char signature[] = "()V"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; void ActivateProgram() const; @@ -2062,14 +1727,12 @@ public: typedef GeckoLayerClient Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "contentDocumentChanged"; static constexpr char signature[] = "()V"; static const bool isStatic = false; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; void ContentDocumentChanged() const; @@ -2079,14 +1742,12 @@ public: typedef GeckoLayerClient Owner; typedef mozilla::jni::Object::LocalRef ReturnType; typedef mozilla::jni::Object::Param SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "createFrame"; static constexpr char signature[] = "()Lorg/mozilla/gecko/gfx/LayerRenderer$Frame;"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; mozilla::jni::Object::LocalRef CreateFrame() const; @@ -2096,19 +1757,12 @@ public: typedef GeckoLayerClient Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - bool, - int32_t, - int32_t, - int32_t, - int32_t> Args; static constexpr char name[] = "deactivateProgramAndRestoreState"; static constexpr char signature[] = "(ZIIII)V"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; void DeactivateProgramAndRestoreState(bool, int32_t, int32_t, int32_t, int32_t) const; @@ -2118,18 +1772,12 @@ public: typedef GeckoLayerClient Owner; typedef mozilla::jni::Object::LocalRef ReturnType; typedef mozilla::jni::Object::Param SetterType; - typedef mozilla::jni::Args< - bool, - bool, - int32_t, - mozilla::jni::Object::Param> Args; static constexpr char name[] = "getDisplayPort"; static constexpr char signature[] = "(ZZILorg/mozilla/gecko/gfx/ImmutableViewportMetrics;)Lorg/mozilla/gecko/gfx/DisplayPortMetrics;"; static const bool isStatic = false; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; mozilla::jni::Object::LocalRef GetDisplayPort(bool, bool, int32_t, mozilla::jni::Object::Param) const; @@ -2139,14 +1787,12 @@ public: typedef GeckoLayerClient Owner; typedef bool ReturnType; typedef bool SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "isContentDocumentDisplayed"; static constexpr char signature[] = "()Z"; static const bool isStatic = false; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; bool IsContentDocumentDisplayed() const; @@ -2156,21 +1802,12 @@ public: typedef GeckoLayerClient Owner; typedef mozilla::jni::Object::LocalRef ReturnType; typedef mozilla::jni::Object::Param SetterType; - typedef mozilla::jni::Args< - bool, - float, - float, - float, - float, - float, - bool> Args; static constexpr char name[] = "progressiveUpdateCallback"; static constexpr char signature[] = "(ZFFFFFZ)Lorg/mozilla/gecko/gfx/ProgressiveUpdateData;"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; mozilla::jni::Object::LocalRef ProgressiveUpdateCallback(bool, float, float, float, float, float, bool) const; @@ -2180,21 +1817,12 @@ public: typedef GeckoLayerClient Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - float, - float, - float, - float, - float, - float, - float> Args; static constexpr char name[] = "setFirstPaintViewport"; static constexpr char signature[] = "(FFFFFFF)V"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; void SetFirstPaintViewport(float, float, float, float, float, float, float) const; @@ -2204,18 +1832,12 @@ public: typedef GeckoLayerClient Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - float, - float, - float, - float> Args; static constexpr char name[] = "setPageRect"; static constexpr char signature[] = "(FFFF)V"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; void SetPageRect(float, float, float, float) const; @@ -2225,28 +1847,12 @@ public: typedef GeckoLayerClient Owner; typedef mozilla::jni::Object::LocalRef ReturnType; typedef mozilla::jni::Object::Param SetterType; - typedef mozilla::jni::Args< - float, - float, - float, - float, - float, - float, - float, - bool, - int32_t, - int32_t, - int32_t, - int32_t, - float, - bool> Args; static constexpr char name[] = "syncFrameMetrics"; static constexpr char signature[] = "(FFFFFFFZIIIIFZ)Lorg/mozilla/gecko/gfx/ViewTransform;"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; mozilla::jni::Object::LocalRef SyncFrameMetrics(float, float, float, float, float, float, float, bool, int32_t, int32_t, int32_t, int32_t, float, bool) const; @@ -2256,33 +1862,25 @@ public: typedef GeckoLayerClient Owner; typedef mozilla::jni::Object::LocalRef ReturnType; typedef mozilla::jni::Object::Param SetterType; - typedef mozilla::jni::Args< - int32_t, - int32_t, - int32_t, - int32_t, - float, - bool> Args; static constexpr char name[] = "syncViewportInfo"; static constexpr char signature[] = "(IIIIFZ)Lorg/mozilla/gecko/gfx/ViewTransform;"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; mozilla::jni::Object::LocalRef SyncViewportInfo(int32_t, int32_t, int32_t, int32_t, float, bool) const; }; -class ImmutableViewportMetrics : public mozilla::jni::Class -{ +class ImmutableViewportMetrics : public mozilla::jni::Class { + public: typedef mozilla::jni::Ref Ref; typedef mozilla::jni::LocalRef LocalRef; typedef mozilla::jni::GlobalRef GlobalRef; - typedef const mozilla::jni::Param& Param; + typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = "org/mozilla/gecko/gfx/ImmutableViewportMetrics"; @@ -2295,40 +1893,25 @@ public: typedef ImmutableViewportMetrics Owner; typedef ImmutableViewportMetrics::LocalRef ReturnType; typedef ImmutableViewportMetrics::Param SetterType; - typedef mozilla::jni::Args< - float, - float, - float, - float, - float, - float, - float, - float, - float, - float, - float, - float, - float> Args; static constexpr char name[] = ""; static constexpr char signature[] = "(FFFFFFFFFFFFF)V"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static ImmutableViewportMetrics::LocalRef New(float, float, float, float, float, float, float, float, float, float, float, float, float); }; -class LayerView : public mozilla::jni::Class -{ +class LayerView : public mozilla::jni::Class { + public: typedef mozilla::jni::Ref Ref; typedef mozilla::jni::LocalRef LocalRef; typedef mozilla::jni::GlobalRef GlobalRef; - typedef const mozilla::jni::Param& Param; + typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = "org/mozilla/gecko/gfx/LayerView"; @@ -2341,14 +1924,12 @@ public: typedef LayerView Owner; typedef mozilla::jni::Object::LocalRef ReturnType; typedef mozilla::jni::Object::Param SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "registerCxxCompositor"; static constexpr char signature[] = "()Lorg/mozilla/gecko/gfx/GLController;"; static const bool isStatic = true; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static mozilla::jni::Object::LocalRef RegisterCompositorWrapper(); @@ -2358,28 +1939,25 @@ public: typedef LayerView Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - mozilla::jni::Object::Param> Args; static constexpr char name[] = "updateZoomedView"; static constexpr char signature[] = "(Ljava/nio/ByteBuffer;)V"; static const bool isStatic = true; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void updateZoomedView(mozilla::jni::Object::Param); }; -class NativePanZoomController : public mozilla::jni::Class -{ +class NativePanZoomController : public mozilla::jni::Class { + public: typedef mozilla::jni::Ref Ref; typedef mozilla::jni::LocalRef LocalRef; typedef mozilla::jni::GlobalRef GlobalRef; - typedef const mozilla::jni::Param& Param; + typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = "org/mozilla/gecko/gfx/NativePanZoomController"; @@ -2392,32 +1970,25 @@ public: typedef NativePanZoomController Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - float, - float, - float, - float, - float> Args; static constexpr char name[] = "requestContentRepaint"; static constexpr char signature[] = "(FFFFF)V"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; void RequestContentRepaintWrapper(float, float, float, float, float) const; }; -class ProgressiveUpdateData : public mozilla::jni::Class -{ +class ProgressiveUpdateData : public mozilla::jni::Class { + public: typedef mozilla::jni::Ref Ref; typedef mozilla::jni::LocalRef LocalRef; typedef mozilla::jni::GlobalRef GlobalRef; - typedef const mozilla::jni::Param& Param; + typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = "org/mozilla/gecko/gfx/ProgressiveUpdateData"; @@ -2430,14 +2001,12 @@ public: typedef ProgressiveUpdateData Owner; typedef ProgressiveUpdateData::LocalRef ReturnType; typedef ProgressiveUpdateData::Param SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = ""; static constexpr char signature[] = "()V"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static ProgressiveUpdateData::LocalRef New(); @@ -2447,15 +2016,12 @@ public: typedef ProgressiveUpdateData Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - mozilla::jni::Object::Param> Args; static constexpr char name[] = "setViewport"; static constexpr char signature[] = "(Lorg/mozilla/gecko/gfx/ImmutableViewportMetrics;)V"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; void SetViewport(mozilla::jni::Object::Param) const; @@ -2465,14 +2031,12 @@ public: typedef ProgressiveUpdateData Owner; typedef bool ReturnType; typedef bool SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "abort"; static constexpr char signature[] = "Z"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; bool Abort() const; @@ -2484,14 +2048,12 @@ public: typedef ProgressiveUpdateData Owner; typedef float ReturnType; typedef float SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "scale"; static constexpr char signature[] = "F"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; float Scale() const; @@ -2503,14 +2065,12 @@ public: typedef ProgressiveUpdateData Owner; typedef float ReturnType; typedef float SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "x"; static constexpr char signature[] = "F"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; float X() const; @@ -2522,14 +2082,12 @@ public: typedef ProgressiveUpdateData Owner; typedef float ReturnType; typedef float SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "y"; static constexpr char signature[] = "F"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; float Y() const; @@ -2538,13 +2096,13 @@ public: }; -class ViewTransform : public mozilla::jni::Class -{ +class ViewTransform : public mozilla::jni::Class { + public: typedef mozilla::jni::Ref Ref; typedef mozilla::jni::LocalRef LocalRef; typedef mozilla::jni::GlobalRef GlobalRef; - typedef const mozilla::jni::Param& Param; + typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = "org/mozilla/gecko/gfx/ViewTransform"; @@ -2557,17 +2115,12 @@ public: typedef ViewTransform Owner; typedef ViewTransform::LocalRef ReturnType; typedef ViewTransform::Param SetterType; - typedef mozilla::jni::Args< - float, - float, - float> Args; static constexpr char name[] = ""; static constexpr char signature[] = "(FFF)V"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static ViewTransform::LocalRef New(float, float, float); @@ -2577,14 +2130,12 @@ public: typedef ViewTransform Owner; typedef float ReturnType; typedef float SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "fixedLayerMarginBottom"; static constexpr char signature[] = "F"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; float FixedLayerMarginBottom() const; @@ -2596,14 +2147,12 @@ public: typedef ViewTransform Owner; typedef float ReturnType; typedef float SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "fixedLayerMarginLeft"; static constexpr char signature[] = "F"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; float FixedLayerMarginLeft() const; @@ -2615,14 +2164,12 @@ public: typedef ViewTransform Owner; typedef float ReturnType; typedef float SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "fixedLayerMarginRight"; static constexpr char signature[] = "F"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; float FixedLayerMarginRight() const; @@ -2634,14 +2181,12 @@ public: typedef ViewTransform Owner; typedef float ReturnType; typedef float SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "fixedLayerMarginTop"; static constexpr char signature[] = "F"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; float FixedLayerMarginTop() const; @@ -2653,14 +2198,12 @@ public: typedef ViewTransform Owner; typedef float ReturnType; typedef float SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "offsetX"; static constexpr char signature[] = "F"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; float OffsetX() const; @@ -2672,14 +2215,12 @@ public: typedef ViewTransform Owner; typedef float ReturnType; typedef float SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "offsetY"; static constexpr char signature[] = "F"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; float OffsetY() const; @@ -2691,14 +2232,12 @@ public: typedef ViewTransform Owner; typedef float ReturnType; typedef float SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "scale"; static constexpr char signature[] = "F"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; float Scale() const; @@ -2710,14 +2249,12 @@ public: typedef ViewTransform Owner; typedef float ReturnType; typedef float SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "x"; static constexpr char signature[] = "F"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; float X() const; @@ -2729,14 +2266,12 @@ public: typedef ViewTransform Owner; typedef float ReturnType; typedef float SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "y"; static constexpr char signature[] = "F"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; float Y() const; @@ -2745,13 +2280,13 @@ public: }; -class NativeZip : public mozilla::jni::Class -{ +class NativeZip : public mozilla::jni::Class { + public: typedef mozilla::jni::Ref Ref; typedef mozilla::jni::LocalRef LocalRef; typedef mozilla::jni::GlobalRef GlobalRef; - typedef const mozilla::jni::Param& Param; + typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = "org/mozilla/gecko/mozglue/NativeZip"; @@ -2764,29 +2299,25 @@ public: typedef NativeZip Owner; typedef mozilla::jni::Object::LocalRef ReturnType; typedef mozilla::jni::Object::Param SetterType; - typedef mozilla::jni::Args< - mozilla::jni::Object::Param, - int32_t> Args; static constexpr char name[] = "createInputStream"; static constexpr char signature[] = "(Ljava/nio/ByteBuffer;I)Ljava/io/InputStream;"; static const bool isStatic = false; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; mozilla::jni::Object::LocalRef CreateInputStream(mozilla::jni::Object::Param, int32_t) const; }; -class MatrixBlobCursor : public mozilla::jni::Class -{ +class MatrixBlobCursor : public mozilla::jni::Class { + public: typedef mozilla::jni::Ref Ref; typedef mozilla::jni::LocalRef LocalRef; typedef mozilla::jni::GlobalRef GlobalRef; - typedef const mozilla::jni::Param& Param; + typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = "org/mozilla/gecko/sqlite/MatrixBlobCursor"; @@ -2799,15 +2330,12 @@ public: typedef MatrixBlobCursor Owner; typedef MatrixBlobCursor::LocalRef ReturnType; typedef MatrixBlobCursor::Param SetterType; - typedef mozilla::jni::Args< - mozilla::jni::ObjectArray::Param> Args; static constexpr char name[] = ""; static constexpr char signature[] = "([Ljava/lang/String;)V"; static const bool isStatic = false; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static MatrixBlobCursor::LocalRef New(mozilla::jni::ObjectArray::Param); @@ -2817,16 +2345,12 @@ public: typedef MatrixBlobCursor Owner; typedef MatrixBlobCursor::LocalRef ReturnType; typedef MatrixBlobCursor::Param SetterType; - typedef mozilla::jni::Args< - mozilla::jni::ObjectArray::Param, - int32_t> Args; static constexpr char name[] = ""; static constexpr char signature[] = "([Ljava/lang/String;I)V"; static const bool isStatic = false; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static MatrixBlobCursor::LocalRef New(mozilla::jni::ObjectArray::Param, int32_t); @@ -2836,15 +2360,12 @@ public: typedef MatrixBlobCursor Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - mozilla::jni::Object::Param> Args; static constexpr char name[] = "addRow"; static constexpr char signature[] = "(Ljava/lang/Iterable;)V"; static const bool isStatic = false; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; void AddRow(mozilla::jni::Object::Param) const; @@ -2854,16 +2375,12 @@ public: typedef MatrixBlobCursor Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - mozilla::jni::Object::Param, - int32_t> Args; static constexpr char name[] = "addRow"; static constexpr char signature[] = "(Ljava/util/ArrayList;I)V"; static const bool isStatic = false; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; void AddRow(mozilla::jni::Object::Param, int32_t) const; @@ -2873,28 +2390,25 @@ public: typedef MatrixBlobCursor Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - mozilla::jni::ObjectArray::Param> Args; static constexpr char name[] = "addRow"; static constexpr char signature[] = "([Ljava/lang/Object;)V"; static const bool isStatic = false; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; void AddRow(mozilla::jni::ObjectArray::Param) const; }; -class SQLiteBridgeException : public mozilla::jni::Class -{ +class SQLiteBridgeException : public mozilla::jni::Class { + public: typedef mozilla::jni::Ref Ref; typedef mozilla::jni::LocalRef LocalRef; typedef mozilla::jni::GlobalRef GlobalRef; - typedef const mozilla::jni::Param& Param; + typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = "org/mozilla/gecko/sqlite/SQLiteBridgeException"; @@ -2907,14 +2421,12 @@ public: typedef SQLiteBridgeException Owner; typedef SQLiteBridgeException::LocalRef ReturnType; typedef SQLiteBridgeException::Param SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = ""; static constexpr char signature[] = "()V"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static SQLiteBridgeException::LocalRef New(); @@ -2924,15 +2436,12 @@ public: typedef SQLiteBridgeException Owner; typedef SQLiteBridgeException::LocalRef ReturnType; typedef SQLiteBridgeException::Param SetterType; - typedef mozilla::jni::Args< - mozilla::jni::String::Param> Args; static constexpr char name[] = ""; static constexpr char signature[] = "(Ljava/lang/String;)V"; static const bool isStatic = false; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static SQLiteBridgeException::LocalRef New(mozilla::jni::String::Param); @@ -2942,27 +2451,25 @@ public: typedef SQLiteBridgeException Owner; typedef int64_t ReturnType; typedef int64_t SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "serialVersionUID"; static constexpr char signature[] = "J"; static const bool isStatic = true; static const bool isMultithreaded = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static int64_t SerialVersionUID(); }; -class Clipboard : public mozilla::jni::Class -{ +class Clipboard : public mozilla::jni::Class { + public: typedef mozilla::jni::Ref Ref; typedef mozilla::jni::LocalRef LocalRef; typedef mozilla::jni::GlobalRef GlobalRef; - typedef const mozilla::jni::Param& Param; + typedef const typename mozilla::jni::Param::Type& Param; static constexpr char name[] = "org/mozilla/gecko/util/Clipboard"; @@ -2975,14 +2482,12 @@ public: typedef Clipboard Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "clearText"; static constexpr char signature[] = "()V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void ClearText(); @@ -2992,14 +2497,12 @@ public: typedef Clipboard Owner; typedef mozilla::jni::String::LocalRef ReturnType; typedef mozilla::jni::String::Param SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "getText"; static constexpr char signature[] = "()Ljava/lang/String;"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static mozilla::jni::String::LocalRef GetClipboardTextWrapper(); @@ -3009,14 +2512,12 @@ public: typedef Clipboard Owner; typedef bool ReturnType; typedef bool SetterType; - typedef mozilla::jni::Args<> Args; static constexpr char name[] = "hasText"; static constexpr char signature[] = "()Z"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static bool HasText(); @@ -3026,15 +2527,12 @@ public: typedef Clipboard Owner; typedef void ReturnType; typedef void SetterType; - typedef mozilla::jni::Args< - mozilla::jni::String::Param> Args; static constexpr char name[] = "setText"; static constexpr char signature[] = "(Ljava/lang/CharSequence;)V"; static const bool isStatic = true; static const bool isMultithreaded = false; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; + static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static void SetClipboardText(mozilla::jni::String::Param); @@ -3044,4 +2542,4 @@ public: } /* widget */ } /* mozilla */ -#endif // GeneratedJNIWrappers_h +#endif // GeneratedJNIWrappers_h__ diff --git a/widget/android/jni/Accessors.h b/widget/android/jni/Accessors.h index 2a33de9c8a0..c38c47199f4 100644 --- a/widget/android/jni/Accessors.h +++ b/widget/android/jni/Accessors.h @@ -33,18 +33,16 @@ struct Value // Base class for Method<>, Field<>, and Constructor<>. class Accessor { -public: +private: template - static jclass EnsureClassRef(JNIEnv* env) + static void EnsureClassRef(JNIEnv* env) { if (!Cls::sClassRef) { MOZ_ALWAYS_TRUE(Cls::sClassRef = AndroidBridge::GetClassGlobalRef(env, Cls::name)); } - return Cls::sClassRef; } -private: static void GetNsresult(JNIEnv* env, nsresult* rv) { if (env->ExceptionCheck()) { diff --git a/widget/android/jni/Natives.h b/widget/android/jni/Natives.h deleted file mode 100644 index 7ea3b72b57d..00000000000 --- a/widget/android/jni/Natives.h +++ /dev/null @@ -1,212 +0,0 @@ -#ifndef mozilla_jni_Natives_h__ -#define mozilla_jni_Natives_h__ - -#include - -#include "mozilla/jni/Accessors.h" -#include "mozilla/jni/Refs.h" -#include "mozilla/jni/Types.h" -#include "mozilla/jni/Utils.h" - -namespace mozilla { -namespace jni{ - -// Get the native pointer stored in a Java instance. -template -Impl* GetInstancePtr(JNIEnv* env, jobject instance) -{ - // TODO: implement instance native pointers. - return nullptr; -} - -namespace detail { - -// Wrapper methods that convert arguments from the JNI types to the native -// types, e.g. from jobject to jni::Object::Ref. For instance methods, the -// wrapper methods also convert calls to calls on objects. -// -// We need specialization for static/non-static because the two have different -// signatures (jobject vs jclass and Impl::*Method vs *Method). -// We need specialization for return type, because void return type requires -// us to not deal with the return value. - -template -class NativeStubImpl; - -// Specialization for instance methods with non-void return type -template -class NativeStubImpl> -{ - typedef typename Traits::Owner Owner; - typedef typename TypeAdapter::JNIType ReturnJNIType; - -public: - // Instance method - template - static ReturnJNIType Wrap(JNIEnv* env, jobject instance, - typename TypeAdapter::JNIType... args) - { - Impl* const impl = GetInstancePtr(env, instance); - if (!impl) { - return ReturnJNIType(); - } - return TypeAdapter::FromNative(env, - (impl->*Method)(TypeAdapter::ToNative(env, args)...)); - } - - // Instance method with instance reference - template - static ReturnJNIType Wrap(JNIEnv* env, jobject instance, - typename TypeAdapter::JNIType... args) - { - Impl* const impl = GetInstancePtr(env, instance); - if (!impl) { - return ReturnJNIType(); - } - return TypeAdapter::FromNative(env, - (impl->*Method)(Owner::Ref::From(instance), - TypeAdapter::ToNative(env, args)...)); - } -}; - -// Specialization for instance methods with void return type -template -class NativeStubImpl> -{ - typedef typename Traits::Owner Owner; - -public: - // Instance method - template - static void Wrap(JNIEnv* env, jobject instance, - typename TypeAdapter::JNIType... args) - { - Impl* const impl = GetInstancePtr(env, instance); - if (!impl) { - return; - } - (impl->*Method)(TypeAdapter::ToNative(env, args)...); - } - - // Instance method with instance reference - template - static void Wrap(JNIEnv* env, jobject instance, - typename TypeAdapter::JNIType... args) - { - Impl* const impl = GetInstancePtr(env, instance); - if (!impl) { - return; - } - (impl->*Method)(Owner::Ref::From(instance), - TypeAdapter::ToNative(env, args)...); - } -}; - -// Specialization for static methods with non-void return type -template -class NativeStubImpl> -{ - typedef typename TypeAdapter::JNIType ReturnJNIType; - -public: - // Static method - template - static ReturnJNIType Wrap(JNIEnv* env, jclass, - typename TypeAdapter::JNIType... args) - { - return TypeAdapter::FromNative(env, - (*Method)(TypeAdapter::ToNative(env, args)...)); - } - - // Static method with class reference - template - static ReturnJNIType Wrap(JNIEnv* env, jclass cls, - typename TypeAdapter::JNIType... args) - { - return TypeAdapter::FromNative(env, - (*Method)(ClassObject::Ref::From(cls), - TypeAdapter::ToNative(env, args)...)); - } -}; - -// Specialization for static methods with void return type -template -class NativeStubImpl> -{ -public: - // Static method - template - static void Wrap(JNIEnv* env, jclass, - typename TypeAdapter::JNIType... args) - { - (*Method)(TypeAdapter::ToNative(env, args)...); - } - - // Static method with class reference - template - static void Wrap(JNIEnv* env, jclass cls, - typename TypeAdapter::JNIType... args) - { - (*Method)(ClassObject::Ref::From(cls), - TypeAdapter::ToNative(env, args)...); - } -}; - -} // namespace detail - -// Form a stub wrapper from a native method's traits class and an implementing -// class. The stub wrapper has a Wrap function that will form a wrapped stub. -template -struct NativeStub : detail::NativeStubImpl -{ -}; - -// Generate a JNINativeMethod from a native -// method's traits class and a wrapped stub. -template -constexpr JNINativeMethod MakeNativeMethod(Ret (*stub)(JNIEnv*, Args...)) -{ - return { - Traits::name, - Traits::signature, - reinterpret_cast(stub) - }; -} - -// Class inherited by implementing class. -template -class NativeImpl -{ - typedef typename Cls::template Natives Natives; - - static bool sInited; - -public: - static void Init() { - if (sInited) { - return; - } - JNIEnv* const env = GetJNIForThread(); - env->RegisterNatives(Accessor::EnsureClassRef(env), - Natives::methods, - sizeof(Natives::methods) / sizeof(JNINativeMethod)); - sInited = true; - } - - NativeImpl() { - // Initialize on creation if not already initialized. - Init(); - } -}; - -// Define static member. -template -bool NativeImpl::sInited; - -} // namespace jni -} // namespace mozilla - -#endif // mozilla_jni_Natives_h__ diff --git a/widget/android/jni/Refs.h b/widget/android/jni/Refs.h index a2d202927bc..6198f743082 100644 --- a/widget/android/jni/Refs.h +++ b/widget/android/jni/Refs.h @@ -25,11 +25,10 @@ template class LocalRef; template class GlobalRef; // Type used for a reference parameter. Default is a wrapped object -// reference, but ParamImpl can be specialized to define custom behavior, +// reference, but Param can be specialized to define custom behavior, // e.g. a StringParam class that automatically converts nsAString& and // nsACString& to a jstring. -template struct ParamImpl { typedef Ref Type; }; -template using Param = typename ParamImpl::Type; +template struct Param { typedef Ref Type; }; // How exception during a JNI call should be treated. @@ -44,13 +43,6 @@ enum class ExceptionMode }; -// Class to hold the native types of a method's arguments. -// For example, if a method has signature (ILjava/lang/String;)V, -// its arguments class would be jni::Args -template -struct Args {}; - - // Base class for all JNI binding classes. // Templated so that we have one sClassRef for each class. template @@ -81,7 +73,7 @@ public: typedef jni::Ref Ref; typedef jni::LocalRef LocalRef; typedef jni::GlobalRef GlobalRef; - typedef const jni::Param& Param; + typedef const typename jni::Param::Type& Param; }; @@ -98,7 +90,7 @@ public: typedef jni::Ref Ref; typedef jni::LocalRef LocalRef; typedef jni::GlobalRef GlobalRef; - typedef const jni::Param& Param; + typedef const typename jni::Param::Type& Param; }; // Define bindings for built-in types. @@ -116,7 +108,7 @@ typedef TypedObject FloatArray; typedef TypedObject DoubleArray; typedef TypedObject ObjectArray; -template<> struct ParamImpl { class Type; }; +template<> struct Param { class Type; }; // Base class for Ref and its specializations. @@ -533,7 +525,7 @@ public: // Define a custom parameter type for String, // which accepts both String::Ref and nsAString/nsACString -class ParamImpl::Type : public Ref +class Param::Type : public Ref { private: // Not null if we should delete ref on destruction. diff --git a/widget/android/jni/Types.h b/widget/android/jni/Types.h index a8e67de5586..10b990878b3 100644 --- a/widget/android/jni/Types.h +++ b/widget/android/jni/Types.h @@ -28,8 +28,6 @@ template struct TypeAdapter; // TypeAdapter> applies when jobject is a return value. template struct TypeAdapter> { - typedef decltype(Ref(nullptr).Get()) JNIType; - static constexpr auto Call = &JNIEnv::CallObjectMethodA; static constexpr auto StaticCall = &JNIEnv::CallStaticObjectMethodA; static constexpr auto Get = &JNIEnv::GetObjectField; @@ -38,10 +36,6 @@ template struct TypeAdapter> { static LocalRef ToNative(JNIEnv* env, jobject instance) { return LocalRef::Adopt(env, instance); } - - static JNIType FromNative(JNIEnv*, LocalRef&& instance) { - return instance.Forget(); - } }; template constexpr jobject @@ -56,16 +50,10 @@ template constexpr jobject // TypeAdapter> applies when jobject is a parameter value. template struct TypeAdapter> { - typedef decltype(Ref(nullptr).Get()) JNIType; - static constexpr auto Set = &JNIEnv::SetObjectField; static constexpr auto StaticSet = &JNIEnv::SetStaticObjectField; - static Ref ToNative(JNIEnv* env, jobject instance) { - return Ref::From(instance); - } - - static JNIType FromNative(JNIEnv*, const Ref& instance) { + static jobject FromNative(JNIEnv*, const Ref& instance) { return instance.Get(); } }; @@ -77,7 +65,7 @@ template constexpr void // jstring has its own Param type. -template<> struct TypeAdapter> +template<> struct TypeAdapter::Type> : public TypeAdapter {}; @@ -85,8 +73,6 @@ template<> struct TypeAdapter> #define DEFINE_PRIMITIVE_TYPE_ADAPTER(NativeType, JNIType, JNIName) \ \ template<> struct TypeAdapter { \ - typedef JNIType JNI##Type; \ - \ static constexpr auto Call = &JNIEnv::Call ## JNIName ## MethodA; \ static constexpr auto StaticCall = &JNIEnv::CallStatic ## JNIName ## MethodA; \ static constexpr auto Get = &JNIEnv::Get ## JNIName ## Field; \ diff --git a/widget/android/jni/moz.build b/widget/android/jni/moz.build index 18d9e9b8829..db4145df5d7 100644 --- a/widget/android/jni/moz.build +++ b/widget/android/jni/moz.build @@ -6,7 +6,6 @@ EXPORTS.mozilla.jni += [ 'Accessors.h', - 'Natives.h', 'Refs.h', 'Types.h', 'Utils.h',