| Index: skia/ext/refptr.h
|
| diff --git a/skia/ext/refptr.h b/skia/ext/refptr.h
|
| index a7ba7ffb78542a7ec64e90dae696d0dfcd2e08fc..c2adac82bfbf57e3b06ba21e5af717307eb71fbd 100644
|
| --- a/skia/ext/refptr.h
|
| +++ b/skia/ext/refptr.h
|
| @@ -7,7 +7,6 @@
|
|
|
| #include <algorithm>
|
|
|
| -#include "base/move.h"
|
| #include "third_party/skia/include/core/SkRefCnt.h"
|
|
|
| namespace skia {
|
| @@ -52,7 +51,6 @@ namespace skia {
|
| // for you.
|
| template<typename T>
|
| class RefPtr {
|
| - TYPE_WITH_MOVE_CONSTRUCTOR_FOR_CPP_03(RefPtr)
|
| public:
|
| RefPtr() : ptr_(nullptr) {}
|
|
|
| @@ -97,7 +95,7 @@ class RefPtr {
|
|
|
| template <typename U>
|
| RefPtr& operator=(RefPtr<U>&& other) {
|
| - RefPtr<T> temp(other.Pass());
|
| + RefPtr<T> temp(std::move(other));
|
| std::swap(ptr_, temp.ptr_);
|
| return *this;
|
| }
|
|
|