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

Delta Between Two Patch Sets: libadblockplus-android/jni/JniJsValue.h

Issue 29345737: Issue 4146 - Fix failing UpdateCheckTest.testApplicationUpdateAvailable test in libadblockplus-andr… (Closed)
Left Patch Set: moved entry points to JniLibrary.cpp Created Sept. 14, 2016, 7:38 a.m.
Right Patch Set: using jni version define from Utils.h Created Sept. 16, 2016, 6:30 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
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 #ifndef JNIJSVALUE_H 18 #ifndef JNIJSVALUE_H
19 #define JNIJSVALUE_H 19 #define JNIJSVALUE_H
20 20
21 #include <jni.h> 21 #include <jni.h>
22 #include <AdblockPlus/JsValue.h> 22 #include <AdblockPlus/JsValue.h>
23 23
24 void JniJsValue_OnLoad(JavaVM* vm, JNIEnv* env, void* reserved); 24 void JniJsValue_OnLoad(JavaVM* vm, JNIEnv* env, void* reserved);
25 25
26 void JniJsValue_OnUnload(JavaVM* vm, JNIEnv* env, void* reserved);
27
26 jobject NewJniJsValue(JNIEnv* env, const AdblockPlus::JsValuePtr& jsValue, jclas s jsValueClass = 0); 28 jobject NewJniJsValue(JNIEnv* env, const AdblockPlus::JsValuePtr& jsValue, jclas s jsValueClass = 0);
27 29
28 jobject JniJsValueListToArrayList(JNIEnv* env, AdblockPlus::JsValueList& list); 30 jobject JniJsValueListToArrayList(JNIEnv* env, AdblockPlus::JsValueList& list);
29 31
30 AdblockPlus::JsValue* JniGetJsValue(jlong ptr); 32 AdblockPlus::JsValue* JniGetJsValue(jlong ptr);
31 33
32 AdblockPlus::JsValuePtr& JniGetJsValuePtr(jlong ptr); 34 AdblockPlus::JsValuePtr& JniGetJsValuePtr(jlong ptr);
33 35
34 void JniJsValue_OnUnload(JavaVM *vm, JNIEnv *env, void *reserved);
Felix Dahlke 2016/09/15 13:01:19 Nit: Maybe it's just me, but I think I'd find it e
anton 2016/09/15 13:28:18 Acknowledged.
35
36 #endif /* JNIJSVALUE_H */ 36 #endif /* JNIJSVALUE_H */
LEFTRIGHT

Powered by Google App Engine
This is Rietveld