Issue 5167 - Update to use libadblockplus revision dca8df9af1a7

libadblockplus-android/jni/JniJsValue.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 29 matching lines @@
 
 jclass GetJsValueClass()
 {
   return (jsValueClass != NULL ? jsValueClass->Get() : NULL);
 }
 
 static jboolean JNICALL JniIsUndefined(JNIEnv* env, jclass clazz, jlong ptr)
 {
   try
   {
-    return JniGetJsValue(ptr)->IsUndefined() ? JNI_TRUE : JNI_FALSE;
+    return JniGetJsValuePtr(ptr)->IsUndefined() ? JNI_TRUE : JNI_FALSE;
   }
   CATCH_THROW_AND_RETURN(env, JNI_FALSE)
 }
 
 static jboolean JNICALL JniIsNull(JNIEnv* env, jclass clazz, jlong ptr)
 {
   try
   {
-    return JniGetJsValue(ptr)->IsNull() ? JNI_TRUE : JNI_FALSE;
+    return JniGetJsValuePtr(ptr)->IsNull() ? JNI_TRUE : JNI_FALSE;
   }
   CATCH_THROW_AND_RETURN(env, JNI_FALSE)
 }
 
 static jboolean JNICALL JniIsNumber(JNIEnv* env, jclass clazz, jlong ptr)
 {
   try
   {
-    return JniGetJsValue(ptr)->IsNumber() ? JNI_TRUE : JNI_FALSE;
+    return JniGetJsValuePtr(ptr)->IsNumber() ? JNI_TRUE : JNI_FALSE;
   }
   CATCH_THROW_AND_RETURN(env, JNI_FALSE)
 }
 
 static jboolean JNICALL JniIsString(JNIEnv* env, jclass clazz, jlong ptr)
 {
   try
   {
-    return JniGetJsValue(ptr)->IsString() ? JNI_TRUE : JNI_FALSE;
+    return JniGetJsValuePtr(ptr)->IsString() ? JNI_TRUE : JNI_FALSE;
   }
   CATCH_THROW_AND_RETURN(env, JNI_FALSE)
 }
 
 static jboolean JNICALL JniIsBoolean(JNIEnv* env, jclass clazz, jlong ptr)
 {
   try
   {
-    return JniGetJsValue(ptr)->IsBool() ? JNI_TRUE : JNI_FALSE;
+    return JniGetJsValuePtr(ptr)->IsBool() ? JNI_TRUE : JNI_FALSE;
   }
   CATCH_THROW_AND_RETURN(env, JNI_FALSE)
 }
 
 static jboolean JNICALL JniIsObject(JNIEnv* env, jclass clazz, jlong ptr)
 {
   try
   {
-    return JniGetJsValue(ptr)->IsObject() ? JNI_TRUE : JNI_FALSE;
+    return JniGetJsValuePtr(ptr)->IsObject() ? JNI_TRUE : JNI_FALSE;
   }
   CATCH_THROW_AND_RETURN(env, JNI_FALSE)
 }
 
 static jboolean JNICALL JniIsArray(JNIEnv* env, jclass clazz, jlong ptr)
 {
   try
   {
-    return JniGetJsValue(ptr)->IsArray() ? JNI_TRUE : JNI_FALSE;
+    return JniGetJsValuePtr(ptr)->IsArray() ? JNI_TRUE : JNI_FALSE;
   }
   CATCH_THROW_AND_RETURN(env, JNI_FALSE)
 }
 
 static jboolean JNICALL JniIsFunction(JNIEnv* env, jclass clazz, jlong ptr)
 {
   try
   {
-    return JniGetJsValue(ptr)->IsFunction() ? JNI_TRUE : JNI_FALSE;
+    return JniGetJsValuePtr(ptr)->IsFunction() ? JNI_TRUE : JNI_FALSE;
   }
   CATCH_THROW_AND_RETURN(env, JNI_FALSE)
 }
 
 static jstring JNICALL JniAsString(JNIEnv* env, jclass clazz, jlong ptr)
 {
   try
   {
-    return env->NewStringUTF(JniGetJsValue(ptr)->AsString().c_str());
+    AdblockPlus::JsValue* jsValue = JniGetJsValuePtr(ptr);
+    return env->NewStringUTF(jsValue->AsString().c_str());
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
 static jlong JNICALL JniAsLong(JNIEnv* env, jclass clazz, jlong ptr)
 {
   try
   {
-    return static_cast<jlong>(JniGetJsValue(ptr)->AsInt());
+    return static_cast<jlong>(JniGetJsValuePtr(ptr)->AsInt());
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
 static jboolean JNICALL JniAsBoolean(JNIEnv* env, jclass clazz, jlong ptr)
 {
   try
   {
-    return JniGetJsValue(ptr)->AsBool() ? JNI_TRUE : JNI_FALSE;
+    return JniGetJsValuePtr(ptr)->AsBool() ? JNI_TRUE : JNI_FALSE;
   }
   CATCH_THROW_AND_RETURN(env, JNI_FALSE)
 }
 
 static jobject JNICALL JniAsList(JNIEnv* env, jclass clazz, jlong ptr)
 {
   try
   {
-    AdblockPlus::JsValueList list = JniGetJsValue(ptr)->AsList();
+    AdblockPlus::JsValueList list = JniGetJsValuePtr(ptr)->AsList();
 
     return JniJsValueListToArrayList(env, list);
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
 static jobject JNICALL JniGetProperty(JNIEnv* env, jclass clazz, jlong ptr, jstring name)
 {
   try
   {
-    return NewJniJsValue(env, JniGetJsValue(ptr)->GetProperty(JniJavaToStdString(env, name)));
+    return NewJniJsValue(env, JniGetJsValuePtr(ptr)->GetProperty(JniJavaToStdString(env, name)));
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
 static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr)
 {
-  delete JniLongToTypePtr<AdblockPlus::JsValuePtr>(ptr);
+  delete JniLongToTypePtr<AdblockPlus::JsValue>(ptr);
 }
 
-jobject NewJniJsValue(JNIEnv* env, const AdblockPlus::JsValuePtr& jsValue, jclass jsValueClassArg)
+jobject NewJniJsValue(JNIEnv* env, const AdblockPlus::JsValue& jsValue, jclass jsValueClassArg)

[sergei, 2017/04/26 09:20:59]

The same (see Utils) regarding r-value is here. For the case with `JsValue&&
jsValue` the call below should be `new JsValue(std::move(jsValue))`.

[sergei, 2017/04/26 14:12:56]

What about it?

 {
-  if (!jsValue.get())
-  {
-    return 0;
-  }
-
-  jlong ptr = JniPtrToLong(new AdblockPlus::JsValuePtr(jsValue));
-  return env->NewObject(jsValueClass->Get(), jsValueCtor, ptr);
+  return env->NewObject(jsValueClass->Get(), jsValueCtor, new AdblockPlus::JsValue(jsValue));
 }
 
-AdblockPlus::JsValue* JniGetJsValue(jlong ptr)
+AdblockPlus::JsValue* JniGetJsValuePtr(jlong ptr)
 {
-  return JniLongToTypePtr<AdblockPlus::JsValuePtr>(ptr)->get();
+  return JniLongToTypePtr<AdblockPlus::JsValue>(ptr);
 }
 
-AdblockPlus::JsValuePtr& JniGetJsValuePtr(jlong ptr)
+AdblockPlus::JsValue& JniGetJsValue(jlong ptr)
 {
-  return *JniLongToTypePtr<AdblockPlus::JsValuePtr>(ptr);
+  return *JniLongToTypePtr<AdblockPlus::JsValue>(ptr);
 }
 
-jobject JniJsValueListToArrayList(JNIEnv* env, AdblockPlus::JsValueList& list)
+jobject JniJsValueListToArrayList(JNIEnv* env, const AdblockPlus::JsValueList& list)

[sergei, 2017/04/26 09:21:00]

Here it would be also better to use `JsValueList& list` and below
for (auto& entry : list)
{
  JniAddObjectToList(env, arrayList, *JniLocalReference<jobject>(env,
NewJniJsValue(env, move(entry))));
}

[sergei, 2017/04/26 14:12:56]

What about it?

[anton, 2017/04/27 06:21:00]

Acknowledged. Now moving in NewJniObject(..){ ... std::move() ... } 

 {
   jobject arrayList = NewJniArrayList(env);
 
-  for (AdblockPlus::JsValueList::iterator it = list.begin(), end = list.end(); it != end; ++it)
+  for (AdblockPlus::JsValueList::const_iterator it = list.begin(), end = list.end(); it != end; ++it)
   {
     JniAddObjectToList(env, arrayList,
         *JniLocalReference<jobject>(env, NewJniJsValue(env, *it)));
   }
 
   return arrayList;
 }
 
 // TODO: List of functions that lack JNI bindings
 //std::vector<std::string> GetOwnPropertyNames() const;
 //void SetProperty(const std::string& name, const std::string& val);
 //void SetProperty(const std::string& name, int64_t val);
 //void SetProperty(const std::string& name, bool val);
-//void SetProperty(const std::string& name, JsValuePtr value);
+//void SetProperty(const std::string& name, JsValue value);
 //void SetProperty(const std::string& name, const char* val);
 //inline void SetProperty(const std::string& name, int val);
 //std::string GetClass() const;
-//JsValuePtr Call(const JsValueList& params = JsValueList(), AdblockPlus::JsValuePtr thisPtr = AdblockPlus::JsValuePtr()) const;
+//JsValue Call(const JsValueList& params = JsValueList(), AdblockPlus::JsValue thisPtr = AdblockPlus::JsValue()) const;

[sergei, 2017/04/26 09:21:00]

I think the types of JsValue now are slightly different, but it's fine me.

[anton, 2017/04/27 06:21:00]

i wil revert this

 
 static JNINativeMethod methods[] =
 {
   { (char*)"isUndefined", (char*)"(J)Z", (void*)JniIsUndefined },
   { (char*)"isNull", (char*)"(J)Z", (void*)JniIsNull },
   { (char*)"isNumber", (char*)"(J)Z", (void*)JniIsNumber },
   { (char*)"isString", (char*)"(J)Z", (void*)JniIsString },
   { (char*)"isBoolean", (char*)"(J)Z", (void*)JniIsBoolean },
   { (char*)"isObject", (char*)"(J)Z", (void*)JniIsObject },
   { (char*)"isArray", (char*)"(J)Z", (void*)JniIsArray },
   { (char*)"isFunction", (char*)"(J)Z", (void*)JniIsFunction },
   { (char*)"asString", (char*)"(J)Ljava/lang/String;", (void*)JniAsString },
   { (char*)"asLong", (char*)"(J)J", (void*)JniAsLong },
   { (char*)"asBoolean", (char*)"(J)Z", (void*)JniAsBoolean },
   { (char*)"asList", (char*)"(J)Ljava/util/List;", (void*)JniAsList },
   { (char*)"getProperty", (char*)"(JLjava/lang/String;)" TYP("JsValue"), (void*)JniGetProperty },
   { (char*)"dtor", (char*)"(J)V", (void*)JniDtor }
 };
 
 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_JsValue_registerNatives(JNIEnv *env, jclass clazz)
 {
   env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
 }