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

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

Issue 29499630: Issue 4938 - fix race conditions and get rid of hacks related to DefaultFileSystem (Closed) Base URL: https://github.com/adblockplus/libadblockplus.git
Patch Set: Created July 27, 2017, 11:15 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
« no previous file with comments | « no previous file | src/DefaultFileSystem.h » ('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-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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 typedef std::shared_ptr<JsEngine> JsEnginePtr; 52 typedef std::shared_ptr<JsEngine> JsEnginePtr;
53 53
54 /** 54 /**
55 * A factory to construct DefaultTimer. 55 * A factory to construct DefaultTimer.
56 */ 56 */
57 TimerPtr CreateDefaultTimer(); 57 TimerPtr CreateDefaultTimer();
58 58
59 /** 59 /**
60 * A factory to construct DefaultFileSystem. 60 * A factory to construct DefaultFileSystem.
61 */ 61 */
62 FileSystemPtr CreateDefaultFileSystem(); 62 FileSystemPtr CreateDefaultFileSystem(const Scheduler& scheduler);
63 63
64 /** 64 /**
65 * A factory to construct DefaultWebRequest. 65 * A factory to construct DefaultWebRequest.
66 */ 66 */
67 WebRequestPtr CreateDefaultWebRequest(const Scheduler& scheduler); 67 WebRequestPtr CreateDefaultWebRequest(const Scheduler& scheduler);
68 68
69 /** 69 /**
70 * A factory to construct LogSystem. 70 * A factory to construct LogSystem.
71 */ 71 */
72 LogSystemPtr CreateDefaultLogSystem(); 72 LogSystemPtr CreateDefaultLogSystem();
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 EventMap eventCallbacks; 320 EventMap eventCallbacks;
321 std::mutex eventCallbacksMutex; 321 std::mutex eventCallbacksMutex;
322 JsWeakValuesLists jsWeakValuesLists; 322 JsWeakValuesLists jsWeakValuesLists;
323 std::mutex jsWeakValuesListsMutex; 323 std::mutex jsWeakValuesListsMutex;
324 TimerPtr timer; 324 TimerPtr timer;
325 WebRequestPtr webRequest; 325 WebRequestPtr webRequest;
326 }; 326 };
327 } 327 }
328 328
329 #endif 329 #endif
OLDNEW
« no previous file with comments | « no previous file | src/DefaultFileSystem.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld