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

chore: convert more module and helper files from bind (#18069)

Browse source
This commit is contained in:
Shelley Vohr 2019-05-02 08:32:33 -07:00 • committed by GitHub
parent 2dd108e9c9
commit 55a7f92297
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 42 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

3
atom/browser/api/atom_api_power_monitor.cc
View file

@ -140,7 +140,8 @@ void Initialize(v8::Local<v8::Object> exports,
void* priv) { void* priv) {
v8::Isolate* isolate = context->GetIsolate(); v8::Isolate* isolate = context->GetIsolate();
mate::Dictionary dict(isolate, exports); mate::Dictionary dict(isolate, exports);
dict.Set("createPowerMonitor", base::Bind(&PowerMonitor::Create, isolate)); dict.Set("createPowerMonitor",
base::BindRepeating(&PowerMonitor::Create, isolate));
dict.Set("PowerMonitor", PowerMonitor::GetConstructor(isolate) dict.Set("PowerMonitor", PowerMonitor::GetConstructor(isolate)
->GetFunction(context) ->GetFunction(context)
.ToLocalChecked()); .ToLocalChecked());

6
atom/browser/api/atom_api_render_process_preferences.cc
View file

@ -64,9 +64,9 @@ void RenderProcessPreferences::BuildPrototype(
// static // static
mate::Handle<RenderProcessPreferences> mate::Handle<RenderProcessPreferences>
RenderProcessPreferences::ForAllWebContents(v8::Isolate* isolate) { RenderProcessPreferences::ForAllWebContents(v8::Isolate* isolate) {
return mate::CreateHandle(isolate, return mate::CreateHandle(
new RenderProcessPreferences( isolate, new RenderProcessPreferences(
isolate, base::Bind(&IsWebContents, isolate))); isolate, base::BindRepeating(&IsWebContents, isolate)));
} }
} // namespace api } // namespace api

2
atom/browser/api/atom_api_screen.cc
View file

@ -163,7 +163,7 @@ void Initialize(v8::Local<v8::Object> exports,
void* priv) { void* priv) {
v8::Isolate* isolate = context->GetIsolate(); v8::Isolate* isolate = context->GetIsolate();
mate::Dictionary dict(isolate, exports); mate::Dictionary dict(isolate, exports);
dict.Set("createScreen", base::Bind(&Screen::Create, isolate)); dict.Set("createScreen", base::BindRepeating(&Screen::Create, isolate));
dict.Set( dict.Set(
"Screen", "Screen",
Screen::GetConstructor(isolate)->GetFunction(context).ToLocalChecked()); Screen::GetConstructor(isolate)->GetFunction(context).ToLocalChecked());

16
atom/browser/api/stream_subscriber.cc
View file

@ -28,9 +28,9 @@ StreamSubscriber::StreamSubscriber(
DCHECK(ui_task_runner->RunsTasksInCurrentSequence()); DCHECK(ui_task_runner->RunsTasksInCurrentSequence());
auto weak_self = weak_factory_.GetWeakPtr(); auto weak_self = weak_factory_.GetWeakPtr();
On("data", base::Bind(&StreamSubscriber::OnData, weak_self)); On("data", base::BindRepeating(&StreamSubscriber::OnData, weak_self));
On("end", base::Bind(&StreamSubscriber::OnEnd, weak_self)); On("end", base::BindRepeating(&StreamSubscriber::OnEnd, weak_self));
On("error", base::Bind(&StreamSubscriber::OnError, weak_self)); On("error", base::BindRepeating(&StreamSubscriber::OnError, weak_self));
} }
StreamSubscriber::~StreamSubscriber() { StreamSubscriber::~StreamSubscriber() {
@ -80,20 +80,20 @@ void StreamSubscriber::OnData(mate::Arguments* args) {
// Pass the data to the URLJob in IO thread. // Pass the data to the URLJob in IO thread.
std::vector<char> buffer(data, data + length); std::vector<char> buffer(data, data + length);
base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::IO}, base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::IO},
base::Bind(&atom::URLRequestStreamJob::OnData, base::BindOnce(&atom::URLRequestStreamJob::OnData,
url_job_, base::Passed(&buffer))); url_job_, base::Passed(&buffer)));
} }
void StreamSubscriber::OnEnd(mate::Arguments* args) { void StreamSubscriber::OnEnd(mate::Arguments* args) {
base::PostTaskWithTraits( base::PostTaskWithTraits(
FROM_HERE, {content::BrowserThread::IO}, FROM_HERE, {content::BrowserThread::IO},
base::Bind(&atom::URLRequestStreamJob::OnEnd, url_job_)); base::BindOnce(&atom::URLRequestStreamJob::OnEnd, url_job_));
} }
void StreamSubscriber::OnError(mate::Arguments* args) { void StreamSubscriber::OnError(mate::Arguments* args) {
base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::IO}, base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::IO},
base::Bind(&atom::URLRequestStreamJob::OnError, base::BindOnce(&atom::URLRequestStreamJob::OnError,
url_job_, net::ERR_FAILED)); url_job_, net::ERR_FAILED));
} }
void StreamSubscriber::RemoveAllListeners() { void StreamSubscriber::RemoveAllListeners() {

2
atom/browser/api/stream_subscriber.h
View file

@ -40,7 +40,7 @@ class StreamSubscriber
friend class base::RefCountedDeleteOnSequence<StreamSubscriber>; friend class base::RefCountedDeleteOnSequence<StreamSubscriber>;
using JSHandlersMap = std::map<std::string, v8::Global<v8::Value>>; using JSHandlersMap = std::map<std::string, v8::Global<v8::Value>>;
using EventCallback = base::Callback<void(mate::Arguments* args)>; using EventCallback = base::RepeatingCallback<void(mate::Arguments* args)>;
~StreamSubscriber(); ~StreamSubscriber();

8
atom/browser/atom_blob_reader.cc
View file

@ -81,8 +81,8 @@ void AtomBlobReader::BlobReadHelper::Read() {
DCHECK_CURRENTLY_ON(BrowserThread::IO); DCHECK_CURRENTLY_ON(BrowserThread::IO);
storage::BlobReader::Status size_status = blob_reader_->CalculateSize( storage::BlobReader::Status size_status = blob_reader_->CalculateSize(
base::Bind(&AtomBlobReader::BlobReadHelper::DidCalculateSize, base::BindOnce(&AtomBlobReader::BlobReadHelper::DidCalculateSize,
base::Unretained(this))); base::Unretained(this)));
if (size_status != storage::BlobReader::Status::IO_PENDING) if (size_status != storage::BlobReader::Status::IO_PENDING)
DidCalculateSize(net::OK); DidCalculateSize(net::OK);
} }
@ -100,8 +100,8 @@ void AtomBlobReader::BlobReadHelper::DidCalculateSize(int result) {
scoped_refptr<net::IOBuffer> blob_data = scoped_refptr<net::IOBuffer> blob_data =
new net::IOBuffer(static_cast<size_t>(total_size)); new net::IOBuffer(static_cast<size_t>(total_size));
auto callback = auto callback =
base::Bind(&AtomBlobReader::BlobReadHelper::DidReadBlobData, base::BindRepeating(&AtomBlobReader::BlobReadHelper::DidReadBlobData,
base::Unretained(this), base::RetainedRef(blob_data)); base::Unretained(this), base::RetainedRef(blob_data));
storage::BlobReader::Status read_status = storage::BlobReader::Status read_status =
blob_reader_->Read(blob_data.get(), total_size, &bytes_read, callback); blob_reader_->Read(blob_data.get(), total_size, &bytes_read, callback);
if (read_status != storage::BlobReader::Status::IO_PENDING) if (read_status != storage::BlobReader::Status::IO_PENDING)

6
atom/browser/atom_browser_main_parts_posix.cc
View file

@ -136,10 +136,10 @@ void ShutdownDetector::ThreadMain() {
bytes_read += ret; bytes_read += ret;
} while (bytes_read < sizeof(signal)); } while (bytes_read < sizeof(signal));
VLOG(1) << "Handling shutdown for signal " << signal << "."; VLOG(1) << "Handling shutdown for signal " << signal << ".";
base::Closure task =
base::Bind(&Browser::Quit, base::Unretained(Browser::Get()));
if (!base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI}, task)) { if (!base::PostTaskWithTraits(
FROM_HERE, {BrowserThread::UI},
base::BindOnce(&Browser::Quit, base::Unretained(Browser::Get())))) {
// Without a UI thread to post the exit task to, there aren't many // Without a UI thread to post the exit task to, there aren't many
// options. Raise the signal again. The default handler will pick it up // options. Raise the signal again. The default handler will pick it up
// and cause an ungraceful exit. // and cause an ungraceful exit.

6
atom/browser/atom_resource_dispatcher_host_delegate.cc
View file

@ -94,9 +94,9 @@ bool AtomResourceDispatcherHostDelegate::ShouldInterceptResourceAsStream(
*origin = GURL(kPdfViewerUIOrigin); *origin = GURL(kPdfViewerUIOrigin);
base::PostTaskWithTraits( base::PostTaskWithTraits(
FROM_HERE, {BrowserThread::UI}, FROM_HERE, {BrowserThread::UI},
base::Bind(&OnPdfResourceIntercepted, request->url(), base::BindOnce(&OnPdfResourceIntercepted, request->url(),
render_process_host_id, render_frame_id, render_process_host_id, render_frame_id,
info->GetWebContentsGetterForRequest())); info->GetWebContentsGetterForRequest()));
return true; return true;
} }
#endif // BUILDFLAG(ENABLE_PDF_VIEWER) #endif // BUILDFLAG(ENABLE_PDF_VIEWER)

21
atom/browser/ui/webui/pdf_viewer_handler.cc
View file

@ -76,22 +76,23 @@ void PdfViewerHandler::SetPdfResourceStream(content::StreamInfo* stream) {
void PdfViewerHandler::RegisterMessages() { void PdfViewerHandler::RegisterMessages() {
web_ui()->RegisterMessageCallback( web_ui()->RegisterMessageCallback(
"initialize", "initialize", base::BindRepeating(&PdfViewerHandler::Initialize,
base::Bind(&PdfViewerHandler::Initialize, base::Unretained(this))); base::Unretained(this)));
web_ui()->RegisterMessageCallback( web_ui()->RegisterMessageCallback(
"getDefaultZoom", "getDefaultZoom", base::BindRepeating(&PdfViewerHandler::GetInitialZoom,
base::Bind(&PdfViewerHandler::GetInitialZoom, base::Unretained(this))); base::Unretained(this)));
web_ui()->RegisterMessageCallback( web_ui()->RegisterMessageCallback(
"getInitialZoom", "getInitialZoom", base::BindRepeating(&PdfViewerHandler::GetInitialZoom,
base::Bind(&PdfViewerHandler::GetInitialZoom, base::Unretained(this))); base::Unretained(this)));
web_ui()->RegisterMessageCallback( web_ui()->RegisterMessageCallback(
"setZoom", "setZoom",
base::Bind(&PdfViewerHandler::SetZoom, base::Unretained(this))); base::BindRepeating(&PdfViewerHandler::SetZoom, base::Unretained(this)));
web_ui()->RegisterMessageCallback( web_ui()->RegisterMessageCallback(
"getStrings", "getStrings", base::BindRepeating(&PdfViewerHandler::GetStrings,
base::Bind(&PdfViewerHandler::GetStrings, base::Unretained(this))); base::Unretained(this)));
web_ui()->RegisterMessageCallback( web_ui()->RegisterMessageCallback(
"reload", base::Bind(&PdfViewerHandler::Reload, base::Unretained(this))); "reload",
base::BindRepeating(&PdfViewerHandler::Reload, base::Unretained(this)));
} }
void PdfViewerHandler::OnJavascriptAllowed() { void PdfViewerHandler::OnJavascriptAllowed() {

12
atom/browser/ui/webui/pdf_viewer_ui.cc
View file

@ -187,9 +187,9 @@ class PdfViewerUI::ResourceRequester
base::PostTaskWithTraits( base::PostTaskWithTraits(
FROM_HERE, {BrowserThread::UI}, FROM_HERE, {BrowserThread::UI},
base::Bind(&CallMigrationCallback<StreamResponseCallback>, base::BindOnce(&CallMigrationCallback<StreamResponseCallback>,
base::Passed(&stream_response_cb_), base::Passed(&stream_response_cb_),
base::Passed(&stream_info_))); base::Passed(&stream_info_)));
} }
private: private:
@ -246,9 +246,9 @@ void PdfViewerUI::RenderFrameCreated(content::RenderFrameHost* rfh) {
resource_requester_ = new ResourceRequester(std::move(callback)); resource_requester_ = new ResourceRequester(std::move(callback));
base::PostTaskWithTraits( base::PostTaskWithTraits(
FROM_HERE, {BrowserThread::IO}, FROM_HERE, {BrowserThread::IO},
base::Bind(&ResourceRequester::StartRequest, resource_requester_, base::BindOnce(&ResourceRequester::StartRequest, resource_requester_,
GURL(src_), GURL(kPdfViewerUIOrigin), render_process_id, GURL(src_), GURL(kPdfViewerUIOrigin), render_process_id,
render_view_id, render_frame_id, resource_context)); render_view_id, render_frame_id, resource_context));
} }
void PdfViewerUI::OnSaveURLAs(const GURL& url, void PdfViewerUI::OnSaveURLAs(const GURL& url,