[webkit-changes] [123602] trunk/Source/WebCore

Wed, 25 Jul 2012 04:16:03 -0700

Title: [123602] trunk/Source/WebCore
Revision
123602
Author
allan.jen...@nokia.com
Date
2012-07-25 04:15:47 -0700 (Wed, 25 Jul 2012)

Log Message

Fix blend filter for autovectorizing
https://bugs.webkit.org/show_bug.cgi?id=91398

Reviewed by Nikolas Zimmermann.

Get rid of wrapper classes, and use functions directly as template argument.

* platform/graphics/filters/FEBlend.cpp:
(WebCore::feBlendNormal):
(WebCore::feBlendMultiply):
(WebCore::feBlendScreen):
(WebCore::feBlendDarken):
(WebCore::feBlendLighten):
(WebCore::feBlendUnknown):
(WebCore::platformApply):
(WebCore::FEBlend::platformApplyGeneric):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (123601 => 123602)


--- trunk/Source/WebCore/ChangeLog	2012-07-25 11:03:38 UTC (rev 123601)
+++ trunk/Source/WebCore/ChangeLog	2012-07-25 11:15:47 UTC (rev 123602)
@@ -1,3 +1,22 @@
+2012-07-25  Allan Sandfeld Jensen  <allan.jen...@nokia.com>
+
+        Fix blend filter for autovectorizing
+        https://bugs.webkit.org/show_bug.cgi?id=91398
+
+        Reviewed by Nikolas Zimmermann.
+
+        Get rid of wrapper classes, and use functions directly as template argument.
+
+        * platform/graphics/filters/FEBlend.cpp:
+        (WebCore::feBlendNormal):
+        (WebCore::feBlendMultiply):
+        (WebCore::feBlendScreen):
+        (WebCore::feBlendDarken):
+        (WebCore::feBlendLighten):
+        (WebCore::feBlendUnknown):
+        (WebCore::platformApply):
+        (WebCore::FEBlend::platformApplyGeneric):
+
 2012-07-25  Keishi Hattori  <kei...@webkit.org>
 
         Add methods to ColorChooserClient so the color chooser can show suggestions

Modified: trunk/Source/WebCore/platform/graphics/filters/FEBlend.cpp (123601 => 123602)


--- trunk/Source/WebCore/platform/graphics/filters/FEBlend.cpp	2012-07-25 11:03:38 UTC (rev 123601)
+++ trunk/Source/WebCore/platform/graphics/filters/FEBlend.cpp	2012-07-25 11:15:47 UTC (rev 123602)
@@ -71,55 +71,37 @@
     return quotient + (remainder >> 8);
 }
 
-class BlendNormal {
-public:
-    static unsigned char apply(unsigned char colorA, unsigned char colorB, unsigned char alphaA, unsigned char)
-    {
-        return fastDivideBy255((255 - alphaA) * colorB + colorA * 255);
-    }
-};
+inline unsigned char feBlendNormal(unsigned char colorA, unsigned char colorB, unsigned char alphaA, unsigned char)
+{
+    return fastDivideBy255((255 - alphaA) * colorB + colorA * 255);
+}
 
-class BlendMultiply {
-public:
-    static unsigned char apply(unsigned char colorA, unsigned char colorB, unsigned char alphaA, unsigned char alphaB)
-    {
-        return fastDivideBy255((255 - alphaA) * colorB + (255 - alphaB + colorB) * colorA);
-    }
-};
+inline unsigned char feBlendMultiply(unsigned char colorA, unsigned char colorB, unsigned char alphaA, unsigned char alphaB)
+{
+    return fastDivideBy255((255 - alphaA) * colorB + (255 - alphaB + colorB) * colorA);
+}
 
-class BlendScreen {
-public:
-    static unsigned char apply(unsigned char colorA, unsigned char colorB, unsigned char, unsigned char)
-    {
-        return fastDivideBy255((colorB + colorA) * 255 - colorA * colorB);
-    }
-};
+inline unsigned char feBlendScreen(unsigned char colorA, unsigned char colorB, unsigned char, unsigned char)
+{
+    return fastDivideBy255((colorB + colorA) * 255 - colorA * colorB);
+}
 
-class BlendDarken {
-public:
-    static unsigned char apply(unsigned char colorA, unsigned char colorB, unsigned char alphaA, unsigned char alphaB)
-    {
-        return fastDivideBy255(std::min((255 - alphaA) * colorB + colorA * 255, (255 - alphaB) * colorA + colorB * 255));
-    }
-};
+inline unsigned char feBlendDarken(unsigned char colorA, unsigned char colorB, unsigned char alphaA, unsigned char alphaB)
+{
+    return fastDivideBy255(std::min((255 - alphaA) * colorB + colorA * 255, (255 - alphaB) * colorA + colorB * 255));
+}
 
-class BlendLighten {
-public:
-    static unsigned char apply(unsigned char colorA, unsigned char colorB, unsigned char alphaA, unsigned char alphaB)
-    {
-        return fastDivideBy255(std::max((255 - alphaA) * colorB + colorA * 255, (255 - alphaB) * colorA + colorB * 255));
-    }
-};
+inline unsigned char feBlendLighten(unsigned char colorA, unsigned char colorB, unsigned char alphaA, unsigned char alphaB)
+{
+    return fastDivideBy255(std::max((255 - alphaA) * colorB + colorA * 255, (255 - alphaB) * colorA + colorB * 255));
+}
 
-class BlendUnknown {
-public:
-    static unsigned char apply(unsigned char, unsigned char, unsigned char, unsigned char)
-    {
-        return 0;
-    }
-};
+inline unsigned char feBlendUnknown(unsigned char, unsigned char, unsigned char, unsigned char)
+{
+    return 0;
+}
 
-template<typename BlendFunctor>
+template<BlendType BlendFunction>
 static void platformApply(unsigned char* sourcePixelA, unsigned char* sourcePixelB,
                           unsigned char* destinationPixel, unsigned pixelArrayLength)
 {
@@ -127,9 +109,9 @@
     for (unsigned pixelOffset = 0; pixelOffset < len; pixelOffset++) {
         unsigned char alphaA = sourcePixelA[3];
         unsigned char alphaB = sourcePixelB[3];
-        destinationPixel[0] = BlendFunctor::apply(sourcePixelA[0], sourcePixelB[0], alphaA, alphaB);
-        destinationPixel[1] = BlendFunctor::apply(sourcePixelA[1], sourcePixelB[1], alphaA, alphaB);
-        destinationPixel[2] = BlendFunctor::apply(sourcePixelA[2], sourcePixelB[2], alphaA, alphaB);
+        destinationPixel[0] = BlendFunction(sourcePixelA[0], sourcePixelB[0], alphaA, alphaB);
+        destinationPixel[1] = BlendFunction(sourcePixelA[1], sourcePixelB[1], alphaA, alphaB);
+        destinationPixel[2] = BlendFunction(sourcePixelA[2], sourcePixelB[2], alphaA, alphaB);
         destinationPixel[3] = 255 - fastDivideBy255((255 - alphaA) * (255 - alphaB));
         sourcePixelA += 4;
         sourcePixelB += 4;
@@ -142,22 +124,22 @@
 {
     switch (m_mode) {
     case FEBLEND_MODE_NORMAL:
-        platformApply<BlendNormal>(sourcePixelA, sourcePixelB, destinationPixel, pixelArrayLength);
+        platformApply<feBlendNormal>(sourcePixelA, sourcePixelB, destinationPixel, pixelArrayLength);
         break;
     case FEBLEND_MODE_MULTIPLY:
-        platformApply<BlendMultiply>(sourcePixelA, sourcePixelB, destinationPixel, pixelArrayLength);
+        platformApply<feBlendMultiply>(sourcePixelA, sourcePixelB, destinationPixel, pixelArrayLength);
         break;
     case FEBLEND_MODE_SCREEN:
-        platformApply<BlendScreen>(sourcePixelA, sourcePixelB, destinationPixel, pixelArrayLength);
+        platformApply<feBlendScreen>(sourcePixelA, sourcePixelB, destinationPixel, pixelArrayLength);
         break;
     case FEBLEND_MODE_DARKEN:
-        platformApply<BlendDarken>(sourcePixelA, sourcePixelB, destinationPixel, pixelArrayLength);
+        platformApply<feBlendDarken>(sourcePixelA, sourcePixelB, destinationPixel, pixelArrayLength);
         break;
     case FEBLEND_MODE_LIGHTEN:
-        platformApply<BlendLighten>(sourcePixelA, sourcePixelB, destinationPixel, pixelArrayLength);
+        platformApply<feBlendLighten>(sourcePixelA, sourcePixelB, destinationPixel, pixelArrayLength);
         break;
     case FEBLEND_MODE_UNKNOWN:
-        platformApply<BlendUnknown>(sourcePixelA, sourcePixelB, destinationPixel, pixelArrayLength);
+        platformApply<feBlendUnknown>(sourcePixelA, sourcePixelB, destinationPixel, pixelArrayLength);
         break;
     }
 }

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to