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

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

Issue 29347012: Issue 4188 - Update libadblockplus-android to use the latest libadblockplus (Closed)
Left Patch Set: Changes in libadblockplus-android repo with Sergei's changes Created Aug. 30, 2016, 11:02 a.m.
Right Patch Set: removed ctors with JsValue argument Created Dec. 12, 2016, 2:22 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
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-2016 Eyeo GmbH 3 * Copyright (C) 2006-2016 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 <AdblockPlus.h> 18 #include <AdblockPlus.h>
19 #include "Utils.h" 19 #include "Utils.h"
20 #include "JniJsValue.h" 20 #include "JniJsValue.h"
21 21
22 static AdblockPlus::Filter* GetFilterPtr(jlong ptr) 22 static AdblockPlus::Filter* GetFilterPtr(jlong ptr)
23 { 23 {
24 return JniLongToTypePtr<AdblockPlus::FilterPtr>(ptr)->get(); 24 return JniLongToTypePtr<AdblockPlus::FilterPtr>(ptr)->get();
25 }
26
27 static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jlong jsValue)
28 {
29 try
30 {
31 return JniPtrToLong(new AdblockPlus::FilterPtr(
32 *JniLongToTypePtr<AdblockPlus::FilterPtr>(jsValue)));
33 }
34 CATCH_THROW_AND_RETURN(env, 0)
35 } 25 }
36 26
37 static jobject JNICALL JniGetType(JNIEnv* env, jclass clazz, jlong ptr) 27 static jobject JNICALL JniGetType(JNIEnv* env, jclass clazz, jlong ptr)
38 { 28 {
39 AdblockPlus::Filter::Type type; 29 AdblockPlus::Filter::Type type;
40 try 30 try
41 { 31 {
42 type = GetFilterPtr(ptr)->GetType(); 32 type = GetFilterPtr(ptr)->GetType();
43 } 33 }
44 CATCH_THROW_AND_RETURN(env, 0) 34 CATCH_THROW_AND_RETURN(env, 0)
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 97
108 try 98 try
109 { 99 {
110 return *me == *other ? JNI_TRUE : JNI_FALSE; 100 return *me == *other ? JNI_TRUE : JNI_FALSE;
111 } 101 }
112 CATCH_THROW_AND_RETURN(env, JNI_FALSE) 102 CATCH_THROW_AND_RETURN(env, JNI_FALSE)
113 } 103 }
114 104
115 static JNINativeMethod methods[] = 105 static JNINativeMethod methods[] =
116 { 106 {
117 { (char*)"ctor", (char*)"(J)J", (void*)JniCtor },
sergei 2016/08/30 12:52:54 Who deletes created in JniCtor "new AdblockPlus::F
sergei 2016/08/31 13:21:04 I see that constructor of Filter passes argument t
118 { (char*)"getType", (char*)"(J)" TYP("Filter$Type"), (void*)JniGetType }, 107 { (char*)"getType", (char*)"(J)" TYP("Filter$Type"), (void*)JniGetType },
119 { (char*)"isListed", (char*)"(J)Z", (void*)JniIsListed }, 108 { (char*)"isListed", (char*)"(J)Z", (void*)JniIsListed },
120 { (char*)"addToList", (char*)"(J)V", (void*)JniAddToList }, 109 { (char*)"addToList", (char*)"(J)V", (void*)JniAddToList },
121 { (char*)"removeFromList", (char*)"(J)V", (void*)JniRemoveFromList }, 110 { (char*)"removeFromList", (char*)"(J)V", (void*)JniRemoveFromList },
122 { (char*)"operatorEquals", (char*)"(JJ)Z", (void*)JniOperatorEquals } 111 { (char*)"operatorEquals", (char*)"(JJ)Z", (void*)JniOperatorEquals }
123 }; 112 };
124 113
125 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_Filter_reg isterNatives(JNIEnv *env, jclass clazz) 114 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_Filter_reg isterNatives(JNIEnv *env, jclass clazz)
126 { 115 {
127 env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0])); 116 env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
128 } 117 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld