Use perfect forwarding in createT of SkSmallAllocator.
This allows createT statements to be written in a clearer style.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2482683002
Review-Url: https://codereview.chromium.org/2482683002
diff --git a/src/core/SkSmallAllocator.h b/src/core/SkSmallAllocator.h
index 67afe75..13b1505 100644
--- a/src/core/SkSmallAllocator.h
+++ b/src/core/SkSmallAllocator.h
@@ -12,6 +12,7 @@
#include "SkTypes.h"
#include <new>
+#include <utility>
/*
* Template class for allocating small objects without additional heap memory
@@ -56,12 +57,12 @@
* will be returned.
*/
template<typename T, typename... Args>
- T* createT(const Args&... args) {
+ T* createT(Args&&... args) {
void* buf = this->reserveT<T>();
if (nullptr == buf) {
return nullptr;
}
- return new (buf) T(args...);
+ return new (buf) T(std::forward<Args>(args)...);
}
/*
@@ -130,10 +131,9 @@
}
alignas(16) char fStorage[kTotalBytes];
- // Number of bytes used so far.
- size_t fStorageUsed;
- uint32_t fNumObjects;
- Rec fRecs[kMaxObjects];
+ size_t fStorageUsed; // Number of bytes used so far.
+ uint32_t fNumObjects;
+ Rec fRecs[kMaxObjects];
};
#endif // SkSmallAllocator_DEFINED
diff --git a/src/utils/SkTextureCompressor_ASTC.cpp b/src/utils/SkTextureCompressor_ASTC.cpp
index 8a96b91..49b34de 100644
--- a/src/utils/SkTextureCompressor_ASTC.cpp
+++ b/src/utils/SkTextureCompressor_ASTC.cpp
@@ -2073,8 +2073,7 @@
}
return allocator->createT<
- SkTCompressedAlphaBlitter<12, 16, CompressorASTC>, int, int, void* >
- (width, height, outputBuffer);
+ SkTCompressedAlphaBlitter<12, 16, CompressorASTC>>(width, height, outputBuffer);
}
void DecompressASTC(uint8_t* dst, int dstRowBytes, const uint8_t* src,
diff --git a/src/utils/SkTextureCompressor_LATC.cpp b/src/utils/SkTextureCompressor_LATC.cpp
index 50aaf0b..d7cae4f 100644
--- a/src/utils/SkTextureCompressor_LATC.cpp
+++ b/src/utils/SkTextureCompressor_LATC.cpp
@@ -498,8 +498,7 @@
sk_bzero(outputBuffer, width * height / 2);
return allocator->createT<
- SkTCompressedAlphaBlitter<4, 8, CompressorLATC>, int, int, void* >
- (width, height, outputBuffer);
+ SkTCompressedAlphaBlitter<4, 8, CompressorLATC>>(width, height, outputBuffer);
#elif COMPRESS_LATC_SLOW
// TODO (krajcevski)
return nullptr;
diff --git a/src/utils/SkTextureCompressor_R11EAC.cpp b/src/utils/SkTextureCompressor_R11EAC.cpp
index 5c298dd..5bdfead 100644
--- a/src/utils/SkTextureCompressor_R11EAC.cpp
+++ b/src/utils/SkTextureCompressor_R11EAC.cpp
@@ -653,8 +653,7 @@
}
return allocator->createT<
- SkTCompressedAlphaBlitter<4, 8, CompressorR11EAC>, int, int, void*>
- (width, height, outputBuffer);
+ SkTCompressedAlphaBlitter<4, 8, CompressorR11EAC>>(width, height, outputBuffer);
}
void DecompressR11EAC(uint8_t* dst, int dstRowBytes, const uint8_t* src, int width, int height) {