Issue 5643 - Make v8::Isolate injectable into JsEngine

libadblockplus-android/jni/JniPlatform.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 11 matching lines @@
 
 /**
  * V8IsolateHolder accepts v8:::Isolate ptr in ctor and just returns it in Get().
  * V8IsolateHolder is not taking ownership so it's not releasing isolate ptr.
  */
 class V8IsolateHolder : public AdblockPlus::IV8IsolateProvider
 {
   public:
     V8IsolateHolder(v8::Isolate* isolate_) : isolate(isolate_)
     {
-    }
-
-    ~V8IsolateHolder()

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

I would propose to remove the destructor here.

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

Acknowledged.

-    {
-      isolate = nullptr;
     }
 
     v8::Isolate* Get() override
     {
       return isolate;
     }
 
   private:
     V8IsolateHolder(const V8IsolateHolder&);
     V8IsolateHolder& operator=(const V8IsolateHolder&);
@@ skipping 49 matching lines @@
 {
   delete JniLongToTypePtr<JniPlatform>(ptr);
 }
 
 static void JNICALL JniSetUpJsEngine(JNIEnv* env, jclass clazz, jlong ptr, jobject jAppInfo, jlong v8IsolatePtr)
 {
   try
   {
     AdblockPlus::AppInfo appInfo;
     TransformAppInfo(env, jAppInfo, appInfo);
-    std::unique_ptr<AdblockPlus::IV8IsolateProvider> isolateProvider = nullptr;

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

There is no need in initializing it to nullptr.

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

Acknowledged.

+    std::unique_ptr<AdblockPlus::IV8IsolateProvider> isolateProvider;
     if (v8IsolatePtr)
     {
-      isolateProvider = std::unique_ptr<AdblockPlus::IV8IsolateProvider>(

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

I think it would be shorter
isolateProvider.reset(new
V8IsolateHolder(static_cast<v8::Isolate*>(v8IsolatePtr)));
and better because of static_cast.

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

Acknowledged.

[anton, 2017/09/26 11:04:25]

"Error:(104, 87) error: invalid static_cast from type 'jlong {aka long long
int}' to type 'v8::Isolate*'"

-        new V8IsolateHolder((v8::Isolate*)v8IsolatePtr));
+      isolateProvider.reset(new V8IsolateHolder(JniLongToTypePtr<v8::Isolate>(v8IsolatePtr)));
     }
 
     GetPlatformRef(ptr).SetUpJsEngine(appInfo, std::move(isolateProvider));
   }
   CATCH_AND_THROW(env)
 }
 
 static long JNICALL JniGetJsEnginePtr(JNIEnv* env, jclass clazz, jlong ptr)
 {
   try
@@ skipping 48 matching lines @@
   { (char*)"setUpJsEngine", (char*)"(J" TYP("AppInfo") "J)V", (void*)JniSetUpJsEngine },
   { (char*)"getJsEnginePtr", (char*)"(J)J", (void*)JniGetJsEnginePtr },
   { (char*)"setUpFilterEngine", (char*)"(J" TYP("IsAllowedConnectionCallback") ")V", (void*)JniSetUpFilterEngine },
   { (char*)"ensureFilterEngine", (char*)"(J)V", (void*)JniEnsureFilterEngine }
 };
 
 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_Platform_registerNatives(JNIEnv *env, jclass clazz)
 {
   env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
 }