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

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

Issue 29422558: Issue 5167 - Update to use libadblockplus revision dca8df9af1a7 (Closed)
Left Patch Set: using move ctors, reverted some unrelated changes Created April 27, 2017, 6:19 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/JniNotification.cpp ('k') | libadblockplus-android/jni/JniSubscription.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 19 matching lines...) Expand all
30 { 30 {
31 delete JniLongToTypePtr<JniShowNotificationCallback>(ptr); 31 delete JniLongToTypePtr<JniShowNotificationCallback>(ptr);
32 } 32 }
33 33
34 JniShowNotificationCallback::JniShowNotificationCallback(JNIEnv* env, 34 JniShowNotificationCallback::JniShowNotificationCallback(JNIEnv* env,
35 jobject callbackObject) 35 jobject callbackObject)
36 : JniCallbackBase(env, callbackObject) 36 : JniCallbackBase(env, callbackObject)
37 { 37 {
38 } 38 }
39 39
40 void JniShowNotificationCallback::Callback(AdblockPlus::Notification& notificati on) 40 void JniShowNotificationCallback::Callback(AdblockPlus::Notification&& notificat ion)
41 { 41 {
42 JNIEnvAcquire env(GetJavaVM()); 42 JNIEnvAcquire env(GetJavaVM());
43 43
44 jmethodID method = env->GetMethodID( 44 jmethodID method = env->GetMethodID(
45 *JniLocalReference<jclass>(*env, 45 *JniLocalReference<jclass>(*env,
46 env->GetObjectClass(GetCallbackObject())), 46 env->GetObjectClass(GetCallbackObject())),
47 "showNotificationCallback", "(" TYP("Notification") ")V"); 47 "showNotificationCallback", "(" TYP("Notification") ")V");
48 48
49 if (method) 49 if (method)
50 { 50 {
51 JniLocalReference<jobject> jNotification(*env, NewJniNotification(*env, noti fication)); 51 JniLocalReference<jobject> jNotification(*env, NewJniNotification(*env, std: :move(notification)));
52 env->CallVoidMethod(GetCallbackObject(), method, *jNotification); 52 env->CallVoidMethod(GetCallbackObject(), method, *jNotification);
53 } 53 }
54 54
55 CheckAndLogJavaException(*env); 55 CheckAndLogJavaException(*env);
56 } 56 }
57 57
58 static JNINativeMethod methods[] = 58 static JNINativeMethod methods[] =
59 { 59 {
60 { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor }, 60 { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor },
61 { (char*)"dtor", (char*)"(J)V", (void*)JniDtor } 61 { (char*)"dtor", (char*)"(J)V", (void*)JniDtor }
62 }; 62 };
63 63
64 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_ShowNotifi cationCallback_registerNatives(JNIEnv *env, jclass clazz) 64 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_ShowNotifi cationCallback_registerNatives(JNIEnv *env, jclass clazz)
65 { 65 {
66 env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0])); 66 env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
67 } 67 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld