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

Delta Between Two Patch Sets: src/JsValue.cpp

Issue 6233220328718336: Issue #3593, #1197- fix isolate management (Closed)
Left Patch Set: Created June 11, 2015, 12:45 p.m.
Right Patch Set: rebase fix v8 initialization Created May 20, 2016, 3:22 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Right: Side by side diff | Download
« no previous file with change/comment | « src/JsEngine.cpp ('k') | test/BaseJsTest.h » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
(no file at all)
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 <vector> 18 #include <vector>
19 #include <AdblockPlus.h> 19 #include <AdblockPlus.h>
20 20
21 #include "JsContext.h" 21 #include "JsContext.h"
22 #include "JsError.h" 22 #include "JsError.h"
23 #include "Utils.h" 23 #include "Utils.h"
24 24
25 AdblockPlus::JsValue::JsValue(AdblockPlus::JsEnginePtr jsEngine, 25 AdblockPlus::JsValue::JsValue(AdblockPlus::JsEnginePtr jsEngine,
26 v8::Handle<v8::Value> value) 26 v8::Handle<v8::Value> value)
27 : jsEngine(jsEngine), 27 : jsEngine(jsEngine),
28 value(new v8::Persistent<v8::Value>(jsEngine->isolate, value)) 28 value(new v8::Persistent<v8::Value>(jsEngine->GetIsolate(), value))
29 { 29 {
30 } 30 }
31 31
32 AdblockPlus::JsValue::JsValue(AdblockPlus::JsValue&& src) 32 AdblockPlus::JsValue::JsValue(AdblockPlus::JsValue&& src)
33 : jsEngine(src.jsEngine), 33 : jsEngine(src.jsEngine),
34 value(std::move(src.value)) 34 value(std::move(src.value))
35 { 35 {
36 } 36 }
37 37
38 AdblockPlus::JsValue::~JsValue() 38 AdblockPlus::JsValue::~JsValue()
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 return result; 144 return result;
145 } 145 }
146 146
147 147
148 AdblockPlus::JsValuePtr AdblockPlus::JsValue::GetProperty(const std::string& nam e) const 148 AdblockPlus::JsValuePtr AdblockPlus::JsValue::GetProperty(const std::string& nam e) const
149 { 149 {
150 if (!IsObject()) 150 if (!IsObject())
151 throw new std::runtime_error("Attempting to get property of a non-object"); 151 throw new std::runtime_error("Attempting to get property of a non-object");
152 152
153 const JsContext context(jsEngine); 153 const JsContext context(jsEngine);
154 v8::Local<v8::String> property = Utils::ToV8String(jsEngine->isolate, name); 154 v8::Local<v8::String> property = Utils::ToV8String(jsEngine->GetIsolate(), nam e);
155 v8::Local<v8::Object> obj = v8::Local<v8::Object>::Cast(UnwrapValue()); 155 v8::Local<v8::Object> obj = v8::Local<v8::Object>::Cast(UnwrapValue());
156 return JsValuePtr(new JsValue(jsEngine, obj->Get(property))); 156 return JsValuePtr(new JsValue(jsEngine, obj->Get(property)));
157 } 157 }
158 158
159 void AdblockPlus::JsValue::SetProperty(const std::string& name, v8::Handle<v8::V alue> val) 159 void AdblockPlus::JsValue::SetProperty(const std::string& name, v8::Handle<v8::V alue> val)
160 { 160 {
161 if (!IsObject()) 161 if (!IsObject())
162 throw new std::runtime_error("Attempting to set property on a non-object"); 162 throw new std::runtime_error("Attempting to set property on a non-object");
163 163
164 v8::Local<v8::String> property = Utils::ToV8String(jsEngine->isolate, name); 164 v8::Local<v8::String> property = Utils::ToV8String(jsEngine->GetIsolate(), nam e);
165 v8::Local<v8::Object> obj = v8::Local<v8::Object>::Cast(UnwrapValue()); 165 v8::Local<v8::Object> obj = v8::Local<v8::Object>::Cast(UnwrapValue());
166 obj->Set(property, val); 166 obj->Set(property, val);
167 } 167 }
168 168
169 v8::Local<v8::Value> AdblockPlus::JsValue::UnwrapValue() const 169 v8::Local<v8::Value> AdblockPlus::JsValue::UnwrapValue() const
170 { 170 {
171 return v8::Local<v8::Value>::New(jsEngine->isolate, *value); 171 return v8::Local<v8::Value>::New(jsEngine->GetIsolate(), *value);
172 } 172 }
173 173
174 void AdblockPlus::JsValue::SetProperty(const std::string& name, const std::strin g& val) 174 void AdblockPlus::JsValue::SetProperty(const std::string& name, const std::strin g& val)
175 { 175 {
176 const JsContext context(jsEngine); 176 const JsContext context(jsEngine);
177 SetProperty(name, Utils::ToV8String(jsEngine->isolate, val)); 177 SetProperty(name, Utils::ToV8String(jsEngine->GetIsolate(), val));
178 } 178 }
179 179
180 void AdblockPlus::JsValue::SetProperty(const std::string& name, int64_t val) 180 void AdblockPlus::JsValue::SetProperty(const std::string& name, int64_t val)
181 { 181 {
182 const JsContext context(jsEngine); 182 const JsContext context(jsEngine);
183 SetProperty(name, v8::Number::New(jsEngine->isolate, val)); 183 SetProperty(name, v8::Number::New(jsEngine->GetIsolate(), val));
184 } 184 }
185 185
186 void AdblockPlus::JsValue::SetProperty(const std::string& name, const JsValuePtr & val) 186 void AdblockPlus::JsValue::SetProperty(const std::string& name, const JsValuePtr & val)
187 { 187 {
188 const JsContext context(jsEngine); 188 const JsContext context(jsEngine);
189 SetProperty(name, val->UnwrapValue()); 189 SetProperty(name, val->UnwrapValue());
190 } 190 }
191 191
192 void AdblockPlus::JsValue::SetProperty(const std::string& name, bool val) 192 void AdblockPlus::JsValue::SetProperty(const std::string& name, bool val)
193 { 193 {
(...skipping 13 matching lines...) Expand all
207 207
208 AdblockPlus::JsValuePtr AdblockPlus::JsValue::Call(const JsValueList& params, Js ValuePtr thisPtr) const 208 AdblockPlus::JsValuePtr AdblockPlus::JsValue::Call(const JsValueList& params, Js ValuePtr thisPtr) const
209 { 209 {
210 if (!IsFunction()) 210 if (!IsFunction())
211 throw new std::runtime_error("Attempting to call a non-function"); 211 throw new std::runtime_error("Attempting to call a non-function");
212 212
213 const JsContext context(jsEngine); 213 const JsContext context(jsEngine);
214 if (!thisPtr) 214 if (!thisPtr)
215 { 215 {
216 v8::Local<v8::Context> localContext = v8::Local<v8::Context>::New( 216 v8::Local<v8::Context> localContext = v8::Local<v8::Context>::New(
217 jsEngine->isolate, *jsEngine->context); 217 jsEngine->GetIsolate(), *jsEngine->context);
218 thisPtr = JsValuePtr(new JsValue(jsEngine, localContext->Global())); 218 thisPtr = JsValuePtr(new JsValue(jsEngine, localContext->Global()));
219 } 219 }
220 if (!thisPtr->IsObject()) 220 if (!thisPtr->IsObject())
221 throw new std::runtime_error("`this` pointer has to be an object"); 221 throw new std::runtime_error("`this` pointer has to be an object");
222 v8::Local<v8::Object> thisObj = v8::Local<v8::Object>::Cast(thisPtr->UnwrapVal ue()); 222 v8::Local<v8::Object> thisObj = v8::Local<v8::Object>::Cast(thisPtr->UnwrapVal ue());
223 223
224 std::vector<v8::Handle<v8::Value>> argv; 224 std::vector<v8::Handle<v8::Value>> argv;
225 for (JsValueList::const_iterator it = params.begin(); it != params.end(); ++it ) 225 for (JsValueList::const_iterator it = params.begin(); it != params.end(); ++it )
226 argv.push_back((*it)->UnwrapValue()); 226 argv.push_back((*it)->UnwrapValue());
227 227
228 const v8::TryCatch tryCatch; 228 const v8::TryCatch tryCatch;
229 v8::Local<v8::Function> func = v8::Local<v8::Function>::Cast(UnwrapValue()); 229 v8::Local<v8::Function> func = v8::Local<v8::Function>::Cast(UnwrapValue());
230 v8::Local<v8::Value> result = func->Call(thisObj, argv.size(), 230 v8::Local<v8::Value> result = func->Call(thisObj, argv.size(),
231 argv.size() ? &argv.front() : 0); 231 argv.size() ? &argv.front() : 0);
232 232
233 if (tryCatch.HasCaught()) 233 if (tryCatch.HasCaught())
234 throw JsError(tryCatch.Exception(), tryCatch.Message()); 234 throw JsError(tryCatch.Exception(), tryCatch.Message());
235 235
236 return JsValuePtr(new JsValue(jsEngine, result)); 236 return JsValuePtr(new JsValue(jsEngine, result));
237 } 237 }
238 238
239 AdblockPlus::JsValuePtr AdblockPlus::JsValue::Call(const JsValue& arg) const 239 AdblockPlus::JsValuePtr AdblockPlus::JsValue::Call(const JsValue& arg) const
240 { 240 {
241 const JsContext context(jsEngine); 241 const JsContext context(jsEngine);
242 JsValueList params; 242 JsValueList params;
243 params.push_back(JsValuePtr(new JsValue(arg.jsEngine, arg.UnwrapValue()))); 243 params.push_back(JsValuePtr(new JsValue(arg.jsEngine, arg.UnwrapValue())));
244 return Call(params); 244 return Call(params);
245 } 245 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld