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

Side by Side Diff: include/AdblockPlus/JsEngine.h

Issue 29783566: Issue 6596 - update to work with v8 6.7.288.11 (Closed) Base URL: https://github.com/adblockplus/libadblockplus@99836840e314b7941fdb51cb2b91f23ca3ee3414
Patch Set: Created May 16, 2018, 10:17 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« README.md ('K') | « dependencies ('k') | libadblockplus.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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-present eyeo GmbH 3 * Copyright (C) 2006-present 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 21 matching lines...) Expand all
32 #include <AdblockPlus/IWebRequest.h> 32 #include <AdblockPlus/IWebRequest.h>
33 #include <AdblockPlus/ITimer.h> 33 #include <AdblockPlus/ITimer.h>
34 #include <AdblockPlus/Scheduler.h> 34 #include <AdblockPlus/Scheduler.h>
35 35
36 namespace v8 36 namespace v8
37 { 37 {
38 class Isolate; 38 class Isolate;
39 class Value; 39 class Value;
40 class Context; 40 class Context;
41 template<typename T> class FunctionCallbackInfo; 41 template<typename T> class FunctionCallbackInfo;
42 typedef void(*FunctionCallback)(const FunctionCallbackInfo<v8::Value>& info); 42 typedef void(*FunctionCallback)(const FunctionCallbackInfo<Value>& info);
hub 2018/05/23 18:27:05 Nit: is this change *needed* here, or was just a d
sergei 2018/05/24 08:45:42 It is needed. I was also surprised, but otherwise
hub 2018/05/24 12:29:51 Acknowledged.
43 } 43 }
44 44
45 namespace AdblockPlus 45 namespace AdblockPlus
46 { 46 {
47 class JsEngine; 47 class JsEngine;
48 class Platform; 48 class Platform;
49 49
50 /** 50 /**
51 * Shared smart pointer to a `JsEngine` instance. 51 * Shared smart pointer to a `JsEngine` instance.
52 */ 52 */
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 290
291 std::unique_ptr<v8::Global<v8::Context>> context; 291 std::unique_ptr<v8::Global<v8::Context>> context;
292 EventMap eventCallbacks; 292 EventMap eventCallbacks;
293 std::mutex eventCallbacksMutex; 293 std::mutex eventCallbacksMutex;
294 JsWeakValuesLists jsWeakValuesLists; 294 JsWeakValuesLists jsWeakValuesLists;
295 std::mutex jsWeakValuesListsMutex; 295 std::mutex jsWeakValuesListsMutex;
296 }; 296 };
297 } 297 }
298 298
299 #endif 299 #endif
OLDNEW
« README.md ('K') | « dependencies ('k') | libadblockplus.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld