mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

build: fix build with enable_printing=false (#27456)

Browse source
This commit is contained in:
Milan Burda 2021-01-25 17:27:25 +01:00 committed by GitHub
parent e7c201288c
commit 1023988ea8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
shell/browser/api/electron_api_web_contents.cc
View file

@ -618,7 +618,9 @@ WebContents::WebContents(v8::Isolate* isolate,
devtools_file_system_indexer_(new DevToolsFileSystemIndexer), devtools_file_system_indexer_(new DevToolsFileSystemIndexer),
file_task_runner_( 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) { weak_factory_(this) {
#if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS) #if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
// WebContents created by extension host will have valid ViewType set. // WebContents created by extension host will have valid ViewType set.
@ -652,7 +654,9 @@ WebContents::WebContents(v8::Isolate* isolate,
devtools_file_system_indexer_(new DevToolsFileSystemIndexer), devtools_file_system_indexer_(new DevToolsFileSystemIndexer),
file_task_runner_( 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) { weak_factory_(this) {
DCHECK(type != Type::kRemote) DCHECK(type != Type::kRemote)
<< "Can't take ownership of a remote WebContents"; << "Can't take ownership of a remote WebContents";
@ -668,7 +672,9 @@ WebContents::WebContents(v8::Isolate* isolate,
devtools_file_system_indexer_(new DevToolsFileSystemIndexer), devtools_file_system_indexer_(new DevToolsFileSystemIndexer),
file_task_runner_( 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) { weak_factory_(this) {
// Read options. // Read options.
options.Get("backgroundThrottling", &background_throttling_); options.Get("backgroundThrottling", &background_throttling_);

3
shell/browser/api/electron_api_web_contents.h
View file

@ -777,7 +777,10 @@ class WebContents : public gin::Wrappable<WebContents>,
DevToolsIndexingJobsMap devtools_indexing_jobs_; DevToolsIndexingJobsMap devtools_indexing_jobs_;
scoped_refptr<base::SequencedTaskRunner> file_task_runner_; scoped_refptr<base::SequencedTaskRunner> file_task_runner_;
#if BUILDFLAG(ENABLE_PRINTING)
scoped_refptr<base::TaskRunner> print_task_runner_; scoped_refptr<base::TaskRunner> print_task_runner_;
#endif
// Stores the frame thats currently in fullscreen, nullptr if there is none. // Stores the frame thats currently in fullscreen, nullptr if there is none.
content::RenderFrameHost* fullscreen_frame_ = nullptr; content::RenderFrameHost* fullscreen_frame_ = nullptr;