Issue 5643 - Make v8::Isolate injectable into JsEngine

libadblockplus-android/jni/JniFilterEngine.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 47 matching lines @@
 {
   try
   {
     AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
 
     return engine.IsFirstRun() ? JNI_TRUE : JNI_FALSE;
   }
   CATCH_THROW_AND_RETURN(env, JNI_FALSE);
 }
 
+static jlong JNICALL JniGetFilterEnginePtr(JNIEnv* env, jclass clazz, jlong ptr)

[sergei, 2017/09/26 09:44:13]

It looks strange to have this method in this file and in FilterEngine because it
looks like getting a pointer to an object from the object itself, why not to use
Platform?
BTW, it seems not used, if so, could you please remove it?

[anton, 2017/09/26 10:55:06]

it's required to pass filter engine to c++ side for integrating into Chromium.
I will move the changes to separate code review.
As for me it sounds good to get filter engine ptr from filter engine class.

+{
+  try
+  {
+    AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
+    return (jlong)&engine;
+  }
+  CATCH_THROW_AND_RETURN(env, 0);
+}
+
 static jobject JNICALL JniGetFilter(JNIEnv* env, jclass clazz, jlong ptr, jstring jText)
 {
   AdblockPlus::FilterEngine& engine = GetFilterEngineRef(ptr);
   std::string text = JniJavaToStdString(env, jText);
 
   try
   {
     return NewJniFilter(env, engine.GetFilter(text));
   }
   CATCH_THROW_AND_RETURN(env, 0);
@@ skipping 443 matching lines @@
   { (char*)"isDocumentWhitelisted", (char*)"(JLjava/lang/String;[Ljava/lang/String;)Z", (void*)JniIsDocumentWhitelisted },
   { (char*)"isElemhideWhitelisted", (char*)"(JLjava/lang/String;[Ljava/lang/String;)Z", (void*)JniIsElemhideWhitelisted },
   { (char*)"getPref", (char*)"(JLjava/lang/String;)" TYP("JsValue"), (void*)JniGetPref },
   { (char*)"setPref", (char*)"(JLjava/lang/String;J)V", (void*)JniSetPref },
   { (char*)"getHostFromURL", (char*)"(JLjava/lang/String;)Ljava/lang/String;", (void*)JniGetHostFromURL },
   { (char*)"setAllowedConnectionType", (char*)"(JLjava/lang/String;)V", (void*)JniSetAllowedConnectionType },
   { (char*)"getAllowedConnectionType", (char*)"(J)Ljava/lang/String;", (void*)JniGetAllowedConnectionType },
   { (char*)"setAcceptableAdsEnabled", (char*)"(JZ)V", (void*)JniSetAcceptableAdsEnabled },
   { (char*)"isAcceptableAdsEnabled", (char*)"(J)Z", (void*)JniIsAcceptableAdsEnabled },
   { (char*)"getAcceptableAdsSubscriptionURL", (char*)"(J)Ljava/lang/String;", (void*)JniGetAcceptableAdsSubscriptionURL },
-  { (char*)"updateFiltersAsync", (char*)"(JLjava/lang/String;)V", (void*)JniUpdateFiltersAsync }
+  { (char*)"updateFiltersAsync", (char*)"(JLjava/lang/String;)V", (void*)JniUpdateFiltersAsync },
+  { (char*)"getFilterEnginePtr", (char*)"(J)J", (void*)JniGetFilterEnginePtr },
 };
 
 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_FilterEngine_registerNatives(JNIEnv *env, jclass clazz)
 {
   env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
 }