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

Unified Diff: ui/events/gestures/blink/web_gesture_curve_impl.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 side-by-side diff with in-line comments
Download patch
Index: ui/events/gestures/blink/web_gesture_curve_impl.cc
diff --git a/ui/events/gestures/blink/web_gesture_curve_impl.cc b/ui/events/gestures/blink/web_gesture_curve_impl.cc
index 908a544d67526ffe28f9a856dd9ee7847ca32af9..d4e407045d19d5883ae0388391cd55e1948568d1 100644
--- a/ui/events/gestures/blink/web_gesture_curve_impl.cc
+++ b/ui/events/gestures/blink/web_gesture_curve_impl.cc
@@ -9,6 +9,7 @@
#include <utility>
#include "base/logging.h"
+#include "base/memory/ptr_util.h"
#include "base/metrics/histogram.h"
#include "build/build_config.h"
#include "third_party/WebKit/public/platform/WebFloatSize.h"
@@ -26,11 +27,11 @@ using blink::WebGestureCurve;
namespace ui {
namespace {
-scoped_ptr<GestureCurve> CreateDefaultPlatformCurve(
+std::unique_ptr<GestureCurve> CreateDefaultPlatformCurve(
const gfx::Vector2dF& initial_velocity) {
DCHECK(!initial_velocity.IsZero());
#if defined(OS_ANDROID)
- auto scroller = make_scoped_ptr(new Scroller(Scroller::Config()));
+ auto scroller = base::WrapUnique(new Scroller(Scroller::Config()));
scroller->Fling(0,
0,
initial_velocity.x(),
@@ -42,32 +43,33 @@ scoped_ptr<GestureCurve> CreateDefaultPlatformCurve(
base::TimeTicks());
return std::move(scroller);
#else
- return make_scoped_ptr(
- new FlingCurve(initial_velocity, base::TimeTicks()));
+ return base::WrapUnique(new FlingCurve(initial_velocity, base::TimeTicks()));
#endif
}
} // namespace
// static
-scoped_ptr<WebGestureCurve> WebGestureCurveImpl::CreateFromDefaultPlatformCurve(
+std::unique_ptr<WebGestureCurve>
+WebGestureCurveImpl::CreateFromDefaultPlatformCurve(
const gfx::Vector2dF& initial_velocity,
const gfx::Vector2dF& initial_offset,
bool on_main_thread) {
- return scoped_ptr<WebGestureCurve>(new WebGestureCurveImpl(
+ return std::unique_ptr<WebGestureCurve>(new WebGestureCurveImpl(
CreateDefaultPlatformCurve(initial_velocity), initial_offset,
on_main_thread ? ThreadType::MAIN : ThreadType::IMPL));
}
// static
-scoped_ptr<WebGestureCurve> WebGestureCurveImpl::CreateFromUICurveForTesting(
- scoped_ptr<GestureCurve> curve,
+std::unique_ptr<WebGestureCurve>
+WebGestureCurveImpl::CreateFromUICurveForTesting(
+ std::unique_ptr<GestureCurve> curve,
const gfx::Vector2dF& initial_offset) {
- return scoped_ptr<WebGestureCurve>(new WebGestureCurveImpl(
+ return std::unique_ptr<WebGestureCurve>(new WebGestureCurveImpl(
std::move(curve), initial_offset, ThreadType::TEST));
}
-WebGestureCurveImpl::WebGestureCurveImpl(scoped_ptr<GestureCurve> curve,
+WebGestureCurveImpl::WebGestureCurveImpl(std::unique_ptr<GestureCurve> curve,
const gfx::Vector2dF& initial_offset,
ThreadType animating_thread_type)
: curve_(std::move(curve)),
« no previous file with comments | « ui/events/gestures/blink/web_gesture_curve_impl.h ('k') | ui/events/gestures/blink/web_gesture_curve_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698