refactor: use C++11 class member variable initialization (#27477)
This commit is contained in:
parent
f083380c38
commit
ddf3ef0a5f
93 changed files with 130 additions and 163 deletions
|
@ -76,8 +76,7 @@ v8::Local<v8::Value> ToBuffer(v8::Isolate* isolate, void* val, int size) {
|
|||
} // namespace
|
||||
|
||||
BaseWindow::BaseWindow(v8::Isolate* isolate,
|
||||
const gin_helper::Dictionary& options)
|
||||
: weak_factory_(this) {
|
||||
const gin_helper::Dictionary& options) {
|
||||
// The parent window.
|
||||
gin::Handle<BaseWindow> parent;
|
||||
if (options.Get("parent", &parent) && !parent.IsEmpty())
|
||||
|
|
|
@ -274,7 +274,7 @@ class BaseWindow : public gin_helper::TrackableObject<BaseWindow>,
|
|||
// Reference to JS wrapper to prevent garbage collection.
|
||||
v8::Global<v8::Value> self_ref_;
|
||||
|
||||
base::WeakPtrFactory<BaseWindow> weak_factory_;
|
||||
base::WeakPtrFactory<BaseWindow> weak_factory_{this};
|
||||
};
|
||||
|
||||
} // namespace api
|
||||
|
|
|
@ -32,7 +32,7 @@ namespace api {
|
|||
|
||||
BrowserWindow::BrowserWindow(gin::Arguments* args,
|
||||
const gin_helper::Dictionary& options)
|
||||
: BaseWindow(args->isolate(), options), weak_factory_(this) {
|
||||
: BaseWindow(args->isolate(), options) {
|
||||
// Use options.webPreferences in WebContents.
|
||||
v8::Isolate* isolate = args->isolate();
|
||||
gin_helper::Dictionary web_preferences =
|
||||
|
|
|
@ -126,7 +126,7 @@ class BrowserWindow : public BaseWindow,
|
|||
v8::Global<v8::Value> web_contents_;
|
||||
base::WeakPtr<api::WebContents> api_web_contents_;
|
||||
|
||||
base::WeakPtrFactory<BrowserWindow> weak_factory_;
|
||||
base::WeakPtrFactory<BrowserWindow> weak_factory_{this};
|
||||
|
||||
DISALLOW_COPY_AND_ASSIGN(BrowserWindow);
|
||||
};
|
||||
|
|
|
@ -47,7 +47,7 @@ class MenuMac : public Menu {
|
|||
// window ID -> open context menu
|
||||
std::map<int32_t, scoped_nsobject<ElectronMenuController>> popup_controllers_;
|
||||
|
||||
base::WeakPtrFactory<MenuMac> weak_factory_;
|
||||
base::WeakPtrFactory<MenuMac> weak_factory_{this};
|
||||
|
||||
DISALLOW_COPY_AND_ASSIGN(MenuMac);
|
||||
};
|
||||
|
|
|
@ -30,7 +30,7 @@ namespace electron {
|
|||
|
||||
namespace api {
|
||||
|
||||
MenuMac::MenuMac(gin::Arguments* args) : Menu(args), weak_factory_(this) {}
|
||||
MenuMac::MenuMac(gin::Arguments* args) : Menu(args) {}
|
||||
|
||||
MenuMac::~MenuMac() = default;
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@ namespace electron {
|
|||
|
||||
namespace api {
|
||||
|
||||
MenuViews::MenuViews(gin::Arguments* args) : Menu(args), weak_factory_(this) {}
|
||||
MenuViews::MenuViews(gin::Arguments* args) : Menu(args) {}
|
||||
|
||||
MenuViews::~MenuViews() = default;
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@ class MenuViews : public Menu {
|
|||
// window ID -> open context menu
|
||||
std::map<int32_t, std::unique_ptr<views::MenuRunner>> menu_runners_;
|
||||
|
||||
base::WeakPtrFactory<MenuViews> weak_factory_;
|
||||
base::WeakPtrFactory<MenuViews> weak_factory_{this};
|
||||
|
||||
DISALLOW_COPY_AND_ASSIGN(MenuViews);
|
||||
};
|
||||
|
|
|
@ -79,7 +79,7 @@ namespace api {
|
|||
gin::WrapperInfo NetLog::kWrapperInfo = {gin::kEmbedderNativeGin};
|
||||
|
||||
NetLog::NetLog(v8::Isolate* isolate, ElectronBrowserContext* browser_context)
|
||||
: browser_context_(browser_context), weak_ptr_factory_(this) {
|
||||
: browser_context_(browser_context) {
|
||||
file_task_runner_ = CreateFileTaskRunner();
|
||||
}
|
||||
|
||||
|
|
|
@ -65,7 +65,7 @@ class NetLog : public gin::Wrappable<NetLog> {
|
|||
|
||||
scoped_refptr<base::TaskRunner> file_task_runner_;
|
||||
|
||||
base::WeakPtrFactory<NetLog> weak_ptr_factory_;
|
||||
base::WeakPtrFactory<NetLog> weak_ptr_factory_{this};
|
||||
|
||||
DISALLOW_COPY_AND_ASSIGN(NetLog);
|
||||
};
|
||||
|
|
|
@ -45,8 +45,7 @@ namespace api {
|
|||
gin::WrapperInfo PowerSaveBlocker::kWrapperInfo = {gin::kEmbedderNativeGin};
|
||||
|
||||
PowerSaveBlocker::PowerSaveBlocker(v8::Isolate* isolate)
|
||||
: current_lock_type_(device::mojom::WakeLockType::kPreventAppSuspension),
|
||||
is_wake_lock_active_(false) {}
|
||||
: current_lock_type_(device::mojom::WakeLockType::kPreventAppSuspension) {}
|
||||
|
||||
PowerSaveBlocker::~PowerSaveBlocker() = default;
|
||||
|
||||
|
|
|
@ -44,7 +44,7 @@ class PowerSaveBlocker : public gin::Wrappable<PowerSaveBlocker> {
|
|||
device::mojom::WakeLockType current_lock_type_;
|
||||
|
||||
// Whether the wake lock is currently active.
|
||||
bool is_wake_lock_active_;
|
||||
bool is_wake_lock_active_ = false;
|
||||
|
||||
// Map from id to the corresponding blocker type for each request.
|
||||
using WakeLockTypeMap = std::map<int, device::mojom::WakeLockType>;
|
||||
|
|
|
@ -74,7 +74,7 @@ gin::WrapperInfo ServiceWorkerContext::kWrapperInfo = {gin::kEmbedderNativeGin};
|
|||
ServiceWorkerContext::ServiceWorkerContext(
|
||||
v8::Isolate* isolate,
|
||||
ElectronBrowserContext* browser_context)
|
||||
: browser_context_(browser_context), weak_ptr_factory_(this) {
|
||||
: browser_context_(browser_context) {
|
||||
service_worker_context_ =
|
||||
content::BrowserContext::GetDefaultStoragePartition(browser_context_)
|
||||
->GetServiceWorkerContext();
|
||||
|
|
|
@ -52,7 +52,7 @@ class ServiceWorkerContext
|
|||
|
||||
content::ServiceWorkerContext* service_worker_context_;
|
||||
|
||||
base::WeakPtrFactory<ServiceWorkerContext> weak_ptr_factory_;
|
||||
base::WeakPtrFactory<ServiceWorkerContext> weak_ptr_factory_{this};
|
||||
|
||||
DISALLOW_COPY_AND_ASSIGN(ServiceWorkerContext);
|
||||
};
|
||||
|
|
|
@ -156,9 +156,9 @@ class SystemPreferences
|
|||
|
||||
std::string current_color_;
|
||||
|
||||
bool invertered_color_scheme_;
|
||||
bool invertered_color_scheme_ = false;
|
||||
|
||||
bool high_contrast_color_scheme_;
|
||||
bool high_contrast_color_scheme_ = false;
|
||||
|
||||
std::unique_ptr<gfx::ScopedSysColorChangeListener> color_change_listener_;
|
||||
#endif
|
||||
|
|
|
@ -617,11 +617,12 @@ WebContents::WebContents(v8::Isolate* isolate,
|
|||
id_(GetAllWebContents().Add(this)),
|
||||
devtools_file_system_indexer_(new DevToolsFileSystemIndexer),
|
||||
file_task_runner_(
|
||||
base::ThreadPool::CreateSequencedTaskRunner({base::MayBlock()})),
|
||||
base::ThreadPool::CreateSequencedTaskRunner({base::MayBlock()}))
|
||||
#if BUILDFLAG(ENABLE_PRINTING)
|
||||
print_task_runner_(CreatePrinterHandlerTaskRunner()),
|
||||
,
|
||||
print_task_runner_(CreatePrinterHandlerTaskRunner())
|
||||
#endif
|
||||
weak_factory_(this) {
|
||||
{
|
||||
#if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
|
||||
// WebContents created by extension host will have valid ViewType set.
|
||||
extensions::ViewType view_type = extensions::GetViewType(web_contents);
|
||||
|
@ -653,11 +654,12 @@ WebContents::WebContents(v8::Isolate* isolate,
|
|||
id_(GetAllWebContents().Add(this)),
|
||||
devtools_file_system_indexer_(new DevToolsFileSystemIndexer),
|
||||
file_task_runner_(
|
||||
base::ThreadPool::CreateSequencedTaskRunner({base::MayBlock()})),
|
||||
base::ThreadPool::CreateSequencedTaskRunner({base::MayBlock()}))
|
||||
#if BUILDFLAG(ENABLE_PRINTING)
|
||||
print_task_runner_(CreatePrinterHandlerTaskRunner()),
|
||||
,
|
||||
print_task_runner_(CreatePrinterHandlerTaskRunner())
|
||||
#endif
|
||||
weak_factory_(this) {
|
||||
{
|
||||
DCHECK(type != Type::kRemote)
|
||||
<< "Can't take ownership of a remote WebContents";
|
||||
auto session = Session::CreateFrom(isolate, GetBrowserContext());
|
||||
|
@ -671,11 +673,12 @@ WebContents::WebContents(v8::Isolate* isolate,
|
|||
: id_(GetAllWebContents().Add(this)),
|
||||
devtools_file_system_indexer_(new DevToolsFileSystemIndexer),
|
||||
file_task_runner_(
|
||||
base::ThreadPool::CreateSequencedTaskRunner({base::MayBlock()})),
|
||||
base::ThreadPool::CreateSequencedTaskRunner({base::MayBlock()}))
|
||||
#if BUILDFLAG(ENABLE_PRINTING)
|
||||
print_task_runner_(CreatePrinterHandlerTaskRunner()),
|
||||
,
|
||||
print_task_runner_(CreatePrinterHandlerTaskRunner())
|
||||
#endif
|
||||
weak_factory_(this) {
|
||||
{
|
||||
// Read options.
|
||||
options.Get("backgroundThrottling", &background_throttling_);
|
||||
|
||||
|
|
|
@ -787,7 +787,7 @@ class WebContents : public gin::Wrappable<WebContents>,
|
|||
|
||||
service_manager::BinderRegistryWithArgs<content::RenderFrameHost*> registry_;
|
||||
|
||||
base::WeakPtrFactory<WebContents> weak_factory_;
|
||||
base::WeakPtrFactory<WebContents> weak_factory_{this};
|
||||
|
||||
DISALLOW_COPY_AND_ASSIGN(WebContents);
|
||||
};
|
||||
|
|
|
@ -26,8 +26,7 @@ FrameSubscriber::FrameSubscriber(content::WebContents* web_contents,
|
|||
bool only_dirty)
|
||||
: content::WebContentsObserver(web_contents),
|
||||
callback_(callback),
|
||||
only_dirty_(only_dirty),
|
||||
weak_ptr_factory_(this) {
|
||||
only_dirty_(only_dirty) {
|
||||
content::RenderViewHost* rvh = web_contents->GetRenderViewHost();
|
||||
if (rvh)
|
||||
AttachToHost(rvh->GetWidget());
|
||||
|
|
|
@ -67,7 +67,7 @@ class FrameSubscriber : public content::WebContentsObserver,
|
|||
content::RenderWidgetHost* host_;
|
||||
std::unique_ptr<viz::ClientFrameSinkVideoCapturer> video_capturer_;
|
||||
|
||||
base::WeakPtrFactory<FrameSubscriber> weak_ptr_factory_;
|
||||
base::WeakPtrFactory<FrameSubscriber> weak_ptr_factory_{this};
|
||||
|
||||
DISALLOW_COPY_AND_ASSIGN(FrameSubscriber);
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue