Index: src/JsValue.cpp |
=================================================================== |
--- a/src/JsValue.cpp |
+++ b/src/JsValue.cpp |
@@ -25,18 +25,22 @@ |
AdblockPlus::JsValue::JsValue(AdblockPlus::JsEnginePtr jsEngine, |
v8::Handle<v8::Value> value) |
: jsEngine(jsEngine), |
- value(jsEngine->isolate, value) |
+ value(new v8::Persistent<v8::Value>(jsEngine->isolate, value)) |
{ |
} |
-AdblockPlus::JsValue::JsValue(AdblockPlus::JsValuePtr value) |
- : jsEngine(value->jsEngine), |
- value(value->value) |
+AdblockPlus::JsValue::JsValue(AdblockPlus::JsValue&& src) |
+ : jsEngine(src.jsEngine), |
+ value(std::move(src.value)) |
{ |
} |
AdblockPlus::JsValue::~JsValue() |
{ |
+ if (value) |
+ { |
+ value->Dispose(); |
+ } |
} |
bool AdblockPlus::JsValue::IsUndefined() const |
@@ -163,7 +167,7 @@ |
v8::Local<v8::Value> AdblockPlus::JsValue::UnwrapValue() const |
{ |
- return v8::Local<v8::Value>::New(jsEngine->isolate, value); |
+ return v8::Local<v8::Value>::New(jsEngine->isolate, *value); |
} |
void AdblockPlus::JsValue::SetProperty(const std::string& name, const std::string& val) |
@@ -208,7 +212,8 @@ |
const JsContext context(jsEngine); |
if (!thisPtr) |
{ |
- v8::Local<v8::Context> localContext = v8::Local<v8::Context>::New(jsEngine->isolate, jsEngine->context); |
+ v8::Local<v8::Context> localContext = v8::Local<v8::Context>::New( |
+ jsEngine->isolate, *jsEngine->context); |
thisPtr = JsValuePtr(new JsValue(jsEngine, localContext->Global())); |
} |
if (!thisPtr->IsObject()) |