| 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-2017 eyeo GmbH | 3 * Copyright (C) 2006-2017 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 |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 138 const ScopedV8IsolatePtr& isolate) | 138 const ScopedV8IsolatePtr& isolate) |
| 139 { | 139 { |
| 140 JsEnginePtr result(new JsEngine(isolate, std::move(timer))); | 140 JsEnginePtr result(new JsEngine(isolate, std::move(timer))); |
| 141 | 141 |
| 142 const v8::Locker locker(result->GetIsolate()); | 142 const v8::Locker locker(result->GetIsolate()); |
| 143 const v8::Isolate::Scope isolateScope(result->GetIsolate()); | 143 const v8::Isolate::Scope isolateScope(result->GetIsolate()); |
| 144 const v8::HandleScope handleScope(result->GetIsolate()); | 144 const v8::HandleScope handleScope(result->GetIsolate()); |
| 145 | 145 |
| 146 result->context.reset(new v8::Persistent<v8::Context>(result->GetIsolate(), | 146 result->context.reset(new v8::Persistent<v8::Context>(result->GetIsolate(), |
| 147 v8::Context::New(result->GetIsolate()))); | 147 v8::Context::New(result->GetIsolate()))); |
| 148 AdblockPlus::GlobalJsObject::Setup(*result, appInfo, result->GetGlobalObject() ); | 148 auto global = result->GetGlobalObject(); |
| 149 AdblockPlus::GlobalJsObject::Setup(*result, appInfo, global); | |
| 149 return result; | 150 return result; |
| 150 } | 151 } |
| 151 | 152 |
| 152 AdblockPlus::JsValuePtr AdblockPlus::JsEngine::GetGlobalObject() | 153 AdblockPlus::JsValue AdblockPlus::JsEngine::GetGlobalObject() |
| 153 { | 154 { |
| 154 JsContext context(shared_from_this()); | 155 JsContext context(shared_from_this()); |
| 155 return JsValuePtr(new JsValue(shared_from_this(), context.GetV8Context()->Glob al())); | 156 return JsValue(shared_from_this(), context.GetV8Context()->Global()); |
| 156 } | 157 } |
| 157 | 158 |
| 158 AdblockPlus::JsValuePtr AdblockPlus::JsEngine::Evaluate(const std::string& sourc e, | 159 AdblockPlus::JsValuePtr AdblockPlus::JsEngine::Evaluate(const std::string& sourc e, |
| 159 const std::string& filename) | 160 const std::string& filename) |
| 160 { | 161 { |
| 161 const JsContext context(shared_from_this()); | 162 const JsContext context(shared_from_this()); |
| 162 const v8::TryCatch tryCatch; | 163 const v8::TryCatch tryCatch; |
| 163 const v8::Handle<v8::Script> script = CompileScript(GetIsolate(), source, | 164 const v8::Handle<v8::Script> script = CompileScript(GetIsolate(), source, |
| 164 filename); | 165 filename); |
| 165 CheckTryCatch(tryCatch); | 166 CheckTryCatch(tryCatch); |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 319 void AdblockPlus::JsEngine::SetLogSystem(const AdblockPlus::LogSystemPtr& val) | 320 void AdblockPlus::JsEngine::SetLogSystem(const AdblockPlus::LogSystemPtr& val) |
| 320 { | 321 { |
| 321 if (!val) | 322 if (!val) |
| 322 throw std::runtime_error("LogSystem cannot be null"); | 323 throw std::runtime_error("LogSystem cannot be null"); |
| 323 | 324 |
| 324 logSystem = val; | 325 logSystem = val; |
| 325 } | 326 } |
| 326 | 327 |
| 327 | 328 |
| 328 void AdblockPlus::JsEngine::SetGlobalProperty(const std::string& name, | 329 void AdblockPlus::JsEngine::SetGlobalProperty(const std::string& name, |
| 329 const AdblockPlus::JsValuePtr& val ue) | 330 const AdblockPlus::JsValue& value) |
| 330 { | 331 { |
| 331 auto global = GetGlobalObject(); | 332 auto global = GetGlobalObject(); |
| 332 if (!global) | 333 if (global.IsUndefined() || global.IsNull()) |
|
sergei
2017/04/19 10:24:31
It's different, previously it was possible to set
hub
2017/04/19 14:47:11
Done.
| |
| 333 throw std::runtime_error("Global object cannot be null"); | 334 throw std::runtime_error("Global object cannot be null"); |
| 334 global->SetProperty(name, value); | 335 global.SetProperty(name, value); |
| 335 } | 336 } |
| OLD | NEW |