Bug 410792 - Remove unused FEUnimplementedMOZElement code. r+sr=tor,a1.9=mtschrep

content/svg/content/src/nsSVGElementFactory.cpp

@@ -133,8 +133,6 @@ NS_NewSVGFEMorphologyElement(nsIContent **aResult, nsINodeInfo *aNodeInfo);
 nsresult
 NS_NewSVGFEOffsetElement(nsIContent **aResult, nsINodeInfo *aNodeInfo);
 nsresult
-NS_NewSVGFEUnimplementedMOZElement(nsIContent **aResult, nsINodeInfo *aNodeInfo);
-nsresult
 NS_NewSVGPatternElement(nsIContent **aResult, nsINodeInfo *aNodeInfo);
 nsresult
 NS_NewSVGMaskElement(nsIContent **aResult, nsINodeInfo *aNodeInfo);

content/svg/content/src/nsSVGFilters.cpp

@@ -5760,77 +5760,3 @@ nsSVGFEDisplacementMapElement::GetEnumInfo()
   return EnumAttributesInfo(mEnumAttributes, sEnumInfo,
                             NS_ARRAY_LENGTH(sEnumInfo));
 }
-
-//---------------------UnimplementedMOZ------------------------
-
-typedef nsSVGFE nsSVGFEUnimplementedMOZElementBase;
-
-class nsSVGFEUnimplementedMOZElement : public nsSVGFEUnimplementedMOZElementBase,
-                                       public nsIDOMSVGFEUnimplementedMOZElement,
-                                       public nsISVGFilter
-{
-  friend nsresult NS_NewSVGFEUnimplementedMOZElement(nsIContent **aResult,
-                                                     nsINodeInfo *aNodeInfo);
-protected:
-  nsSVGFEUnimplementedMOZElement(nsINodeInfo* aNodeInfo)
-    : nsSVGFEUnimplementedMOZElementBase(aNodeInfo) {}
-
-public:
-  // interfaces:
-  NS_DECL_ISUPPORTS_INHERITED
-
-  // FE Base
-  NS_FORWARD_NSIDOMSVGFILTERPRIMITIVESTANDARDATTRIBUTES(nsSVGFEUnimplementedMOZElementBase::)
-
-  // nsISVGFilter
-  NS_IMETHOD Filter(nsSVGFilterInstance *instance);
-  NS_IMETHOD GetRequirements(PRUint32 *aRequirements);
-
-  // Gaussian
-  NS_DECL_NSIDOMSVGFEMERGEELEMENT
-
-  NS_FORWARD_NSIDOMSVGELEMENT(nsSVGFEUnimplementedMOZElementBase::)
-
-  NS_FORWARD_NSIDOMNODE(nsSVGFEUnimplementedMOZElementBase::)
-  NS_FORWARD_NSIDOMELEMENT(nsSVGFEUnimplementedMOZElementBase::)
-
-  virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
-};
-
-NS_IMPL_NS_NEW_SVG_ELEMENT(FEUnimplementedMOZ)
-
-//----------------------------------------------------------------------
-// nsISupports methods
-
-NS_IMPL_ADDREF_INHERITED(nsSVGFEUnimplementedMOZElement,nsSVGFEUnimplementedMOZElementBase)
-NS_IMPL_RELEASE_INHERITED(nsSVGFEUnimplementedMOZElement,nsSVGFEUnimplementedMOZElementBase)
-
-NS_INTERFACE_MAP_BEGIN(nsSVGFEUnimplementedMOZElement)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMNode)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMElement)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMSVGElement)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMSVGFilterPrimitiveStandardAttributes)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMSVGFEUnimplementedMOZElement)
-  NS_INTERFACE_MAP_ENTRY(nsISVGFilter)
-  NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGFEUnimplementedMOZElement)
-NS_INTERFACE_MAP_END_INHERITING(nsSVGFEUnimplementedMOZElementBase)
-
-//----------------------------------------------------------------------
-// nsIDOMNode methods
-
-NS_IMPL_ELEMENT_CLONE_WITH_INIT(nsSVGFEUnimplementedMOZElement)
-
-NS_IMETHODIMP
-nsSVGFEUnimplementedMOZElement::Filter(nsSVGFilterInstance *instance)
-{
-  /* should never be called */
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-
-NS_IMETHODIMP
-nsSVGFEUnimplementedMOZElement::GetRequirements(PRUint32 *aRequirements)
-{
-  /* should never be called */
-  return NS_ERROR_NOT_IMPLEMENTED;
-}

dom/public/idl/svg/nsIDOMSVGFilters.idl

@@ -327,8 +327,3 @@ interface nsIDOMSVGFEDisplacementMapElement : nsIDOMSVGFilterPrimitiveStandardAt
   readonly attribute nsIDOMSVGAnimatedEnumeration xChannelSelector;
   readonly attribute nsIDOMSVGAnimatedEnumeration yChannelSelector;
 };
-
-[scriptable, uuid(8698c635-26c7-468b-905e-494e8825d56b)]
-interface nsIDOMSVGFEUnimplementedMOZElement : nsIDOMSVGFilterPrimitiveStandardAttributes
-{
-};

dom/public/nsDOMClassInfoID.h

@@ -270,7 +270,6 @@ enum nsDOMClassInfoID {
   eDOMClassInfo_SVGFESpotLightElement_id,
   eDOMClassInfo_SVGFETileElement_id,
   eDOMClassInfo_SVGFETurbulenceElement_id,
-  eDOMClassInfo_SVGFEUnimplementedMOZElement_id,
   eDOMClassInfo_SVGFilterElement_id,
   eDOMClassInfo_SVGGElement_id,
   eDOMClassInfo_SVGImageElement_id,

dom/src/base/nsDOMClassInfo.cpp

@@ -966,8 +966,6 @@ static nsDOMClassInfoData sClassInfoData[] = {
                            ELEMENT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(SVGFETurbulenceElement, nsElementSH,
                            ELEMENT_SCRIPTABLE_FLAGS)
-  NS_DEFINE_CLASSINFO_DATA(SVGFEUnimplementedMOZElement, nsElementSH,
-                           ELEMENT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(SVGFilterElement, nsElementSH,
                            ELEMENT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(SVGGElement, nsElementSH,
@@ -2825,12 +2823,6 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_SVG_ELEMENT_MAP_ENTRIES
   DOM_CLASSINFO_MAP_END
 
-  DOM_CLASSINFO_MAP_BEGIN(SVGFEUnimplementedMOZElement, nsIDOMSVGFEUnimplementedMOZElement)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGFEUnimplementedMOZElement)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGStylable)
-    DOM_CLASSINFO_SVG_ELEMENT_MAP_ENTRIES
-  DOM_CLASSINFO_MAP_END
-
   DOM_CLASSINFO_MAP_BEGIN(SVGFilterElement, nsIDOMSVGFilterElement)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGFilterElement)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGURIReference)

layout/svg/base/src/nsSVGFilterFrame.cpp

@@ -90,7 +90,6 @@ nsSVGFilterFrame::FilterPaint(nsSVGRenderState *aContext,
   nsCOMPtr<nsIDOMSVGFilterElement> aFilter = do_QueryInterface(mContent);
   NS_ASSERTION(aFilter, "Wrong content element (not filter)");
 
-  PRBool unimplementedFilter = PR_FALSE;
   PRUint32 requirements = 0;
   PRUint32 count = mContent->GetChildCount();
   for (PRUint32 i=0; i<count; ++i) {
@@ -102,21 +101,13 @@ nsSVGFilterFrame::FilterPaint(nsSVGRenderState *aContext,
       filter->GetRequirements(&tmp);
       requirements |= tmp;
     }
-
-    nsCOMPtr<nsIDOMSVGFEUnimplementedMOZElement> unimplemented;
-    unimplemented = do_QueryInterface(child);
-    if (unimplemented)
-      unimplementedFilter = PR_TRUE;
   }
 
-  // check for source requirements or filter elements that we don't support yet
-  if (requirements & ~(NS_FE_SOURCEGRAPHIC | NS_FE_SOURCEALPHA) ||
-      unimplementedFilter) {
+  // check for source requirements that we don't support yet
+  if (requirements & ~(NS_FE_SOURCEGRAPHIC | NS_FE_SOURCEALPHA)) {
 #ifdef DEBUG_tor
     if (requirements & ~(NS_FE_SOURCEGRAPHIC | NS_FE_SOURCEALPHA))
       fprintf(stderr, "FilterFrame: unimplemented source requirement\n");
-    if (unimplementedFilter)
-      fprintf(stderr, "FilterFrame: unimplemented filter element\n");
 #endif
     aTarget->PaintSVG(aContext, nsnull);
     return NS_OK;