Issue 5556 - use JsEngine& instead of JsEnginePtr because JsEnginePtr is not available anymore

libadblockplus-android/jni/JniJsEngine.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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 45 matching lines @@
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
 static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr)
 {
   delete JniLongToTypePtr<JniJsEngine>(ptr);
 }
 
 static void JNICALL JniSetEventCallback(JNIEnv* env, jclass clazz, jlong ptr, jstring jEventName, jlong jCallbackPtr)
 {
-  AdblockPlus::JsEngine& jsEngine = GetJsEngineRef(ptr);

[anton, 2017/08/23 05:46:47]

in code review https://codereview.adblockplus.org/29523682/ you did not rename
variable 'engine' to 'filterEngine' but here you did it.
actually i don't see any [significant] reason as there are no other engines (eg.
filter engine instance) in methods.

Let's have consistent code style and revert renaming here or rename vars there.

[sergei, 2017/08/23 08:24:18]

Done.

+  AdblockPlus::JsEngine& engine = GetJsEngineRef(ptr);
 
   JniEventCallback* callback = JniLongToTypePtr<JniEventCallback>(jCallbackPtr);
   std::string eventName = JniJavaToStdString(env, jEventName);
 
   auto eCallback = [callback](AdblockPlus::JsValueList&& params)
   {
     callback->Callback(std::move(params));
   };
 
   try
   {
-    jsEngine.SetEventCallback(eventName, eCallback);
+    engine.SetEventCallback(eventName, eCallback);
   }
   CATCH_AND_THROW(env)
 }
 
 static void JNICALL JniRemoveEventCallback(JNIEnv* env, jclass clazz, jlong ptr, jstring jEventName)
 {
-  AdblockPlus::JsEngine& jsEngine = GetJsEngineRef(ptr);
+  AdblockPlus::JsEngine& engine = GetJsEngineRef(ptr);
 
   std::string eventName = JniJavaToStdString(env, jEventName);
 
   try
   {
-    jsEngine.RemoveEventCallback(eventName);
+    engine.RemoveEventCallback(eventName);
   }
   CATCH_AND_THROW(env)
 }
 
 static jobject JNICALL JniEvaluate(JNIEnv* env, jclass clazz, jlong ptr, jstring jSource, jstring jFilename)
 {
   AdblockPlus::JsEngine& engine = GetJsEngineRef(ptr);
 
   std::string source = JniJavaToStdString(env, jSource);
   std::string filename = JniJavaToStdString(env, jFilename);
 
   try
   {
     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)
 {
-  AdblockPlus::JsEngine& jsEngine = GetJsEngineRef(ptr);
+  AdblockPlus::JsEngine& engine = GetJsEngineRef(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
   {
-    jsEngine.TriggerEvent(eventName, std::move(args));
+    engine.TriggerEvent(eventName, std::move(args));
   }
   CATCH_AND_THROW(env)
 }
 
 static void JNICALL JniSetDefaultFileSystem(JNIEnv* env, jclass clazz, jlong ptr, jstring jBasePath)
 {
-  AdblockPlus::JsEngine& jsEngine = GetJsEngineRef(ptr);
+  AdblockPlus::JsEngine& engine = GetJsEngineRef(ptr);
 
   try
   {
     auto fileSystem = std::make_shared<AdblockPlus::DefaultFileSystemSync>();
 
     std::string basePath = JniJavaToStdString(env, jBasePath);
     fileSystem->SetBasePath(basePath);
 
-    jsEngine.SetFileSystem(fileSystem);
+    engine.SetFileSystem(fileSystem);
   }
   CATCH_AND_THROW(env)
 }
 
 static void JNICALL JniSetDefaultLogSystem(JNIEnv* env, jclass clazz, jlong ptr)
 {
-  AdblockPlus::JsEngine& jsEngine = GetJsEngineRef(ptr);
+  AdblockPlus::JsEngine& engine = GetJsEngineRef(ptr);
 
   try
   {
     AdblockPlus::LogSystemPtr logSystem(new AdblockPlus::DefaultLogSystem());
 
-    jsEngine.SetLogSystem(logSystem);
+    engine.SetLogSystem(logSystem);
   }
   CATCH_AND_THROW(env)
 }
 
 static void JNICALL JniSetLogSystem(JNIEnv* env, jclass clazz, jlong ptr, jlong logSystemPtr)
 {
-  AdblockPlus::JsEngine& jsEngine = GetJsEngineRef(ptr);
+  AdblockPlus::JsEngine& engine = GetJsEngineRef(ptr);
 
   try
   {
     AdblockPlus::LogSystemPtr logSystem = *JniLongToTypePtr<AdblockPlus::LogSystemPtr>(logSystemPtr);
 
-    jsEngine.SetLogSystem(logSystem);
+    engine.SetLogSystem(logSystem);
   }
   CATCH_AND_THROW(env)
 }
 
 static void JNICALL JniSetWebRequest(JNIEnv* env, jclass clazz, jlong ptr, jlong webRequestPtr)
 {
-  AdblockPlus::JsEngine& jsEngine = GetJsEngineRef(ptr);
+  AdblockPlus::JsEngine& engine = GetJsEngineRef(ptr);
 
   try
   {
     auto& webRequest = *JniLongToTypePtr<AdblockPlus::WebRequestSharedPtr>(webRequestPtr);
 
-    jsEngine.SetWebRequest(webRequest);
+    engine.SetWebRequest(webRequest);
   }
   CATCH_AND_THROW(env)
 }
 
 static jobject JNICALL JniNewLongValue(JNIEnv* env, jclass clazz, jlong ptr, jlong value)
 {
-  AdblockPlus::JsEngine& jsEngine = GetJsEngineRef(ptr);
-
-  try
-  {
-    return NewJniJsValue(env, jsEngine.NewValue(static_cast<int64_t>(value)));
+  AdblockPlus::JsEngine& engine = GetJsEngineRef(ptr);
+
+  try
+  {
+    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::JsEngine& jsEngine = GetJsEngineRef(ptr);
-
-  try
-  {
-    return NewJniJsValue(env, jsEngine.NewValue(value == JNI_TRUE ? true : false));
+  AdblockPlus::JsEngine& engine = GetJsEngineRef(ptr);
+
+  try
+  {
+    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::JsEngine& jsEngine = GetJsEngineRef(ptr);
+  AdblockPlus::JsEngine& engine = GetJsEngineRef(ptr);
 
   try
   {
     std::string strValue = JniJavaToStdString(env, value);
-    return NewJniJsValue(env, jsEngine.NewValue(strValue));
+    return NewJniJsValue(env, engine.NewValue(strValue));
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
 // TODO: List of functions that lack JNI bindings
 //JsValuePtr NewObject();
 //JsValuePtr NewCallback(v8::InvocationCallback callback);
 //static JsEnginePtr FromArguments(const v8::Arguments& arguments);
 //JsValueList ConvertArguments(const v8::Arguments& arguments);
 
@@ skipping 15 matching lines @@
 
   { (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]));
 }