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

init SkSTArray storage before passing to SkTArray

Browse Source 
Using private inheritance is similar to having a class member,
except it's initialized before the next base class, SkTArray.
This lets us pass it to SkTArray's constructors.

I think we can make related changes (updating the various SkAlignedFoo,
not using them here, or not using them anywhere) independently.

... storage constructors made explicit at suggestion of GCC's -Wextra.
... now with explicit static_cast<STORAGE*>(this)

Change-Id: I665cf840e111da68f039416c9649ce328cc308d6
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/333146
Reviewed-by: John Stiles <johnstiles@google.com>
This commit is contained in:
Mike Klein 2020-11-09 10:27:41 -06:00
parent 5de0b38dd1
commit 46f11c2aab
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/private/SkTArray.h
View File

@ -628,40 +628,41 @@ template<typename T, bool MEM_MOVE> constexpr int SkTArray<T, MEM_MOVE>::kMinHea
* Subclass of SkTArray that contains a preallocated memory block for the array.
*/
template <int N, typename T, bool MEM_MOVE = false>
class SkSTArray : public SkTArray<T, MEM_MOVE> {
class SkSTArray : private SkAlignedSTStorage<N,T>, public SkTArray<T, MEM_MOVE> {
private:
using STORAGE = SkAlignedSTStorage<N,T>;
using INHERITED = SkTArray<T, MEM_MOVE>;
public:
SkSTArray() : INHERITED(&fStorage) {
SkSTArray() : STORAGE{}, INHERITED(static_cast<STORAGE*>(this)) {
}
SkSTArray(const SkSTArray& array)
: INHERITED(array, &fStorage) {
: STORAGE{}, INHERITED(array, static_cast<STORAGE*>(this)) {
}
SkSTArray(SkSTArray&& array)
: INHERITED(std::move(array), &fStorage) {
: STORAGE{}, INHERITED(std::move(array), static_cast<STORAGE*>(this)) {
}
explicit SkSTArray(const INHERITED& array)
: INHERITED(array, &fStorage) {
: STORAGE{}, INHERITED(array, static_cast<STORAGE*>(this)) {
}
explicit SkSTArray(INHERITED&& array)
: INHERITED(std::move(array), &fStorage) {
: STORAGE{}, INHERITED(std::move(array), static_cast<STORAGE*>(this)) {
}
explicit SkSTArray(int reserveCount)
: INHERITED(reserveCount) {
: STORAGE{}, INHERITED(reserveCount) {
}
SkSTArray(const T* array, int count)
: INHERITED(array, count, &fStorage) {
: STORAGE{}, INHERITED(array, count, static_cast<STORAGE*>(this)) {
}
SkSTArray(std::initializer_list<T> data)
: INHERITED(data, &fStorage) {
: STORAGE{}, INHERITED(data, static_cast<STORAGE*>(this)) {
}
SkSTArray& operator=(const SkSTArray& array) {
@ -683,9 +684,6 @@ public:
INHERITED::operator=(std::move(array));
return *this;
}
private:
SkAlignedSTStorage<N,T> fStorage;
};
#endif