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

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

Issue 29389576: Issue 4694 - JsEngine::{SetEventCallback,RemoveEventCallback,TriggerEvent} should be thread safe. (Closed)
Patch Set: Created March 20, 2017, 1:59 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | src/JsEngine.cpp » ('j') | src/JsEngine.cpp » ('J')
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-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 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 277
278 /// Isolate must be disposed only after disposing of all objects which are 278 /// Isolate must be disposed only after disposing of all objects which are
279 /// using it. 279 /// using it.
280 ScopedV8IsolatePtr isolate; 280 ScopedV8IsolatePtr isolate;
281 281
282 FileSystemPtr fileSystem; 282 FileSystemPtr fileSystem;
283 WebRequestPtr webRequest; 283 WebRequestPtr webRequest;
284 LogSystemPtr logSystem; 284 LogSystemPtr logSystem;
285 std::unique_ptr<v8::Persistent<v8::Context>> context; 285 std::unique_ptr<v8::Persistent<v8::Context>> context;
286 EventMap eventCallbacks; 286 EventMap eventCallbacks;
287 std::mutex eventCallbacksMutex;
287 std::mutex isConnectionAllowedMutex; 288 std::mutex isConnectionAllowedMutex;
288 IsConnectionAllowedCallback isConnectionAllowed; 289 IsConnectionAllowedCallback isConnectionAllowed;
289 }; 290 };
290 } 291 }
291 292
292 #endif 293 #endif
OLDNEW
« no previous file with comments | « no previous file | src/JsEngine.cpp » ('j') | src/JsEngine.cpp » ('J')

Powered by Google App Engine
This is Rietveld