Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: libadblockplus-android/jni/JniFilterChangeCallback.cpp

Issue 29422558: Issue 5167 - Update to use libadblockplus revision dca8df9af1a7 (Closed)
Patch Set: removed unneeded intermediate variable Created April 26, 2017, 6:57 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
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
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, 40 void JniFilterChangeCallback::Callback(const std::string& arg, const AdblockPlus ::JsValue& jsValue)
41 const AdblockPlus::JsValuePtr jsValue)
42 { 41 {
43 JNIEnvAcquire env(GetJavaVM()); 42 JNIEnvAcquire env(GetJavaVM());
44 43
45 jmethodID method = env->GetMethodID( 44 jmethodID method = env->GetMethodID(
46 *JniLocalReference<jclass>(*env, 45 *JniLocalReference<jclass>(*env,
47 env->GetObjectClass(GetCallbackObject())), 46 env->GetObjectClass(GetCallbackObject())),
48 "filterChangeCallback", "(Ljava/lang/String;" TYP("JsValue") ")V"); 47 "filterChangeCallback", "(Ljava/lang/String;" TYP("JsValue") ")V");
49 48
50 if (method) 49 if (method)
51 { 50 {
52 JniLocalReference<jstring> jArg(*env, env->NewStringUTF(arg.c_str())); 51 JniLocalReference<jstring> jArg(*env, env->NewStringUTF(arg.c_str()));
53 JniLocalReference<jobject> jJsValue(*env, NewJniJsValue(*env, jsValue, GetJs ValueClass())); 52 JniLocalReference<jobject> jJsValue(*env, NewJniJsValue(*env, jsValue, GetJs ValueClass()));
54 env->CallVoidMethod(GetCallbackObject(), method, *jArg, *jJsValue); 53 env->CallVoidMethod(GetCallbackObject(), method, *jArg, *jJsValue);
55 } 54 }
56 55
57 CheckAndLogJavaException(*env); 56 CheckAndLogJavaException(*env);
58 } 57 }
59 58
60 static JNINativeMethod methods[] = 59 static JNINativeMethod methods[] =
61 { 60 {
62 { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor }, 61 { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor },
63 { (char*)"dtor", (char*)"(J)V", (void*)JniDtor } 62 { (char*)"dtor", (char*)"(J)V", (void*)JniDtor }
64 }; 63 };
65 64
66 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)
67 { 66 {
68 env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0])); 67 env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
69 } 68 }
OLDNEW

Powered by Google App Engine
This is Rietveld