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

Delta Between Two Patch Sets: libadblockplus-android/jni/JniEventCallback.cpp

Issue 29422558: Issue 5167 - Update to use libadblockplus revision dca8df9af1a7 (Closed)
Left Patch Set: removed unneeded intermediate variable Created April 26, 2017, 6:57 a.m.
Right Patch Set: updated dependencies (..-binaries) Created May 10, 2017, 6:54 a.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 | « libadblockplus-android/jni/JniCallbacks.h ('k') | libadblockplus-android/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 <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 18 matching lines...) Expand all
29 static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr) 29 static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr)
30 { 30 {
31 delete JniLongToTypePtr<JniEventCallback>(ptr); 31 delete JniLongToTypePtr<JniEventCallback>(ptr);
32 } 32 }
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(const AdblockPlus::JsValueList& params) 39 void JniEventCallback::Callback(AdblockPlus::JsValueList&& params)
40 { 40 {
41 JNIEnvAcquire env(GetJavaVM()); 41 JNIEnvAcquire env(GetJavaVM());
42 42
43 jmethodID method = env->GetMethodID( 43 jmethodID method = env->GetMethodID(
44 *JniLocalReference<jclass>(*env, 44 *JniLocalReference<jclass>(*env,
45 env->GetObjectClass(GetCallbackObject())), 45 env->GetObjectClass(GetCallbackObject())),
46 "eventCallback", "(Ljava/util/List;)V"); 46 "eventCallback", "(Ljava/util/List;)V");
47 47
48 if (method) 48 if (method)
49 { 49 {
50 jobject jsList = JniJsValueListToArrayList(*env, params); 50 jobject jsList = JniJsValueListToArrayList(*env, std::move(params));
sergei 2017/04/26 09:20:59 That's a good point, I think libadblockplus should
anton 2017/04/26 10:22:58 Acknowledged.
51 env->CallVoidMethod(GetCallbackObject(), method, jsList); 51 env->CallVoidMethod(GetCallbackObject(), method, jsList);
52 } 52 }
53 } 53 }
54 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_EventCallb ack_registerNatives(JNIEnv *env, jclass clazz) 61 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_EventCallb ack_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 }
65 65
LEFTRIGHT

Powered by Google App Engine
This is Rietveld