Don't use MEM_MOVE=true with SkTArrays of sk_sp
The code generated from std::move()ing them should be fine.
Bug: skia:8355
Change-Id: I63ef650b5fbcf9fb6356006190eae5e0977ae642
Reviewed-on: https://skia-review.googlesource.com/151982
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
diff --git a/tools/viewer/SlideDir.cpp b/tools/viewer/SlideDir.cpp
index 584bfe8..5ee46dd 100644
--- a/tools/viewer/SlideDir.cpp
+++ b/tools/viewer/SlideDir.cpp
@@ -249,7 +249,7 @@
using INHERITED = sksg::Animator;
};
-SlideDir::SlideDir(const SkString& name, SkTArray<sk_sp<Slide>, true>&& slides, int columns)
+SlideDir::SlideDir(const SkString& name, SkTArray<sk_sp<Slide>>&& slides, int columns)
: fSlides(std::move(slides))
, fColumns(columns) {
fName = name;
diff --git a/tools/viewer/SlideDir.h b/tools/viewer/SlideDir.h
index f391a24..376aee5 100644
--- a/tools/viewer/SlideDir.h
+++ b/tools/viewer/SlideDir.h
@@ -23,7 +23,7 @@
class SlideDir final : public Slide {
public:
- SlideDir(const SkString& name, SkTArray<sk_sp<Slide>, true>&&,
+ SlideDir(const SkString& name, SkTArray<sk_sp<Slide>>&&,
int columns = kDefaultColumnCount);
protected:
@@ -46,7 +46,7 @@
const Rec* findCell(float x, float y) const;
- const SkTArray<sk_sp<Slide>, true> fSlides;
+ const SkTArray<sk_sp<Slide>> fSlides;
std::unique_ptr<FocusController> fFocusController;
const int fColumns;
diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp
index 198d63d..3658185 100644
--- a/tools/viewer/Viewer.cpp
+++ b/tools/viewer/Viewer.cpp
@@ -544,7 +544,7 @@
#endif
};
- SkTArray<sk_sp<Slide>, true> dirSlides;
+ SkTArray<sk_sp<Slide>> dirSlides;
const auto addSlide = [&](const SkString& name,
const SkString& path,