Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1114)

Unified Diff: content/renderer/input/render_widget_input_handler.cc

Issue 1873783003: Convert //content/renderer from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/input/render_widget_input_handler.cc
diff --git a/content/renderer/input/render_widget_input_handler.cc b/content/renderer/input/render_widget_input_handler.cc
index 90734376315caa0fa148ce2776a0c0d4f099d40b..e407428414bb72c13349a14233874715ff6f97f5 100644
--- a/content/renderer/input/render_widget_input_handler.cc
+++ b/content/renderer/input/render_widget_input_handler.cc
@@ -188,8 +188,8 @@ void RenderWidgetInputHandler::HandleInputEvent(
// Calls into |didOverscroll()| while handling this event will populate
// |event_overscroll|, which in turn will be bundled with the event ack.
- scoped_ptr<DidOverscrollParams> event_overscroll;
- base::AutoReset<scoped_ptr<DidOverscrollParams>*>
+ std::unique_ptr<DidOverscrollParams> event_overscroll;
+ base::AutoReset<std::unique_ptr<DidOverscrollParams>*>
handling_event_overscroll_resetter(&handling_event_overscroll_,
&event_overscroll);
@@ -241,7 +241,7 @@ void RenderWidgetInputHandler::HandleInputEvent(
if (!start_time.is_null())
LogInputEventLatencyUma(input_event, start_time);
- scoped_ptr<cc::SwapPromiseMonitor> latency_info_swap_promise_monitor;
+ std::unique_ptr<cc::SwapPromiseMonitor> latency_info_swap_promise_monitor;
ui::LatencyInfo swap_latency_info(latency_info);
if (widget_->compositor()) {
@@ -411,7 +411,7 @@ void RenderWidgetInputHandler::HandleInputEvent(
if ((dispatch_type == DISPATCH_TYPE_BLOCKING ||
dispatch_type == DISPATCH_TYPE_BLOCKING_NOTIFY_MAIN) &&
can_send_ack) {
- scoped_ptr<InputEventAck> response(new InputEventAck(
+ std::unique_ptr<InputEventAck> response(new InputEventAck(
input_event.type, ack_result, swap_latency_info,
std::move(event_overscroll),
WebInputEventTraits::GetUniqueTouchEventId(input_event)));
@@ -489,7 +489,7 @@ void RenderWidgetInputHandler::DidOverscrollFromBlink(
const WebFloatSize& accumulatedRootOverScroll,
const WebFloatPoint& position,
const WebFloatSize& velocity) {
- scoped_ptr<DidOverscrollParams> params(new DidOverscrollParams());
+ std::unique_ptr<DidOverscrollParams> params(new DidOverscrollParams());
params->accumulated_overscroll = gfx::Vector2dF(
accumulatedRootOverScroll.width, accumulatedRootOverScroll.height);
params->latest_overscroll_delta =
@@ -515,7 +515,7 @@ bool RenderWidgetInputHandler::SendAckForMouseMoveFromDebugger() {
// If we pause multiple times during a single mouse move event, we should
// only send ACK once.
if (!ignore_ack_for_mouse_move_from_debugger_) {
- scoped_ptr<InputEventAck> ack(new InputEventAck(
+ std::unique_ptr<InputEventAck> ack(new InputEventAck(
handling_event_type_, INPUT_EVENT_ACK_STATE_CONSUMED));
delegate_->OnInputEventAck(std::move(ack));
return true;
« no previous file with comments | « content/renderer/input/render_widget_input_handler.h ('k') | content/renderer/input/render_widget_input_handler_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698