Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (152349 => 152350)
--- trunk/Source/WebCore/CMakeLists.txt 2013-07-03 10:19:14 UTC (rev 152349)
+++ trunk/Source/WebCore/CMakeLists.txt 2013-07-03 10:50:17 UTC (rev 152350)
@@ -676,6 +676,7 @@
svg/SVGFETileElement.idl
svg/SVGFETurbulenceElement.idl
svg/SVGFilterElement.idl
+ svg/SVGFilterPrimitiveStandardAttributes.idl
svg/SVGFitToViewBox.idl
svg/SVGFontElement.idl
svg/SVGFontFaceElement.idl
Modified: trunk/Source/WebCore/ChangeLog (152349 => 152350)
--- trunk/Source/WebCore/ChangeLog 2013-07-03 10:19:14 UTC (rev 152349)
+++ trunk/Source/WebCore/ChangeLog 2013-07-03 10:50:17 UTC (rev 152350)
@@ -1,3 +1,38 @@
+2013-07-03 Christophe Dumez <[email protected]>
+
+ Stop inheriting SVGFilterPrimitiveStandardAttributes in SVG
+ https://bugs.webkit.org/show_bug.cgi?id=118305
+
+ Reviewed by Kentaro Hara.
+
+ Stop inheriting SVGFilterPrimitiveStandardAttributes in SVG and use
+ Web IDL implements instead to get rid of multiple inheritance and
+ follow the latest specification:
+ - http://www.w3.org/TR/filter-effects/#DOMInterfaces
+
+ No new tests, no behavior change.
+
+ * CMakeLists.txt:
+ * DerivedSources.pri:
+ * GNUmakefile.list.am:
+ * svg/SVGFEBlendElement.idl:
+ * svg/SVGFEColorMatrixElement.idl:
+ * svg/SVGFEComponentTransferElement.idl:
+ * svg/SVGFECompositeElement.idl:
+ * svg/SVGFEConvolveMatrixElement.idl:
+ * svg/SVGFEDiffuseLightingElement.idl:
+ * svg/SVGFEDisplacementMapElement.idl:
+ * svg/SVGFEDropShadowElement.idl:
+ * svg/SVGFEFloodElement.idl:
+ * svg/SVGFEGaussianBlurElement.idl:
+ * svg/SVGFEImageElement.idl:
+ * svg/SVGFEMergeElement.idl:
+ * svg/SVGFEMorphologyElement.idl:
+ * svg/SVGFEOffsetElement.idl:
+ * svg/SVGFESpecularLightingElement.idl:
+ * svg/SVGFETileElement.idl:
+ * svg/SVGFETurbulenceElement.idl:
+
2013-07-03 Zalan Bujtas <[email protected]>
H&R Block 2010 Help window can not be reopened.
Modified: trunk/Source/WebCore/DerivedSources.pri (152349 => 152350)
--- trunk/Source/WebCore/DerivedSources.pri 2013-07-03 10:19:14 UTC (rev 152349)
+++ trunk/Source/WebCore/DerivedSources.pri 2013-07-03 10:50:17 UTC (rev 152350)
@@ -559,6 +559,7 @@
$$PWD/svg/SVGFETileElement.idl \
$$PWD/svg/SVGFETurbulenceElement.idl \
$$PWD/svg/SVGFilterElement.idl \
+ $$PWD/svg/SVGFilterPrimitiveStandardAttributes.idl \
$$PWD/svg/SVGFitToViewBox.idl \
$$PWD/svg/SVGFontElement.idl \
$$PWD/svg/SVGFontFaceElement.idl \
Modified: trunk/Source/WebCore/GNUmakefile.list.am (152349 => 152350)
--- trunk/Source/WebCore/GNUmakefile.list.am 2013-07-03 10:19:14 UTC (rev 152349)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2013-07-03 10:50:17 UTC (rev 152350)
@@ -1706,6 +1706,7 @@
$(WebCore)/svg/SVGFETileElement.idl \
$(WebCore)/svg/SVGFETurbulenceElement.idl \
$(WebCore)/svg/SVGFilterElement.idl \
+ $(WebCore)/svg/SVGFilterPrimitiveStandardAttributes.idl \
$(WebCore)/svg/SVGFitToViewBox.idl \
$(WebCore)/svg/SVGFontElement.idl \
$(WebCore)/svg/SVGFontFaceElement.idl \
Modified: trunk/Source/WebCore/svg/SVGFEBlendElement.idl (152349 => 152350)
--- trunk/Source/WebCore/svg/SVGFEBlendElement.idl 2013-07-03 10:19:14 UTC (rev 152349)
+++ trunk/Source/WebCore/svg/SVGFEBlendElement.idl 2013-07-03 10:50:17 UTC (rev 152350)
@@ -26,8 +26,7 @@
[
Conditional=SVG&FILTERS,
DoNotCheckConstants
-] interface SVGFEBlendElement : SVGStyledElement,
- SVGFilterPrimitiveStandardAttributes {
+] interface SVGFEBlendElement : SVGStyledElement {
// Blend Mode Types
const unsigned short SVG_FEBLEND_MODE_UNKNOWN = 0;
const unsigned short SVG_FEBLEND_MODE_NORMAL = 1;
@@ -41,3 +40,4 @@
readonly attribute SVGAnimatedEnumeration mode;
};
+SVGFEBlendElement implements SVGFilterPrimitiveStandardAttributes;
Modified: trunk/Source/WebCore/svg/SVGFEColorMatrixElement.idl (152349 => 152350)
--- trunk/Source/WebCore/svg/SVGFEColorMatrixElement.idl 2013-07-03 10:19:14 UTC (rev 152349)
+++ trunk/Source/WebCore/svg/SVGFEColorMatrixElement.idl 2013-07-03 10:50:17 UTC (rev 152350)
@@ -26,8 +26,7 @@
[
Conditional=SVG&FILTERS,
DoNotCheckConstants
-] interface SVGFEColorMatrixElement : SVGStyledElement,
- SVGFilterPrimitiveStandardAttributes {
+] interface SVGFEColorMatrixElement : SVGStyledElement {
// Color Matrix Types
const unsigned short SVG_FECOLORMATRIX_TYPE_UNKNOWN = 0;
const unsigned short SVG_FECOLORMATRIX_TYPE_MATRIX = 1;
@@ -40,3 +39,4 @@
readonly attribute SVGAnimatedNumberList values;
};
+SVGFEColorMatrixElement implements SVGFilterPrimitiveStandardAttributes;
Modified: trunk/Source/WebCore/svg/SVGFEComponentTransferElement.idl (152349 => 152350)
--- trunk/Source/WebCore/svg/SVGFEComponentTransferElement.idl 2013-07-03 10:19:14 UTC (rev 152349)
+++ trunk/Source/WebCore/svg/SVGFEComponentTransferElement.idl 2013-07-03 10:50:17 UTC (rev 152350)
@@ -25,8 +25,8 @@
[
Conditional=SVG&FILTERS
-] interface SVGFEComponentTransferElement : SVGStyledElement,
- SVGFilterPrimitiveStandardAttributes {
+] interface SVGFEComponentTransferElement : SVGStyledElement {
readonly attribute SVGAnimatedString in1;
};
+SVGFEComponentTransferElement implements SVGFilterPrimitiveStandardAttributes;
Modified: trunk/Source/WebCore/svg/SVGFECompositeElement.idl (152349 => 152350)
--- trunk/Source/WebCore/svg/SVGFECompositeElement.idl 2013-07-03 10:19:14 UTC (rev 152349)
+++ trunk/Source/WebCore/svg/SVGFECompositeElement.idl 2013-07-03 10:50:17 UTC (rev 152350)
@@ -26,8 +26,7 @@
[
Conditional=SVG&FILTERS,
DoNotCheckConstants
-] interface SVGFECompositeElement : SVGStyledElement,
- SVGFilterPrimitiveStandardAttributes {
+] interface SVGFECompositeElement : SVGStyledElement {
// Composite Operators
const unsigned short SVG_FECOMPOSITE_OPERATOR_UNKNOWN = 0;
const unsigned short SVG_FECOMPOSITE_OPERATOR_OVER = 1;
@@ -46,3 +45,4 @@
readonly attribute SVGAnimatedNumber k4;
};
+SVGFECompositeElement implements SVGFilterPrimitiveStandardAttributes;
Modified: trunk/Source/WebCore/svg/SVGFEConvolveMatrixElement.idl (152349 => 152350)
--- trunk/Source/WebCore/svg/SVGFEConvolveMatrixElement.idl 2013-07-03 10:19:14 UTC (rev 152349)
+++ trunk/Source/WebCore/svg/SVGFEConvolveMatrixElement.idl 2013-07-03 10:50:17 UTC (rev 152350)
@@ -26,8 +26,7 @@
[
Conditional=SVG&FILTERS,
DoNotCheckConstants
-] interface SVGFEConvolveMatrixElement : SVGStyledElement,
- SVGFilterPrimitiveStandardAttributes {
+] interface SVGFEConvolveMatrixElement : SVGStyledElement {
// Edge Mode Values
const unsigned short SVG_EDGEMODE_UNKNOWN = 0;
const unsigned short SVG_EDGEMODE_DUPLICATE = 1;
@@ -48,3 +47,4 @@
readonly attribute SVGAnimatedBoolean preserveAlpha;
};
+SVGFEConvolveMatrixElement implements SVGFilterPrimitiveStandardAttributes;
Modified: trunk/Source/WebCore/svg/SVGFEDiffuseLightingElement.idl (152349 => 152350)
--- trunk/Source/WebCore/svg/SVGFEDiffuseLightingElement.idl 2013-07-03 10:19:14 UTC (rev 152349)
+++ trunk/Source/WebCore/svg/SVGFEDiffuseLightingElement.idl 2013-07-03 10:50:17 UTC (rev 152350)
@@ -25,8 +25,7 @@
[
Conditional=SVG&FILTERS
-] interface SVGFEDiffuseLightingElement : SVGStyledElement,
- SVGFilterPrimitiveStandardAttributes {
+] interface SVGFEDiffuseLightingElement : SVGStyledElement {
readonly attribute SVGAnimatedString in1;
readonly attribute SVGAnimatedNumber surfaceScale;
readonly attribute SVGAnimatedNumber diffuseConstant;
@@ -34,3 +33,4 @@
readonly attribute SVGAnimatedNumber kernelUnitLengthY;
};
+SVGFEDiffuseLightingElement implements SVGFilterPrimitiveStandardAttributes;
Modified: trunk/Source/WebCore/svg/SVGFEDisplacementMapElement.idl (152349 => 152350)
--- trunk/Source/WebCore/svg/SVGFEDisplacementMapElement.idl 2013-07-03 10:19:14 UTC (rev 152349)
+++ trunk/Source/WebCore/svg/SVGFEDisplacementMapElement.idl 2013-07-03 10:50:17 UTC (rev 152350)
@@ -26,8 +26,7 @@
[
Conditional=SVG&FILTERS,
DoNotCheckConstants
-] interface SVGFEDisplacementMapElement : SVGStyledElement,
- SVGFilterPrimitiveStandardAttributes {
+] interface SVGFEDisplacementMapElement : SVGStyledElement {
// Channel Selectors
const unsigned short SVG_CHANNEL_UNKNOWN = 0;
const unsigned short SVG_CHANNEL_R = 1;
@@ -42,3 +41,4 @@
readonly attribute SVGAnimatedEnumeration yChannelSelector;
};
+SVGFEDisplacementMapElement implements SVGFilterPrimitiveStandardAttributes;
Modified: trunk/Source/WebCore/svg/SVGFEDropShadowElement.idl (152349 => 152350)
--- trunk/Source/WebCore/svg/SVGFEDropShadowElement.idl 2013-07-03 10:19:14 UTC (rev 152349)
+++ trunk/Source/WebCore/svg/SVGFEDropShadowElement.idl 2013-07-03 10:50:17 UTC (rev 152350)
@@ -19,8 +19,7 @@
[
Conditional=SVG&FILTERS
-] interface SVGFEDropShadowElement : SVGStyledElement,
- SVGFilterPrimitiveStandardAttributes {
+] interface SVGFEDropShadowElement : SVGStyledElement {
readonly attribute SVGAnimatedString in1;
readonly attribute SVGAnimatedNumber dx;
readonly attribute SVGAnimatedNumber dy;
@@ -31,3 +30,4 @@
[Default=Undefined] optional float stdDeviationY);
};
+SVGFEDropShadowElement implements SVGFilterPrimitiveStandardAttributes;
Modified: trunk/Source/WebCore/svg/SVGFEFloodElement.idl (152349 => 152350)
--- trunk/Source/WebCore/svg/SVGFEFloodElement.idl 2013-07-03 10:19:14 UTC (rev 152349)
+++ trunk/Source/WebCore/svg/SVGFEFloodElement.idl 2013-07-03 10:50:17 UTC (rev 152350)
@@ -25,6 +25,7 @@
[
Conditional=SVG&FILTERS
-] interface SVGFEFloodElement : SVGStyledElement,
- SVGFilterPrimitiveStandardAttributes {
+] interface SVGFEFloodElement : SVGStyledElement {
};
+
+SVGFEFloodElement implements SVGFilterPrimitiveStandardAttributes;
Modified: trunk/Source/WebCore/svg/SVGFEGaussianBlurElement.idl (152349 => 152350)
--- trunk/Source/WebCore/svg/SVGFEGaussianBlurElement.idl 2013-07-03 10:19:14 UTC (rev 152349)
+++ trunk/Source/WebCore/svg/SVGFEGaussianBlurElement.idl 2013-07-03 10:50:17 UTC (rev 152350)
@@ -25,8 +25,7 @@
[
Conditional=SVG&FILTERS
-] interface SVGFEGaussianBlurElement : SVGStyledElement,
- SVGFilterPrimitiveStandardAttributes {
+] interface SVGFEGaussianBlurElement : SVGStyledElement {
readonly attribute SVGAnimatedString in1;
readonly attribute SVGAnimatedNumber stdDeviationX;
readonly attribute SVGAnimatedNumber stdDeviationY;
@@ -35,3 +34,4 @@
[Default=Undefined] optional float stdDeviationY);
};
+SVGFEGaussianBlurElement implements SVGFilterPrimitiveStandardAttributes;
Modified: trunk/Source/WebCore/svg/SVGFEImageElement.idl (152349 => 152350)
--- trunk/Source/WebCore/svg/SVGFEImageElement.idl 2013-07-03 10:19:14 UTC (rev 152349)
+++ trunk/Source/WebCore/svg/SVGFEImageElement.idl 2013-07-03 10:50:17 UTC (rev 152350)
@@ -25,10 +25,10 @@
[
Conditional=SVG&FILTERS
-] interface SVGFEImageElement : SVGStyledElement,
- SVGFilterPrimitiveStandardAttributes {
+] interface SVGFEImageElement : SVGStyledElement {
readonly attribute SVGAnimatedPreserveAspectRatio preserveAspectRatio;
};
SVGFEImageElement implements SVGExternalResourcesRequired;
+SVGFEImageElement implements SVGFilterPrimitiveStandardAttributes;
SVGFEImageElement implements SVGURIReference;
Modified: trunk/Source/WebCore/svg/SVGFEMergeElement.idl (152349 => 152350)
--- trunk/Source/WebCore/svg/SVGFEMergeElement.idl 2013-07-03 10:19:14 UTC (rev 152349)
+++ trunk/Source/WebCore/svg/SVGFEMergeElement.idl 2013-07-03 10:50:17 UTC (rev 152350)
@@ -25,7 +25,7 @@
[
Conditional=SVG&FILTERS
-] interface SVGFEMergeElement : SVGStyledElement,
- SVGFilterPrimitiveStandardAttributes {
+] interface SVGFEMergeElement : SVGStyledElement {
};
+SVGFEMergeElement implements SVGFilterPrimitiveStandardAttributes;
Modified: trunk/Source/WebCore/svg/SVGFEMorphologyElement.idl (152349 => 152350)
--- trunk/Source/WebCore/svg/SVGFEMorphologyElement.idl 2013-07-03 10:19:14 UTC (rev 152349)
+++ trunk/Source/WebCore/svg/SVGFEMorphologyElement.idl 2013-07-03 10:50:17 UTC (rev 152350)
@@ -26,8 +26,7 @@
[
Conditional=SVG&FILTERS,
DoNotCheckConstants
-] interface SVGFEMorphologyElement : SVGStyledElement,
- SVGFilterPrimitiveStandardAttributes {
+] interface SVGFEMorphologyElement : SVGStyledElement {
// Morphology Operators
const unsigned short SVG_MORPHOLOGY_OPERATOR_UNKNOWN = 0;
const unsigned short SVG_MORPHOLOGY_OPERATOR_ERODE = 1;
@@ -42,3 +41,4 @@
[Default=Undefined] optional float radiusY);
};
+SVGFEMorphologyElement implements SVGFilterPrimitiveStandardAttributes;
Modified: trunk/Source/WebCore/svg/SVGFEOffsetElement.idl (152349 => 152350)
--- trunk/Source/WebCore/svg/SVGFEOffsetElement.idl 2013-07-03 10:19:14 UTC (rev 152349)
+++ trunk/Source/WebCore/svg/SVGFEOffsetElement.idl 2013-07-03 10:50:17 UTC (rev 152350)
@@ -25,10 +25,10 @@
[
Conditional=SVG&FILTERS
-] interface SVGFEOffsetElement : SVGStyledElement,
- SVGFilterPrimitiveStandardAttributes {
+] interface SVGFEOffsetElement : SVGStyledElement {
readonly attribute SVGAnimatedString in1;
readonly attribute SVGAnimatedNumber dx;
readonly attribute SVGAnimatedNumber dy;
};
+SVGFEOffsetElement implements SVGFilterPrimitiveStandardAttributes;
Modified: trunk/Source/WebCore/svg/SVGFESpecularLightingElement.idl (152349 => 152350)
--- trunk/Source/WebCore/svg/SVGFESpecularLightingElement.idl 2013-07-03 10:19:14 UTC (rev 152349)
+++ trunk/Source/WebCore/svg/SVGFESpecularLightingElement.idl 2013-07-03 10:50:17 UTC (rev 152350)
@@ -25,11 +25,11 @@
[
Conditional=SVG&FILTERS
-] interface SVGFESpecularLightingElement : SVGStyledElement,
- SVGFilterPrimitiveStandardAttributes {
+] interface SVGFESpecularLightingElement : SVGStyledElement {
readonly attribute SVGAnimatedString in1;
readonly attribute SVGAnimatedNumber surfaceScale;
readonly attribute SVGAnimatedNumber specularConstant;
readonly attribute SVGAnimatedNumber specularExponent;
};
+SVGFESpecularLightingElement implements SVGFilterPrimitiveStandardAttributes;
Modified: trunk/Source/WebCore/svg/SVGFETileElement.idl (152349 => 152350)
--- trunk/Source/WebCore/svg/SVGFETileElement.idl 2013-07-03 10:19:14 UTC (rev 152349)
+++ trunk/Source/WebCore/svg/SVGFETileElement.idl 2013-07-03 10:50:17 UTC (rev 152350)
@@ -25,8 +25,8 @@
[
Conditional=SVG&FILTERS
-] interface SVGFETileElement : SVGStyledElement,
- SVGFilterPrimitiveStandardAttributes {
+] interface SVGFETileElement : SVGStyledElement {
readonly attribute SVGAnimatedString in1;
};
+SVGFETileElement implements SVGFilterPrimitiveStandardAttributes;
Modified: trunk/Source/WebCore/svg/SVGFETurbulenceElement.idl (152349 => 152350)
--- trunk/Source/WebCore/svg/SVGFETurbulenceElement.idl 2013-07-03 10:19:14 UTC (rev 152349)
+++ trunk/Source/WebCore/svg/SVGFETurbulenceElement.idl 2013-07-03 10:50:17 UTC (rev 152350)
@@ -26,8 +26,7 @@
[
Conditional=SVG&FILTERS,
DoNotCheckConstants
-] interface SVGFETurbulenceElement : SVGStyledElement,
- SVGFilterPrimitiveStandardAttributes {
+] interface SVGFETurbulenceElement : SVGStyledElement {
// Turbulence Types
const unsigned short SVG_TURBULENCE_TYPE_UNKNOWN = 0;
const unsigned short SVG_TURBULENCE_TYPE_FRACTALNOISE = 1;
@@ -46,3 +45,4 @@
readonly attribute SVGAnimatedEnumeration type;
};
+SVGFETurbulenceElement implements SVGFilterPrimitiveStandardAttributes;
