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

Side by Side Diff: adblock-android/jni/JniPlatform.cpp

Issue 29908555: Issue 7035 - Update libadblockplus dependency (Closed) Base URL: git@github.com:adblockplus/libadblockplus-android.git@d150f08d5d72de8938c7ebbdccd9b0c4e06b4070
Patch Set: Issue 7035 - Update libadblockplus dependency Created Oct. 15, 2018, 9:53 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
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-present eyeo GmbH 3 * Copyright (C) 2006-present 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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 126
127 static void JNICALL JniEnsureFilterEngine(JNIEnv* env, jclass clazz, jlong ptr) 127 static void JNICALL JniEnsureFilterEngine(JNIEnv* env, jclass clazz, jlong ptr)
128 { 128 {
129 try 129 try
130 { 130 {
131 GetPlatformRef(ptr).GetFilterEngine(); 131 GetPlatformRef(ptr).GetFilterEngine();
132 } 132 }
133 CATCH_AND_THROW(env) 133 CATCH_AND_THROW(env)
134 } 134 }
135 135
136 static void JNICALL JniEnsureUpdater(JNIEnv* env, jclass clazz, jlong ptr)
137 {
138 try
139 {
140 GetPlatformRef(ptr).GetUpdater();
141 }
142 CATCH_AND_THROW(env)
143 }
144
136 static JNINativeMethod methods[] = 145 static JNINativeMethod methods[] =
137 { 146 {
138 { (char*)"ctor", (char*)"(" TYP("LogSystem") TYP("WebRequest") "Ljava/lang/Str ing;)J", (void*)JniCtor }, 147 { (char*)"ctor", (char*)"(" TYP("LogSystem") TYP("WebRequest") "Ljava/lang/Str ing;)J", (void*)JniCtor },
139 { (char*)"dtor", (char*)"(J)V", (void*)JniDtor }, 148 { (char*)"dtor", (char*)"(J)V", (void*)JniDtor },
140 149
141 { (char*)"setUpJsEngine", (char*)"(J" TYP("AppInfo") "J)V", (void*)JniSetUpJsE ngine }, 150 { (char*)"setUpJsEngine", (char*)"(J" TYP("AppInfo") "J)V", (void*)JniSetUpJsE ngine },
142 { (char*)"getJsEnginePtr", (char*)"(J)J", (void*)JniGetJsEnginePtr }, 151 { (char*)"getJsEnginePtr", (char*)"(J)J", (void*)JniGetJsEnginePtr },
143 { (char*)"setUpFilterEngine", (char*)"(J" TYP("IsAllowedConnectionCallback") " )V", (void*)JniSetUpFilterEngine }, 152 { (char*)"setUpFilterEngine", (char*)"(J" TYP("IsAllowedConnectionCallback") " )V", (void*)JniSetUpFilterEngine },
144 { (char*)"ensureFilterEngine", (char*)"(J)V", (void*)JniEnsureFilterEngine } 153 { (char*)"ensureFilterEngine", (char*)"(J)V", (void*)JniEnsureFilterEngine },
154 { (char*)"ensureUpdater", (char*)"(J)V", (void*)JniEnsureUpdater }
145 }; 155 };
146 156
147 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_Platform_r egisterNatives(JNIEnv *env, jclass clazz) 157 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_Platform_r egisterNatives(JNIEnv *env, jclass clazz)
148 { 158 {
149 env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0])); 159 env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
150 } 160 }
OLDNEW

Powered by Google App Engine
This is Rietveld