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

Delta Between Two Patch Sets: jni/JniUpdaterCallback.cpp

Issue 6606493159784448: New JNI bindings (Closed)
Left Patch Set: Bug fix for global references (shadowing) Created March 31, 2014, 2:43 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/JniSubscription.cpp ('k') | jni/JniWebRequest.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
20 static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jobject callbackObject)
21 {
22 try
23 {
24 return JniPtrToLong(new JniUpdaterCallback(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<JniUpdaterCallback>(ptr);
32 }
19 33
20 JniUpdaterCallback::JniUpdaterCallback(JNIEnv* env, jobject callbackObject) 34 JniUpdaterCallback::JniUpdaterCallback(JNIEnv* env, jobject callbackObject)
21 : JniCallbackBase(env, callbackObject) 35 : JniCallbackBase(env, callbackObject)
22 { 36 {
23 } 37 }
24 38
25 void JniUpdaterCallback::Callback(const std::string& arg) 39 void JniUpdaterCallback::Callback(const std::string& arg)
26 { 40 {
27 JNIEnvAcquire env(GetJavaVM()); 41 JNIEnvAcquire env(GetJavaVM());
28 42
29 jclass clazz = env->GetObjectClass(GetCallbackObject()); 43 jclass clazz = env->GetObjectClass(GetCallbackObject());
30 jmethodID method = env->GetMethodID(clazz, "updateCallback", "(Ljava/lang/Stri ng;)V"); 44 jmethodID method = env->GetMethodID(clazz, "updateCallback", "(Ljava/lang/Stri ng;)V");
31 45
32 if (method) 46 if (method)
33 { 47 {
34 jstring jArg = env->NewStringUTF(arg.c_str()); 48 jstring jArg = env->NewStringUTF(arg.c_str());
35 env->CallVoidMethod(GetCallbackObject(), method, jArg); 49 env->CallVoidMethod(GetCallbackObject(), method, jArg);
36 } 50 }
37 51
38 CheckAndLogJavaException(*env); 52 CheckAndLogJavaException(*env);
39 } 53 }
40 54
41 static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jobject callbackObject)
42 {
43 TRY
44 {
45 return JniPtrToLong(new JniUpdaterCallback(env, callbackObject));
46 }
47 CATCH_THROW_AND_RETURN(env, 0)
48 }
49
50 static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr)
51 {
52 delete JniLongToTypePtr<JniUpdaterCallback>(ptr);
53 }
54
55 static JNINativeMethod methods[] = 55 static JNINativeMethod methods[] =
56 { 56 {
57 { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor }, 57 { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor },
58 { (char*)"dtor", (char*)"(J)V", (void*)JniDtor } 58 { (char*)"dtor", (char*)"(J)V", (void*)JniDtor }
59 }; 59 };
60 60
61 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_UpdaterCal lback_registerNatives(JNIEnv *env, jclass clazz) 61 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_UpdaterCal lback_registerNatives(JNIEnv *env, jclass clazz)
62 { 62 {
63 env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0])); 63 env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
64 } 64 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld