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

Side by Side Diff: jni/JniEventCallback.cpp

Issue 4761138508070912: Issue 1848 - Clean up local reference handling (Closed)
Patch Set: Created Jan. 22, 2015, 6:53 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « jni/JniCallbacks.cpp ('k') | jni/JniFilter.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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-2015 Eyeo GmbH 3 * Copyright (C) 2006-2015 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 22 matching lines...) Expand all
33 33
34 JniEventCallback::JniEventCallback(JNIEnv* env, jobject callbackObject) 34 JniEventCallback::JniEventCallback(JNIEnv* env, jobject callbackObject)
35 : JniCallbackBase(env, callbackObject) 35 : JniCallbackBase(env, callbackObject)
36 { 36 {
37 } 37 }
38 38
39 void JniEventCallback::Callback(AdblockPlus::JsValueList& params) 39 void JniEventCallback::Callback(AdblockPlus::JsValueList& params)
40 { 40 {
41 JNIEnvAcquire env(GetJavaVM()); 41 JNIEnvAcquire env(GetJavaVM());
42 42
43 jclass clazz = env->GetObjectClass(GetCallbackObject()); 43 jmethodID method = env->GetMethodID(
44 jmethodID method = env->GetMethodID(clazz, "eventCallback", "(Ljava/util/List; )V"); 44 *JniLocalReference<jclass>(*env, env->GetObjectClass(GetCallbackObject())) ,
45 "eventCallback", "(Ljava/util/List;)V");
45 46
46 if (method) 47 if (method)
47 { 48 {
48 jobject jsList = JniJsValueListToArrayList(*env, params); 49 jobject jsList = JniJsValueListToArrayList(*env, params);
49 env->CallVoidMethod(GetCallbackObject(), method, jsList); 50 env->CallVoidMethod(GetCallbackObject(), method, jsList);
50 } 51 }
51 } 52 }
52 53
53 static JNINativeMethod methods[] = 54 static JNINativeMethod methods[] =
54 { 55 {
55 { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor }, 56 { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor },
56 { (char*)"dtor", (char*)"(J)V", (void*)JniDtor } 57 { (char*)"dtor", (char*)"(J)V", (void*)JniDtor }
57 }; 58 };
58 59
59 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_EventCallb ack_registerNatives(JNIEnv *env, jclass clazz) 60 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_EventCallb ack_registerNatives(JNIEnv *env, jclass clazz)
60 { 61 {
61 env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0])); 62 env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
62 } 63 }
63 64
OLDNEW
« no previous file with comments | « jni/JniCallbacks.cpp ('k') | jni/JniFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld