Changeset 50718 in webkit

Timestamp:

Nov 9, 2009 11:23:39 PM (14 years ago)

Author:

krit@webkit.org

Message:

2009-11-09 Dirk Schulze <​krit@webkit.org>

Reviewed by Oliver Hunt.

SVG feDisplacementMap is not implemented
​https://bugs.webkit.org/show_bug.cgi?id=31255

This is the implementation of the SVG filter effect
feDisplacementMap.

Test: svg/filters/feDisplacementMap.svg

• svg/graphics/filters/SVGFEDisplacementMap.cpp: (WebCore::FEDisplacementMap::apply):

Test for SVG filter effect feDisplacementMap.

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/svg/filters/feDisplacementMap-expected.checksum (added)
• LayoutTests/platform/mac/svg/filters/feDisplacementMap-expected.png (added)
• LayoutTests/platform/mac/svg/filters/feDisplacementMap-expected.txt (added)
• LayoutTests/svg/filters/feDisplacementMap.svg (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/svg/graphics/filters/SVGFEDisplacementMap.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-11-09  Dirk Schulze  <krit@webkit.org>
+
+        Reviewed by Oliver Hunt.
+
+        Test for SVG filter effect feDisplacementMap.
+
+        * platform/mac/svg/filters/feDisplacementMap-expected.checksum: Added.
+        * platform/mac/svg/filters/feDisplacementMap-expected.png: Added.
+        * platform/mac/svg/filters/feDisplacementMap-expected.txt: Added.
+        * svg/filters/feDisplacementMap.svg: Added.
+
 2009-11-03  Shinichiro Hamaji  <hamaji@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-11-09  Dirk Schulze  <krit@webkit.org>
+
+        Reviewed by Oliver Hunt.
+
+        SVG feDisplacementMap is not implemented
+        [https://bugs.webkit.org/show_bug.cgi?id=31255]
+
+        This is the implementation of the SVG filter effect
+        feDisplacementMap. 
+
+        Test: svg/filters/feDisplacementMap.svg
+
+        * svg/graphics/filters/SVGFEDisplacementMap.cpp:
+        (WebCore::FEDisplacementMap::apply):
+
 2009-11-09  Kent Tamura  <tkent@chromium.org>
 

trunk/WebCore/svg/graphics/filters/SVGFEDisplacementMap.cpp

@@ -3 +3 @@
                   2004, 2005 Rob Buis <buis@kde.org>
                   2005 Eric Seidel <eric@webkit.org>
+                  2009 Dirk Schulze <krit@webkit.org>
 
     This library is free software; you can redistribute it and/or
@@ -24 +25 @@
 #if ENABLE(SVG) && ENABLE(FILTERS)
 #include "SVGFEDisplacementMap.h"
+
+#include "CanvasPixelArray.h"
+#include "Filter.h"
+#include "GraphicsContext.h"
+#include "ImageData.h"
 #include "SVGRenderTreeAsText.h"
-#include "Filter.h"
 
 namespace WebCore {
@@ -76 +81 @@
 }
 
-void FEDisplacementMap::apply(Filter*)
+void FEDisplacementMap::apply(Filter* filter)
 {
+    m_in->apply(filter);
+    m_in2->apply(filter);
+    if (!m_in->resultImage() || !m_in2->resultImage())
+        return;
+
+    if (m_xChannelSelector == CHANNEL_UNKNOWN || m_yChannelSelector == CHANNEL_UNKNOWN)
+        return;
+
+    if (!getEffectContext())
+        return;
+
+    IntRect effectADrawingRect = calculateDrawingIntRect(m_in->subRegion());
+    RefPtr<CanvasPixelArray> srcPixelArrayA(m_in->resultImage()->getPremultipliedImageData(effectADrawingRect)->data());
+
+    IntRect effectBDrawingRect = calculateDrawingIntRect(m_in2->subRegion());
+    RefPtr<CanvasPixelArray> srcPixelArrayB(m_in2->resultImage()->getUnmultipliedImageData(effectBDrawingRect)->data());
+
+    IntRect imageRect(IntPoint(), resultImage()->size());
+    RefPtr<ImageData> imageData = ImageData::create(imageRect.width(), imageRect.height());
+
+    ASSERT(srcPixelArrayA->length() == srcPixelArrayB->length());
+
+    float scale = m_scale / 255.f;
+    float scaleAdjustment = 0.5f - 0.5f * m_scale;
+    int stride = imageRect.width() * 4;
+    for (int y = 0; y < imageRect.height(); ++y) {
+        int line = y * stride;
+        for (int x = 0; x < imageRect.width(); ++x) {
+            int dstIndex = line + x * 4;
+            int srcX = x + static_cast<int>(scale * srcPixelArrayB->get(dstIndex + m_xChannelSelector - 1) + scaleAdjustment);
+            int srcY = y + static_cast<int>(scale * srcPixelArrayB->get(dstIndex + m_yChannelSelector - 1) + scaleAdjustment);
+            for (unsigned channel = 0; channel < 4; ++channel) {
+                if (srcX < 0 || srcX >= imageRect.width() || srcY < 0 || srcY >= imageRect.height())
+                    imageData->data()->set(dstIndex + channel, static_cast<unsigned char>(0));
+                else {
+                    unsigned char pixelValue = srcPixelArrayA->get(srcY * stride + srcX * 4 + channel);
+                    imageData->data()->set(dstIndex + channel, pixelValue);
+                }
+            }
+
+        }
+    }
+    resultImage()->putPremultipliedImageData(imageData.get(), imageRect, IntPoint());
 }