Modified: trunk/Source/WebCore/ChangeLog (277383 => 277384)
--- trunk/Source/WebCore/ChangeLog 2021-05-12 19:11:25 UTC (rev 277383)
+++ trunk/Source/WebCore/ChangeLog 2021-05-12 20:11:20 UTC (rev 277384)
@@ -1,3 +1,24 @@
+2021-05-12 Sam Weinig <wei...@apple.com>
+
+ Remove inline annoatations for static functions in PixelBufferConversion
+ https://bugs.webkit.org/show_bug.cgi?id=225708
+
+ Reviewed by Darin Adler.
+
+ Remove inline annoatations for static functions in PixelBufferConversion
+ as suggested by Darin. The theory here is that outside of a header, the
+ use of 'inline' serves no purpose as the compiler is perfectly allowed
+ and capable of inlining these functions.
+
+ * platform/graphics/PixelBufferConversion.cpp:
+ (WebCore::makeVImageBuffer):
+ (WebCore::convertImagePixelsAccelerated):
+ (WebCore::convertSinglePixelPremultipliedToPremultiplied):
+ (WebCore::convertSinglePixelPremultipliedToUnpremultiplied):
+ (WebCore::convertSinglePixelUnpremultipliedToPremultiplied):
+ (WebCore::convertSinglePixelUnpremultipliedToUnpremultiplied):
+ (WebCore::convertFunctor):
+
2021-05-12 Alex Christensen <achristen...@webkit.org>
Use HashSet<RefPtr<Node>> instead of HashSet<Node*>
Modified: trunk/Source/WebCore/platform/graphics/PixelBufferConversion.cpp (277383 => 277384)
--- trunk/Source/WebCore/platform/graphics/PixelBufferConversion.cpp 2021-05-12 19:11:25 UTC (rev 277383)
+++ trunk/Source/WebCore/platform/graphics/PixelBufferConversion.cpp 2021-05-12 20:11:20 UTC (rev 277384)
@@ -39,7 +39,7 @@
#if USE(ACCELERATE)
-template<typename View> static inline vImage_Buffer makeVImageBuffer(const View& view, const IntSize& size)
+template<typename View> static vImage_Buffer makeVImageBuffer(const View& view, const IntSize& size)
{
vImage_Buffer vImageBuffer;
@@ -51,7 +51,7 @@
return vImageBuffer;
}
-static inline void convertImagePixelsAccelerated(const ConstPixelBufferConversionView& source, const PixelBufferConversionView& destination, const IntSize& destinationSize)
+static void convertImagePixelsAccelerated(const ConstPixelBufferConversionView& source, const PixelBufferConversionView& destination, const IntSize& destinationSize)
{
auto sourceVImageBuffer = makeVImageBuffer(source, destinationSize);
auto destinationVImageBuffer = makeVImageBuffer(destination, destinationSize);
@@ -78,12 +78,13 @@
vImagePermuteChannels_ARGB8888(&sourceVImageBuffer, &destinationVImageBuffer, map, kvImageNoFlags);
}
}
+
#endif
enum class PixelFormatConversion { None, Permute };
template<PixelFormatConversion pixelFormatConversion>
-static inline void convertSinglePixelPremultipliedToPremultiplied(const uint8_t* sourcePixel, uint8_t* destinationPixel)
+static void convertSinglePixelPremultipliedToPremultiplied(const uint8_t* sourcePixel, uint8_t* destinationPixel)
{
uint8_t alpha = sourcePixel[3];
if (!alpha) {
@@ -103,7 +104,7 @@
}
template<PixelFormatConversion pixelFormatConversion>
-static inline void convertSinglePixelPremultipliedToUnpremultiplied(const uint8_t* sourcePixel, uint8_t* destinationPixel)
+static void convertSinglePixelPremultipliedToUnpremultiplied(const uint8_t* sourcePixel, uint8_t* destinationPixel)
{
uint8_t alpha = sourcePixel[3];
if (!alpha || alpha == 255) {
@@ -126,7 +127,7 @@
}
template<PixelFormatConversion pixelFormatConversion>
-static inline void convertSinglePixelUnpremultipliedToPremultiplied(const uint8_t* sourcePixel, uint8_t* destinationPixel)
+static void convertSinglePixelUnpremultipliedToPremultiplied(const uint8_t* sourcePixel, uint8_t* destinationPixel)
{
uint8_t alpha = sourcePixel[3];
if (!alpha || alpha == 255) {
@@ -149,7 +150,7 @@
}
template<PixelFormatConversion pixelFormatConversion>
-static inline void convertSinglePixelUnpremultipliedToUnpremultiplied(const uint8_t* sourcePixel, uint8_t* destinationPixel)
+static void convertSinglePixelUnpremultipliedToUnpremultiplied(const uint8_t* sourcePixel, uint8_t* destinationPixel)
{
if constexpr (pixelFormatConversion == PixelFormatConversion::None)
reinterpret_cast<uint32_t*>(destinationPixel)[0] = reinterpret_cast<const uint32_t*>(sourcePixel)[0];
@@ -163,7 +164,7 @@
}
template<void (*convertFunctor)(const uint8_t*, uint8_t*)>
-static inline void convertImagePixelsUnaccelerated(const ConstPixelBufferConversionView& source, const PixelBufferConversionView& destination, const IntSize& destinationSize)
+static void convertImagePixelsUnaccelerated(const ConstPixelBufferConversionView& source, const PixelBufferConversionView& destination, const IntSize& destinationSize)
{
const uint8_t* sourceRows = source.rows;
uint8_t* destinationRows = destination.rows;
