Issue 5643 - Make v8::Isolate injectable into JsEngine

libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockHelper.java

 /*
  * 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 41 matching lines @@
 
   private Context context;
   private String basePath;
   private boolean developmentBuild;
   private String settingsPreferenceName;
   private String preloadedPreferenceName;
   private Map<String, Integer> urlToResourceIdMap;
   private AdblockEngine engine;
   private AdblockSettingsStorage storage;
   private CountDownLatch engineCreated;
+  private Long v8IsolatePtr;
 
   /*
     Simple ARC management for AdblockEngine
     Use `retain` and `release`
    */
 
   private AtomicInteger referenceCounter = new AtomicInteger(0);
 
   // singleton
   protected AdblockHelper()
@@ skipping 52 matching lines @@
    * @param preferenceName Shared Preferences name to store intercepted requests stats
    * @param urlToResourceIdMap
    */
   public AdblockHelper preloadSubscriptions(String preferenceName, Map<String, Integer> urlToResourceIdMap)
   {
     this.preloadedPreferenceName = preferenceName;
     this.urlToResourceIdMap = urlToResourceIdMap;
     return this;
   }
 
+  public void useV8Isolate(long ptr)
+  {
+    this.v8IsolatePtr = ptr;
+  }
+
   private void createAdblock()
   {
     ConnectivityManager connectivityManager =
       (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
     IsAllowedConnectionCallback isAllowedConnectionCallback = new IsAllowedConnectionCallbackImpl(connectivityManager);
 
     Log.d(TAG, "Creating adblock engine ...");
 
     // read and apply current settings
     SharedPreferences settingsPrefs = context.getSharedPreferences(
       settingsPreferenceName,
       Context.MODE_PRIVATE);
     storage = new SharedPrefsStorage(settingsPrefs);
 
     AdblockEngine.Builder builder = AdblockEngine
       .builder(
         AdblockEngine.generateAppInfo(context, developmentBuild),
         basePath)
       .setIsAllowedConnectionCallback(isAllowedConnectionCallback)
       .enableElementHiding(true);
 
+    if (v8IsolatePtr != null)
+    {
+      builder.useV8Isolate(v8IsolatePtr);
+    }
+
     // if preloaded subscriptions provided
     if (preloadedPreferenceName != null)
     {
       SharedPreferences preloadedSubscriptionsPrefs = context.getSharedPreferences(
         preloadedPreferenceName,
         Context.MODE_PRIVATE);
       builder.preloadSubscriptions(
         context,
         urlToResourceIdMap,
         new AndroidWebRequestResourceWrapper.SharedPrefsStorage(preloadedSubscriptionsPrefs));
@@ skipping 67 matching lines @@
   public int getCounter()
   {
     return referenceCounter.get();
   }
 
   /**
    * Register AdblockHelper engine client
    * @param asynchronous If `true` engines will be created in background thread without locking of
    *                     current thread. Use waitForReady() before getEngine() later.
    *                     If `false` locks current thread.
+   * @return if a new instance is allocated
    */
-  public synchronized void retain(boolean asynchronous)
+  public synchronized boolean retain(boolean asynchronous)

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

It seems this code and `lastInstance` are not used and unrelated, could you
please remove it from this codereview?

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

They are related but i will split it into separate code review

   {
+    boolean firstInstance = false;
+
     if (referenceCounter.getAndIncrement() == 0)
     {
+      firstInstance = true;
+
       if (!asynchronous)
       {
         createAdblock();
       }
       else
       {
         // latch is required for async (see `waitForReady()`)
         engineCreated = new CountDownLatch(1);
 
         new Thread(new Runnable()
         {
           @Override
           public void run()
           {
             createAdblock();
 
             // unlock waiting client thread
             engineCreated.countDown();
           }
         }).start();
       }
     }
+    return firstInstance;
   }
 
   /**
    * Unregister AdblockHelper engine client
+   * @return if the last instance is destroyed
    */
-  public synchronized void release()
+  public synchronized boolean release()
   {
+    boolean lastInstance = false;
+
     if (referenceCounter.decrementAndGet() == 0)
     {
+      lastInstance = true;
+
       if (engineCreated != null)
       {
         // retained asynchronously
         waitForReady();
         disposeAdblock();
 
         // to unlock waiting client in waitForReady()
         engineCreated.countDown();
         engineCreated = null;
       }
       else
       {
         disposeAdblock();
       }
     }
+    return lastInstance;
   }
 }