Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: src/JsContext.cpp

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.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/JsContext.h ('k') | src/JsValue.cpp » ('j') | src/JsValue.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2016 Eyeo GmbH 3 * Copyright (C) 2006-2016 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 #include "JsContext.h" 18 #include "JsContext.h"
19 #include "Utils.h"
19 20
20 AdblockPlus::JsContext::JsContext(const JsEnginePtr jsEngine) 21 AdblockPlus::JsContext::JsContext(const std::weak_ptr<JsEngine>& jsEngineArg)
21 : locker(jsEngine->GetIsolate()), isolateScope(jsEngine->GetIsolate()), 22 : jsEngine(Utils::lockJsEngine(jsEngineArg))
22 handleScope(jsEngine->GetIsolate()), 23 , locker(jsEngine->GetIsolate())
23 contextScope(v8::Local<v8::Context>::New(jsEngine->GetIsolate(), *jsEngine ->context)) 24 , isolateScope(jsEngine->GetIsolate())
25 , handleScope(jsEngine->GetIsolate())
26 , contextScope(v8::Local<v8::Context>::New(jsEngine->GetIsolate(), *jsEngine-> context))
24 { 27 {
25 } 28 }
OLDNEW
« no previous file with comments | « src/JsContext.h ('k') | src/JsValue.cpp » ('j') | src/JsValue.cpp » ('J')

Powered by Google App Engine
This is Rietveld