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

Delta Between Two Patch Sets: src/JsEngine.cpp

Issue 29416579: Issue 5034 - Part 1: Pass a JsValue directly to SetProperty() and return from GetProperty() (Closed) Base URL: https://hg.adblockplus.org/libadblockplus/
Left Patch Set: Created April 18, 2017, 9:17 p.m.
Right Patch Set: Remove JsValue test Created April 19, 2017, 2:46 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/GlobalJsObject.cpp ('k') | src/JsValue.cpp » ('j') | 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 <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 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 throw std::runtime_error("LogSystem cannot be null"); 323 throw std::runtime_error("LogSystem cannot be null");
324 324
325 logSystem = val; 325 logSystem = val;
326 } 326 }
327 327
328 328
329 void AdblockPlus::JsEngine::SetGlobalProperty(const std::string& name, 329 void AdblockPlus::JsEngine::SetGlobalProperty(const std::string& name,
330 const AdblockPlus::JsValue& value) 330 const AdblockPlus::JsValue& value)
331 { 331 {
332 auto global = GetGlobalObject(); 332 auto global = GetGlobalObject();
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.
334 throw std::runtime_error("Global object cannot be null");
335 global.SetProperty(name, value); 333 global.SetProperty(name, value);
336 } 334 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld