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

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

Issue 29536678: Noissue - fix a warning class 'IV8IsolateProvider' was previously declared as a struct [-Wmismatche… (Closed) Base URL: https://hg.adblockplus.org/libadblockplus/
Left Patch Set: Rebased Created Sept. 5, 2017, 5:43 p.m.
Right Patch Set: RE-rebase properly Created Sept. 5, 2017, 6:18 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 | « no previous file | no next file » | 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-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 12 matching lines...) Expand all
23 #include "IFileSystem.h" 23 #include "IFileSystem.h"
24 #include "IWebRequest.h" 24 #include "IWebRequest.h"
25 #include "AppInfo.h" 25 #include "AppInfo.h"
26 #include "Scheduler.h" 26 #include "Scheduler.h"
27 #include "FilterEngine.h" 27 #include "FilterEngine.h"
28 #include <mutex> 28 #include <mutex>
29 #include <future> 29 #include <future>
30 30
31 namespace AdblockPlus 31 namespace AdblockPlus
32 { 32 {
33 /** 33 struct IV8IsolateProvider;
34 * A factory to construct DefaultTimer.
35 */
36 TimerPtr CreateDefaultTimer();
37
38 /**
39 * A factory to construct DefaultFileSystem.
40 */
41 FileSystemPtr CreateDefaultFileSystem(const Scheduler& scheduler, const std::s tring& basePath = std::string());
42
43 /**
44 * A factory to construct DefaultWebRequest.
45 */
46 WebRequestPtr CreateDefaultWebRequest(const Scheduler& scheduler, WebRequestSy ncPtr syncImpl = nullptr);
47
48 /**
49 * A factory to construct LogSystem.
50 */
51 LogSystemPtr CreateDefaultLogSystem();
52
53 class IV8IsolateProvider;
sergei 2017/09/05 17:54:51 It seems there had been some conflicts in rebase a
54 class JsEngine; 34 class JsEngine;
55 35
56 /** 36 /**
57 * AdblockPlus platform is the main component providing access to other 37 * AdblockPlus platform is the main component providing access to other
58 * modules. 38 * modules.
59 * 39 *
60 * It manages the functionality modules, e.g. JsEngine and FilterEngine as 40 * It manages the functionality modules, e.g. JsEngine and FilterEngine as
61 * well as allows to correctly work with asynchronous functionality. 41 * well as allows to correctly work with asynchronous functionality.
62 */ 42 */
63 class Platform 43 class Platform
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 * when a corresponding field is nullptr and with a default Scheduler. 179 * when a corresponding field is nullptr and with a default Scheduler.
200 */ 180 */
201 std::unique_ptr<Platform> CreatePlatform(); 181 std::unique_ptr<Platform> CreatePlatform();
202 private: 182 private:
203 std::shared_ptr<Scheduler> asyncExecutor; 183 std::shared_ptr<Scheduler> asyncExecutor;
204 Scheduler defaultScheduler; 184 Scheduler defaultScheduler;
205 }; 185 };
206 } 186 }
207 187
208 #endif // ADBLOCK_PLUS_PLATFORM_H 188 #endif // ADBLOCK_PLUS_PLATFORM_H
LEFTRIGHT
« no previous file | no next file » | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld