| Index: ui/gfx/path_x11.cc
|
| diff --git a/ui/gfx/path_x11.cc b/ui/gfx/path_x11.cc
|
| index caea2ec12e6eef417c64d6efeb67bebd066a61a2..4a0842c9828a96afadd356e8b0ace23062fc5def 100644
|
| --- a/ui/gfx/path_x11.cc
|
| +++ b/ui/gfx/path_x11.cc
|
| @@ -8,7 +8,8 @@
|
| #include <X11/Xregion.h>
|
| #include <X11/Xutil.h>
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include <memory>
|
| +
|
| #include "third_party/skia/include/core/SkRegion.h"
|
| #include "ui/gfx/path.h"
|
|
|
| @@ -31,9 +32,9 @@ Region CreateRegionFromSkRegion(const SkRegion& region) {
|
|
|
| Region CreateRegionFromSkPath(const SkPath& path) {
|
| int point_count = path.getPoints(NULL, 0);
|
| - scoped_ptr<SkPoint[]> points(new SkPoint[point_count]);
|
| + std::unique_ptr<SkPoint[]> points(new SkPoint[point_count]);
|
| path.getPoints(points.get(), point_count);
|
| - scoped_ptr<XPoint[]> x11_points(new XPoint[point_count]);
|
| + std::unique_ptr<XPoint[]> x11_points(new XPoint[point_count]);
|
| for (int i = 0; i < point_count; ++i) {
|
| x11_points[i].x = SkScalarRoundToInt(points[i].fX);
|
| x11_points[i].y = SkScalarRoundToInt(points[i].fY);
|
|
|