include/AdblockPlus/JsValue.h - Issue 29361562: Issue 3594 - remove circular references JsEngine-JsValue-JsEngine

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: include/AdblockPlus/JsValue.h

Issue 29361562: Issue 3594 - remove circular references JsEngine-JsValue-JsEngine (Closed)

Patch Set: temporary workaround for race condition Created Dec. 1, 2016, 10:26 a.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: include/AdblockPlus/JsValue.h

diff --git a/include/AdblockPlus/JsValue.h b/include/AdblockPlus/JsValue.h

index c9632149822fe9d5d44ef06efc2ef1caa0555613..3d2bfa97b3633125896fce8fc7c2c0b609b05437 100644

--- a/include/AdblockPlus/JsValue.h

+++ b/include/AdblockPlus/JsValue.h

@@ -132,11 +132,11 @@ 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> jsEngine;

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;

};