Issue 3594 - remove circular references JsEngine-JsValue-JsEngine

include/AdblockPlus/JsValue.h

Index: include/AdblockPlus/JsValue.h
diff --git a/include/AdblockPlus/JsValue.h b/include/AdblockPlus/JsValue.h
index c9632149822fe9d5d44ef06efc2ef1caa0555613..8f3ea79c34b94428fd056a068a653ec770869448 100644
--- a/include/AdblockPlus/JsValue.h
+++ b/include/AdblockPlus/JsValue.h
@@ -132,13 +132,13 @@ namespace AdblockPlus
      */
     JsValuePtr Call(const JsValue& arg) const;
 
-    v8::Local<v8::Value> UnwrapValue() const;
+    v8::Local<v8::Value> UnwrapValue(JsEngine& jsEngine) const;
   protected:
-    JsEnginePtr jsEngine;
+    std::weak_ptr<JsEngine> m_jsEngine;

[Oleksandr, 2016/11/25 10:38:04]

Nit: I don't really see a value in renaming the variable here and below.

[sergei, 2016/11/25 12:04:46]

I thought we finally started to use #pragma once and prefixes for members of
classes in C++.
https://codereview.adblockplus.org/29333474/diff/29345688/compiled/String.h

Actually, it's very helpful in C++. Here in particular it also helped to
eliminate all accidental cases of usage of jsEngine member instead of strong
referenced JsEngine.

m_ is removed.

   private:
-    JsValue(JsEnginePtr jsEngine, v8::Handle<v8::Value> value);
+    JsValue(const std::weak_ptr<JsEngine>& jsEngine, v8::Handle<v8::Value> value);
     void SetProperty(const std::string& name, v8::Handle<v8::Value> val);
-    std::unique_ptr<v8::Persistent<v8::Value>> value;
+    std::unique_ptr<v8::Persistent<v8::Value>> m_value;
   };
 }