Changeset 73997 in webkit

Timestamp:

Dec 13, 2010 8:47:34 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2010-12-13 Noel Gordon <​noel.gordon@gmail.com>

Reviewed by David Levin.

[chromium] Upstream skia/ImageBuffer.cpp routine mulDiv255Ceil()
​https://bugs.webkit.org/show_bug.cgi?id=50545

Skia has rolled, replace uses of mulDiv255Ceil with SkMulDiv255Ceiling.

No new tests, no change in behaviour.

• platform/graphics/skia/ImageBufferSkia.cpp: (WebCore::putImageData):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/skia/ImageBufferSkia.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-13  Noel Gordon  <noel.gordon@gmail.com>
+
+        Reviewed by David Levin.
+
+        [chromium] Upstream skia/ImageBuffer.cpp routine mulDiv255Ceil()
+        https://bugs.webkit.org/show_bug.cgi?id=50545
+
+        Skia has rolled, replace uses of mulDiv255Ceil with SkMulDiv255Ceiling.
+
+        No new tests, no change in behaviour.
+
+        * platform/graphics/skia/ImageBufferSkia.cpp:
+        (WebCore::putImageData):
+
 2010-12-13  Gavin Peters  <gavinp@chromium.org>
 

trunk/WebCore/platform/graphics/skia/ImageBufferSkia.cpp

@@ -247 +247 @@
 }
 
-// This function does the equivalent of (a * b + 254) / 255, without an integer divide.
-// Valid for a, b in the range [0..255].
-unsigned mulDiv255Ceil(unsigned a, unsigned b)
-{
-    unsigned value = a * b + 255;
-    return (value + (value >> 8)) >> 8;
-}
-
 template <Multiply multiplied>
 void putImageData(ImageData*& source, const IntRect& sourceRect, const IntPoint& destPoint, 
@@ -298 +290 @@
             if (multiplied == Unmultiplied) {
                 unsigned char alpha = srcPixel[3];
-                unsigned char r = mulDiv255Ceil(srcPixel[0], alpha);
-                unsigned char g = mulDiv255Ceil(srcPixel[1], alpha);
-                unsigned char b = mulDiv255Ceil(srcPixel[2], alpha);
+                unsigned char r = SkMulDiv255Ceiling(srcPixel[0], alpha);
+                unsigned char g = SkMulDiv255Ceiling(srcPixel[1], alpha);
+                unsigned char b = SkMulDiv255Ceiling(srcPixel[2], alpha);
                 destRow[x] = SkPackARGB32(alpha, r, g, b);
             } else