From 859567983a939a5d920c1751cdc53695b3ce4b86 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 5 Oct 2018 10:38:27 -0500 Subject: [PATCH] chore: run clang-format to clear linter for #14977 (#14990) --- atom/browser/api/stream_subscriber.cc | 13 +++++++------ atom/browser/api/stream_subscriber.h | 4 ++-- atom/browser/mac/dict_util.h | 2 +- atom/browser/net/url_request_stream_job.cc | 9 +++++---- atom/browser/net/url_request_stream_job.h | 3 ++- atom/browser/osr/osr_render_widget_host_view.cc | 2 +- atom/browser/ui/accelerator_util.cc | 2 +- atom/common/native_mate_converters/callback.cc | 11 +++++------ atom/common/native_mate_converters/callback.h | 15 ++++++++------- 9 files changed, 32 insertions(+), 29 deletions(-) diff --git a/atom/browser/api/stream_subscriber.cc b/atom/browser/api/stream_subscriber.cc index f28bcc0a3cf6..ec2b924a4aa9 100644 --- a/atom/browser/api/stream_subscriber.cc +++ b/atom/browser/api/stream_subscriber.cc @@ -34,7 +34,8 @@ StreamSubscriber::~StreamSubscriber() { RemoveAllListeners(); } -void StreamSubscriber::On(const std::string& event, EventCallback&& callback) { // NOLINT +void StreamSubscriber::On(const std::string& event, + EventCallback&& callback) { // NOLINT DCHECK_CURRENTLY_ON(content::BrowserThread::UI); DCHECK(js_handlers_.find(event) == js_handlers_.end()); @@ -44,7 +45,7 @@ void StreamSubscriber::On(const std::string& event, EventCallback&& callback) { // emitter.on(event, EventEmitted) auto fn = CallbackToV8(isolate_, callback); js_handlers_[event] = v8::Global(isolate_, fn); - internal::ValueVector args = { StringToV8(isolate_, event), fn }; + internal::ValueVector args = {StringToV8(isolate_, event), fn}; internal::CallMethodWithArgs(isolate_, emitter_.Get(isolate_), "on", &args); } @@ -77,8 +78,8 @@ void StreamSubscriber::OnData(mate::Arguments* args) { std::vector buffer(data, data + length); content::BrowserThread::PostTask( content::BrowserThread::IO, FROM_HERE, - base::Bind(&atom::URLRequestStreamJob::OnData, - url_job_, base::Passed(&buffer))); + base::Bind(&atom::URLRequestStreamJob::OnData, url_job_, + base::Passed(&buffer))); } void StreamSubscriber::OnEnd(mate::Arguments* args) { @@ -103,8 +104,8 @@ void StreamSubscriber::RemoveAllListeners() { } void StreamSubscriber::RemoveListener(JSHandlersMap::iterator it) { - internal::ValueVector args = { StringToV8(isolate_, it->first), - it->second.Get(isolate_) }; + internal::ValueVector args = {StringToV8(isolate_, it->first), + it->second.Get(isolate_)}; internal::CallMethodWithArgs(isolate_, emitter_.Get(isolate_), "removeListener", &args); js_handlers_.erase(it); diff --git a/atom/browser/api/stream_subscriber.h b/atom/browser/api/stream_subscriber.h index 19bda81b95ba..3a766b92b52d 100644 --- a/atom/browser/api/stream_subscriber.h +++ b/atom/browser/api/stream_subscriber.h @@ -26,8 +26,8 @@ class Arguments; class StreamSubscriber { public: StreamSubscriber(v8::Isolate* isolate, - v8::Local emitter, - base::WeakPtr url_job); + v8::Local emitter, + base::WeakPtr url_job); ~StreamSubscriber(); private: diff --git a/atom/browser/mac/dict_util.h b/atom/browser/mac/dict_util.h index a5b973698f84..740f2c71377d 100644 --- a/atom/browser/mac/dict_util.h +++ b/atom/browser/mac/dict_util.h @@ -12,7 +12,7 @@ namespace base { class ListValue; class DictionaryValue; -} +} // namespace base namespace atom { diff --git a/atom/browser/net/url_request_stream_job.cc b/atom/browser/net/url_request_stream_job.cc index 6d3b81eaabdc..4761c68835f2 100644 --- a/atom/browser/net/url_request_stream_job.cc +++ b/atom/browser/net/url_request_stream_job.cc @@ -87,7 +87,7 @@ void URLRequestStreamJob::BeforeStartInUI(v8::Isolate* isolate, } subscriber_.reset(new mate::StreamSubscriber(isolate, data.GetHandle(), - weak_factory_.GetWeakPtr())); + weak_factory_.GetWeakPtr())); } void URLRequestStreamJob::StartAsync(std::unique_ptr options) { @@ -123,8 +123,8 @@ void URLRequestStreamJob::OnEnd() { } void URLRequestStreamJob::OnError() { - NotifyStartError(net::URLRequestStatus(net::URLRequestStatus::FAILED, - net::ERR_FAILED)); + NotifyStartError( + net::URLRequestStatus(net::URLRequestStatus::FAILED, net::ERR_FAILED)); } int URLRequestStreamJob::ReadRawData(net::IOBuffer* dest, int dest_size) { @@ -186,7 +186,8 @@ void URLRequestStreamJob::GetResponseInfo(net::HttpResponseInfo* info) { } int URLRequestStreamJob::BufferCopy(std::vector* source, - net::IOBuffer* target, int target_size) { + net::IOBuffer* target, + int target_size) { int bytes_written = std::min(static_cast(source->size()), target_size); memcpy(target->data(), source->data(), bytes_written); return bytes_written; diff --git a/atom/browser/net/url_request_stream_job.h b/atom/browser/net/url_request_stream_job.h index a967ca145322..8c1ed83c8bec 100644 --- a/atom/browser/net/url_request_stream_job.h +++ b/atom/browser/net/url_request_stream_job.h @@ -49,7 +49,8 @@ class URLRequestStreamJob : public JsAsker { void OnResponse(bool success, std::unique_ptr value); int BufferCopy(std::vector* source, - net::IOBuffer* target, int target_size); + net::IOBuffer* target, + int target_size); // Saved arguments passed to ReadRawData. scoped_refptr pending_buf_; diff --git a/atom/browser/osr/osr_render_widget_host_view.cc b/atom/browser/osr/osr_render_widget_host_view.cc index 19d33f0737aa..a3d3a3fdfd42 100644 --- a/atom/browser/osr/osr_render_widget_host_view.cc +++ b/atom/browser/osr/osr_render_widget_host_view.cc @@ -27,8 +27,8 @@ #include "content/public/browser/context_factory.h" #include "content/public/browser/render_process_host.h" #include "media/base/video_frame.h" -#include "third_party/skia/include/core/SkCanvas.h" #include "third_party/blink/public/platform/web_input_event.h" +#include "third_party/skia/include/core/SkCanvas.h" #include "ui/compositor/compositor.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_type.h" diff --git a/atom/browser/ui/accelerator_util.cc b/atom/browser/ui/accelerator_util.cc index 8a8067c5a788..0a6c5233563d 100644 --- a/atom/browser/ui/accelerator_util.cc +++ b/atom/browser/ui/accelerator_util.cc @@ -92,7 +92,7 @@ bool TriggerAcceleratorTableCommand(AcceleratorTable* table, const accelerator_util::MenuItem& item = (*table)[accelerator]; if (item.model->IsEnabledAt(item.position)) { const auto event_flags = - accelerator.MaskOutKeyEventFlags(accelerator.modifiers()); + accelerator.MaskOutKeyEventFlags(accelerator.modifiers()); item.model->ActivatedAt(item.position, event_flags); return true; } diff --git a/atom/common/native_mate_converters/callback.cc b/atom/common/native_mate_converters/callback.cc index b72d51f35453..27d43a0ad8e1 100644 --- a/atom/common/native_mate_converters/callback.cc +++ b/atom/common/native_mate_converters/callback.cc @@ -114,8 +114,9 @@ v8::Local SafeV8Function::NewHandle(v8::Isolate* isolate) const { return v8_function_->NewHandle(isolate); } -v8::Local CreateFunctionFromTranslater( - v8::Isolate* isolate, const Translater& translater, bool one_time) { +v8::Local CreateFunctionFromTranslater(v8::Isolate* isolate, + const Translater& translater, + bool one_time) { // The FunctionTemplate is cached. if (g_call_translater.IsEmpty()) g_call_translater.Reset(isolate, mate::CreateFunctionTemplate( @@ -128,11 +129,9 @@ v8::Local CreateFunctionFromTranslater( Dictionary state = mate::Dictionary::CreateEmpty(isolate); if (one_time) state.Set("oneTime", true); - return BindFunctionWith(isolate, - isolate->GetCurrentContext(), + return BindFunctionWith(isolate, isolate->GetCurrentContext(), call_translater->GetFunction(), - holder->handle.Get(isolate), - state.GetHandle()); + holder->handle.Get(isolate), state.GetHandle()); } // func.bind(func, arg1). diff --git a/atom/common/native_mate_converters/callback.h b/atom/common/native_mate_converters/callback.h index 1bf8ecd7537d..5ec1c317a8e9 100644 --- a/atom/common/native_mate_converters/callback.h +++ b/atom/common/native_mate_converters/callback.h @@ -108,8 +108,9 @@ struct V8FunctionInvoker { // Helper to pass a C++ funtion to JavaScript. using Translater = base::Callback; -v8::Local CreateFunctionFromTranslater( - v8::Isolate* isolate, const Translater& translater, bool one_time); +v8::Local CreateFunctionFromTranslater(v8::Isolate* isolate, + const Translater& translater, + bool one_time); v8::Local BindFunctionWith(v8::Isolate* isolate, v8::Local context, v8::Local func, @@ -152,8 +153,8 @@ struct Converter> { const base::RepeatingCallback& val) { // We don't use CreateFunctionTemplate here because it creates a new // FunctionTemplate everytime, which is cached by V8 and causes leaks. - internal::Translater translater = base::Bind( - &internal::NativeFunctionInvoker::Go, val); + internal::Translater translater = + base::Bind(&internal::NativeFunctionInvoker::Go, val); // To avoid memory leak, we ensure that the callback can only be called // for once. return internal::CreateFunctionFromTranslater(isolate, translater, true); @@ -172,11 +173,11 @@ struct Converter> { // Convert a callback to V8 without the call number limitation, this can easily // cause memory leaks so use it with caution. -template +template v8::Local CallbackToV8(v8::Isolate* isolate, const base::Callback& val) { - internal::Translater translater = base::Bind( - &internal::NativeFunctionInvoker::Go, val); + internal::Translater translater = + base::Bind(&internal::NativeFunctionInvoker::Go, val); return internal::CreateFunctionFromTranslater(isolate, translater, false); }