Attachment #59494 for bug #5861

View Details Raw Unified Return to Bug 5861

| Differences between

Lines 6-16 layer at (0,0) size 480x360 a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/filters-conv-01-f-expected.txt_sec1
- a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/filters-conv-01-f-expected.txt +12 lines
6	RenderSVGContainer {g} at (30,46) size 415x180 [transform={m=((1.00,0.00)(0.00,1.00)) t=(20.00,40.00)}]	6	RenderSVGContainer {g} at (30,46) size 415x180 [transform={m=((1.00,0.00)(0.00,1.00)) t=(20.00,40.00)}]
7	RenderSVGHiddenContainer {defs} at (0,0) size 0x0	7	RenderSVGHiddenContainer {defs} at (0,0) size 0x0
8	RenderSVGResourceFilter {filter} [id="convolve1"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]	8	RenderSVGResourceFilter {filter} [id="convolve1"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
		9	[feConvolveMatrix order="width=3 height=3" kernelMatrix="[0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11]" divisor="1.00" bias="0.00" target="(1,1)" edgeMode="NONE" kernelUnitLength="(0,0)" preserveAlpha="0"]
		10	[SourceGraphic]
9	RenderSVGResourceFilter {filter} [id="convolve2"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]	11	RenderSVGResourceFilter {filter} [id="convolve2"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
		12	[feConvolveMatrix order="width=3 height=3" kernelMatrix="[-1.00, -1.00, -1.00, -1.00, 8.00, -1.00, -1.00, -1.00, -1.00]" divisor="1.00" bias="0.00" target="(1,1)" edgeMode="DUPLICATE" kernelUnitLength="(0,0)" preserveAlpha="0"]
		13	[SourceGraphic]
10	RenderSVGResourceFilter {filter} [id="convolve3"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]	14	RenderSVGResourceFilter {filter} [id="convolve3"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
		15	[feConvolveMatrix order="width=3 height=3" kernelMatrix="[-1.00, -1.00, -1.00, -1.00, 9.00, -1.00, -1.00, -1.00, -1.00]" divisor="1.00" bias="0.00" target="(1,1)" edgeMode="NONE" kernelUnitLength="(0,0)" preserveAlpha="0"]
		16	[SourceGraphic]
11	RenderSVGResourceFilter {filter} [id="convolve4"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]	17	RenderSVGResourceFilter {filter} [id="convolve4"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
		18	[feConvolveMatrix order="width=3 height=3" kernelMatrix="[-2.00, 0.00, 0.00, 0.00, 1.00, 0.00, 0.00, 0.00, 2.00]" divisor="1.00" bias="0.00" target="(1,1)" edgeMode="NONE" kernelUnitLength="(0,0)" preserveAlpha="0"]
		19	[SourceGraphic]
12	RenderSVGResourceFilter {filter} [id="convolve5"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]	20	RenderSVGResourceFilter {filter} [id="convolve5"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
		21	[feConvolveMatrix order="width=3 height=1" kernelMatrix="[0.33, 0.33, 0.33]" divisor="1.00" bias="0.00" target="(1,0)" edgeMode="NONE" kernelUnitLength="(0,0)" preserveAlpha="0"]
		22	[SourceGraphic]
13	RenderSVGResourceFilter {filter} [id="convolve6"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]	23	RenderSVGResourceFilter {filter} [id="convolve6"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
		24	[feConvolveMatrix order="width=1 height=3" kernelMatrix="[0.33, 0.33, 0.33]" divisor="1.00" bias="0.00" target="(0,1)" edgeMode="NONE" kernelUnitLength="(0,0)" preserveAlpha="0"]
		25	[SourceGraphic]
14	RenderSVGContainer {g} at (30,46) size 415x180	26	RenderSVGContainer {g} at (30,46) size 415x180
15	RenderSVGText {text} at (10,6) size 66x18 contains 1 chunk(s)	27	RenderSVGText {text} at (10,6) size 66x18 contains 1 chunk(s)
16	RenderSVGInlineText {#text} at (0,0) size 66x18	28	RenderSVGInlineText {#text} at (0,0) size 66x18

Lines 118-124 PASS SVGFEFuncGElement.toString() is '[object SVGFEFuncGElementConstructor]' a/LayoutTests/svg/custom/global-constructors-expected.txt_sec1
- a/LayoutTests/svg/custom/global-constructors-expected.txt -1 / +1 lines
118	PASS SVGFEFuncBElement.toString() is '[object SVGFEFuncBElementConstructor]'	118	PASS SVGFEFuncBElement.toString() is '[object SVGFEFuncBElementConstructor]'
119	PASS SVGFEFuncAElement.toString() is '[object SVGFEFuncAElementConstructor]'	119	PASS SVGFEFuncAElement.toString() is '[object SVGFEFuncAElementConstructor]'
120	PASS SVGFECompositeElement.toString() is '[object SVGFECompositeElementConstructor]'	120	PASS SVGFECompositeElement.toString() is '[object SVGFECompositeElementConstructor]'
121	FAIL SVGFEConvolveMatrixElement.toString() should be [object SVGFEConvolveMatrixElementConstructor]. Threw exception ReferenceError: Can't find variable: SVGFEConvolveMatrixElement	121	PASS SVGFEConvolveMatrixElement.toString() is '[object SVGFEConvolveMatrixElementConstructor]'
122	PASS SVGFEDiffuseLightingElement.toString() is '[object SVGFEDiffuseLightingElementConstructor]'	122	PASS SVGFEDiffuseLightingElement.toString() is '[object SVGFEDiffuseLightingElementConstructor]'
123	PASS SVGFEDistantLightElement.toString() is '[object SVGFEDistantLightElementConstructor]'	123	PASS SVGFEDistantLightElement.toString() is '[object SVGFEDistantLightElementConstructor]'
124	PASS SVGFEPointLightElement.toString() is '[object SVGFEPointLightElementConstructor]'	124	PASS SVGFEPointLightElement.toString() is '[object SVGFEPointLightElementConstructor]'

Lines 35-40 SVGFECompositeElement.SVG_FECOMPOSITE_OPERATOR_OUT PASSED a/LayoutTests/svg/custom/js-svg-constructors-expected.txt_sec1
- a/LayoutTests/svg/custom/js-svg-constructors-expected.txt +4 lines
35	SVGFECompositeElement.SVG_FECOMPOSITE_OPERATOR_ATOP PASSED	35	SVGFECompositeElement.SVG_FECOMPOSITE_OPERATOR_ATOP PASSED
36	SVGFECompositeElement.SVG_FECOMPOSITE_OPERATOR_XOR PASSED	36	SVGFECompositeElement.SVG_FECOMPOSITE_OPERATOR_XOR PASSED
37	SVGFECompositeElement.SVG_FECOMPOSITE_OPERATOR_ARITHMETIC PASSED	37	SVGFECompositeElement.SVG_FECOMPOSITE_OPERATOR_ARITHMETIC PASSED
		38	SVGFEConvolveMatrixElement.SVG_EDGEMODE_UNKNOWN PASSED
		39	SVGFEConvolveMatrixElement.SVG_EDGEMODE_DUPLICATE PASSED
		40	SVGFEConvolveMatrixElement.SVG_EDGEMODE_WRAP PASSED
		41	SVGFEConvolveMatrixElement.SVG_EDGEMODE_NONE PASSED
38	SVGFEDisplacementMapElement.SVG_CHANNEL_UNKNOWN PASSED	42	SVGFEDisplacementMapElement.SVG_CHANNEL_UNKNOWN PASSED
39	SVGFEDisplacementMapElement.SVG_CHANNEL_R PASSED	43	SVGFEDisplacementMapElement.SVG_CHANNEL_R PASSED
40	SVGFEDisplacementMapElement.SVG_CHANNEL_G PASSED	44	SVGFEDisplacementMapElement.SVG_CHANNEL_G PASSED



      }

      if (window.SVGFEConvolveMatrixElement) {
          expect("SVGFEConvolveMatrixElement.SVG_EDGEMODE_UNKNOWN", 0);
          expect("SVGFEConvolveMatrixElement.SVG_EDGEMODE_DUPLICATE", 1);
          expect("SVGFEConvolveMatrixElement.SVG_EDGEMODE_WRAP", 2);
          expect("SVGFEConvolveMatrixElement.SVG_EDGEMODE_NONE", 3);
      }

      if (window.SVGFEDisplacementMapElement) {

Lines 420-425 GEN := \ a/WebCore/Android.derived.jscbindings.mk_sec1
- a/WebCore/Android.derived.jscbindings.mk +1 lines
420	$(intermediates)/svg/JSSVGFEColorMatrixElement.h \	420	$(intermediates)/svg/JSSVGFEColorMatrixElement.h \
421	$(intermediates)/svg/JSSVGFEComponentTransferElement.h \	421	$(intermediates)/svg/JSSVGFEComponentTransferElement.h \
422	$(intermediates)/svg/JSSVGFECompositeElement.h \	422	$(intermediates)/svg/JSSVGFECompositeElement.h \
		423	$(intermediates)/svg/JSSVGFEConvolveMatrixElement.h \
423	$(intermediates)/svg/JSSVGFEDiffuseLightingElement.h \	424	$(intermediates)/svg/JSSVGFEDiffuseLightingElement.h \
424	$(intermediates)/svg/JSSVGFEDisplacementMapElement.h \	425	$(intermediates)/svg/JSSVGFEDisplacementMapElement.h \
425	$(intermediates)/svg/JSSVGFEDistantLightElement.h \	426	$(intermediates)/svg/JSSVGFEDistantLightElement.h \

Lines 391-396 GEN += \ a/WebCore/Android.derived.v8bindings.mk_sec1
- a/WebCore/Android.derived.v8bindings.mk +1 lines
391	$(intermediates)/bindings/V8SVGFEColorMatrixElement.h \	391	$(intermediates)/bindings/V8SVGFEColorMatrixElement.h \
392	$(intermediates)/bindings/V8SVGFEComponentTransferElement.h \	392	$(intermediates)/bindings/V8SVGFEComponentTransferElement.h \
393	$(intermediates)/bindings/V8SVGFECompositeElement.h \	393	$(intermediates)/bindings/V8SVGFECompositeElement.h \
		394	$(intermediates)/bindings/V8SVGFEConvolveMatrixElement.h \
394	$(intermediates)/bindings/V8SVGFEDiffuseLightingElement.h \	395	$(intermediates)/bindings/V8SVGFEDiffuseLightingElement.h \
395	$(intermediates)/bindings/V8SVGFEDisplacementMapElement.h \	396	$(intermediates)/bindings/V8SVGFEDisplacementMapElement.h \
396	$(intermediates)/bindings/V8SVGFEDistantLightElement.h \	397	$(intermediates)/bindings/V8SVGFEDistantLightElement.h \

Lines 788-793 LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ a/WebCore/Android.mk_sec1
- a/WebCore/Android.mk +1 lines
788	svg/SVGFEColorMatrixElement.cpp \	788	svg/SVGFEColorMatrixElement.cpp \
789	svg/SVGFEComponentTransferElement.cpp \	789	svg/SVGFEComponentTransferElement.cpp \
790	svg/SVGFECompositeElement.cpp \	790	svg/SVGFECompositeElement.cpp \
		791	svg/SVGFEConvolveMatrixElement.cpp \
791	svg/SVGFEDiffuseLightingElement.cpp \	792	svg/SVGFEDiffuseLightingElement.cpp \
792	svg/SVGFEDisplacementMapElement.cpp \	793	svg/SVGFEDisplacementMapElement.cpp \
793	svg/SVGFEDistantLightElement.cpp \	794	svg/SVGFEDistantLightElement.cpp \



        svg/SVGFEColorMatrixElement.idl
        svg/SVGFEComponentTransferElement.idl
        svg/SVGFECompositeElement.idl
        svg/SVGFEConvolveMatrixElement.idl
        svg/SVGFEDiffuseLightingElement.idl
        svg/SVGFEDisplacementMapElement.idl
        svg/SVGFEDistantLightElement.idl

        svg/SVGFEColorMatrixElement.cpp
        svg/SVGFEComponentTransferElement.cpp
        svg/SVGFECompositeElement.cpp
        svg/SVGFEConvolveMatrixElement.cpp
        svg/SVGFEDiffuseLightingElement.cpp
        svg/SVGFEDisplacementMapElement.cpp
        svg/SVGFEDistantLightElement.cpp

Lines 272-277 a/WebCore/DerivedSources.cpp_sec1
- a/WebCore/DerivedSources.cpp +1 lines
272	#include "JSSVGFEColorMatrixElement.cpp"	272	#include "JSSVGFEColorMatrixElement.cpp"
273	#include "JSSVGFEComponentTransferElement.cpp"	273	#include "JSSVGFEComponentTransferElement.cpp"
274	#include "JSSVGFECompositeElement.cpp"	274	#include "JSSVGFECompositeElement.cpp"
		275	#include "JSSVGFEConvolveMatrixElement.cpp"
275	#include "JSSVGFEDiffuseLightingElement.cpp"	276	#include "JSSVGFEDiffuseLightingElement.cpp"
276	#include "JSSVGFEDisplacementMapElement.cpp"	277	#include "JSSVGFEDisplacementMapElement.cpp"
277	#include "JSSVGFEDistantLightElement.cpp"	278	#include "JSSVGFEDistantLightElement.cpp"

Lines 316-321 DOM_CLASSES = \ a/WebCore/DerivedSources.make_sec1
- a/WebCore/DerivedSources.make +1 lines
316	SVGFEColorMatrixElement \	316	SVGFEColorMatrixElement \
317	SVGFEComponentTransferElement \	317	SVGFEComponentTransferElement \
318	SVGFECompositeElement \	318	SVGFECompositeElement \
		319	SVGFEConvolveMatrixElement \
319	SVGFEDiffuseLightingElement \	320	SVGFEDiffuseLightingElement \
320	SVGFEDisplacementMapElement \	321	SVGFEDisplacementMapElement \
321	SVGFEDistantLightElement \	322	SVGFEDistantLightElement \

Lines 522-527 IDL_BINDINGS += \ a/WebCore/WebCore.pri_sec1
- a/WebCore/WebCore.pri +1 lines
522	svg/SVGFEColorMatrixElement.idl \	522	svg/SVGFEColorMatrixElement.idl \
523	svg/SVGFEComponentTransferElement.idl \	523	svg/SVGFEComponentTransferElement.idl \
524	svg/SVGFECompositeElement.idl \	524	svg/SVGFECompositeElement.idl \
		525	svg/SVGFEConvolveMatrixElement.idl \
525	svg/SVGFEDiffuseLightingElement.idl \	526	svg/SVGFEDiffuseLightingElement.idl \
526	svg/SVGFEDisplacementMapElement.idl \	527	svg/SVGFEDisplacementMapElement.idl \
527	svg/SVGFEDistantLightElement.idl \	528	svg/SVGFEDistantLightElement.idl \



    svg/SVGFEColorMatrixElement.h \
    svg/SVGFEComponentTransferElement.h \
    svg/SVGFECompositeElement.h \
    svg/SVGFEConvolveMatrixElement.h \
    svg/SVGFEDiffuseLightingElement.h \
    svg/SVGFEDisplacementMapElement.h \
    svg/SVGFEDistantLightElement.h \

        svg/SVGFEColorMatrixElement.cpp \
        svg/SVGFEComponentTransferElement.cpp \
        svg/SVGFECompositeElement.cpp \
        svg/SVGFEConvolveMatrixElement.cpp \
        svg/SVGFEDiffuseLightingElement.cpp \
        svg/SVGFEDisplacementMapElement.cpp \
        svg/SVGFEDistantLightElement.cpp \



				>
			</File>
			<File
				RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSSVGFEConvolveMatrixElement.cpp"
				>
				<FileConfiguration
					Name="Debug|Win32"
					ExcludedFromBuild="true"
					>
					<Tool
						Name="VCCLCompilerTool"
					/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32"
					ExcludedFromBuild="true"
					>
					<Tool
						Name="VCCLCompilerTool"
					/>
				</FileConfiguration>
				<FileConfiguration
					Name="Debug_Internal|Win32"
					ExcludedFromBuild="true"
					>
					<Tool
						Name="VCCLCompilerTool"
					/>
				</FileConfiguration>
				<FileConfiguration
					Name="Debug_Cairo|Win32"
					ExcludedFromBuild="true"
					>
					<Tool
						Name="VCCLCompilerTool"
					/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release_Cairo|Win32"
					ExcludedFromBuild="true"
					>
					<Tool
						Name="VCCLCompilerTool"
					/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSSVGFEConvolveMatrixElement.h"
				>
			</File>
			<File
				RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSSVGFEDiffuseLightingElement.cpp"
				>
				<FileConfiguration

				>
			</File>
			<File
				RelativePath="..\svg\SVGFEConvolveMatrixElement.h"
				>
			</File>
			<File
				RelativePath="..\svg\SVGFEDiffuseLightingElement.h"
				>
			</File>

Lines 165-170 static void createElementClassMap() a/WebCore/bindings/objc/DOM.mm_sec1
- a/WebCore/bindings/objc/DOM.mm +1 lines
165	addElementClass(SVGNames::feColorMatrixTag, [DOMSVGFEColorMatrixElement class]);	165	addElementClass(SVGNames::feColorMatrixTag, [DOMSVGFEColorMatrixElement class]);
166	addElementClass(SVGNames::feComponentTransferTag, [DOMSVGFEComponentTransferElement class]);	166	addElementClass(SVGNames::feComponentTransferTag, [DOMSVGFEComponentTransferElement class]);
167	addElementClass(SVGNames::feCompositeTag, [DOMSVGFECompositeElement class]);	167	addElementClass(SVGNames::feCompositeTag, [DOMSVGFECompositeElement class]);
		168	addElementClass(SVGNames::feConvolveMatrixTag, [DOMSVGFEConvolveMatrixElement class]);
168	addElementClass(SVGNames::feDiffuseLightingTag, [DOMSVGFEDiffuseLightingElement class]);	169	addElementClass(SVGNames::feDiffuseLightingTag, [DOMSVGFEDiffuseLightingElement class]);
169	addElementClass(SVGNames::feDisplacementMapTag, [DOMSVGFEDisplacementMapElement class]);	170	addElementClass(SVGNames::feDisplacementMapTag, [DOMSVGFEDisplacementMapElement class]);
170	addElementClass(SVGNames::feDistantLightTag, [DOMSVGFEDistantLightElement class]);	171	addElementClass(SVGNames::feDistantLightTag, [DOMSVGFEDistantLightElement class]);

Lines 63-68 a/WebCore/bindings/objc/DOMSVG.h_sec1
- a/WebCore/bindings/objc/DOMSVG.h +1 lines
63	#import <WebCore/DOMSVGFEColorMatrixElement.h>	63	#import <WebCore/DOMSVGFEColorMatrixElement.h>
64	#import <WebCore/DOMSVGFEComponentTransferElement.h>	64	#import <WebCore/DOMSVGFEComponentTransferElement.h>
65	#import <WebCore/DOMSVGFECompositeElement.h>	65	#import <WebCore/DOMSVGFECompositeElement.h>
		66	#import <WebCore/DOMSVGFEConvolveMatrixElement.h>
66	#import <WebCore/DOMSVGFEDiffuseLightingElement.h>	67	#import <WebCore/DOMSVGFEDiffuseLightingElement.h>
67	#import <WebCore/DOMSVGFEDisplacementMapElement.h>	68	#import <WebCore/DOMSVGFEDisplacementMapElement.h>
68	#import <WebCore/DOMSVGFEDistantLightElement.h>	69	#import <WebCore/DOMSVGFEDistantLightElement.h>

Lines 705-711 module window { a/WebCore/page/DOMWindow.idl_sec1
- a/WebCore/page/DOMWindow.idl -1 / +1 lines
705	attribute SVGFEColorMatrixElementConstructor SVGFEColorMatrixElement;	705	attribute SVGFEColorMatrixElementConstructor SVGFEColorMatrixElement;
706	attribute SVGFEComponentTransferElementConstructor SVGFEComponentTransferElement;	706	attribute SVGFEComponentTransferElementConstructor SVGFEComponentTransferElement;
707	attribute SVGFECompositeElementConstructor SVGFECompositeElement;	707	attribute SVGFECompositeElementConstructor SVGFECompositeElement;
708	// attribute SVGFEConvolveMatrixElementConstructor SVGFEConvolveMatrixElement;	708	attribute SVGFEConvolveMatrixElementConstructor SVGFEConvolveMatrixElement;
709	attribute SVGFEDiffuseLightingElementConstructor SVGFEDiffuseLightingElement;	709	attribute SVGFEDiffuseLightingElementConstructor SVGFEDiffuseLightingElement;
710	attribute SVGFEDisplacementMapElementConstructor SVGFEDisplacementMapElement;	710	attribute SVGFEDisplacementMapElementConstructor SVGFEDisplacementMapElement;
711	attribute SVGFEDistantLightElementConstructor SVGFEDistantLightElement;	711	attribute SVGFEDistantLightElementConstructor SVGFEDistantLightElement;

Lines 54-59 a/WebCore/svg/SVGAllInOne.cpp_sec1
- a/WebCore/svg/SVGAllInOne.cpp +1 lines
54	#include "SVGFEColorMatrixElement.cpp"	54	#include "SVGFEColorMatrixElement.cpp"
55	#include "SVGFEComponentTransferElement.cpp"	55	#include "SVGFEComponentTransferElement.cpp"
56	#include "SVGFECompositeElement.cpp"	56	#include "SVGFECompositeElement.cpp"
		57	#include "SVGFEConvolveMatrixElement.cpp"
57	#include "SVGFEDiffuseLightingElement.cpp"	58	#include "SVGFEDiffuseLightingElement.cpp"
58	#include "SVGFEDisplacementMapElement.cpp"	59	#include "SVGFEDisplacementMapElement.cpp"
59	#include "SVGFEDistantLightElement.cpp"	60	#include "SVGFEDistantLightElement.cpp"



/*
    Copyright (C) 2009 Dirk Schulze <krit@webkit.org>

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.

    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
*/

#include "config.h"

#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEConvolveMatrixElement.h"

#include "Attr.h"
#include "FloatPoint.h"
#include "FloatSize.h"
#include "IntPoint.h"
#include "IntSize.h"
#include "SVGNames.h"
#include "SVGNumberList.h"
#include "SVGParserUtilities.h"

#include <math.h>

namespace WebCore {

char SVGKernelUnitLengthXAttrIdentifier[] = "SVGKernelUnitLengthXAttr";
char SVGKernelUnitLengthYAttrIdentifier[] = "SVGKernelUnitLengthYAttr";

SVGFEConvolveMatrixElement::SVGFEConvolveMatrixElement(const QualifiedName& tagName, Document* doc)
    : SVGFilterPrimitiveStandardAttributes(tagName, doc)
    , m_kernelMatrix(SVGNumberList::create(SVGNames::kernelMatrixAttr))
    , m_edgeMode(EDGEMODE_DUPLICATE)
{
}

SVGFEConvolveMatrixElement::~SVGFEConvolveMatrixElement()
{
}

void SVGFEConvolveMatrixElement::parseMappedAttribute(Attribute* attr)
{
    const String& value = attr->value();
    if (attr->name() == SVGNames::inAttr)
        setIn1BaseValue(value);
    else if (attr->name() == SVGNames::orderAttr) {
        float x, y;
        if (parseNumberOptionalNumber(value, x, y)) {
            setOrderXBaseValue(x);
            setOrderYBaseValue(y);
        }
    } else if (attr->name() == SVGNames::edgeModeAttr) {
        if (value == "duplicate")
            setEdgeModeBaseValue(EDGEMODE_DUPLICATE);
        else if (value == "wrap")
            setEdgeModeBaseValue(EDGEMODE_WRAP);
        else if (value == "none")
            setEdgeModeBaseValue(EDGEMODE_NONE);
    } else if (attr->name() == SVGNames::kernelMatrixAttr)
        kernelMatrixBaseValue()->parse(value);
    else if (attr->name() == SVGNames::divisorAttr)
        setDivisorBaseValue(value.toFloat());
    else if (attr->name() == SVGNames::biasAttr)
        setBiasBaseValue(value.toFloat());
    else if (attr->name() == SVGNames::targetXAttr)
        setTargetXBaseValue(value.toUIntStrict());
    else if (attr->name() == SVGNames::targetYAttr)
        setTargetYBaseValue(value.toUIntStrict());
    else if (attr->name() == SVGNames::kernelUnitLengthAttr) {
        float x, y;
        if (parseNumberOptionalNumber(value, x, y)) {
            setKernelUnitLengthXBaseValue(x);
            setKernelUnitLengthYBaseValue(y);
        }
    } else if (attr->name() == SVGNames::preserveAlphaAttr) {
        if (value == "true")
            setPreserveAlphaBaseValue(true);
        else if (value == "false")
            setPreserveAlphaBaseValue(false);
    } else
        SVGFilterPrimitiveStandardAttributes::parseMappedAttribute(attr);
}

void SVGFEConvolveMatrixElement::setOrder(float, float)
{
    // FIXME: Needs an implementation.
}

void SVGFEConvolveMatrixElement::setKernelUnitLength(float, float)
{
    // FIXME: Needs an implementation.
}

PassRefPtr<FilterEffect> SVGFEConvolveMatrixElement::build(SVGFilterBuilder* filterBuilder)
{
    FilterEffect* input1 = filterBuilder->getEffectById(in1());

    if (!input1)
        return 0;

    Vector<float> kernelMatrixValues;
    SVGNumberList* numbers = kernelMatrix();

    ExceptionCode ec = 0;
    int numberOfItems = numbers->numberOfItems();
    for (int i = 0; i < numberOfItems; i++)
        kernelMatrixValues.append(numbers->getItem(i, ec));

    int orderXValue = orderX();
    int orderYValue = orderY();
    if (!hasAttribute(SVGNames::orderAttr)) {
        orderXValue = 3;
        orderYValue = 3;
    }
    // The spec says this is a requirement, and should bail out if fails
    if (orderXValue * orderYValue != numberOfItems)
        return 0;

    int targetXValue = targetX();
    int targetYValue = targetY();
    if (hasAttribute(SVGNames::targetXAttr) && (targetXValue < 0 || targetXValue >= orderXValue))
        return 0;
    if (!hasAttribute(SVGNames::targetXAttr))
        targetXValue = static_cast<int>(floor(orderXValue / 2));
    if (hasAttribute(SVGNames::targetYAttr) && (targetYValue < 0 || targetYValue >= orderYValue))
        return 0;
    if (!hasAttribute(SVGNames::targetYAttr))
        targetYValue = static_cast<int>(floor(orderYValue / 2));

    float divisorValue = divisor();
    if (hasAttribute(SVGNames::divisorAttr) && !divisorValue)
        return 0;
    if (!hasAttribute(SVGNames::divisorAttr)) {
        for (int i = 0; i < numberOfItems; i++)
            divisorValue += kernelMatrixValues[i];
        if (!divisorValue)
            divisorValue = 1.0f;
    }

    return FEConvolveMatrix::create(input1, IntSize(orderXValue, orderYValue), divisorValue, bias(), IntPoint(targetXValue, targetYValue), static_cast<EdgeModeType>(edgeMode()), FloatPoint(kernelUnitLengthX(), kernelUnitLengthX()), preserveAlpha(), kernelMatrixValues);
}

} // namespace WebCore

#endif // ENABLE(SVG)



/*
    Copyright (C) 2009 Dirk Schulze <krit@webkit.org>

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.

    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
*/

#ifndef SVGFEConvolveMatrixElement_h
#define SVGFEConvolveMatrixElement_h

#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGFEConvolveMatrix.h"
#include "SVGFilterPrimitiveStandardAttributes.h"
#include "SVGNumberList.h"

namespace WebCore {

class SVGFEConvolveMatrixElement : public SVGFilterPrimitiveStandardAttributes {
public:
    SVGFEConvolveMatrixElement(const QualifiedName&, Document*);
    virtual ~SVGFEConvolveMatrixElement();

    void setOrder(float orderX, float orderY);
    void setKernelUnitLength(float kernelUnitLengthX, float kernelUnitLengthY);

    virtual void parseMappedAttribute(Attribute*);
    virtual PassRefPtr<FilterEffect> build(SVGFilterBuilder*);

private:
    DECLARE_ANIMATED_PROPERTY(SVGFEConvolveMatrixElement, SVGNames::inAttr, String, In1, in1)
    DECLARE_ANIMATED_PROPERTY(SVGFEConvolveMatrixElement, SVGNames::orderXAttr, long, OrderX, orderX)
    DECLARE_ANIMATED_PROPERTY(SVGFEConvolveMatrixElement, SVGNames::orderYAttr, long, OrderY, orderY)
    DECLARE_ANIMATED_PROPERTY(SVGFEConvolveMatrixElement, SVGNames::kernelMatrixAttr, SVGNumberList*, KernelMatrix, kernelMatrix)
    DECLARE_ANIMATED_PROPERTY(SVGFEConvolveMatrixElement, SVGNames::divisorAttr, float, Divisor, divisor)
    DECLARE_ANIMATED_PROPERTY(SVGFEConvolveMatrixElement, SVGNames::biasAttr, float, Bias, bias)
    DECLARE_ANIMATED_PROPERTY(SVGFEConvolveMatrixElement, SVGNames::targetXAttr, long, TargetX, targetX)
    DECLARE_ANIMATED_PROPERTY(SVGFEConvolveMatrixElement, SVGNames::targetYAttr, long, TargetY, targetY)
    DECLARE_ANIMATED_PROPERTY(SVGFEConvolveMatrixElement, SVGNames::operatorAttr, int, EdgeMode, edgeMode)
    DECLARE_ANIMATED_PROPERTY_MULTIPLE_WRAPPERS(SVGFEConvolveMatrixElement, SVGNames::kernelUnitLengthAttr, SVGKernelUnitLengthXIdentifier, float, KernelUnitLengthX, kernelUnitLengthX)
    DECLARE_ANIMATED_PROPERTY_MULTIPLE_WRAPPERS(SVGFEConvolveMatrixElement, SVGNames::kernelUnitLengthAttr, SVGKernelUnitLengthYIdentifier, float, KernelUnitLengthY, kernelUnitLengthY)
    DECLARE_ANIMATED_PROPERTY(SVGFEConvolveMatrixElement, SVGNames::preserveAlphaAttr, bool, PreserveAlpha, preserveAlpha)
};

} // namespace WebCore

#endif // ENABLE(SVG)
#endif



/*
 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

module svg {

    interface [Conditional=SVG&FILTERS, GenerateConstructor] SVGFEConvolveMatrixElement : SVGElement,
                                                             SVGFilterPrimitiveStandardAttributes {
        // Edge Mode Values
        const unsigned short SVG_EDGEMODE_UNKNOWN   = 0;
        const unsigned short SVG_EDGEMODE_DUPLICATE = 1;
        const unsigned short SVG_EDGEMODE_WRAP      = 2;
        const unsigned short SVG_EDGEMODE_NONE      = 3;

        readonly attribute SVGAnimatedString      in1;
        readonly attribute SVGAnimatedInteger     orderX;
        readonly attribute SVGAnimatedInteger     orderY;
        readonly attribute SVGAnimatedNumberList  kernelMatrix;
        readonly attribute SVGAnimatedNumber      divisor;
        readonly attribute SVGAnimatedNumber      bias;
        readonly attribute SVGAnimatedInteger     targetX;
        readonly attribute SVGAnimatedInteger     targetY;
        readonly attribute SVGAnimatedEnumeration edgeMode;
        readonly attribute SVGAnimatedNumber      kernelUnitLengthX;
        readonly attribute SVGAnimatedNumber      kernelUnitLengthY;
        readonly attribute SVGAnimatedBoolean     preserveAlpha;
    };

}

Lines 2-7 a/WebCore/svg/graphics/filters/SVGFEConvolveMatrix.cpp_sec1
- a/WebCore/svg/graphics/filters/SVGFEConvolveMatrix.cpp -13 / +15 lines
2	Copyright (C) 2004, 2005, 2006, 2007 Nikolas Zimmermann <zimmermann@kde.org>	2	Copyright (C) 2004, 2005, 2006, 2007 Nikolas Zimmermann <zimmermann@kde.org>
3	2004, 2005 Rob Buis <buis@kde.org>	3	2004, 2005 Rob Buis <buis@kde.org>
4	2005 Eric Seidel <eric@webkit.org>	4	2005 Eric Seidel <eric@webkit.org>
		5	2009 Dirk Schulze <krit@webkit.org>
		6	2010 Zoltan Herczeg <zherczeg@webkit.org>
5		7
6	This library is free software; you can redistribute it and/or	8	This library is free software; you can redistribute it and/or
7	modify it under the terms of the GNU Library General Public	9	modify it under the terms of the GNU Library General Public
Lines 23-39 a/WebCore/svg/graphics/filters/SVGFEConvolveMatrix.cpp_sec2
23		25
24	#if ENABLE(SVG) && ENABLE(FILTERS)	26	#if ENABLE(SVG) && ENABLE(FILTERS)
25	#include "SVGFEConvolveMatrix.h"	27	#include "SVGFEConvolveMatrix.h"
		28
		29	#include "CanvasPixelArray.h"
26	#include "Filter.h"	30	#include "Filter.h"
		31	#include "ImageData.h"
27	#include "SVGRenderTreeAsText.h"	32	#include "SVGRenderTreeAsText.h"
28		33
29	namespace WebCore {	34	namespace WebCore {
30		35
31	FEConvolveMatrix::FEConvolveMatrix(FilterEffect* in, FilterEffect* in2, const FloatSize& kernelSize,	36	FEConvolveMatrix::FEConvolveMatrix(FilterEffect* in, const IntSize& kernelSize,
32	const float& divisor, const float& bias, const FloatSize& targetOffset, EdgeModeType edgeMode,	37	float divisor, float bias, const IntPoint& targetOffset, EdgeModeType edgeMode,
33	const FloatPoint& kernelUnitLength, bool preserveAlpha, const Vector<float>& kernelMatrix)	38	const FloatPoint& kernelUnitLength, bool preserveAlpha, const Vector<float>& kernelMatrix)
34	: FilterEffect()	39	: FilterEffect()
35	, m_in(in)	40	, m_in(in)
36	, m_in2(in2)
37	, m_kernelSize(kernelSize)	41	, m_kernelSize(kernelSize)
38	, m_divisor(divisor)	42	, m_divisor(divisor)
39	, m_bias(bias)	43	, m_bias(bias)
Lines 45-65 FEConvolveMatrix::FEConvolveMatrix(FilterEffect* in, FilterEffect* in2, const Fl a/WebCore/svg/graphics/filters/SVGFEConvolveMatrix.cpp_sec3
45	{	49	{
46	}	50	}
47		51
48	PassRefPtr<FEConvolveMatrix> FEConvolveMatrix::create(FilterEffect* in, FilterEffect* in2, const FloatSize& kernelSize,	52	PassRefPtr<FEConvolveMatrix> FEConvolveMatrix::create(FilterEffect* in, const IntSize& kernelSize,
49	const float& divisor, const float& bias, const FloatSize& targetOffset, EdgeModeType edgeMode,	53	float divisor, float bias, const IntPoint& targetOffset, EdgeModeType edgeMode,
50	const FloatPoint& kernelUnitLength, bool preserveAlpha, const Vector<float>& kernelMatrix)	54	const FloatPoint& kernelUnitLength, bool preserveAlpha, const Vector<float>& kernelMatrix)
51	{	55	{
52	return adoptRef(new FEConvolveMatrix(in, in2, kernelSize, divisor, bias, targetOffset, edgeMode, kernelUnitLength,	56	return adoptRef(new FEConvolveMatrix(in, kernelSize, divisor, bias, targetOffset, edgeMode, kernelUnitLength,
53	preserveAlpha, kernelMatrix));	57	preserveAlpha, kernelMatrix));
54	}	58	}
55		59
56		60
57	FloatSize FEConvolveMatrix::kernelSize() const	61	IntSize FEConvolveMatrix::kernelSize() const
58	{	62	{
59	return m_kernelSize;	63	return m_kernelSize;
60	}	64	}
61		65
62	void FEConvolveMatrix::setKernelSize(FloatSize kernelSize)	66	void FEConvolveMatrix::setKernelSize(IntSize kernelSize)
63	{	67	{
64	m_kernelSize = kernelSize;	68	m_kernelSize = kernelSize;
65	}	69	}
Lines 94-105 void FEConvolveMatrix::setBias(float bias) a/WebCore/svg/graphics/filters/SVGFEConvolveMatrix.cpp_sec4
94	m_bias = bias;	98	m_bias = bias;
95	}	99	}
96		100
97	FloatSize FEConvolveMatrix::targetOffset() const	101	IntPoint FEConvolveMatrix::targetOffset() const
98	{	102	{
99	return m_targetOffset;	103	return m_targetOffset;
100	}	104	}
101		105
102	void FEConvolveMatrix::setTargetOffset(FloatSize targetOffset)	106	void FEConvolveMatrix::setTargetOffset(IntPoint targetOffset)
103	{	107	{
104	m_targetOffset = targetOffset;	108	m_targetOffset = targetOffset;
105	}	109	}
Lines 144-151 void FEConvolveMatrix::dump() a/WebCore/svg/graphics/filters/SVGFEConvolveMatrix.cpp_sec5
144		148
145	static TextStream& operator<<(TextStream& ts, const EdgeModeType& type)	149	static TextStream& operator<<(TextStream& ts, const EdgeModeType& type)
146	{	150	{
147	switch (type)	151	switch (type) {
148	{
149	case EDGEMODE_UNKNOWN:	152	case EDGEMODE_UNKNOWN:
150	ts << "UNKNOWN";	153	ts << "UNKNOWN";
151	break;	154	break;
Lines 176-182 TextStream& FEConvolveMatrix::externalRepresentation(TextStream& ts, int indent) a/WebCore/svg/graphics/filters/SVGFEConvolveMatrix.cpp_sec6
176	<< "kernelUnitLength=\"" << m_kernelUnitLength << "\" "	179	<< "kernelUnitLength=\"" << m_kernelUnitLength << "\" "
177	<< "preserveAlpha=\"" << m_preserveAlpha << "\"]\n";	180	<< "preserveAlpha=\"" << m_preserveAlpha << "\"]\n";
178	m_in->externalRepresentation(ts, indent + 1);	181	m_in->externalRepresentation(ts, indent + 1);
179	m_in2->externalRepresentation(ts, indent + 1);
180	return ts;	182	return ts;
181	}	183	}
182		184



    Copyright (C) 2004, 2005, 2006, 2007 Nikolas Zimmermann <zimmermann@kde.org>
                  2004, 2005 Rob Buis <buis@kde.org>
                  2005 Eric Seidel <eric@webkit.org>
                  2010 Zoltan Herczeg <zherczeg@webkit.org>

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public

#include "FloatPoint.h"
#include "FloatSize.h"
#include "Filter.h"
#include <wtf/AlwaysInline.h>
#include <wtf/Vector.h>

namespace WebCore {

enum EdgeModeType {
    EDGEMODE_UNKNOWN   = 0,
    EDGEMODE_DUPLICATE = 1,
    EDGEMODE_WRAP      = 2,
    EDGEMODE_NONE      = 3
};

class CanvasPixelArray;

class FEConvolveMatrix : public FilterEffect {
public:
    static PassRefPtr<FEConvolveMatrix> create(FilterEffect*, const IntSize&,
            float, float, const IntPoint&, EdgeModeType, const FloatPoint&,
            bool, const Vector<float>&);

    IntSize kernelSize() const;
    void setKernelSize(IntSize);

    const Vector<float>& kernel() const;
    void setKernel(const Vector<float>&);

    float divisor() const;
    void setDivisor(float);

    float bias() const;
    void setBias(float);

    IntPoint targetOffset() const;
    void setTargetOffset(IntPoint);

    EdgeModeType edgeMode() const;
    void setEdgeMode(EdgeModeType);

    FloatPoint kernelUnitLength() const;
    void setKernelUnitLength(FloatPoint);

    bool preserveAlpha() const;
    void setPreserveAlpha(bool);

    void apply(Filter*);
    void dump();
    TextStream& externalRepresentation(TextStream&, int indent) const;

private:
    FEConvolveMatrix(FilterEffect*, const IntSize&, float, float,
            const IntPoint&, EdgeModeType, const FloatPoint&, bool, const Vector<float>&);

    RefPtr<FilterEffect> m_in;
    IntSize m_kernelSize;
    float m_divisor;
    float m_bias;
    IntPoint m_targetOffset;
    EdgeModeType m_edgeMode;
    FloatPoint m_kernelUnitLength;
    bool m_preserveAlpha;
    Vector<float> m_kernelMatrix;
};

} // namespace WebCore


Lines 141-146 onzoom a/WebCore/svg/svgattrs.in_sec1
- a/WebCore/svg/svgattrs.in +2 lines
141	opacity	141	opacity
142	operator	142	operator
143	order	143	order
		144	orderX
		145	orderY
144	orient	146	orient
145	orientation	147	orientation
146	origin	148	origin



feColorMatrix createWithNew
feComponentTransfer createWithNew
feComposite createWithNew
#if 0
feConvolveMatrix createWithNew
#endif
feDiffuseLighting createWithNew
feDisplacementMap createWithNew
feDistantLight createWithNew

Lines 268-273 all : \ a/WebKit/mac/MigrateHeaders.make_sec1
- a/WebKit/mac/MigrateHeaders.make -1 / +2 lines
268	$(INTERNAL_HEADERS_DIR)/DOMSVGFEComponentTransferElementInternal.h \	268	$(INTERNAL_HEADERS_DIR)/DOMSVGFEComponentTransferElementInternal.h \
269	$(PRIVATE_HEADERS_DIR)/DOMSVGFECompositeElement.h \	269	$(PRIVATE_HEADERS_DIR)/DOMSVGFECompositeElement.h \
270	$(INTERNAL_HEADERS_DIR)/DOMSVGFECompositeElementInternal.h \	270	$(INTERNAL_HEADERS_DIR)/DOMSVGFECompositeElementInternal.h \
		271	$(PRIVATE_HEADERS_DIR)/DOMSVGFEConvolveMatrixElement.h \
		272	$(INTERNAL_HEADERS_DIR)/DOMSVGFEConvolveMatrixElementInternal.h \
271	$(PRIVATE_HEADERS_DIR)/DOMSVGFEDiffuseLightingElement.h \	273	$(PRIVATE_HEADERS_DIR)/DOMSVGFEDiffuseLightingElement.h \
272	$(INTERNAL_HEADERS_DIR)/DOMSVGFEDiffuseLightingElementInternal.h \	274	$(INTERNAL_HEADERS_DIR)/DOMSVGFEDiffuseLightingElementInternal.h \
273	$(PRIVATE_HEADERS_DIR)/DOMSVGFEDisplacementMapElement.h \	275	$(PRIVATE_HEADERS_DIR)/DOMSVGFEDisplacementMapElement.h \
274	-

Return to Bug 5861

Lines 12869-12874 a/WebCore/WebCore.vcproj/WebCore.vcproj_sec1
- a/WebCore/WebCore.vcproj/WebCore.vcproj +52 lines
12869	>	12869	>
12870	</File>	12870	</File>
12871	<File	12871	<File
		12872	RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSSVGFEConvolveMatrixElement.cpp"
		12873	>
		12874	<FileConfiguration
		12875	Name="Debug\|Win32"
		12876	ExcludedFromBuild="true"
		12877	>
		12878	<Tool
		12879	Name="VCCLCompilerTool"
		12880	/>
		12881	</FileConfiguration>
		12882	<FileConfiguration
		12883	Name="Release\|Win32"
		12884	ExcludedFromBuild="true"
		12885	>
		12886	<Tool
		12887	Name="VCCLCompilerTool"
		12888	/>
		12889	</FileConfiguration>
		12890	<FileConfiguration
		12891	Name="Debug_Internal\|Win32"
		12892	ExcludedFromBuild="true"
		12893	>
		12894	<Tool
		12895	Name="VCCLCompilerTool"
		12896	/>
		12897	</FileConfiguration>
		12898	<FileConfiguration
		12899	Name="Debug_Cairo\|Win32"
		12900	ExcludedFromBuild="true"
		12901	>
		12902	<Tool
		12903	Name="VCCLCompilerTool"
		12904	/>
		12905	</FileConfiguration>
		12906	<FileConfiguration
		12907	Name="Release_Cairo\|Win32"
		12908	ExcludedFromBuild="true"
		12909	>
		12910	<Tool
		12911	Name="VCCLCompilerTool"
		12912	/>
		12913	</FileConfiguration>
		12914	</File>
		12915	<File
		12916	RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSSVGFEConvolveMatrixElement.h"
		12917	>
		12918	</File>
		12919	<File
12872	RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSSVGFEDiffuseLightingElement.cpp"	12920	RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSSVGFEDiffuseLightingElement.cpp"
12873	>	12921	>
12874	<FileConfiguration	12922	<FileConfiguration
Lines 44921-44926 a/WebCore/WebCore.vcproj/WebCore.vcproj_sec2
44921	>	44969	>
44922	</File>	44970	</File>
44923	<File	44971	<File
		44972	RelativePath="..\svg\SVGFEConvolveMatrixElement.h"
		44973	>
		44974	</File>
		44975	<File
44924	RelativePath="..\svg\SVGFEDiffuseLightingElement.h"	44976	RelativePath="..\svg\SVGFEDiffuseLightingElement.h"
44925	>	44977	>
44926	</File>	44978	</File>

Lines 78-87 a/LayoutTests/svg/custom/js-svg-constructors.svg_sec1
- a/LayoutTests/svg/custom/js-svg-constructors.svg -4 / +4 lines
78	}	78	}
79		79
80	if (window.SVGFEConvolveMatrixElement) {	80	if (window.SVGFEConvolveMatrixElement) {
81	expect_failure("SVGFEConvolveMatrixElement.SVG_EDGEMODE_UNKNOWN", 0);	81	expect("SVGFEConvolveMatrixElement.SVG_EDGEMODE_UNKNOWN", 0);
82	expect_failure("SVGFEConvolveMatrixElement.SVG_EDGEMODE_DUPLICATE", 1);	82	expect("SVGFEConvolveMatrixElement.SVG_EDGEMODE_DUPLICATE", 1);
83	expect_failure("SVGFEConvolveMatrixElement.SVG_EDGEMODE_WRAP", 2);	83	expect("SVGFEConvolveMatrixElement.SVG_EDGEMODE_WRAP", 2);
84	expect_failure("SVGFEConvolveMatrixElement.SVG_EDGEMODE_NONE", 3);	84	expect("SVGFEConvolveMatrixElement.SVG_EDGEMODE_NONE", 3);
85	}	85	}
86		86
87	if (window.SVGFEDisplacementMapElement) {	87	if (window.SVGFEDisplacementMapElement) {

Lines 410-415 IF (ENABLE_SVG) a/WebCore/CMakeLists.txt_sec1
- a/WebCore/CMakeLists.txt +2 lines
410	svg/SVGFEColorMatrixElement.idl	410	svg/SVGFEColorMatrixElement.idl
411	svg/SVGFEComponentTransferElement.idl	411	svg/SVGFEComponentTransferElement.idl
412	svg/SVGFECompositeElement.idl	412	svg/SVGFECompositeElement.idl
		413	svg/SVGFEConvolveMatrixElement.idl
413	svg/SVGFEDiffuseLightingElement.idl	414	svg/SVGFEDiffuseLightingElement.idl
414	svg/SVGFEDisplacementMapElement.idl	415	svg/SVGFEDisplacementMapElement.idl
415	svg/SVGFEDistantLightElement.idl	416	svg/SVGFEDistantLightElement.idl
Lines 1550-1555 IF (ENABLE_SVG) a/WebCore/CMakeLists.txt_sec2
1550	svg/SVGFEColorMatrixElement.cpp	1551	svg/SVGFEColorMatrixElement.cpp
1551	svg/SVGFEComponentTransferElement.cpp	1552	svg/SVGFEComponentTransferElement.cpp
1552	svg/SVGFECompositeElement.cpp	1553	svg/SVGFECompositeElement.cpp
		1554	svg/SVGFEConvolveMatrixElement.cpp
1553	svg/SVGFEDiffuseLightingElement.cpp	1555	svg/SVGFEDiffuseLightingElement.cpp
1554	svg/SVGFEDisplacementMapElement.cpp	1556	svg/SVGFEDisplacementMapElement.cpp
1555	svg/SVGFEDistantLightElement.cpp	1557	svg/SVGFEDistantLightElement.cpp

Lines 3161-3166 IDL_BINDINGS += \ a/WebCore/GNUmakefile.am_sec1
- a/WebCore/GNUmakefile.am +3 lines
3161	WebCore/svg/SVGFEColorMatrixElement.idl \	3161	WebCore/svg/SVGFEColorMatrixElement.idl \
3162	WebCore/svg/SVGFEComponentTransferElement.idl \	3162	WebCore/svg/SVGFEComponentTransferElement.idl \
3163	WebCore/svg/SVGFECompositeElement.idl \	3163	WebCore/svg/SVGFECompositeElement.idl \
		3164	WebCore/svg/SVGFEConvolveMatrixElement.idl \
3164	WebCore/svg/SVGFEDiffuseLightingElement.idl \	3165	WebCore/svg/SVGFEDiffuseLightingElement.idl \
3165	WebCore/svg/SVGFEDisplacementMapElement.idl \	3166	WebCore/svg/SVGFEDisplacementMapElement.idl \
3166	WebCore/svg/SVGFEDistantLightElement.idl \	3167	WebCore/svg/SVGFEDistantLightElement.idl \
Lines 3439-3444 webcore_sources += \ a/WebCore/GNUmakefile.am_sec2
3439	WebCore/svg/SVGFEComponentTransferElement.h \	3440	WebCore/svg/SVGFEComponentTransferElement.h \
3440	WebCore/svg/SVGFECompositeElement.cpp \	3441	WebCore/svg/SVGFECompositeElement.cpp \
3441	WebCore/svg/SVGFECompositeElement.h \	3442	WebCore/svg/SVGFECompositeElement.h \
		3443	WebCore/svg/SVGFEConvolveMatrixElement.cpp \
		3444	WebCore/svg/SVGFEConvolveMatrixElement.h \
3442	WebCore/svg/SVGFEDiffuseLightingElement.cpp \	3445	WebCore/svg/SVGFEDiffuseLightingElement.cpp \
3443	WebCore/svg/SVGFEDiffuseLightingElement.h \	3446	WebCore/svg/SVGFEDiffuseLightingElement.h \
3444	WebCore/svg/SVGFEDisplacementMapElement.cpp \	3447	WebCore/svg/SVGFEDisplacementMapElement.cpp \

Lines 312-317 a/WebCore/WebCore.gypi_sec1
- a/WebCore/WebCore.gypi +3 lines
312	'svg/SVGFEColorMatrixElement.idl',	312	'svg/SVGFEColorMatrixElement.idl',
313	'svg/SVGFEComponentTransferElement.idl',	313	'svg/SVGFEComponentTransferElement.idl',
314	'svg/SVGFECompositeElement.idl',	314	'svg/SVGFECompositeElement.idl',
		315	'svg/SVGFEConvolveMatrixElement.idl',
315	'svg/SVGFEDiffuseLightingElement.idl',	316	'svg/SVGFEDiffuseLightingElement.idl',
316	'svg/SVGFEDisplacementMapElement.idl',	317	'svg/SVGFEDisplacementMapElement.idl',
317	'svg/SVGFEDistantLightElement.idl',	318	'svg/SVGFEDistantLightElement.idl',
Lines 3577-3582 a/WebCore/WebCore.gypi_sec2
3577	'svg/SVGFEComponentTransferElement.h',	3578	'svg/SVGFEComponentTransferElement.h',
3578	'svg/SVGFECompositeElement.cpp',	3579	'svg/SVGFECompositeElement.cpp',
3579	'svg/SVGFECompositeElement.h',	3580	'svg/SVGFECompositeElement.h',
		3581	'svg/SVGFEConvolveMatrixElement.cpp',
		3582	'svg/SVGFEConvolveMatrixElement.h',
3580	'svg/SVGFEDiffuseLightingElement.cpp',	3583	'svg/SVGFEDiffuseLightingElement.cpp',
3581	'svg/SVGFEDiffuseLightingElement.h',	3584	'svg/SVGFEDiffuseLightingElement.h',
3582	'svg/SVGFEDisplacementMapElement.cpp',	3585	'svg/SVGFEDisplacementMapElement.cpp',

Lines 1904-1909 HEADERS += \ a/WebCore/WebCore.pro_sec1
- a/WebCore/WebCore.pro +2 lines
1904	svg/SVGFEColorMatrixElement.h \	1904	svg/SVGFEColorMatrixElement.h \
1905	svg/SVGFEComponentTransferElement.h \	1905	svg/SVGFEComponentTransferElement.h \
1906	svg/SVGFECompositeElement.h \	1906	svg/SVGFECompositeElement.h \
		1907	svg/SVGFEConvolveMatrixElement.h \
1907	svg/SVGFEDiffuseLightingElement.h \	1908	svg/SVGFEDiffuseLightingElement.h \
1908	svg/SVGFEDisplacementMapElement.h \	1909	svg/SVGFEDisplacementMapElement.h \
1909	svg/SVGFEDistantLightElement.h \	1910	svg/SVGFEDistantLightElement.h \
Lines 2702-2707 contains(DEFINES, ENABLE_SVG=1) { a/WebCore/WebCore.pro_sec2
2702	svg/SVGFEColorMatrixElement.cpp \	2703	svg/SVGFEColorMatrixElement.cpp \
2703	svg/SVGFEComponentTransferElement.cpp \	2704	svg/SVGFEComponentTransferElement.cpp \
2704	svg/SVGFECompositeElement.cpp \	2705	svg/SVGFECompositeElement.cpp \
		2706	svg/SVGFEConvolveMatrixElement.cpp \
2705	svg/SVGFEDiffuseLightingElement.cpp \	2707	svg/SVGFEDiffuseLightingElement.cpp \
2706	svg/SVGFEDisplacementMapElement.cpp \	2708	svg/SVGFEDisplacementMapElement.cpp \
2707	svg/SVGFEDistantLightElement.cpp \	2709	svg/SVGFEDistantLightElement.cpp \

Lines 296-301 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec1
- a/WebCore/WebCore.xcodeproj/project.pbxproj +35 lines
296	188604B30F2E654A000B6443 /* DOMTimer.cpp in Sources / = {isa = PBXBuildFile; fileRef = 188604B10F2E654A000B6443 / DOMTimer.cpp */; };	296	188604B30F2E654A000B6443 /* DOMTimer.cpp in Sources / = {isa = PBXBuildFile; fileRef = 188604B10F2E654A000B6443 / DOMTimer.cpp */; };
297	188604B40F2E654A000B6443 /* DOMTimer.h in Headers / = {isa = PBXBuildFile; fileRef = 188604B20F2E654A000B6443 / DOMTimer.h */; };	297	188604B40F2E654A000B6443 /* DOMTimer.h in Headers / = {isa = PBXBuildFile; fileRef = 188604B20F2E654A000B6443 / DOMTimer.h */; };
298	18F831B80FD48C7800D8C56B /* WorkerLoaderProxy.h in Headers / = {isa = PBXBuildFile; fileRef = 18F831B70FD48C7800D8C56B / WorkerLoaderProxy.h */; };	298	18F831B80FD48C7800D8C56B /* WorkerLoaderProxy.h in Headers / = {isa = PBXBuildFile; fileRef = 18F831B70FD48C7800D8C56B / WorkerLoaderProxy.h */; };
		299	1921327411C0E6BB00456238 /* SVGFEConvolveMatrixElement.cpp in Sources / = {isa = PBXBuildFile; fileRef = 1921327111C0E6BB00456238 / SVGFEConvolveMatrixElement.cpp */; };
		300	1921327511C0E6BB00456238 /* SVGFEConvolveMatrixElement.h in Headers / = {isa = PBXBuildFile; fileRef = 1921327211C0E6BB00456238 / SVGFEConvolveMatrixElement.h */; };
		301	19BFF64B11C0F2AC00B8C04D /* DOMSVGFEConvolveMatrixElement.h in Headers / = {isa = PBXBuildFile; fileRef = 19BFF64611C0F2AC00B8C04D / DOMSVGFEConvolveMatrixElement.h */; };
		302	19BFF64C11C0F2AC00B8C04D /* DOMSVGFEConvolveMatrixElement.mm in Sources / = {isa = PBXBuildFile; fileRef = 19BFF64711C0F2AC00B8C04D / DOMSVGFEConvolveMatrixElement.mm */; };
		303	19BFF64D11C0F2AC00B8C04D /* DOMSVGFEConvolveMatrixElementInternal.h in Headers / = {isa = PBXBuildFile; fileRef = 19BFF64811C0F2AC00B8C04D / DOMSVGFEConvolveMatrixElementInternal.h */; };
		304	19BFF64E11C0F2AC00B8C04D /* JSSVGFEConvolveMatrixElement.cpp in Sources / = {isa = PBXBuildFile; fileRef = 19BFF64911C0F2AC00B8C04D / JSSVGFEConvolveMatrixElement.cpp */; };
		305	19BFF64F11C0F2AC00B8C04D /* JSSVGFEConvolveMatrixElement.h in Headers / = {isa = PBXBuildFile; fileRef = 19BFF64A11C0F2AC00B8C04D / JSSVGFEConvolveMatrixElement.h */; };
		306	19BFF6A311C10FDF00B8C04D /* DOMSVGFEConvolveMatrixElement.h in Copy Generated Headers / = {isa = PBXBuildFile; fileRef = 19BFF64611C0F2AC00B8C04D / DOMSVGFEConvolveMatrixElement.h */; };
		307	19BFF6A411C1102D00B8C04D /* DOMSVGFEConvolveMatrixElementInternal.h in Copy Generated Headers / = {isa = PBXBuildFile; fileRef = 19BFF64811C0F2AC00B8C04D / DOMSVGFEConvolveMatrixElementInternal.h */; };
299	1A0D57360A5C77FE007EDD4C /* OverflowEvent.cpp in Sources / = {isa = PBXBuildFile; fileRef = 1A0D57340A5C77FE007EDD4C / OverflowEvent.cpp */; };	308	1A0D57360A5C77FE007EDD4C /* OverflowEvent.cpp in Sources / = {isa = PBXBuildFile; fileRef = 1A0D57340A5C77FE007EDD4C / OverflowEvent.cpp */; };
300	1A0D57370A5C77FE007EDD4C /* OverflowEvent.h in Headers / = {isa = PBXBuildFile; fileRef = 1A0D57350A5C77FE007EDD4C / OverflowEvent.h */; };	309	1A0D57370A5C77FE007EDD4C /* OverflowEvent.h in Headers / = {isa = PBXBuildFile; fileRef = 1A0D57350A5C77FE007EDD4C / OverflowEvent.h */; };
301	1A0D57400A5C7867007EDD4C /* JSOverflowEvent.cpp in Sources / = {isa = PBXBuildFile; fileRef = 1A0D573E0A5C7867007EDD4C / JSOverflowEvent.cpp */; };	310	1A0D57400A5C7867007EDD4C /* JSOverflowEvent.cpp in Sources / = {isa = PBXBuildFile; fileRef = 1A0D573E0A5C7867007EDD4C / JSOverflowEvent.cpp */; };
Lines 5348-5353 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec2
5348	A80F3B680CCDCE24002DD990 /* DOMSVGFEComponentTransferElementInternal.h in Copy Generated Headers */,	5357	A80F3B680CCDCE24002DD990 /* DOMSVGFEComponentTransferElementInternal.h in Copy Generated Headers */,
5349	A8F46AC30CB20A9D003A9670 /* DOMSVGFECompositeElement.h in Copy Generated Headers */,	5358	A8F46AC30CB20A9D003A9670 /* DOMSVGFECompositeElement.h in Copy Generated Headers */,
5350	A80F3B310CCDCE24002DD990 /* DOMSVGFECompositeElementInternal.h in Copy Generated Headers */,	5359	A80F3B310CCDCE24002DD990 /* DOMSVGFECompositeElementInternal.h in Copy Generated Headers */,
		5360	19BFF6A311C10FDF00B8C04D /* DOMSVGFEConvolveMatrixElement.h in Copy Generated Headers */,
		5361	19BFF6A411C1102D00B8C04D /* DOMSVGFEConvolveMatrixElementInternal.h in Copy Generated Headers */,
5351	A80F3B430CCDCE24002DD990 /* DOMSVGFEDiffuseLightingElement.h in Copy Generated Headers */,	5362	A80F3B430CCDCE24002DD990 /* DOMSVGFEDiffuseLightingElement.h in Copy Generated Headers */,
5352	A80F3B440CCDCE24002DD990 /* DOMSVGFEDiffuseLightingElementInternal.h in Copy Generated Headers */,	5363	A80F3B440CCDCE24002DD990 /* DOMSVGFEDiffuseLightingElementInternal.h in Copy Generated Headers */,
5353	A8F46AAA0CB20A9D003A9670 /* DOMSVGFEDisplacementMapElement.h in Copy Generated Headers */,	5364	A8F46AAA0CB20A9D003A9670 /* DOMSVGFEDisplacementMapElement.h in Copy Generated Headers */,
Lines 5837-5842 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec3
5837	188604B10F2E654A000B6443 /* DOMTimer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMTimer.cpp; sourceTree = "<group>"; };	5848	188604B10F2E654A000B6443 /* DOMTimer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMTimer.cpp; sourceTree = "<group>"; };
5838	188604B20F2E654A000B6443 /* DOMTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMTimer.h; sourceTree = "<group>"; };	5849	188604B20F2E654A000B6443 /* DOMTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMTimer.h; sourceTree = "<group>"; };
5839	18F831B70FD48C7800D8C56B /* WorkerLoaderProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WorkerLoaderProxy.h; path = workers/WorkerLoaderProxy.h; sourceTree = "<group>"; };	5850	18F831B70FD48C7800D8C56B /* WorkerLoaderProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WorkerLoaderProxy.h; path = workers/WorkerLoaderProxy.h; sourceTree = "<group>"; };
		5851	1921327111C0E6BB00456238 /* SVGFEConvolveMatrixElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGFEConvolveMatrixElement.cpp; sourceTree = "<group>"; };
		5852	1921327211C0E6BB00456238 /* SVGFEConvolveMatrixElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGFEConvolveMatrixElement.h; sourceTree = "<group>"; };
		5853	1921327311C0E6BB00456238 /* SVGFEConvolveMatrixElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SVGFEConvolveMatrixElement.idl; sourceTree = "<group>"; };
		5854	19BFF64611C0F2AC00B8C04D /* DOMSVGFEConvolveMatrixElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file; path = DOMSVGFEConvolveMatrixElement.h; sourceTree = "<group>"; };
		5855	19BFF64711C0F2AC00B8C04D /* DOMSVGFEConvolveMatrixElement.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMSVGFEConvolveMatrixElement.mm; sourceTree = "<group>"; };
		5856	19BFF64811C0F2AC00B8C04D /* DOMSVGFEConvolveMatrixElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file; path = DOMSVGFEConvolveMatrixElementInternal.h; sourceTree = "<group>"; };
		5857	19BFF64911C0F2AC00B8C04D /* JSSVGFEConvolveMatrixElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGFEConvolveMatrixElement.cpp; sourceTree = "<group>"; };
		5858	19BFF64A11C0F2AC00B8C04D /* JSSVGFEConvolveMatrixElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSVGFEConvolveMatrixElement.h; sourceTree = "<group>"; };
5840	1A0D57340A5C77FE007EDD4C /* OverflowEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = OverflowEvent.cpp; sourceTree = "<group>"; };	5859	1A0D57340A5C77FE007EDD4C /* OverflowEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = OverflowEvent.cpp; sourceTree = "<group>"; };
5841	1A0D57350A5C77FE007EDD4C /* OverflowEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = OverflowEvent.h; sourceTree = "<group>"; };	5860	1A0D57350A5C77FE007EDD4C /* OverflowEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = OverflowEvent.h; sourceTree = "<group>"; };
5842	1A0D57380A5C7812007EDD4C /* OverflowEvent.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = OverflowEvent.idl; sourceTree = "<group>"; };	5861	1A0D57380A5C7812007EDD4C /* OverflowEvent.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = OverflowEvent.idl; sourceTree = "<group>"; };
Lines 12466-12471 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec4
12466	8502AB1A0AD438C000378540 /* DOMSVGFECompositeElement.h */,	12485	8502AB1A0AD438C000378540 /* DOMSVGFECompositeElement.h */,
12467	8502AB1B0AD438C000378540 /* DOMSVGFECompositeElement.mm */,	12486	8502AB1B0AD438C000378540 /* DOMSVGFECompositeElement.mm */,
12468	A8E5447F0CA9D1C20097D09B /* DOMSVGFECompositeElementInternal.h */,	12487	A8E5447F0CA9D1C20097D09B /* DOMSVGFECompositeElementInternal.h */,
		12488	19BFF64611C0F2AC00B8C04D /* DOMSVGFEConvolveMatrixElement.h */,
		12489	19BFF64711C0F2AC00B8C04D /* DOMSVGFEConvolveMatrixElement.mm */,
		12490	19BFF64811C0F2AC00B8C04D /* DOMSVGFEConvolveMatrixElementInternal.h */,
12469	8502AB1C0AD438C000378540 /* DOMSVGFEDiffuseLightingElement.h */,	12491	8502AB1C0AD438C000378540 /* DOMSVGFEDiffuseLightingElement.h */,
12470	8502AB1D0AD438C000378540 /* DOMSVGFEDiffuseLightingElement.mm */,	12492	8502AB1D0AD438C000378540 /* DOMSVGFEDiffuseLightingElement.mm */,
12471	A8E5447D0CA9D1C20097D09B /* DOMSVGFEDiffuseLightingElementInternal.h */,	12493	A8E5447D0CA9D1C20097D09B /* DOMSVGFEDiffuseLightingElementInternal.h */,
Lines 13158-13163 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec5
13158	8502AB790AD4394E00378540 /* DOMSVGFEColorMatrixElementInternal.h */,	13180	8502AB790AD4394E00378540 /* DOMSVGFEColorMatrixElementInternal.h */,
13159	8502AB7A0AD4394E00378540 /* DOMSVGFEComponentTransferElementInternal.h */,	13181	8502AB7A0AD4394E00378540 /* DOMSVGFEComponentTransferElementInternal.h */,
13160	8502AB7B0AD4394E00378540 /* DOMSVGFECompositeElementInternal.h */,	13182	8502AB7B0AD4394E00378540 /* DOMSVGFECompositeElementInternal.h */,
		13183	19BFF64811C0F2AC00B8C04D /* DOMSVGFEConvolveMatrixElementInternal.h */,
13161	8502AB7C0AD4394E00378540 /* DOMSVGFEDiffuseLightingElementInternal.h */,	13184	8502AB7C0AD4394E00378540 /* DOMSVGFEDiffuseLightingElementInternal.h */,
13162	8502AB7D0AD4394E00378540 /* DOMSVGFEDisplacementMapElementInternal.h */,	13185	8502AB7D0AD4394E00378540 /* DOMSVGFEDisplacementMapElementInternal.h */,
13163	8502AB7E0AD4394E00378540 /* DOMSVGFEDistantLightElementInternal.h */,	13186	8502AB7E0AD4394E00378540 /* DOMSVGFEDistantLightElementInternal.h */,
Lines 14097-14102 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec6
14097	B2FA3C870AB75A6E000E5AC4 /* JSSVGFEComponentTransferElement.h */,	14120	B2FA3C870AB75A6E000E5AC4 /* JSSVGFEComponentTransferElement.h */,
14098	B2FA3C880AB75A6E000E5AC4 /* JSSVGFECompositeElement.cpp */,	14121	B2FA3C880AB75A6E000E5AC4 /* JSSVGFECompositeElement.cpp */,
14099	B2FA3C890AB75A6E000E5AC4 /* JSSVGFECompositeElement.h */,	14122	B2FA3C890AB75A6E000E5AC4 /* JSSVGFECompositeElement.h */,
		14123	19BFF64911C0F2AC00B8C04D /* JSSVGFEConvolveMatrixElement.cpp */,
		14124	19BFF64A11C0F2AC00B8C04D /* JSSVGFEConvolveMatrixElement.h */,
14100	B2FA3C8A0AB75A6E000E5AC4 /* JSSVGFEDiffuseLightingElement.cpp */,	14125	B2FA3C8A0AB75A6E000E5AC4 /* JSSVGFEDiffuseLightingElement.cpp */,
14101	B2FA3C8B0AB75A6E000E5AC4 /* JSSVGFEDiffuseLightingElement.h */,	14126	B2FA3C8B0AB75A6E000E5AC4 /* JSSVGFEDiffuseLightingElement.h */,
14102	B2FA3C8C0AB75A6E000E5AC4 /* JSSVGFEDisplacementMapElement.cpp */,	14127	B2FA3C8C0AB75A6E000E5AC4 /* JSSVGFEDisplacementMapElement.cpp */,
Lines 14697-14702 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec7
14697	B222783A0D00BF1F0071B782 /* SVGFECompositeElement.cpp */,	14722	B222783A0D00BF1F0071B782 /* SVGFECompositeElement.cpp */,
14698	B222783B0D00BF1F0071B782 /* SVGFECompositeElement.h */,	14723	B222783B0D00BF1F0071B782 /* SVGFECompositeElement.h */,
14699	B222783C0D00BF1F0071B782 /* SVGFECompositeElement.idl */,	14724	B222783C0D00BF1F0071B782 /* SVGFECompositeElement.idl */,
		14725	1921327111C0E6BB00456238 /* SVGFEConvolveMatrixElement.cpp */,
		14726	1921327211C0E6BB00456238 /* SVGFEConvolveMatrixElement.h */,
		14727	1921327311C0E6BB00456238 /* SVGFEConvolveMatrixElement.idl */,
14700	B222783D0D00BF1F0071B782 /* SVGFEDiffuseLightingElement.cpp */,	14728	B222783D0D00BF1F0071B782 /* SVGFEDiffuseLightingElement.cpp */,
14701	B222783E0D00BF1F0071B782 /* SVGFEDiffuseLightingElement.h */,	14729	B222783E0D00BF1F0071B782 /* SVGFEDiffuseLightingElement.h */,
14702	B222783F0D00BF1F0071B782 /* SVGFEDiffuseLightingElement.idl */,	14730	B222783F0D00BF1F0071B782 /* SVGFEDiffuseLightingElement.idl */,
Lines 17533-17538 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec8
17533	8502AB460AD438C000378540 /* DOMSVGFECompositeElement.h in Headers */,	17561	8502AB460AD438C000378540 /* DOMSVGFECompositeElement.h in Headers */,
17534	8502AB910AD4394E00378540 /* DOMSVGFECompositeElementInternal.h in Headers */,	17562	8502AB910AD4394E00378540 /* DOMSVGFECompositeElementInternal.h in Headers */,
17535	A8E5457D0CA9D1C20097D09B /* DOMSVGFECompositeElementInternal.h in Headers */,	17563	A8E5457D0CA9D1C20097D09B /* DOMSVGFECompositeElementInternal.h in Headers */,
		17564	19BFF64B11C0F2AC00B8C04D /* DOMSVGFEConvolveMatrixElement.h in Headers */,
		17565	19BFF64D11C0F2AC00B8C04D /* DOMSVGFEConvolveMatrixElementInternal.h in Headers */,
17536	8502AB480AD438C000378540 /* DOMSVGFEDiffuseLightingElement.h in Headers */,	17566	8502AB480AD438C000378540 /* DOMSVGFEDiffuseLightingElement.h in Headers */,
17537	A8D0C5E10CCB459800B2CDD4 /* DOMSVGFEDiffuseLightingElement.h in Headers */,	17567	A8D0C5E10CCB459800B2CDD4 /* DOMSVGFEDiffuseLightingElement.h in Headers */,
17538	8502AB920AD4394E00378540 /* DOMSVGFEDiffuseLightingElementInternal.h in Headers */,	17568	8502AB920AD4394E00378540 /* DOMSVGFEDiffuseLightingElementInternal.h in Headers */,
Lines 18501-18506 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec9
18501	B2FA3D6D0AB75A6F000E5AC4 /* JSSVGFEColorMatrixElement.h in Headers */,	18531	B2FA3D6D0AB75A6F000E5AC4 /* JSSVGFEColorMatrixElement.h in Headers */,
18502	B2FA3D6F0AB75A6F000E5AC4 /* JSSVGFEComponentTransferElement.h in Headers */,	18532	B2FA3D6F0AB75A6F000E5AC4 /* JSSVGFEComponentTransferElement.h in Headers */,
18503	B2FA3D710AB75A6F000E5AC4 /* JSSVGFECompositeElement.h in Headers */,	18533	B2FA3D710AB75A6F000E5AC4 /* JSSVGFECompositeElement.h in Headers */,
		18534	19BFF64F11C0F2AC00B8C04D /* JSSVGFEConvolveMatrixElement.h in Headers */,
18504	B2FA3D730AB75A6F000E5AC4 /* JSSVGFEDiffuseLightingElement.h in Headers */,	18535	B2FA3D730AB75A6F000E5AC4 /* JSSVGFEDiffuseLightingElement.h in Headers */,
18505	B2FA3D750AB75A6F000E5AC4 /* JSSVGFEDisplacementMapElement.h in Headers */,	18536	B2FA3D750AB75A6F000E5AC4 /* JSSVGFEDisplacementMapElement.h in Headers */,
18506	B2FA3D770AB75A6F000E5AC4 /* JSSVGFEDistantLightElement.h in Headers */,	18537	B2FA3D770AB75A6F000E5AC4 /* JSSVGFEDistantLightElement.h in Headers */,
Lines 19136-19141 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec10
19136	B22279CE0D00BF220071B782 /* SVGFEComponentTransferElement.h in Headers */,	19167	B22279CE0D00BF220071B782 /* SVGFEComponentTransferElement.h in Headers */,
19137	B22279D10D00BF220071B782 /* SVGFECompositeElement.h in Headers */,	19168	B22279D10D00BF220071B782 /* SVGFECompositeElement.h in Headers */,
19138	B255997B0D00D8BA00BB825C /* SVGFEConvolveMatrix.h in Headers */,	19169	B255997B0D00D8BA00BB825C /* SVGFEConvolveMatrix.h in Headers */,
		19170	1921327511C0E6BB00456238 /* SVGFEConvolveMatrixElement.h in Headers */,
19139	B255997D0D00D8BA00BB825C /* SVGFEDiffuseLighting.h in Headers */,	19171	B255997D0D00D8BA00BB825C /* SVGFEDiffuseLighting.h in Headers */,
19140	B22279D40D00BF220071B782 /* SVGFEDiffuseLightingElement.h in Headers */,	19172	B22279D40D00BF220071B782 /* SVGFEDiffuseLightingElement.h in Headers */,
19141	B255997F0D00D8BA00BB825C /* SVGFEDisplacementMap.h in Headers */,	19173	B255997F0D00D8BA00BB825C /* SVGFEDisplacementMap.h in Headers */,
Lines 20132-20137 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec11
20132	8502AB430AD438C000378540 /* DOMSVGFEColorMatrixElement.mm in Sources */,	20164	8502AB430AD438C000378540 /* DOMSVGFEColorMatrixElement.mm in Sources */,
20133	8502AB450AD438C000378540 /* DOMSVGFEComponentTransferElement.mm in Sources */,	20165	8502AB450AD438C000378540 /* DOMSVGFEComponentTransferElement.mm in Sources */,
20134	8502AB470AD438C000378540 /* DOMSVGFECompositeElement.mm in Sources */,	20166	8502AB470AD438C000378540 /* DOMSVGFECompositeElement.mm in Sources */,
		20167	19BFF64C11C0F2AC00B8C04D /* DOMSVGFEConvolveMatrixElement.mm in Sources */,
20135	8502AB490AD438C000378540 /* DOMSVGFEDiffuseLightingElement.mm in Sources */,	20168	8502AB490AD438C000378540 /* DOMSVGFEDiffuseLightingElement.mm in Sources */,
20136	8502AB4B0AD438C000378540 /* DOMSVGFEDisplacementMapElement.mm in Sources */,	20169	8502AB4B0AD438C000378540 /* DOMSVGFEDisplacementMapElement.mm in Sources */,
20137	8502AB4D0AD438C000378540 /* DOMSVGFEDistantLightElement.mm in Sources */,	20170	8502AB4D0AD438C000378540 /* DOMSVGFEDistantLightElement.mm in Sources */,
Lines 20900-20905 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec12
20900	B2FA3D6C0AB75A6F000E5AC4 /* JSSVGFEColorMatrixElement.cpp in Sources */,	20933	B2FA3D6C0AB75A6F000E5AC4 /* JSSVGFEColorMatrixElement.cpp in Sources */,
20901	B2FA3D6E0AB75A6F000E5AC4 /* JSSVGFEComponentTransferElement.cpp in Sources */,	20934	B2FA3D6E0AB75A6F000E5AC4 /* JSSVGFEComponentTransferElement.cpp in Sources */,
20902	B2FA3D700AB75A6F000E5AC4 /* JSSVGFECompositeElement.cpp in Sources */,	20935	B2FA3D700AB75A6F000E5AC4 /* JSSVGFECompositeElement.cpp in Sources */,
		20936	19BFF64E11C0F2AC00B8C04D /* JSSVGFEConvolveMatrixElement.cpp in Sources */,
20903	B2FA3D720AB75A6F000E5AC4 /* JSSVGFEDiffuseLightingElement.cpp in Sources */,	20937	B2FA3D720AB75A6F000E5AC4 /* JSSVGFEDiffuseLightingElement.cpp in Sources */,
20904	B2FA3D740AB75A6F000E5AC4 /* JSSVGFEDisplacementMapElement.cpp in Sources */,	20938	B2FA3D740AB75A6F000E5AC4 /* JSSVGFEDisplacementMapElement.cpp in Sources */,
20905	B2FA3D760AB75A6F000E5AC4 /* JSSVGFEDistantLightElement.cpp in Sources */,	20939	B2FA3D760AB75A6F000E5AC4 /* JSSVGFEDistantLightElement.cpp in Sources */,
Lines 21496-21501 a/WebCore/WebCore.xcodeproj/project.pbxproj_sec13
21496	B22279CD0D00BF220071B782 /* SVGFEComponentTransferElement.cpp in Sources */,	21530	B22279CD0D00BF220071B782 /* SVGFEComponentTransferElement.cpp in Sources */,
21497	B22279D00D00BF220071B782 /* SVGFECompositeElement.cpp in Sources */,	21531	B22279D00D00BF220071B782 /* SVGFECompositeElement.cpp in Sources */,
21498	B255997A0D00D8BA00BB825C /* SVGFEConvolveMatrix.cpp in Sources */,	21532	B255997A0D00D8BA00BB825C /* SVGFEConvolveMatrix.cpp in Sources */,
		21533	1921327411C0E6BB00456238 /* SVGFEConvolveMatrixElement.cpp in Sources */,
21499	B255997C0D00D8BA00BB825C /* SVGFEDiffuseLighting.cpp in Sources */,	21534	B255997C0D00D8BA00BB825C /* SVGFEDiffuseLighting.cpp in Sources */,
21500	B22279D30D00BF220071B782 /* SVGFEDiffuseLightingElement.cpp in Sources */,	21535	B22279D30D00BF220071B782 /* SVGFEDiffuseLightingElement.cpp in Sources */,
21501	B255997E0D00D8BA00BB825C /* SVGFEDisplacementMap.cpp in Sources */,	21536	B255997E0D00D8BA00BB825C /* SVGFEDisplacementMap.cpp in Sources */,

Line 0 a/WebCore/svg/SVGFEConvolveMatrixElement.cpp_sec1
- a/WebCore/svg/SVGFEConvolveMatrixElement.cpp +156 lines
		1	/*
		2	Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
		3
		4	This library is free software; you can redistribute it and/or
		5	modify it under the terms of the GNU Library General Public
		6	License as published by the Free Software Foundation; either
		7	version 2 of the License, or (at your option) any later version.
		8
		9	This library is distributed in the hope that it will be useful,
		10	but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		12	Library General Public License for more details.
		13
		14	You should have received a copy of the GNU Library General Public License
		15	along with this library; see the file COPYING.LIB. If not, write to
		16	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
		17	Boston, MA 02110-1301, USA.
		18	*/
		19
		20	#include "config.h"
		21
		22	#if ENABLE(SVG) && ENABLE(FILTERS)
		23	#include "SVGFEConvolveMatrixElement.h"
		24
		25	#include "Attr.h"
		26	#include "FloatPoint.h"
		27	#include "FloatSize.h"
		28	#include "IntPoint.h"
		29	#include "IntSize.h"
		30	#include "SVGNames.h"
		31	#include "SVGNumberList.h"
		32	#include "SVGParserUtilities.h"
		33
		34	#include <math.h>
		35
		36	namespace WebCore {
		37
		38	char SVGKernelUnitLengthXAttrIdentifier[] = "SVGKernelUnitLengthXAttr";
		39	char SVGKernelUnitLengthYAttrIdentifier[] = "SVGKernelUnitLengthYAttr";
		40
		41	SVGFEConvolveMatrixElement::SVGFEConvolveMatrixElement(const QualifiedName& tagName, Document* doc)
		42	: SVGFilterPrimitiveStandardAttributes(tagName, doc)
		43	, m_kernelMatrix(SVGNumberList::create(SVGNames::kernelMatrixAttr))
		44	, m_edgeMode(EDGEMODE_DUPLICATE)
		45	{
		46	}
		47
		48	SVGFEConvolveMatrixElement::~SVGFEConvolveMatrixElement()
		49	{
		50	}
		51
		52	void SVGFEConvolveMatrixElement::parseMappedAttribute(Attribute* attr)
		53	{
		54	const String& value = attr->value();
		55	if (attr->name() == SVGNames::inAttr)
		56	setIn1BaseValue(value);
		57	else if (attr->name() == SVGNames::orderAttr) {
		58	float x, y;
		59	if (parseNumberOptionalNumber(value, x, y)) {
		60	setOrderXBaseValue(x);
		61	setOrderYBaseValue(y);
		62	}
		63	} else if (attr->name() == SVGNames::edgeModeAttr) {
		64	if (value == "duplicate")
65	setEdgeModeBaseValue(EDGEMODE_DUPLICATE);
66	else if (value == "wrap")
67	setEdgeModeBaseValue(EDGEMODE_WRAP);
68	else if (value == "none")
69	setEdgeModeBaseValue(EDGEMODE_NONE);
70	} else if (attr->name() == SVGNames::kernelMatrixAttr)
71	kernelMatrixBaseValue()->parse(value);
72	else if (attr->name() == SVGNames::divisorAttr)
73	setDivisorBaseValue(value.toFloat());
74	else if (attr->name() == SVGNames::biasAttr)
75	setBiasBaseValue(value.toFloat());
76	else if (attr->name() == SVGNames::targetXAttr)
77	setTargetXBaseValue(value.toUIntStrict());
78	else if (attr->name() == SVGNames::targetYAttr)
79	setTargetYBaseValue(value.toUIntStrict());
80	else if (attr->name() == SVGNames::kernelUnitLengthAttr) {
81	float x, y;
82	if (parseNumberOptionalNumber(value, x, y)) {
83	setKernelUnitLengthXBaseValue(x);
84	setKernelUnitLengthYBaseValue(y);
85	}
86	} else if (attr->name() == SVGNames::preserveAlphaAttr) {
87	if (value == "true")
88	setPreserveAlphaBaseValue(true);
89	else if (value == "false")
90	setPreserveAlphaBaseValue(false);
91	} else
92	SVGFilterPrimitiveStandardAttributes::parseMappedAttribute(attr);
93	}
94
95	void SVGFEConvolveMatrixElement::setOrder(float, float)
96	{
97	// FIXME: Needs an implementation.
98	}
99
100	void SVGFEConvolveMatrixElement::setKernelUnitLength(float, float)
101	{
102	// FIXME: Needs an implementation.
103	}
104
105	PassRefPtr<FilterEffect> SVGFEConvolveMatrixElement::build(SVGFilterBuilder* filterBuilder)
106	{
107	FilterEffect* input1 = filterBuilder->getEffectById(in1());
108
109	if (!input1)
110	return 0;
111
112	Vector<float> kernelMatrixValues;
113	SVGNumberList* numbers = kernelMatrix();
114
115	ExceptionCode ec = 0;
116	int numberOfItems = numbers->numberOfItems();
117	for (int i = 0; i < numberOfItems; i++)
118	kernelMatrixValues.append(numbers->getItem(i, ec));
119
120	int orderXValue = orderX();
121	int orderYValue = orderY();
122	if (!hasAttribute(SVGNames::orderAttr)) {
123	orderXValue = 3;
124	orderYValue = 3;
125	}
126	// The spec says this is a requirement, and should bail out if fails
127	if (orderXValue * orderYValue != numberOfItems)
128	return 0;
129
130	int targetXValue = targetX();
131	int targetYValue = targetY();
132	if (hasAttribute(SVGNames::targetXAttr) && (targetXValue < 0 \|\| targetXValue >= orderXValue))
133	return 0;
134	if (!hasAttribute(SVGNames::targetXAttr))
135	targetXValue = static_cast<int>(floor(orderXValue / 2));
136	if (hasAttribute(SVGNames::targetYAttr) && (targetYValue < 0 \|\| targetYValue >= orderYValue))
137	return 0;
138	if (!hasAttribute(SVGNames::targetYAttr))
139	targetYValue = static_cast<int>(floor(orderYValue / 2));
140
141	float divisorValue = divisor();
142	if (hasAttribute(SVGNames::divisorAttr) && !divisorValue)
143	return 0;
144	if (!hasAttribute(SVGNames::divisorAttr)) {
145	for (int i = 0; i < numberOfItems; i++)
146	divisorValue += kernelMatrixValues[i];
147	if (!divisorValue)
148	divisorValue = 1.0f;
149	}
150
151	return FEConvolveMatrix::create(input1, IntSize(orderXValue, orderYValue), divisorValue, bias(), IntPoint(targetXValue, targetYValue), static_cast<EdgeModeType>(edgeMode()), FloatPoint(kernelUnitLengthX(), kernelUnitLengthX()), preserveAlpha(), kernelMatrixValues);
152	}
153
154	} // namespace WebCore
155
156	#endif // ENABLE(SVG)

Line 0 a/WebCore/svg/SVGFEConvolveMatrixElement.idl_sec1
- a/WebCore/svg/SVGFEConvolveMatrixElement.idl +50 lines
	1	/*
	2	* Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
	3	*
	4	* Redistribution and use in source and binary forms, with or without
	5	* modification, are permitted provided that the following conditions
	6	* are met:
	7	* 1. Redistributions of source code must retain the above copyright
	8	* notice, this list of conditions and the following disclaimer.
	9	* 2. Redistributions in binary form must reproduce the above copyright
	10	* notice, this list of conditions and the following disclaimer in the
	11	* documentation and/or other materials provided with the distribution.
	12	*
	13	* THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
	14	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	15	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
	16	* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
	17	* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
	18	* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
	19	* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
	20	* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
	21	* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
	22	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
	23	* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
	24	*/
	25
	26	module svg {
	27
	28	interface [Conditional=SVG&FILTERS, GenerateConstructor] SVGFEConvolveMatrixElement : SVGElement,
	29	SVGFilterPrimitiveStandardAttributes {
	30	// Edge Mode Values
	31	const unsigned short SVG_EDGEMODE_UNKNOWN = 0;
	32	const unsigned short SVG_EDGEMODE_DUPLICATE = 1;
	33	const unsigned short SVG_EDGEMODE_WRAP = 2;
	34	const unsigned short SVG_EDGEMODE_NONE = 3;
	35
	36	readonly attribute SVGAnimatedString in1;
	37	readonly attribute SVGAnimatedInteger orderX;
	38	readonly attribute SVGAnimatedInteger orderY;
	39	readonly attribute SVGAnimatedNumberList kernelMatrix;
	40	readonly attribute SVGAnimatedNumber divisor;
	41	readonly attribute SVGAnimatedNumber bias;
	42	readonly attribute SVGAnimatedInteger targetX;
	43	readonly attribute SVGAnimatedInteger targetY;
	44	readonly attribute SVGAnimatedEnumeration edgeMode;
	45	readonly attribute SVGAnimatedNumber kernelUnitLengthX;
	46	readonly attribute SVGAnimatedNumber kernelUnitLengthY;
	47	readonly attribute SVGAnimatedBoolean preserveAlpha;
	48	};
	49
	50	}

Lines 31-39 feBlend createWithNew a/WebCore/svg/svgtags.in_sec1
- a/WebCore/svg/svgtags.in -2 lines
31	feColorMatrix createWithNew	31	feColorMatrix createWithNew
32	feComponentTransfer createWithNew	32	feComponentTransfer createWithNew
33	feComposite createWithNew	33	feComposite createWithNew
34	#if 0
35	feConvolveMatrix createWithNew	34	feConvolveMatrix createWithNew
36	#endif
37	feDiffuseLighting createWithNew	35	feDiffuseLighting createWithNew
38	feDisplacementMap createWithNew	36	feDisplacementMap createWithNew
39	feDistantLight createWithNew	37	feDistantLight createWithNew