| Left: | ||
| Right: |
| OLD | NEW |
|---|---|
| 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 JsLocker { | |
|
Oleksandr
2017/02/28 15:36:02
Nit: JsLocker is pretty ambivalent. How about JsEn
Eric
2017/02/28 16:26:44
I've been deep in this code, and I don't see why t
Oleksandr
2017/02/28 17:33:56
To clarify, this looks good to me, provided this i
sergei
2017/02/28 22:14:48
I used it to synchronize access to JsEngine::isCon
| |
| 27 public: | |
| 28 explicit JsLocker(const JsEnginePtr& jsEngine); | |
| 29 private: | |
| 30 const v8::Locker locker; | |
| 31 }; | |
| 32 | |
| 26 class JsContext | 33 class JsContext |
| 27 { | 34 { |
| 28 public: | 35 public: |
| 29 explicit JsContext(const JsEnginePtr jsEngine); | 36 explicit JsContext(const JsEnginePtr& jsEngine); |
|
Eric
2017/02/28 16:26:44
Changing this API signature is not documented in t
sergei
2017/02/28 22:14:48
It seems to be the reason you are always missing c
| |
| 30 | 37 |
| 31 v8::Local<v8::Context> GetV8Context() const | 38 v8::Local<v8::Context> GetV8Context() const |
| 32 { | 39 { |
| 33 return context; | 40 return context; |
| 34 } | 41 } |
| 35 | 42 |
| 36 private: | 43 private: |
| 37 const v8::Locker locker; | 44 const JsLocker locker; |
| 38 const v8::Isolate::Scope isolateScope; | 45 const v8::Isolate::Scope isolateScope; |
| 39 const v8::HandleScope handleScope; | 46 const v8::HandleScope handleScope; |
| 40 const v8::Local<v8::Context> context; | 47 const v8::Local<v8::Context> context; |
| 41 const v8::Context::Scope contextScope; | 48 const v8::Context::Scope contextScope; |
| 42 }; | 49 }; |
| 43 } | 50 } |
| 44 | 51 |
| 45 #endif | 52 #endif |
| OLD | NEW |