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

Side by Side Diff: src/JsContext.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.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
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 #ifndef ADBLOCK_PLUS_JS_CONTEXT_H 18 #ifndef ADBLOCK_PLUS_JS_CONTEXT_H
19 #define ADBLOCK_PLUS_JS_CONTEXT_H 19 #define ADBLOCK_PLUS_JS_CONTEXT_H
20 20
21 #include <v8.h> 21 #include <v8.h>
22 #include <AdblockPlus/JsEngine.h> 22 #include <AdblockPlus/JsEngine.h>
23 23
24 namespace AdblockPlus 24 namespace AdblockPlus
25 { 25 {
26 class JsContext 26 class JsContext
27 { 27 {
28 public: 28 public:
29 explicit JsContext(const JsEnginePtr jsEngine); 29 explicit JsContext(const std::weak_ptr<JsEngine>& jsEngine);
30 30 JsEngine& GetJsEngine() {
31 return *jsEngine;
32 }
31 private: 33 private:
34 JsEnginePtr jsEngine;
32 const v8::Locker locker; 35 const v8::Locker locker;
33 const v8::Isolate::Scope isolateScope; 36 const v8::Isolate::Scope isolateScope;
34 const v8::HandleScope handleScope; 37 const v8::HandleScope handleScope;
35 const v8::Context::Scope contextScope; 38 const v8::Context::Scope contextScope;
36 }; 39 };
37 } 40 }
38 41
39 #endif 42 #endif
OLDNEW
« no previous file with comments | « src/FilterEngine.cpp ('k') | src/JsContext.cpp » ('j') | src/JsValue.cpp » ('J')

Powered by Google App Engine
This is Rietveld