Apply base_bind_rewriters to //content/renderer/input
This CL applies //tools/clang/base_bind_rewriters to //content/renderer/input
It rewrites base::Bind to base::BindOnce where the resulting base::Callback
is immediately converted to base::OnceCallback, which is considered safe
to use base::BindOnce.
E.g.:
base::PostTask(FROM_HERE, base::Bind([]{}));
base::OnceClosure cb = base::Bind([]{});
are converted to:
base::PostTask(FROM_HERE, base::BindOnce([]{}));
base::OnceClosure cb = base::BindOnce([]{});
Change-Id: I54d839c5d69736a063f39b843b7314c185118ed4
Reviewed-on: https://chromium-review.googlesource.com/628054
Reviewed-by: Dave Tapuska <[email protected]>
Commit-Queue: Taiju Tsuiki <[email protected]>
Cr-Commit-Position: refs/heads/master@{#497320}diff --git a/content/renderer/input/frame_input_handler_impl.cc b/content/renderer/input/frame_input_handler_impl.cc
index 79a223a4..645c45c 100644
--- a/content/renderer/input/frame_input_handler_impl.cc
+++ b/content/renderer/input/frame_input_handler_impl.cc
@@ -424,7 +424,7 @@
// thread to delete this object.
binding_.Close();
main_thread_task_runner_->PostTask(
- FROM_HERE, base::Bind(&FrameInputHandlerImpl::Release, weak_this_));
+ FROM_HERE, base::BindOnce(&FrameInputHandlerImpl::Release, weak_this_));
return;
}
delete this;
@@ -433,7 +433,7 @@
void FrameInputHandlerImpl::BindNow(mojom::FrameInputHandlerRequest request) {
binding_.Bind(std::move(request));
binding_.set_connection_error_handler(
- base::Bind(&FrameInputHandlerImpl::Release, base::Unretained(this)));
+ base::BindOnce(&FrameInputHandlerImpl::Release, base::Unretained(this)));
}
FrameInputHandlerImpl::HandlingState::HandlingState(
diff --git a/content/renderer/input/input_event_filter.cc b/content/renderer/input/input_event_filter.cc
index bba934a..f0d87bb 100644
--- a/content/renderer/input/input_event_filter.cc
+++ b/content/renderer/input/input_event_filter.cc
@@ -196,8 +196,8 @@
}
bool postedTask = target_task_runner_->PostTask(
- FROM_HERE, base::Bind(&InputEventFilter::ForwardToHandler, this,
- routing_id, message, received_time));
+ FROM_HERE, base::BindOnce(&InputEventFilter::ForwardToHandler, this,
+ routing_id, message, received_time));
LOG_IF(WARNING, !postedTask) << "PostTask failed";
return true;
}
@@ -299,8 +299,8 @@
void InputEventFilter::SendMessage(std::unique_ptr<IPC::Message> message) {
CHECK(io_task_runner_->PostTask(
- FROM_HERE, base::Bind(&InputEventFilter::SendMessageOnIOThread, this,
- base::Passed(&message))))
+ FROM_HERE, base::BindOnce(&InputEventFilter::SendMessageOnIOThread, this,
+ base::Passed(&message))))
<< "PostTask failed";
}
diff --git a/content/renderer/input/input_handler_manager.cc b/content/renderer/input/input_handler_manager.cc
index b12010d..19b9e75 100644
--- a/content/renderer/input/input_handler_manager.cc
+++ b/content/renderer/input/input_handler_manager.cc
@@ -81,10 +81,11 @@
} else {
task_runner_->PostTask(
FROM_HERE,
- base::Bind(&InputHandlerManager::AddInputHandlerOnCompositorThread,
- base::Unretained(this), routing_id,
- base::ThreadTaskRunnerHandle::Get(), input_handler,
- input_event_queue, render_widget, enable_smooth_scrolling));
+ base::BindOnce(&InputHandlerManager::AddInputHandlerOnCompositorThread,
+ base::Unretained(this), routing_id,
+ base::ThreadTaskRunnerHandle::Get(), input_handler,
+ input_event_queue, render_widget,
+ enable_smooth_scrolling));
}
}
@@ -142,10 +143,11 @@
} else {
task_runner_->PostTask(
FROM_HERE,
- base::Bind(&InputHandlerManager::
- RegisterAssociatedRenderFrameRoutingIDOnCompositorThread,
- base::Unretained(this), render_frame_routing_id,
- render_view_routing_id));
+ base::BindOnce(
+ &InputHandlerManager::
+ RegisterAssociatedRenderFrameRoutingIDOnCompositorThread,
+ base::Unretained(this), render_frame_routing_id,
+ render_view_routing_id));
}
}
@@ -164,8 +166,9 @@
} else {
task_runner_->PostTask(
FROM_HERE,
- base::Bind(&InputHandlerManager::UnregisterRoutingIDOnCompositorThread,
- base::Unretained(this), routing_id));
+ base::BindOnce(
+ &InputHandlerManager::UnregisterRoutingIDOnCompositorThread,
+ base::Unretained(this), routing_id));
}
}
@@ -181,7 +184,7 @@
const cc::InputHandlerScrollResult& scroll_result) {
task_runner_->PostTask(
FROM_HERE,
- base::Bind(
+ base::BindOnce(
&InputHandlerManager::ObserveGestureEventAndResultOnCompositorThread,
base::Unretained(this), routing_id, gesture_event, scroll_result));
}
diff --git a/content/renderer/input/input_handler_wrapper.cc b/content/renderer/input/input_handler_wrapper.cc
index 29308940..d9610c7 100644
--- a/content/renderer/input/input_handler_wrapper.cc
+++ b/content/renderer/input/input_handler_wrapper.cc
@@ -40,14 +40,15 @@
void InputHandlerWrapper::NeedsMainFrame() {
main_task_runner_->PostTask(
FROM_HERE,
- base::Bind(&RenderWidget::SetNeedsMainFrame, render_widget_));
+ base::BindOnce(&RenderWidget::SetNeedsMainFrame, render_widget_));
}
void InputHandlerWrapper::TransferActiveWheelFlingAnimation(
const blink::WebActiveWheelFlingParameters& params) {
main_task_runner_->PostTask(
- FROM_HERE, base::Bind(&RenderWidget::TransferActiveWheelFlingAnimation,
- render_widget_, params));
+ FROM_HERE,
+ base::BindOnce(&RenderWidget::TransferActiveWheelFlingAnimation,
+ render_widget_, params));
}
void InputHandlerWrapper::DispatchNonBlockingEventToMainThread(
diff --git a/content/renderer/input/main_thread_event_queue.cc b/content/renderer/input/main_thread_event_queue.cc
index 7b15c0b8..3f5bce49 100644
--- a/content/renderer/input/main_thread_event_queue.cc
+++ b/content/renderer/input/main_thread_event_queue.cc
@@ -483,7 +483,7 @@
void MainThreadEventQueue::PostTaskToMainThread() {
main_task_runner_->PostTask(
- FROM_HERE, base::Bind(&MainThreadEventQueue::DispatchEvents, this));
+ FROM_HERE, base::BindOnce(&MainThreadEventQueue::DispatchEvents, this));
}
void MainThreadEventQueue::QueueEvent(
@@ -556,7 +556,8 @@
}
main_task_runner_->PostTask(
- FROM_HERE, base::Bind(&MainThreadEventQueue::SetNeedsMainFrame, this));
+ FROM_HERE,
+ base::BindOnce(&MainThreadEventQueue::SetNeedsMainFrame, this));
}
void MainThreadEventQueue::ClearClient() {
diff --git a/content/renderer/input/main_thread_event_queue_unittest.cc b/content/renderer/input/main_thread_event_queue_unittest.cc
index f8bd6573..97203cb 100644
--- a/content/renderer/input/main_thread_event_queue_unittest.cc
+++ b/content/renderer/input/main_thread_event_queue_unittest.cc
@@ -181,8 +181,8 @@
void QueueClosure() {
unsigned closure_id = ++closure_count_;
- queue_->QueueClosure(base::Bind(&MainThreadEventQueueTest::RunClosure,
- base::Unretained(this), closure_id));
+ queue_->QueueClosure(base::BindOnce(&MainThreadEventQueueTest::RunClosure,
+ base::Unretained(this), closure_id));
}
MainThreadEventQueueTaskList& event_queue() {
diff --git a/content/renderer/input/main_thread_input_event_filter.cc b/content/renderer/input/main_thread_input_event_filter.cc
index 61814c9..abab750 100644
--- a/content/renderer/input/main_thread_input_event_filter.cc
+++ b/content/renderer/input/main_thread_input_event_filter.cc
@@ -24,7 +24,7 @@
DCHECK_EQ(static_cast<int>(IPC_MESSAGE_ID_CLASS(message.type())),
InputMsgStart);
bool handled = main_task_runner_->PostTask(
- FROM_HERE, base::Bind(main_listener_, message));
+ FROM_HERE, base::BindOnce(main_listener_, message));
return handled;
}
diff --git a/content/renderer/input/widget_input_handler_impl.cc b/content/renderer/input/widget_input_handler_impl.cc
index e619ee8..b731df44 100644
--- a/content/renderer/input/widget_input_handler_impl.cc
+++ b/content/renderer/input/widget_input_handler_impl.cc
@@ -72,35 +72,36 @@
mojom::WidgetInputHandlerAssociatedRequest request) {
associated_binding_.Bind(std::move(request));
associated_binding_.set_connection_error_handler(
- base::Bind(&WidgetInputHandlerImpl::Release, base::Unretained(this)));
+ base::BindOnce(&WidgetInputHandlerImpl::Release, base::Unretained(this)));
}
void WidgetInputHandlerImpl::SetBinding(
mojom::WidgetInputHandlerRequest request) {
binding_.Bind(std::move(request));
binding_.set_connection_error_handler(
- base::Bind(&WidgetInputHandlerImpl::Release, base::Unretained(this)));
+ base::BindOnce(&WidgetInputHandlerImpl::Release, base::Unretained(this)));
}
void WidgetInputHandlerImpl::SetFocus(bool focused) {
RunOnMainThread(
- base::Bind(&RenderWidget::OnSetFocus, render_widget_, focused));
+ base::BindOnce(&RenderWidget::OnSetFocus, render_widget_, focused));
}
void WidgetInputHandlerImpl::MouseCaptureLost() {
RunOnMainThread(
- base::Bind(&RenderWidget::OnMouseCaptureLost, render_widget_));
+ base::BindOnce(&RenderWidget::OnMouseCaptureLost, render_widget_));
}
void WidgetInputHandlerImpl::SetEditCommandsForNextKeyEvent(
const std::vector<EditCommand>& commands) {
- RunOnMainThread(base::Bind(&RenderWidget::OnSetEditCommandsForNextKeyEvent,
- render_widget_, commands));
+ RunOnMainThread(
+ base::BindOnce(&RenderWidget::OnSetEditCommandsForNextKeyEvent,
+ render_widget_, commands));
}
void WidgetInputHandlerImpl::CursorVisibilityChanged(bool visible) {
- RunOnMainThread(base::Bind(&RenderWidget::OnCursorVisibilityChange,
- render_widget_, visible));
+ RunOnMainThread(base::BindOnce(&RenderWidget::OnCursorVisibilityChange,
+ render_widget_, visible));
}
void WidgetInputHandlerImpl::ImeSetComposition(
@@ -110,9 +111,9 @@
int32_t start,
int32_t end) {
RunOnMainThread(
- base::Bind(&RenderWidget::OnImeSetComposition, render_widget_, text,
- ConvertUIImeTextSpansToBlinkImeTextSpans(ime_text_spans),
- range, start, end));
+ base::BindOnce(&RenderWidget::OnImeSetComposition, render_widget_, text,
+ ConvertUIImeTextSpansToBlinkImeTextSpans(ime_text_spans),
+ range, start, end));
}
void WidgetInputHandlerImpl::ImeCommitText(
@@ -121,26 +122,26 @@
const gfx::Range& range,
int32_t relative_cursor_position) {
RunOnMainThread(
- base::Bind(&RenderWidget::OnImeCommitText, render_widget_, text,
- ConvertUIImeTextSpansToBlinkImeTextSpans(ime_text_spans),
- range, relative_cursor_position));
+ base::BindOnce(&RenderWidget::OnImeCommitText, render_widget_, text,
+ ConvertUIImeTextSpansToBlinkImeTextSpans(ime_text_spans),
+ range, relative_cursor_position));
}
void WidgetInputHandlerImpl::ImeFinishComposingText(bool keep_selection) {
- RunOnMainThread(base::Bind(&RenderWidget::OnImeFinishComposingText,
- render_widget_, keep_selection));
+ RunOnMainThread(base::BindOnce(&RenderWidget::OnImeFinishComposingText,
+ render_widget_, keep_selection));
}
void WidgetInputHandlerImpl::RequestTextInputStateUpdate() {
- RunOnMainThread(
- base::Bind(&RenderWidget::OnRequestTextInputStateUpdate, render_widget_));
+ RunOnMainThread(base::BindOnce(&RenderWidget::OnRequestTextInputStateUpdate,
+ render_widget_));
}
void WidgetInputHandlerImpl::RequestCompositionUpdates(bool immediate_request,
bool monitor_request) {
- RunOnMainThread(base::Bind(&RenderWidget::OnRequestCompositionUpdates,
- render_widget_, immediate_request,
- monitor_request));
+ RunOnMainThread(base::BindOnce(&RenderWidget::OnRequestCompositionUpdates,
+ render_widget_, immediate_request,
+ monitor_request));
}
void WidgetInputHandlerImpl::DispatchEvent(
@@ -172,8 +173,8 @@
associated_binding_.Close();
binding_.Close();
main_thread_task_runner_->PostTask(
- FROM_HERE,
- base::Bind(&WidgetInputHandlerImpl::Release, base::Unretained(this)));
+ FROM_HERE, base::BindOnce(&WidgetInputHandlerImpl::Release,
+ base::Unretained(this)));
return;
}
delete this;
diff --git a/content/renderer/input/widget_input_handler_manager.cc b/content/renderer/input/widget_input_handler_manager.cc
index 96d8eff..a4cc46d6 100644
--- a/content/renderer/input/widget_input_handler_manager.cc
+++ b/content/renderer/input/widget_input_handler_manager.cc
@@ -129,8 +129,9 @@
void WidgetInputHandlerManager::TransferActiveWheelFlingAnimation(
const blink::WebActiveWheelFlingParameters& params) {
main_thread_task_runner_->PostTask(
- FROM_HERE, base::Bind(&RenderWidget::TransferActiveWheelFlingAnimation,
- render_widget_, params));
+ FROM_HERE,
+ base::BindOnce(&RenderWidget::TransferActiveWheelFlingAnimation,
+ render_widget_, params));
}
void WidgetInputHandlerManager::DispatchNonBlockingEventToMainThread(
