Changeset 128223 in webkit

Timestamp:

Sep 11, 2012 1:54:05 PM (12 years ago)

Author:

senorblanco@chromium.org

Message:

Source/WebCore: [skia] Switch FEComponentTransfer filter to use skia's SkColorFilter
​https://bugs.webkit.org/show_bug.cgi?id=95238

Reviewed by Dirk Schulze.

Covered by existing tests in svg/, such as svg/custom/feComponentTransfer-Discrete.svg.

• WebCore.gypi:
• platform/graphics/filters/FEComponentTransfer.cpp:

(WebCore::FEComponentTransfer::platformApplySoftware):
Add a check for the skia implementation.
(WebCore::FEComponentTransfer::getValues):

• platform/graphics/filters/FEComponentTransfer.h:

Factor out the retrieval of LUT values into its own function, so we
can call it from the Skia implementation.

• platform/graphics/filters/skia/FEComponentTransferSkia.cpp: Added.

(WebCore::FEComponentTransfer::platformApplySkia):

LayoutTests: [chromium] Mark some tests as needing a rebaseline due to SVG filters change.
​https://bugs.webkit.org/show_bug.cgi?id=95238

Reviewed by Dirk Schulze.

• platform/chromium/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/WebCore.gypi (modified) (1 diff)
• Source/WebCore/platform/graphics/filters/FEComponentTransfer.cpp (modified) (2 diffs)
• Source/WebCore/platform/graphics/filters/FEComponentTransfer.h (modified) (2 diffs)
• Source/WebCore/platform/graphics/filters/skia/FEComponentTransferSkia.cpp (added)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-09-11  Stephen White  <senorblanco@chromium.org>
+
+        [chromium] Mark some tests as needing a rebaseline due to SVG filters change.
+        https://bugs.webkit.org/show_bug.cgi?id=95238
+
+        Reviewed by Dirk Schulze.
+
+        * platform/chromium/TestExpectations:
+
 2012-09-11  Kevin Ellis  <kevers@chromium.org>
 

trunk/LayoutTests/platform/chromium/TestExpectations

@@ -1319 +1319 @@
 BUGWK93589 LINUX SNOWLEOPARD DEBUG : svg/dom/SVGScriptElement/script-change-externalResourcesRequired-while-loading.svg = TIMEOUT PASS TEXT
 
+// Need rebaseline for slight pixel changes
+BUGWK95238 : svg/W3C-SVG-1.1/filters-comptran-01-b.svg = IMAGE
+BUGWK95238 : svg/custom/feComponentTransfer-Discrete.svg = IMAGE
+BUGWK95238 : svg/custom/feComponentTransfer-Gamma.svg = IMAGE
+BUGWK95238 : svg/custom/feComponentTransfer-Linear.svg = IMAGE
+BUGWK95238 : svg/custom/feComponentTransfer-Table.svg = IMAGE
+BUGWK95238 : svg/dynamic-updates/SVGFEComponentTransferElement-dom-tableValues-attr.html = IMAGE
+BUGWK95238 : svg/dynamic-updates/SVGFEComponentTransferElement-svgdom-tableValues-prop.html = IMAGE
+BUGWK95238 : css3/filters/effect-reference-ordering.html = IMAGE
+BUGWK95238 : css3/filters/effect-combined.html = IMAGE
+BUGWK95238 : css3/filters/effect-opacity.html = IMAGE
+
 // -----------------------------------------------------------------
 // End SVG TESTS

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-11  Stephen White  <senorblanco@chromium.org>
+
+        [skia] Switch FEComponentTransfer filter to use skia's SkColorFilter
+        https://bugs.webkit.org/show_bug.cgi?id=95238
+
+        Reviewed by Dirk Schulze.
+
+        Covered by existing tests in svg/, such as svg/custom/feComponentTransfer-Discrete.svg.
+
+        * WebCore.gypi:
+        * platform/graphics/filters/FEComponentTransfer.cpp:
+        (WebCore::FEComponentTransfer::platformApplySoftware):
+        Add a check for the skia implementation.
+        (WebCore::FEComponentTransfer::getValues):
+        * platform/graphics/filters/FEComponentTransfer.h:
+        Factor out the retrieval of LUT values into its own function, so we
+        can call it from the Skia implementation.
+        * platform/graphics/filters/skia/FEComponentTransferSkia.cpp: Added.
+        (WebCore::FEComponentTransfer::platformApplySkia):
+
 2012-09-11  Kevin Ellis  <kevers@chromium.org>
 

trunk/Source/WebCore/WebCore.gypi

@@ -4997 +4997 @@
             'platform/graphics/filters/skia/FEBlendSkia.cpp',
             'platform/graphics/filters/skia/FEColorMatrixSkia.cpp',
+            'platform/graphics/filters/skia/FEComponentTransferSkia.cpp',
             'platform/graphics/filters/skia/FEGaussianBlurSkia.cpp',
             'platform/graphics/filters/skia/FEMorphologySkia.cpp',

trunk/Source/WebCore/platform/graphics/filters/FEComponentTransfer.cpp

@@ -160 +160 @@
 
     unsigned char rValues[256], gValues[256], bValues[256], aValues[256];
-    for (unsigned i = 0; i < 256; ++i)
-        rValues[i] = gValues[i] = bValues[i] = aValues[i] = i;
+    getValues(rValues, gValues, bValues, aValues);
     unsigned char* tables[] = { rValues, gValues, bValues, aValues };
-    ComponentTransferFunction transferFunction[] = {m_redFunc, m_greenFunc, m_blueFunc, m_alphaFunc};
-    TransferType callEffect[] = {identity, identity, table, discrete, linear, gamma};
-
-    for (unsigned channel = 0; channel < 4; channel++) {
-        ASSERT(static_cast<size_t>(transferFunction[channel].type) < WTF_ARRAY_LENGTH(callEffect));
-        (*callEffect[transferFunction[channel].type])(tables[channel], transferFunction[channel]);
-    }
 
     IntRect drawingRect = requestedRegionOfInputImageData(in->absolutePaintRect());
@@ -180 +172 @@
             pixelArray->set(pixelOffset + channel, tables[channel][c]);
         }
+    }
+}
+
+void FEComponentTransfer::getValues(unsigned char rValues[256], unsigned char gValues[256], unsigned char bValues[256], unsigned char aValues[256])
+{
+    for (unsigned i = 0; i < 256; ++i)
+        rValues[i] = gValues[i] = bValues[i] = aValues[i] = i;
+    unsigned char* tables[] = { rValues, gValues, bValues, aValues };
+    ComponentTransferFunction transferFunction[] = {m_redFunc, m_greenFunc, m_blueFunc, m_alphaFunc};
+    TransferType callEffect[] = {identity, identity, table, discrete, linear, gamma};
+
+    for (unsigned channel = 0; channel < 4; channel++) {
+        ASSERT(static_cast<size_t>(transferFunction[channel].type) < WTF_ARRAY_LENGTH(callEffect));
+        (*callEffect[transferFunction[channel].type])(tables[channel], transferFunction[channel]);
     }
 }

trunk/Source/WebCore/platform/graphics/filters/FEComponentTransfer.h

@@ -80 +80 @@
 
     virtual void platformApplySoftware();
+#if USE(SKIA)
+    virtual bool platformApplySkia();
+#endif
     virtual void dump();
 
@@ -87 +90 @@
     FEComponentTransfer(Filter*, const ComponentTransferFunction& redFunc, const ComponentTransferFunction& greenFunc,
                         const ComponentTransferFunction& blueFunc, const ComponentTransferFunction& alphaFunc);
+
+    void getValues(unsigned char rValues[256], unsigned char gValues[256], unsigned char bValues[256], unsigned char aValues[256]);
 
     ComponentTransferFunction m_redFunc;