LEFT | RIGHT |
1 /* | 1 /* |
2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
3 * Copyright (C) 2006-2017 eyeo GmbH | 3 * Copyright (C) 2006-2017 eyeo GmbH |
4 * | 4 * |
5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
8 * | 8 * |
9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
(...skipping 19 matching lines...) Expand all Loading... |
30 { | 30 { |
31 delete JniLongToTypePtr<JniFilterChangeCallback>(ptr); | 31 delete JniLongToTypePtr<JniFilterChangeCallback>(ptr); |
32 } | 32 } |
33 | 33 |
34 JniFilterChangeCallback::JniFilterChangeCallback(JNIEnv* env, | 34 JniFilterChangeCallback::JniFilterChangeCallback(JNIEnv* env, |
35 jobject callbackObject) | 35 jobject callbackObject) |
36 : JniCallbackBase(env, callbackObject) | 36 : JniCallbackBase(env, callbackObject) |
37 { | 37 { |
38 } | 38 } |
39 | 39 |
40 void JniFilterChangeCallback::Callback(const std::string& arg, const AdblockPlus
::JsValue& jsValue) | 40 void JniFilterChangeCallback::Callback(const std::string& arg, AdblockPlus::JsVa
lue&& jsValue) |
41 { | 41 { |
42 JNIEnvAcquire env(GetJavaVM()); | 42 JNIEnvAcquire env(GetJavaVM()); |
43 | 43 |
44 jmethodID method = env->GetMethodID( | 44 jmethodID method = env->GetMethodID( |
45 *JniLocalReference<jclass>(*env, | 45 *JniLocalReference<jclass>(*env, |
46 env->GetObjectClass(GetCallbackObject())), | 46 env->GetObjectClass(GetCallbackObject())), |
47 "filterChangeCallback", "(Ljava/lang/String;" TYP("JsValue") ")V"); | 47 "filterChangeCallback", "(Ljava/lang/String;" TYP("JsValue") ")V"); |
48 | 48 |
49 if (method) | 49 if (method) |
50 { | 50 { |
51 JniLocalReference<jstring> jArg(*env, env->NewStringUTF(arg.c_str())); | 51 JniLocalReference<jstring> jArg(*env, env->NewStringUTF(arg.c_str())); |
52 JniLocalReference<jobject> jJsValue(*env, NewJniJsValue(*env, jsValue, GetJs
ValueClass())); | 52 JniLocalReference<jobject> jJsValue(*env, NewJniJsValue(*env, std::move(jsVa
lue), GetJsValueClass())); |
53 env->CallVoidMethod(GetCallbackObject(), method, *jArg, *jJsValue); | 53 env->CallVoidMethod(GetCallbackObject(), method, *jArg, *jJsValue); |
54 } | 54 } |
55 | 55 |
56 CheckAndLogJavaException(*env); | 56 CheckAndLogJavaException(*env); |
57 } | 57 } |
58 | 58 |
59 static JNINativeMethod methods[] = | 59 static JNINativeMethod methods[] = |
60 { | 60 { |
61 { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor }, | 61 { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor }, |
62 { (char*)"dtor", (char*)"(J)V", (void*)JniDtor } | 62 { (char*)"dtor", (char*)"(J)V", (void*)JniDtor } |
63 }; | 63 }; |
64 | 64 |
65 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_FilterChan
geCallback_registerNatives(JNIEnv *env, jclass clazz) | 65 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_FilterChan
geCallback_registerNatives(JNIEnv *env, jclass clazz) |
66 { | 66 { |
67 env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0])); | 67 env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0])); |
68 } | 68 } |
LEFT | RIGHT |