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

Fix SkTArray operator= to work with self assignment

Browse Source 
BUG=skia:

Change-Id: I2a403a7ccbb87a030757f3e57d2ea53503f72512
Reviewed-on: https://skia-review.googlesource.com/10012
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
This commit is contained in:
Greg Daniel 2017-03-22 13:33:21 -04:00 committed by Skia Commit-Bot
parent dbd11ec106
commit 70131b97f9
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/private/SkTArray.h
View File

@ -59,6 +59,9 @@ public:
}
SkTArray& operator=(const SkTArray& that) {
if (this == &that) {
return *this;
}
for (int i = 0; i < fCount; ++i) {
fItemArray[i].~T();
}
@ -69,6 +72,9 @@ public:
return *this;
}
SkTArray& operator=(SkTArray&& that) {
if (this == &that) {
return *this;
}
for (int i = 0; i < fCount; ++i) {
fItemArray[i].~T();
}

15
tests/TArrayTest.cpp
View File

@ -281,6 +281,19 @@ void test_unnecessary_alloc(skiatest::Reporter* reporter) {
}
}
static void test_self_assignment(skiatest::Reporter* reporter) {
SkTArray<int> a;
a.push_back(1);
REPORTER_ASSERT(reporter, !a.empty());
REPORTER_ASSERT(reporter, a.count() == 1);
REPORTER_ASSERT(reporter, a[0] == 1);
a = a;
REPORTER_ASSERT(reporter, !a.empty());
REPORTER_ASSERT(reporter, a.count() == 1);
REPORTER_ASSERT(reporter, a[0] == 1);
}
DEF_TEST(TArray, reporter) {
TestTSet_basic<true>(reporter);
TestTSet_basic<false>(reporter);
@ -296,4 +309,6 @@ DEF_TEST(TArray, reporter) {
test_move(reporter);
test_unnecessary_alloc(reporter);
test_self_assignment(reporter);
}