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

Delta Between Two Patch Sets: src/JsValue.cpp

Issue 6584950149087232: Issue 1280 - Update v8 (Closed)
Left Patch Set: get rid of unrelated stuff Created Nov. 3, 2014, 12:54 p.m.
Right Patch Set: revert not critical chanegs in JsValue ctr Created Nov. 3, 2014, 2:49 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « src/JsEngine.cpp ('k') | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 /* 1 /*
2 * This file is part of Adblock Plus <http://adblockplus.org/>, 2 * This file is part of Adblock Plus <http://adblockplus.org/>,
3 * Copyright (C) 2006-2014 Eyeo GmbH 3 * Copyright (C) 2006-2014 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 <v8.h>
20 #include <AdblockPlus.h> 19 #include <AdblockPlus.h>
21 20
22 #include "JsContext.h" 21 #include "JsContext.h"
23 #include "JsError.h" 22 #include "JsError.h"
24 #include "Utils.h" 23 #include "Utils.h"
25 24
26 AdblockPlus::JsValue::JsValue(const JsEnginePtr& jsEngine, v8::Handle<v8::Value> value) 25 AdblockPlus::JsValue::JsValue(AdblockPlus::JsEnginePtr jsEngine,
26 v8::Handle<v8::Value> value)
27 : jsEngine(jsEngine), 27 : jsEngine(jsEngine),
28 value(jsEngine->isolate, value) 28 value(jsEngine->isolate, value)
29 { 29 {
30 } 30 }
31 31
32 AdblockPlus::JsValue::JsValue(const JsValuePtr& value) 32 AdblockPlus::JsValue::JsValue(AdblockPlus::JsValuePtr value)
33 : jsEngine(value->jsEngine), 33 : jsEngine(value->jsEngine),
34 value(value->value) 34 value(value->value)
35 { 35 {
36 } 36 }
37 37
38 AdblockPlus::JsValue::~JsValue() 38 AdblockPlus::JsValue::~JsValue()
39 { 39 {
40 } 40 }
41 41
42 bool AdblockPlus::JsValue::IsUndefined() const 42 bool AdblockPlus::JsValue::IsUndefined() const
43 { 43 {
44 const JsContext context(jsEngine); 44 const JsContext context(jsEngine);
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 const v8::TryCatch tryCatch; 222 const v8::TryCatch tryCatch;
223 v8::Local<v8::Function> func = v8::Local<v8::Function>::Cast(UnwrapValue()); 223 v8::Local<v8::Function> func = v8::Local<v8::Function>::Cast(UnwrapValue());
224 v8::Local<v8::Value> result = func->Call(thisObj, argv.size(), 224 v8::Local<v8::Value> result = func->Call(thisObj, argv.size(),
225 argv.size() ? &argv.front() : 0); 225 argv.size() ? &argv.front() : 0);
226 226
227 if (tryCatch.HasCaught()) 227 if (tryCatch.HasCaught())
228 throw JsError(tryCatch.Exception(), tryCatch.Message()); 228 throw JsError(tryCatch.Exception(), tryCatch.Message());
229 229
230 return JsValuePtr(new JsValue(jsEngine, result)); 230 return JsValuePtr(new JsValue(jsEngine, result));
231 } 231 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld