Issue 3594 - remove circular references JsEngine-JsValue-JsEngine

src/FileSystemJsObject.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 16 matching lines @@
 #include "Utils.h"
 
 using namespace AdblockPlus;
 
 namespace
 {
   class IoThread : public Thread
   {
   public:
     IoThread(JsEnginePtr jsEngine, JsValuePtr callback)
-      : Thread(true), jsEngine(jsEngine), fileSystem(jsEngine->GetFileSystem()),
-        callback(callback)
+      : Thread(true)
+      , m_jsEngine(jsEngine)
+      , fileSystem(jsEngine->GetFileSystem())
+      , callback(callback)
     {
     }
 
   protected:
-    JsEnginePtr jsEngine;
+    std::weak_ptr<JsEngine> m_jsEngine;
     FileSystemPtr fileSystem;
     JsValuePtr callback;
   };
 
   class ReadThread : public IoThread
   {
   public:
     ReadThread(JsEnginePtr jsEngine, JsValuePtr callback,
                const std::string& path)
       : IoThread(jsEngine, callback), path(path)
@@ skipping 11 matching lines @@
       }
       catch (std::exception& e)
       {
         error = e.what();
       }
       catch (...)
       {
         error =  "Unknown error while reading from " + path;
       }
 
-      const JsContext context(jsEngine);
-      JsValuePtr result = jsEngine->NewObject();
+      JsContext context(m_jsEngine);
+      JsValuePtr result = context.GetJsEngine().NewObject();
       result->SetProperty("content", content);
       result->SetProperty("error", error);
       JsValueList params;
       params.push_back(result);
       callback->Call(params);
     }
 
   private:
     std::string path;
   };
@@ skipping 18 matching lines @@
       }
       catch (std::exception& e)
       {
         error = e.what();
       }
       catch (...)
       {
         error = "Unknown error while writing to " + path;
       }
 
-      const JsContext context(jsEngine);
-      JsValuePtr errorValue = jsEngine->NewValue(error);
+      JsContext context(m_jsEngine);
+      JsValuePtr errorValue = context.GetJsEngine().NewValue(error);
       JsValueList params;
       params.push_back(errorValue);
       callback->Call(params);
     }
 
   private:
     std::string path;
     std::string content;
   };
 
@@ skipping 15 matching lines @@
       }
       catch (std::exception& e)
       {
         error = e.what();
       }
       catch (...)
       {
         error = "Unknown error while moving " + fromPath + " to " + toPath;
       }
 
-      const JsContext context(jsEngine);
-      JsValuePtr errorValue = jsEngine->NewValue(error);
+      JsContext context(m_jsEngine);
+      JsValuePtr errorValue = context.GetJsEngine().NewValue(error);
       JsValueList params;
       params.push_back(errorValue);
       callback->Call(params);
     }
 
   private:
     std::string fromPath;
     std::string toPath;
   };
 
@@ skipping 15 matching lines @@
       }
       catch (std::exception& e)
       {
         error = e.what();
       }
       catch (...)
       {
         error = "Unknown error while removing " + path;
       }
 
-      const JsContext context(jsEngine);
-      JsValuePtr errorValue = jsEngine->NewValue(error);
+      JsContext context(m_jsEngine);
+      JsValuePtr errorValue = context.GetJsEngine().NewValue(error);
       JsValueList params;
       params.push_back(errorValue);
       callback->Call(params);
     }
 
   private:
     std::string path;
   };
 
 
@@ skipping 16 matching lines @@
       }
       catch (std::exception& e)
       {
         error = e.what();
       }
       catch (...)
       {
         error = "Unknown error while calling stat on " + path;
       }
 
-      const JsContext context(jsEngine);
-      JsValuePtr result = jsEngine->NewObject();
+      JsContext context(m_jsEngine);
+      JsValuePtr result = context.GetJsEngine().NewObject();
       result->SetProperty("exists", statResult.exists);
       result->SetProperty("isFile", statResult.isFile);
       result->SetProperty("isDirectory", statResult.isDirectory);
       result->SetProperty("lastModified", statResult.lastModified);
       result->SetProperty("error", error);
 
       JsValueList params;
       params.push_back(result);
       callback->Call(params);
     }
@@ skipping 113 matching lines @@
 JsValuePtr FileSystemJsObject::Setup(JsEnginePtr jsEngine, JsValuePtr obj)
 {
   obj->SetProperty("read", jsEngine->NewCallback(::ReadCallback));
   obj->SetProperty("write", jsEngine->NewCallback(::WriteCallback));
   obj->SetProperty("move", jsEngine->NewCallback(::MoveCallback));
   obj->SetProperty("remove", jsEngine->NewCallback(::RemoveCallback));
   obj->SetProperty("stat", jsEngine->NewCallback(::StatCallback));
   obj->SetProperty("resolve", jsEngine->NewCallback(::ResolveCallback));
   return obj;
 }