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

Side by Side Diff: ui/events/blink/blink_event_util.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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 unified diff | Download patch
« no previous file with comments | « ui/events/blink/blink_event_util.h ('k') | ui/events/blink/input_handler_proxy.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // MSVC++ requires this to be set before any other includes to get M_PI. 5 // MSVC++ requires this to be set before any other includes to get M_PI.
6 #define _USE_MATH_DEFINES 6 #define _USE_MATH_DEFINES
7 7
8 #include "ui/events/blink/blink_event_util.h" 8 #include "ui/events/blink/blink_event_util.h"
9 9
10 #include <stddef.h> 10 #include <stddef.h>
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 return gesture; 332 return gesture;
333 } 333 }
334 334
335 WebGestureEvent CreateWebGestureEventFromGestureEventData( 335 WebGestureEvent CreateWebGestureEventFromGestureEventData(
336 const GestureEventData& data) { 336 const GestureEventData& data) {
337 return CreateWebGestureEvent(data.details, data.time - base::TimeTicks(), 337 return CreateWebGestureEvent(data.details, data.time - base::TimeTicks(),
338 gfx::PointF(data.x, data.y), 338 gfx::PointF(data.x, data.y),
339 gfx::PointF(data.raw_x, data.raw_y), data.flags); 339 gfx::PointF(data.raw_x, data.raw_y), data.flags);
340 } 340 }
341 341
342 scoped_ptr<blink::WebInputEvent> ScaleWebInputEvent( 342 std::unique_ptr<blink::WebInputEvent> ScaleWebInputEvent(
343 const blink::WebInputEvent& event, 343 const blink::WebInputEvent& event,
344 float scale) { 344 float scale) {
345 scoped_ptr<blink::WebInputEvent> scaled_event; 345 std::unique_ptr<blink::WebInputEvent> scaled_event;
346 if (scale == 1.f) 346 if (scale == 1.f)
347 return scaled_event; 347 return scaled_event;
348 if (event.type == blink::WebMouseEvent::MouseWheel) { 348 if (event.type == blink::WebMouseEvent::MouseWheel) {
349 blink::WebMouseWheelEvent* wheel_event = new blink::WebMouseWheelEvent; 349 blink::WebMouseWheelEvent* wheel_event = new blink::WebMouseWheelEvent;
350 scaled_event.reset(wheel_event); 350 scaled_event.reset(wheel_event);
351 *wheel_event = static_cast<const blink::WebMouseWheelEvent&>(event); 351 *wheel_event = static_cast<const blink::WebMouseWheelEvent&>(event);
352 wheel_event->x *= scale; 352 wheel_event->x *= scale;
353 wheel_event->y *= scale; 353 wheel_event->y *= scale;
354 wheel_event->deltaX *= scale; 354 wheel_event->deltaX *= scale;
355 wheel_event->deltaY *= scale; 355 wheel_event->deltaY *= scale;
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 case MotionEvent::TOOL_TYPE_MOUSE: 456 case MotionEvent::TOOL_TYPE_MOUSE:
457 return WebPointerProperties::PointerType::Mouse; 457 return WebPointerProperties::PointerType::Mouse;
458 case MotionEvent::TOOL_TYPE_ERASER: 458 case MotionEvent::TOOL_TYPE_ERASER:
459 return WebPointerProperties::PointerType::Unknown; 459 return WebPointerProperties::PointerType::Unknown;
460 } 460 }
461 NOTREACHED() << "Invalid MotionEvent::ToolType = " << tool_type; 461 NOTREACHED() << "Invalid MotionEvent::ToolType = " << tool_type;
462 return WebPointerProperties::PointerType::Unknown; 462 return WebPointerProperties::PointerType::Unknown;
463 } 463 }
464 464
465 } // namespace ui 465 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/blink/blink_event_util.h ('k') | ui/events/blink/input_handler_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698