AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add SkSTArray move assignment operators

Browse Source 
Change-Id: Ib655a8a4d62c27dee4f92fcb644237f6fbbdb75b
Reviewed-on: https://skia-review.googlesource.com/9510
Commit-Queue: Florin Malita <fmalita@chromium.org>
Reviewed-by: Ben Wagner <bungeman@google.com>
This commit is contained in:
Florin Malita 2017-03-12 10:40:13 -04:00 committed by Skia Commit-Bot
parent 9a4148f2eb
commit d54639f768
2 changed files with 95 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/private/SkTArray.h
View File

@ -569,7 +569,13 @@ public:
}
SkSTArray& operator= (const SkSTArray& array) {
return *this = *(const INHERITED*)&array;
INHERITED::operator=(array);
return *this;
}
SkSTArray& operator= (SkSTArray&& array) {
INHERITED::operator=(std::move(array));
return *this;
}
SkSTArray& operator= (const INHERITED& array) {
@ -577,6 +583,11 @@ public:
return *this;
}
SkSTArray& operator= (INHERITED&& array) {
INHERITED::operator=(std::move(array));
return *this;
}
private:
SkAlignedSTStorage<N,T> fStorage;
};

83
tests/TArrayTest.cpp
View File

@ -138,6 +138,87 @@ void test_copy_ctor(skiatest::Reporter* reporter, SkTArray<T, MEM_MOVE>&& array)
REPORTER_ASSERT(reporter, ref->unique());
}
static void test_move(skiatest::Reporter* reporter) {
#define TEST_MOVE do { \
SRC_T src; \
src.emplace_back(sk_make_sp<SkRefCnt>()); \
{ \
/* copy ctor */ \
DST_T copy(src); \
REPORTER_ASSERT(reporter, !copy[0]->unique()); \
} \
{ \
/* move ctor */ \
DST_T move(std::move(src)); \
REPORTER_ASSERT(reporter, move[0]->unique()); \
} \
REPORTER_ASSERT(reporter, src.empty()); \
src.emplace_back(sk_make_sp<SkRefCnt>()); \
{ \
/* copy assignment */ \
DST_T copy; \
copy = src; \
REPORTER_ASSERT(reporter, !copy[0]->unique()); \
} \
{ \
/* move assignment */ \
DST_T move; \
move = std::move(src); \
REPORTER_ASSERT(reporter, move[0]->unique()); \
} \
REPORTER_ASSERT(reporter, src.empty()); \
} while (false)
{
using SRC_T = SkTArray<sk_sp<SkRefCnt>, false>;
using DST_T = SkTArray<sk_sp<SkRefCnt>, false>;
TEST_MOVE;
}
{
using SRC_T = SkTArray<sk_sp<SkRefCnt>, true>;
using DST_T = SkTArray<sk_sp<SkRefCnt>, true>;
TEST_MOVE;
}
{
using SRC_T = SkSTArray<1, sk_sp<SkRefCnt>, false>;
using DST_T = SkSTArray<1, sk_sp<SkRefCnt>, false>;
TEST_MOVE;
}
{
using SRC_T = SkSTArray<1, sk_sp<SkRefCnt>, true>;
using DST_T = SkSTArray<1, sk_sp<SkRefCnt>, true>;
TEST_MOVE;
}
{
using SRC_T = SkTArray<sk_sp<SkRefCnt>, false>;
using DST_T = SkSTArray<1, sk_sp<SkRefCnt>, false>;
TEST_MOVE;
}
{
using SRC_T = SkTArray<sk_sp<SkRefCnt>, true>;
using DST_T = SkSTArray<1, sk_sp<SkRefCnt>, true>;
TEST_MOVE;
}
{
using SRC_T = SkSTArray<1, sk_sp<SkRefCnt>, false>;
using DST_T = SkTArray<sk_sp<SkRefCnt>, false>;
TEST_MOVE;
}
{
using SRC_T = SkSTArray<1, sk_sp<SkRefCnt>, true>;
using DST_T = SkTArray<sk_sp<SkRefCnt>, true>;
TEST_MOVE;
}
#undef TEST_MOVE
}
DEF_TEST(TArray, reporter) {
TestTSet_basic<true>(reporter);
TestTSet_basic<false>(reporter);
@ -149,4 +230,6 @@ DEF_TEST(TArray, reporter) {
test_copy_ctor(reporter, SkSTArray< 1, sk_sp<SkRefCnt>, true>());
test_copy_ctor(reporter, SkSTArray<10, sk_sp<SkRefCnt>, false>());
test_copy_ctor(reporter, SkSTArray<10, sk_sp<SkRefCnt>, true>());
test_move(reporter);
}