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

Delta Between Two Patch Sets: jni/JniJsValue.cpp

Issue 6606493159784448: New JNI bindings (Closed)
Left Patch Set: Reuploaded full diff Created March 28, 2014, 3:56 p.m.
Right Patch Set: Removed TODO from AppInfo. Created April 11, 2014, 1:28 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
« no previous file with change/comment | « jni/JniJsValue.h ('k') | jni/JniLogSystem.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 <http://adblockplus.org/>, 2 * This file is part of Adblock Plus <http://adblockplus.org/>,
3 * Copyright (C) 2006-2014 Eyeo GmbH 3 * Copyright (C) 2006-2014 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 jboolean JNICALL JniIsUndefined(JNIEnv* env, jclass clazz, jlong ptr)
23 {
24 try
25 {
26 return JniGetJsValue(ptr)->IsUndefined() ? JNI_TRUE : JNI_FALSE;
27 }
28 CATCH_THROW_AND_RETURN(env, JNI_FALSE)
29 }
30
31 static jboolean JNICALL JniIsNull(JNIEnv* env, jclass clazz, jlong ptr)
32 {
33 try
34 {
35 return JniGetJsValue(ptr)->IsNull() ? JNI_TRUE : JNI_FALSE;
36 }
37 CATCH_THROW_AND_RETURN(env, JNI_FALSE)
38 }
39
40 static jboolean JNICALL JniIsString(JNIEnv* env, jclass clazz, jlong ptr)
41 {
42 try
43 {
44 return JniGetJsValue(ptr)->IsString() ? JNI_TRUE : JNI_FALSE;
45 }
46 CATCH_THROW_AND_RETURN(env, JNI_FALSE)
47 }
48
49 static jboolean JNICALL JniIsBoolean(JNIEnv* env, jclass clazz, jlong ptr)
50 {
51 try
52 {
53 return JniGetJsValue(ptr)->IsBool() ? JNI_TRUE : JNI_FALSE;
54 }
55 CATCH_THROW_AND_RETURN(env, JNI_FALSE)
56 }
57
58 static jboolean JNICALL JniIsObject(JNIEnv* env, jclass clazz, jlong ptr)
59 {
60 try
61 {
62 return JniGetJsValue(ptr)->IsObject() ? JNI_TRUE : JNI_FALSE;
63 }
64 CATCH_THROW_AND_RETURN(env, JNI_FALSE)
65 }
66
67 static jboolean JNICALL JniIsArray(JNIEnv* env, jclass clazz, jlong ptr)
68 {
69 try
70 {
71 return JniGetJsValue(ptr)->IsArray() ? JNI_TRUE : JNI_FALSE;
72 }
73 CATCH_THROW_AND_RETURN(env, JNI_FALSE)
74 }
75
76 static jboolean JNICALL JniIsFunction(JNIEnv* env, jclass clazz, jlong ptr)
77 {
78 try
79 {
80 return JniGetJsValue(ptr)->IsFunction() ? JNI_TRUE : JNI_FALSE;
81 }
82 CATCH_THROW_AND_RETURN(env, JNI_FALSE)
83 }
84
85 static jstring JNICALL JniAsString(JNIEnv* env, jclass clazz, jlong ptr)
86 {
87 try
88 {
89 return env->NewStringUTF(JniGetJsValue(ptr)->AsString().c_str());
90 }
91 CATCH_THROW_AND_RETURN(env, 0)
92 }
93
94 static jlong JNICALL JniAsLong(JNIEnv* env, jclass clazz, jlong ptr)
95 {
96 try
97 {
98 return static_cast<jlong>(JniGetJsValue(ptr)->AsInt());
99 }
100 CATCH_THROW_AND_RETURN(env, 0)
101 }
102
103 static jboolean JNICALL JniAsBoolean(JNIEnv* env, jclass clazz, jlong ptr)
104 {
105 try
106 {
107 return JniGetJsValue(ptr)->AsBool() ? JNI_TRUE : JNI_FALSE;
108 }
109 CATCH_THROW_AND_RETURN(env, JNI_FALSE)
110 }
111
112 static jboolean JNICALL JniIsValid(JNIEnv* env, jclass clazz, jlong ptr)
113 {
114 return JniGetJsValue(ptr) ? JNI_TRUE : JNI_FALSE;
115 }
116
117 static jobject JNICALL JniAsList(JNIEnv* env, jclass clazz, jlong ptr)
118 {
119 try
120 {
121 AdblockPlus::JsValueList list = JniGetJsValue(ptr)->AsList();
122
123 return JniJsValueListToArrayList(env, list);
124 }
125 CATCH_THROW_AND_RETURN(env, 0)
126 }
127
128 static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr)
129 {
130 delete JniLongToTypePtr<AdblockPlus::JsValuePtr>(ptr);
131 }
132
22 jobject NewJniJsValue(JNIEnv* env, const AdblockPlus::JsValuePtr& jsValue) 133 jobject NewJniJsValue(JNIEnv* env, const AdblockPlus::JsValuePtr& jsValue)
23 { 134 {
24 jclass clazz = env->FindClass(PKG("JsValue")); 135 jclass clazz = env->FindClass(PKG("JsValue"));
25 jmethodID ctor = env->GetMethodID(clazz, "<init>", "(J)V"); 136 jmethodID ctor = env->GetMethodID(clazz, "<init>", "(J)V");
26 jlong ptr = JniPtrToLong(new AdblockPlus::JsValuePtr(jsValue)); 137 jlong ptr = JniPtrToLong(new AdblockPlus::JsValuePtr(jsValue));
27 return env->NewObject(clazz, ctor, ptr); 138 return env->NewObject(clazz, ctor, ptr);
28 } 139 }
29 140
30 AdblockPlus::JsValue* JniGetJsValue(jlong ptr) 141 AdblockPlus::JsValue* JniGetJsValue(jlong ptr)
31 { 142 {
32 return JniLongToTypePtr<AdblockPlus::JsValuePtr>(ptr)->get(); 143 return JniLongToTypePtr<AdblockPlus::JsValuePtr>(ptr)->get();
33 } 144 }
34 145
35 AdblockPlus::JsValuePtr& JniGetJsValuePtr(jlong ptr) 146 AdblockPlus::JsValuePtr& JniGetJsValuePtr(jlong ptr)
36 { 147 {
37 return *JniLongToTypePtr<AdblockPlus::JsValuePtr>(ptr); 148 return *JniLongToTypePtr<AdblockPlus::JsValuePtr>(ptr);
38 } 149 }
39 150
40 jobject JniJsValueList2ArrayList(JNIEnv* env, AdblockPlus::JsValueList& list) 151 jobject JniJsValueListToArrayList(JNIEnv* env, AdblockPlus::JsValueList& list)
41 { 152 {
42 jobject arrayList = NewJniArrayList(env); 153 jobject arrayList = NewJniArrayList(env);
43 154
44 for (AdblockPlus::JsValueList::iterator it = list.begin(), end = list.end(); i t != end; ++it) 155 for (AdblockPlus::JsValueList::iterator it = list.begin(), end = list.end(); i t != end; ++it)
45 { 156 {
46 JniAddObjectToList(env, arrayList, NewJniJsValue(env, *it)); 157 JniAddObjectToList(env, arrayList, NewJniJsValue(env, *it));
47 } 158 }
48 159
49 return arrayList; 160 return arrayList;
50 }
51
52 static jboolean JNICALL JniIsUndefined(JNIEnv* env, jclass clazz, jlong ptr)
Felix Dahlke 2014/03/28 17:28:41 Static stuff to the top here as well please.
René Jeschke 2014/04/11 12:25:53 Done.
53 {
54 TRY
55 {
56 return JniGetJsValue(ptr)->IsUndefined() ? JNI_TRUE : JNI_FALSE;
57 }
58 CATCH_THROW_AND_RETURN(env, JNI_FALSE)
59 }
60
61 static jboolean JNICALL JniIsNull(JNIEnv* env, jclass clazz, jlong ptr)
62 {
63 TRY
64 {
65 return JniGetJsValue(ptr)->IsNull() ? JNI_TRUE : JNI_FALSE;
66 }
67 CATCH_THROW_AND_RETURN(env, JNI_FALSE)
68 }
69
70 static jboolean JNICALL JniIsString(JNIEnv* env, jclass clazz, jlong ptr)
71 {
72 TRY
73 {
74 return JniGetJsValue(ptr)->IsString() ? JNI_TRUE : JNI_FALSE;
75 }
76 CATCH_THROW_AND_RETURN(env, JNI_FALSE)
77 }
78
79 static jboolean JNICALL JniIsBoolean(JNIEnv* env, jclass clazz, jlong ptr)
80 {
81 TRY
82 {
83 return JniGetJsValue(ptr)->IsBool() ? JNI_TRUE : JNI_FALSE;
84 }
85 CATCH_THROW_AND_RETURN(env, JNI_FALSE)
86 }
87
88 static jboolean JNICALL JniIsObject(JNIEnv* env, jclass clazz, jlong ptr)
89 {
90 TRY
91 {
92 return JniGetJsValue(ptr)->IsObject() ? JNI_TRUE : JNI_FALSE;
93 }
94 CATCH_THROW_AND_RETURN(env, JNI_FALSE)
95 }
96
97 static jboolean JNICALL JniIsArray(JNIEnv* env, jclass clazz, jlong ptr)
98 {
99 TRY
100 {
101 return JniGetJsValue(ptr)->IsArray() ? JNI_TRUE : JNI_FALSE;
102 }
103 CATCH_THROW_AND_RETURN(env, JNI_FALSE)
104 }
105
106 static jboolean JNICALL JniIsFunction(JNIEnv* env, jclass clazz, jlong ptr)
107 {
108 TRY
109 {
110 return JniGetJsValue(ptr)->IsFunction() ? JNI_TRUE : JNI_FALSE;
111 }
112 CATCH_THROW_AND_RETURN(env, JNI_FALSE)
113 }
114
115 static jstring JNICALL JniAsString(JNIEnv* env, jclass clazz, jlong ptr)
116 {
117 TRY
118 {
119 return env->NewStringUTF(JniGetJsValue(ptr)->AsString().c_str());
120 }
121 CATCH_THROW_AND_RETURN(env, 0)
122 }
123
124 static jlong JNICALL JniAsLong(JNIEnv* env, jclass clazz, jlong ptr)
125 {
126 TRY
127 {
128 return static_cast<jlong>(JniGetJsValue(ptr)->AsInt());
129 }
130 CATCH_THROW_AND_RETURN(env, 0)
131 }
132
133 static jboolean JNICALL JniAsBoolean(JNIEnv* env, jclass clazz, jlong ptr)
134 {
135 TRY
136 {
137 return JniGetJsValue(ptr)->AsBool() ? JNI_TRUE : JNI_FALSE;
138 }
139 CATCH_THROW_AND_RETURN(env, JNI_FALSE)
140 }
141
142 static jboolean JNICALL JniIsValid(JNIEnv* env, jclass clazz, jlong ptr)
143 {
144 return JniGetJsValue(ptr) ? JNI_TRUE : JNI_FALSE;
145 }
146
147 static jobject JNICALL JniAsList(JNIEnv* env, jclass clazz, jlong ptr)
148 {
149 TRY
150 {
151 AdblockPlus::JsValueList list = JniGetJsValue(ptr)->AsList();
152
153 return JniJsValueList2ArrayList(env, list);
154 }
155 CATCH_THROW_AND_RETURN(env, 0)
156 }
157
158 static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr)
159 {
160 delete JniLongToTypePtr<AdblockPlus::JsValuePtr>(ptr);
161 } 161 }
162 162
163 // TODO: List of functions that lack JNI bindings 163 // TODO: List of functions that lack JNI bindings
164 //std::vector<std::string> GetOwnPropertyNames() const; 164 //std::vector<std::string> GetOwnPropertyNames() const;
165 //JsValuePtr GetProperty(const std::string& name) const; 165 //JsValuePtr GetProperty(const std::string& name) const;
166 //void SetProperty(const std::string& name, const std::string& val); 166 //void SetProperty(const std::string& name, const std::string& val);
167 //void SetProperty(const std::string& name, int64_t val); 167 //void SetProperty(const std::string& name, int64_t val);
168 //void SetProperty(const std::string& name, bool val); 168 //void SetProperty(const std::string& name, bool val);
169 //void SetProperty(const std::string& name, JsValuePtr value); 169 //void SetProperty(const std::string& name, JsValuePtr value);
170 //void SetProperty(const std::string& name, const char* val); 170 //void SetProperty(const std::string& name, const char* val);
(...skipping 11 matching lines...) Expand all
182 { (char*)"isArray", (char*)"(J)Z", (void*)JniIsArray }, 182 { (char*)"isArray", (char*)"(J)Z", (void*)JniIsArray },
183 { (char*)"isFunction", (char*)"(J)Z", (void*)JniIsFunction }, 183 { (char*)"isFunction", (char*)"(J)Z", (void*)JniIsFunction },
184 { (char*)"asString", (char*)"(J)Ljava/lang/String;", (void*)JniAsString }, 184 { (char*)"asString", (char*)"(J)Ljava/lang/String;", (void*)JniAsString },
185 { (char*)"asLong", (char*)"(J)J", (void*)JniAsLong }, 185 { (char*)"asLong", (char*)"(J)J", (void*)JniAsLong },
186 { (char*)"asBoolean", (char*)"(J)Z", (void*)JniAsBoolean }, 186 { (char*)"asBoolean", (char*)"(J)Z", (void*)JniAsBoolean },
187 { (char*)"asList", (char*)"(J)Ljava/util/List;", (void*)JniAsList }, 187 { (char*)"asList", (char*)"(J)Ljava/util/List;", (void*)JniAsList },
188 { (char*)"isValid", (char*)"(J)Z", (void*)JniIsValid }, 188 { (char*)"isValid", (char*)"(J)Z", (void*)JniIsValid },
189 { (char*)"dtor", (char*)"(J)V", (void*)JniDtor } 189 { (char*)"dtor", (char*)"(J)V", (void*)JniDtor }
190 }; 190 };
191 191
192 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_android_api_JsValue_regis terNatives(JNIEnv *env, jclass clazz) 192 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_JsValue_re gisterNatives(JNIEnv *env, jclass clazz)
193 { 193 {
194 env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0])); 194 env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
195 } 195 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld