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

Delta Between Two Patch Sets: include/AdblockPlus/JsEngine.h

Issue 29396582: Issue 5039 - add support of nullable non-object values in settings
Left Patch Set: fix comment and rename local var Created March 28, 2017, 10:24 a.m.
Right Patch Set: rebase Created March 29, 2017, 4:39 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 | « no previous file | lib/prefs.js » ('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-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 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 #endif 179 #endif
180 //@} 180 //@}
181 181
182 /** 182 /**
183 * Creates a new JavaScript object. 183 * Creates a new JavaScript object.
184 * @return New `JsValue` instance. 184 * @return New `JsValue` instance.
185 */ 185 */
186 JsValuePtr NewObject(); 186 JsValuePtr NewObject();
187 187
188 /** 188 /**
189 * Creates a null JavaScript object.
190 * @return New `JsValue` instance.
191 */
192 JsValuePtr NullValue();
193
194 /**
189 * Creates a JavaScript function that invokes a C++ callback. 195 * Creates a JavaScript function that invokes a C++ callback.
190 * @param callback C++ callback to invoke. The callback receives a 196 * @param callback C++ callback to invoke. The callback receives a
191 * `v8::Arguments` object and can use `FromArguments()` to retrieve 197 * `v8::Arguments` object and can use `FromArguments()` to retrieve
192 * the current `JsEngine`. 198 * the current `JsEngine`.
193 * @return New `JsValue` instance. 199 * @return New `JsValue` instance.
194 */ 200 */
195 JsValuePtr NewCallback(v8::InvocationCallback callback); 201 JsValuePtr NewCallback(v8::InvocationCallback callback);
196 202
197 /** 203 /**
198 * Returns a `JsEngine` instance contained in a `v8::Arguments` object. 204 * Returns a `JsEngine` instance contained in a `v8::Arguments` object.
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 EventMap eventCallbacks; 317 EventMap eventCallbacks;
312 std::mutex eventCallbacksMutex; 318 std::mutex eventCallbacksMutex;
313 std::mutex isConnectionAllowedMutex; 319 std::mutex isConnectionAllowedMutex;
314 IsConnectionAllowedCallback isConnectionAllowed; 320 IsConnectionAllowedCallback isConnectionAllowed;
315 TimerTasks timerTasks; 321 TimerTasks timerTasks;
316 TimerPtr timer; 322 TimerPtr timer;
317 }; 323 };
318 } 324 }
319 325
320 #endif 326 #endif
LEFTRIGHT
« no previous file | lib/prefs.js » ('j') | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld