Issue 5167 - Update to use libadblockplus revision dca8df9af1a7

libadblockplus-android/jni/JniJsEngine.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 38 matching lines @@
 {
   delete JniLongToTypePtr<AdblockPlus::JsEnginePtr>(ptr);
 }
 
 static void JNICALL JniSetEventCallback(JNIEnv* env, jclass clazz, jlong ptr, jstring jEventName, jlong jCallbackPtr)
 {
   AdblockPlus::JsEnginePtr& engine = *JniLongToTypePtr<AdblockPlus::JsEnginePtr>(ptr);
 
   JniEventCallback* callback = JniLongToTypePtr<JniEventCallback>(jCallbackPtr);
   std::string eventName = JniJavaToStdString(env, jEventName);
-  const AdblockPlus::JsEngine::EventCallback eCallback =

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

the `const` is not required here.

[anton, 2017/04/26 10:22:59]

Acknowledged.

-    std::bind(&JniEventCallback::Callback, callback, std::placeholders::_1);
+
+  auto eCallback = [callback](AdblockPlus::JsValueList&& params)
+  {
+    callback->Callback(std::move(params));
+  };
 
   try
   {
     engine->SetEventCallback(eventName, eCallback);
   }
   CATCH_AND_THROW(env)
 }
 
 static void JNICALL JniRemoveEventCallback(JNIEnv* env, jclass clazz, jlong ptr, jstring jEventName)
 {
@@ skipping 10 matching lines @@
 
 static jobject JNICALL JniEvaluate(JNIEnv* env, jclass clazz, jlong ptr, jstring jSource, jstring jFilename)
 {
   AdblockPlus::JsEnginePtr& engine = *JniLongToTypePtr<AdblockPlus::JsEnginePtr>(ptr);
 
   std::string source = JniJavaToStdString(env, jSource);
   std::string filename = JniJavaToStdString(env, jFilename);
 
   try
   {
-    AdblockPlus::JsValue jsValue = engine->Evaluate(source, filename);
-    return NewJniJsValue(env, jsValue);

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

to avoid call of a copy-ctr one has to either
return NewJniJsValue(env, engine->Evaluate(source, filename));
or
return NewJniJsValue(env, move(jsValue));

[anton, 2017/04/26 10:22:58]

Acknowledged.

+    return NewJniJsValue(env, engine->Evaluate(source, filename));
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
 static void JNICALL JniTriggerEvent(JNIEnv* env, jclass clazz, jlong ptr, jstring jEventName, jarray jJsPtrs)

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

I wonder we need it for. TriggerEvent is called only from JS, I doubt that there
is a need to call it from Java code, I would propose to remove such
functionality from libadblockplus-android in some future changes.

[anton, 2017/04/26 10:22:59]

this was written from the very beginning and i don't do any unrelated (and
undesired) changed for now

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

I totally agree that it should not be in this codereview, but in general it
should be removed, maybe in some future codereview. I think we will soon make
method JsEngine::TriggerEvent not available for others, so compiler will help to
ensure that it's not used in an undesired way even accidentally.

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

feel free to add a ticket to libadblockplus-android

 {
   AdblockPlus::JsEnginePtr& engine = *JniLongToTypePtr<AdblockPlus::JsEnginePtr>(ptr);
   std::string eventName = JniJavaToStdString(env, jEventName);
   AdblockPlus::JsValueList args;
 
   if (jJsPtrs)
   {
     jlong* ptrs = (jlong*)env->GetPrimitiveArrayCritical(jJsPtrs, 0);
 
     jsize length = env->GetArrayLength(jJsPtrs);
 
     for (jsize i = 0; i < length; i++)
     {
       args.push_back(JniGetJsValue(ptrs[i]));
     }
 
     env->ReleasePrimitiveArrayCritical(jJsPtrs, ptrs, JNI_ABORT);
   }
 
   try
   {
-    engine->TriggerEvent(eventName, args);
+    engine->TriggerEvent(eventName, std::move(args));
   }
   CATCH_AND_THROW(env)
 }
 
 static void JNICALL JniSetDefaultFileSystem(JNIEnv* env, jclass clazz, jlong ptr, jstring jBasePath)
 {
   AdblockPlus::JsEnginePtr& engine = *JniLongToTypePtr<AdblockPlus::JsEnginePtr>(ptr);
 
   try
   {
-    const AdblockPlus::FileSystemPtr fileSystem(new AdblockPlus::DefaultFileSystem());

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

const is not required here.

[anton, 2017/04/26 10:22:59]

Acknowledged.

+    AdblockPlus::FileSystemPtr fileSystem(new AdblockPlus::DefaultFileSystem());
 
     std::string basePath = JniJavaToStdString(env, jBasePath);
     reinterpret_cast<AdblockPlus::DefaultFileSystem*>(fileSystem.get())->SetBasePath(basePath);
 
     engine->SetFileSystem(fileSystem);
   }
   CATCH_AND_THROW(env)
 }
 
 static void JNICALL JniSetDefaultWebRequest(JNIEnv* env, jclass clazz, jlong ptr)
 {
   AdblockPlus::JsEnginePtr& engine = *JniLongToTypePtr<AdblockPlus::JsEnginePtr>(ptr);
 
   try
   {
-    const AdblockPlus::WebRequestPtr webRequest(new AdblockPlus::DefaultWebRequest());

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

const is not required here.

[anton, 2017/04/26 10:22:59]

Acknowledged.

+    AdblockPlus::WebRequestPtr webRequest(new AdblockPlus::DefaultWebRequest());
     engine->SetWebRequest(webRequest);
   }
   CATCH_AND_THROW(env)
 }
 
 static void JNICALL JniSetDefaultLogSystem(JNIEnv* env, jclass clazz, jlong ptr)
 {
   AdblockPlus::JsEnginePtr& engine = *JniLongToTypePtr<AdblockPlus::JsEnginePtr>(ptr);
 
   try
   {
-    const AdblockPlus::LogSystemPtr logSystem(new AdblockPlus::DefaultLogSystem());

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

const is not required here.

+    AdblockPlus::LogSystemPtr logSystem(new AdblockPlus::DefaultLogSystem());
 
     engine->SetLogSystem(logSystem);
   }
   CATCH_AND_THROW(env)
 }
 
 static void JNICALL JniSetLogSystem(JNIEnv* env, jclass clazz, jlong ptr, jlong logSystemPtr)
 {
   AdblockPlus::JsEnginePtr& engine = *JniLongToTypePtr<AdblockPlus::JsEnginePtr>(ptr);
 
   try
   {
-    const AdblockPlus::LogSystemPtr logSystem = *JniLongToTypePtr<AdblockPlus::LogSystemPtr>(logSystemPtr);

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

const is not required here.

[anton, 2017/04/26 10:22:59]

Acknowledged.

+    AdblockPlus::LogSystemPtr logSystem = *JniLongToTypePtr<AdblockPlus::LogSystemPtr>(logSystemPtr);
 
     engine->SetLogSystem(logSystem);
   }
   CATCH_AND_THROW(env)
 }
 
 static void JNICALL JniSetWebRequest(JNIEnv* env, jclass clazz, jlong ptr, jlong webRequestPtr)
 {
   AdblockPlus::JsEnginePtr& engine = *JniLongToTypePtr<AdblockPlus::JsEnginePtr>(ptr);
 
   try
   {
-    const AdblockPlus::WebRequestPtr& webRequest =

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

const is not required here.

[anton, 2017/04/26 10:22:59]

Acknowledged.

-      *JniLongToTypePtr<AdblockPlus::WebRequestPtr>(webRequestPtr);
+    AdblockPlus::WebRequestPtr& webRequest = *JniLongToTypePtr<AdblockPlus::WebRequestPtr>(webRequestPtr);
 
     engine->SetWebRequest(webRequest);
   }
   CATCH_AND_THROW(env)
 }
 
 static jobject JNICALL JniNewLongValue(JNIEnv* env, jclass clazz, jlong ptr, jlong value)
 {
   AdblockPlus::JsEnginePtr& engine = *JniLongToTypePtr<AdblockPlus::JsEnginePtr>(ptr);
 
   try
   {
-    AdblockPlus::JsValue jsValue = engine->NewValue(static_cast<int64_t>(value));

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

here and blow, see comment above to avoid copy-ctr.

[anton, 2017/04/26 10:22:59]

Acknowledged.

-    return NewJniJsValue(env, jsValue);
+    return NewJniJsValue(env, engine->NewValue(static_cast<int64_t>(value)));
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
 static jobject JNICALL JniNewBooleanValue(JNIEnv* env, jclass clazz, jlong ptr, jboolean value)
 {
   AdblockPlus::JsEnginePtr& engine = *JniLongToTypePtr<AdblockPlus::JsEnginePtr>(ptr);
 
   try
   {
-    AdblockPlus::JsValue jsValue = engine->NewValue(value == JNI_TRUE ? true : false);
-    return NewJniJsValue(env, jsValue);
+    return NewJniJsValue(env, engine->NewValue(value == JNI_TRUE ? true : false));
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
 static jobject JNICALL JniNewStringValue(JNIEnv* env, jclass clazz, jlong ptr, jstring value)
 {
   AdblockPlus::JsEnginePtr& engine = *JniLongToTypePtr<AdblockPlus::JsEnginePtr>(ptr);
 
   try
   {
     std::string strValue = JniJavaToStdString(env, value);
-    AdblockPlus::JsValue jsValue = engine->NewValue(strValue);
-    return NewJniJsValue(env, jsValue);
+    return NewJniJsValue(env, engine->NewValue(strValue));
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
 // TODO: List of functions that lack JNI bindings
-//JsValue NewObject();
-//JsValue NewCallback(v8::InvocationCallback callback);
+//JsValuePtr NewObject();
+//JsValuePtr NewCallback(v8::InvocationCallback callback);
 //static JsEnginePtr FromArguments(const v8::Arguments& arguments);
 //JsValueList ConvertArguments(const v8::Arguments& arguments);
 
 static JNINativeMethod methods[] =
 {
   { (char*)"ctor", (char*)"(" TYP("AppInfo") ")J", (void*)JniCtor },
   { (char*)"dtor", (char*)"(J)V", (void*)JniDtor },
 
   { (char*)"setEventCallback", (char*)"(JLjava/lang/String;J)V", (void*)JniSetEventCallback },
   { (char*)"removeEventCallback", (char*)"(JLjava/lang/String;)V", (void*)JniRemoveEventCallback },
   { (char*)"triggerEvent", (char*)"(JLjava/lang/String;[J)V", (void*)JniTriggerEvent },
 
   { (char*)"evaluate", (char*)"(JLjava/lang/String;Ljava/lang/String;)" TYP("JsValue"), (void*)JniEvaluate },
 
   { (char*)"setDefaultFileSystem", (char*)"(JLjava/lang/String;)V", (void*)JniSetDefaultFileSystem },
   { (char*)"setLogSystem", (char*)"(JJ)V", (void*)JniSetLogSystem },
   { (char*)"setDefaultLogSystem", (char*)"(J)V", (void*)JniSetDefaultLogSystem },
   { (char*)"setWebRequest", (char*)"(JJ)V", (void*)JniSetWebRequest },
   { (char*)"setDefaultWebRequest", (char*)"(J)V", (void*)JniSetDefaultWebRequest },
 
   { (char*)"newValue", (char*)"(JJ)" TYP("JsValue"), (void*)JniNewLongValue },
   { (char*)"newValue", (char*)"(JZ)" TYP("JsValue"), (void*)JniNewBooleanValue },
   { (char*)"newValue", (char*)"(JLjava/lang/String;)" TYP("JsValue"), (void*)JniNewStringValue }
 };
 
 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_JsEngine_registerNatives(JNIEnv *env, jclass clazz)
 {
   env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
 }