| Left: | ||
| Right: |
| LEFT | RIGHT |
|---|---|
| 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 |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 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() |
| 39 { | 39 { |
| 40 if (value) | 40 if (value) |
| 41 { | 41 { |
| 42 value->Dispose(); | 42 value->Dispose(); |
| 43 value.reset(); | 43 value.reset(); |
| 44 } | 44 } |
|
Eric
2016/01/27 17:21:03
This code showed up in the new patch set. Does it
sergei
2016/01/28 14:02:51
No, and it's not introduced in this patch set. It'
| |
| 45 } | 45 } |
| 46 | 46 |
| 47 bool AdblockPlus::JsValue::IsUndefined() const | 47 bool AdblockPlus::JsValue::IsUndefined() const |
| 48 { | 48 { |
| 49 const JsContext context(jsEngine); | 49 const JsContext context(jsEngine); |
| 50 return UnwrapValue()->IsUndefined(); | 50 return UnwrapValue()->IsUndefined(); |
| 51 } | 51 } |
| 52 | 52 |
| 53 bool AdblockPlus::JsValue::IsNull() const | 53 bool AdblockPlus::JsValue::IsNull() const |
| 54 { | 54 { |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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 | |
| 239 AdblockPlus::JsValuePtr AdblockPlus::JsValue::Call(const JsValue& arg) const | |
| 240 { | |
| 241 const JsContext context(jsEngine); | |
| 242 JsValueList params; | |
| 243 params.push_back(JsValuePtr(new JsValue(arg.jsEngine, arg.UnwrapValue()))); | |
| 244 return Call(params); | |
| 245 } | |
| LEFT | RIGHT |