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

Delta Between Two Patch Sets: jni/JniEventCallback.cpp

Issue 6606493159784448: New JNI bindings (Closed)
Left Patch Set: Cleaned up namespace usage in cpp files. Created March 20, 2014, 3:17 p.m.
Right Patch Set: Removed TODO from AppInfo. Created April 11, 2014, 1:28 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « jni/JniCallbacks.cpp ('k') | jni/JniFilter.cpp » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 /* 1 /*
2 * This file is part of Adblock Plus <http://adblockplus.org/>, 2 * This file is part of Adblock Plus <http://adblockplus.org/>,
3 * Copyright (C) 2006-2014 Eyeo GmbH 3 * Copyright (C) 2006-2014 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
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 #include "JniCallbacks.h" 18 #include "JniCallbacks.h"
19 19
20 AdblockPlus::Android::JniEventCallback::JniEventCallback(JNIEnv* env, jobject ca llbackObject) : 20 static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jobject callbackObject)
Felix Dahlke 2014/03/28 08:29:00 Should be broken before ":", not after it, accord
21 JniCallbackBase(env, callbackObject) 21 {
22 try
23 {
24 return JniPtrToLong(new JniEventCallback(env, callbackObject));
25 }
26 CATCH_THROW_AND_RETURN(env, 0)
27 }
28
29 static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr)
30 {
31 delete JniLongToTypePtr<JniEventCallback>(ptr);
32 }
33
34 JniEventCallback::JniEventCallback(JNIEnv* env, jobject callbackObject)
35 : JniCallbackBase(env, callbackObject)
22 { 36 {
23 } 37 }
24 38
25 AdblockPlus::Android::JniEventCallback::~JniEventCallback() 39 void JniEventCallback::Callback(AdblockPlus::JsValueList& params)
26 { 40 {
27 } 41 JNIEnvAcquire env(GetJavaVM());
28
29 void AdblockPlus::Android::JniEventCallback::Callback(AdblockPlus::JsValueList& params)
30 {
31 AdblockPlus::Android::JNIEnvAcquire env(GetJavaVM());
Felix Dahlke 2014/03/28 08:29:00 Capitalisation is inconsistent here, "JniEventCall
René Jeschke 2014/03/28 10:59:15 It is called JNIEnvAcquire because it acquires a t
Felix Dahlke 2014/03/28 11:27:18 Yeah you're right, that's better.
32 42
33 jclass clazz = env->GetObjectClass(GetCallbackObject()); 43 jclass clazz = env->GetObjectClass(GetCallbackObject());
34 jmethodID method = env->GetMethodID(clazz, "eventCallback", "(Ljava/util/List; )V"); 44 jmethodID method = env->GetMethodID(clazz, "eventCallback", "(Ljava/util/List; )V");
35 45
36 if (method) 46 if (method)
37 { 47 {
38 jobject jsList = AdblockPlus::Android::JniJsValueList2ArrayList(*env, params ); 48 jobject jsList = JniJsValueListToArrayList(*env, params);
39 env->CallVoidMethod(GetCallbackObject(), method, jsList); 49 env->CallVoidMethod(GetCallbackObject(), method, jsList);
40 } 50 }
41 } 51 }
42 52
43 static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jobject callbackObject)
Felix Dahlke 2014/03/28 08:29:00 We mostly use unnamed namespaces instead of static
44 {
45 TRY
46 {
47 return AdblockPlus::Android::JniPtr2Long(new AdblockPlus::Android::JniEventC allback(env, callbackObject));
48 }
49 CATCH_THROW_AND_RETURN(env, 0)
50 }
51
52 static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr)
53 {
54 delete AdblockPlus::Android::JniLong2TypePtr<AdblockPlus::Android::JniEventCal lback>(ptr);
Felix Dahlke 2014/03/28 08:29:00 I'd much prefer "JniLongToTypePtr" since this had
55 }
56
57 static JNINativeMethod methods[] = 53 static JNINativeMethod methods[] =
58 { 54 {
59 { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor }, 55 { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor },
Felix Dahlke 2014/03/28 08:29:00 1. Note that as per our coding style, new code sho
60 { (char*)"dtor", (char*)"(J)V", (void*)JniDtor }, }; 56 { (char*)"dtor", (char*)"(J)V", (void*)JniDtor }
57 };
61 58
62 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_android_api_EventCallback _registerNatives(JNIEnv *env, jclass clazz) 59 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_EventCallb ack_registerNatives(JNIEnv *env, jclass clazz)
63 { 60 {
64 env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0])); 61 env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
65 } 62 }
63
LEFTRIGHT

Powered by Google App Engine
This is Rietveld