Changeset 74010 in webkit

Timestamp:

Dec 14, 2010 3:02:56 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2010-12-14 Pieter Senster <​psenster@google.com>

Reviewed by Dirk Schulze.

Test that the channel offsets in the ColorMatrix filter are correctly incorporated
​https://bugs.webkit.org/show_bug.cgi?id=50682

• platform/mac/svg/filters/feColorMatrix-offset-expected.checksum: Added.
• platform/mac/svg/filters/feColorMatrix-offset-expected.png: Added.
• platform/mac/svg/filters/feColorMatrix-offset-expected.txt: Added.
• svg/filters/feColorMatrix-offset.svg: Added.

2010-12-14 Pieter Senster <​psenster@google.com>

Reviewed by Dirk Schulze.

Incorporate the channel offsets from the ColorMatrix filter in the filter calculation
​https://bugs.webkit.org/show_bug.cgi?id=50682

Test: svg/filters/feColorMatrix-offset.svg

• platform/graphics/filters/FEColorMatrix.cpp: (WebCore::matrix):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/svg/filters/feColorMatrix-offset-expected.checksum (added)
• LayoutTests/platform/mac/svg/filters/feColorMatrix-offset-expected.png (added)
• LayoutTests/platform/mac/svg/filters/feColorMatrix-offset-expected.txt (added)
• LayoutTests/svg/filters/feColorMatrix-offset.svg (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/filters/FEColorMatrix.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-12-14  Pieter Senster  <psenster@google.com>
+
+        Reviewed by Dirk Schulze.
+
+        Test that the channel offsets in the ColorMatrix filter are correctly incorporated
+        https://bugs.webkit.org/show_bug.cgi?id=50682
+
+        * platform/mac/svg/filters/feColorMatrix-offset-expected.checksum: Added.
+        * platform/mac/svg/filters/feColorMatrix-offset-expected.png: Added.
+        * platform/mac/svg/filters/feColorMatrix-offset-expected.txt: Added.
+        * svg/filters/feColorMatrix-offset.svg: Added.
+
 2010-12-13  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-14  Pieter Senster  <psenster@google.com>
+
+        Reviewed by Dirk Schulze.
+
+        Incorporate the channel offsets from the ColorMatrix filter in the filter calculation
+        https://bugs.webkit.org/show_bug.cgi?id=50682
+
+        Test: svg/filters/feColorMatrix-offset.svg
+
+        * platform/graphics/filters/FEColorMatrix.cpp:
+        (WebCore::matrix):
+
 2010-12-14  Jarred Nicholls  <jarred@sencha.com>
 

trunk/WebCore/platform/graphics/filters/FEColorMatrix.cpp

@@ -68 +68 @@
 inline void matrix(double& red, double& green, double& blue, double& alpha, const Vector<float>& values)
 {
-    double r = values[0]  * red + values[1]  * green + values[2]  * blue + values[3]  * alpha;
-    double g = values[5]  * red + values[6]  * green + values[7]  * blue + values[8]  * alpha;
-    double b = values[10]  * red + values[11]  * green + values[12] * blue + values[13] * alpha;
-    double a = values[15] * red + values[16] * green + values[17] * blue + values[18] * alpha;
+    double r = values[0]  * red + values[1]  * green + values[2]  * blue + values[3]  * alpha + values[4] * 255;
+    double g = values[5]  * red + values[6]  * green + values[7]  * blue + values[8]  * alpha + values[9] * 255;
+    double b = values[10]  * red + values[11]  * green + values[12] * blue + values[13] * alpha + values[14] * 255;
+    double a = values[15] * red + values[16] * green + values[17] * blue + values[18] * alpha + values[19] * 255;
 
     red = r;