--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -698,17 +698,16 @@
@RESPATH@/res/MainMenu.nib/
#endif
; Content-accessible resources.
@RESPATH@/contentaccessible/*
; svg
@RESPATH@/res/svg.css
-@RESPATH@/components/dom_svg.xpt
@RESPATH@/components/dom_smil.xpt
; [Personal Security Manager]
;
; NSS libraries are signed in the staging directory,
; meaning their .chk files are created there directly.
;
#ifndef MOZ_SYSTEM_NSS
deleted file mode 100644
--- a/dom/interfaces/svg/moz.build
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-with Files("**"):
- BUG_COMPONENT = ("Core", "SVG")
-
-XPIDL_SOURCES += [
- 'nsIDOMSVGElement.idl',
-]
-
-XPIDL_MODULE = 'dom_svg'
-
deleted file mode 100644
--- a/dom/interfaces/svg/nsIDOMSVGElement.idl
+++ /dev/null
@@ -1,17 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsIDOMElement.idl"
-
-[uuid(c63517c5-8bab-4cd1-8694-bccafc32a195)]
-interface nsIDOMSVGElement : nsIDOMElement
-{
- // raises DOMException on setting
- readonly attribute nsIDOMSVGElement ownerSVGElement;
- readonly attribute nsIDOMSVGElement viewportElement;
-
- [binaryname(SVGClassName)]
- readonly attribute nsISupports className;
-};
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -24,17 +24,16 @@ interfaces = [
'xbl',
'xpath',
'xul',
'security',
'storage',
'offline',
'geolocation',
'notification',
- 'svg',
'smil',
'push',
'payments',
]
DIRS += ['interfaces/' + i for i in interfaces]
DIRS += [
--- a/dom/svg/DOMSVGLength.h
+++ b/dom/svg/DOMSVGLength.h
@@ -178,17 +178,17 @@ public:
void GetValueAsString(nsAString& aValue);
void SetValueAsString(const nsAString& aValue, ErrorResult& aRv);
void NewValueSpecifiedUnits(uint16_t aUnit, float aValue,
ErrorResult& aRv);
void ConvertToSpecifiedUnits(uint16_t aUnit, ErrorResult& aRv);
nsISupports* GetParentObject() const {
auto svgElement = mList ? Element() : mSVGElement.get();
- return static_cast<nsIDOMSVGElement*> (svgElement);
+ return static_cast<nsIDOMElement*>(svgElement);
}
JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
private:
nsSVGElement* Element() const {
return mList->Element();
--- a/dom/svg/SVGAElement.cpp
+++ b/dom/svg/SVGAElement.cpp
@@ -36,17 +36,16 @@ nsSVGElement::StringInfo SVGAElement::sS
//----------------------------------------------------------------------
// nsISupports methods
NS_INTERFACE_MAP_BEGIN(SVGAElement)
NS_INTERFACE_MAP_ENTRY(nsIDOMNode)
NS_INTERFACE_MAP_ENTRY(nsIDOMElement)
- NS_INTERFACE_MAP_ENTRY(nsIDOMSVGElement)
NS_INTERFACE_MAP_ENTRY(Link)
NS_INTERFACE_MAP_END_INHERITING(SVGAElementBase)
NS_IMPL_ADDREF_INHERITED(SVGAElement, SVGAElementBase)
NS_IMPL_RELEASE_INHERITED(SVGAElement, SVGAElementBase)
//----------------------------------------------------------------------
// Implementation
--- a/dom/svg/SVGAnimationElement.h
+++ b/dom/svg/SVGAnimationElement.h
@@ -84,17 +84,17 @@ public:
float GetSimpleDuration(ErrorResult& rv);
void BeginElement(ErrorResult& rv) { BeginElementAt(0.f, rv); }
void BeginElementAt(float offset, ErrorResult& rv);
void EndElement(ErrorResult& rv) { EndElementAt(0.f, rv); }
void EndElementAt(float offset, ErrorResult& rv);
// SVGTests
virtual bool IsInChromeDoc() const override;
-
+ nsSVGElement* AsSVGElement() final { return this; }
protected:
// nsSVGElement overrides
void UpdateHrefTarget(nsIContent* aNodeForContext,
const nsAString& aHrefStr);
void AnimationTargetChanged();
--- a/dom/svg/SVGDocument.cpp
+++ b/dom/svg/SVGDocument.cpp
@@ -11,17 +11,16 @@
#include "nsISimpleEnumerator.h"
#include "nsIStyleSheetService.h"
#include "nsISupportsPrimitives.h"
#include "nsLayoutStylesheetCache.h"
#include "nsNetUtil.h"
#include "nsServiceManagerUtils.h"
#include "nsString.h"
#include "nsLiteralString.h"
-#include "nsIDOMSVGElement.h"
#include "mozilla/dom/Element.h"
#include "nsSVGElement.h"
#include "mozilla/StyleSheet.h"
#include "mozilla/StyleSheetInlines.h"
using namespace mozilla::css;
using namespace mozilla::dom;
--- a/dom/svg/SVGFEImageElement.cpp
+++ b/dom/svg/SVGFEImageElement.cpp
@@ -38,17 +38,17 @@ nsSVGElement::StringInfo SVGFEImageEleme
{ &nsGkAtoms::href, kNameSpaceID_None, true },
{ &nsGkAtoms::href, kNameSpaceID_XLink, true }
};
//----------------------------------------------------------------------
// nsISupports methods
NS_IMPL_ISUPPORTS_INHERITED(SVGFEImageElement, SVGFEImageElementBase,
- nsIDOMNode, nsIDOMElement, nsIDOMSVGElement,
+ nsIDOMNode, nsIDOMElement,
imgINotificationObserver, nsIImageLoadingContent)
//----------------------------------------------------------------------
// Implementation
SVGFEImageElement::SVGFEImageElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: SVGFEImageElementBase(aNodeInfo)
{
--- a/dom/svg/SVGGraphicsElement.h
+++ b/dom/svg/SVGGraphicsElement.h
@@ -22,14 +22,15 @@ protected:
explicit SVGGraphicsElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
~SVGGraphicsElement();
public:
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
bool IsInChromeDoc() const override;
+ nsSVGElement* AsSVGElement() final { return this; }
};
} // namespace dom
} // namespace mozilla
#endif // mozilla_dom_SVGGraphicsElement_h
--- a/dom/svg/SVGImageElement.cpp
+++ b/dom/svg/SVGImageElement.cpp
@@ -45,17 +45,16 @@ nsSVGElement::StringInfo SVGImageElement
{ &nsGkAtoms::href, kNameSpaceID_XLink, true }
};
//----------------------------------------------------------------------
// nsISupports methods
NS_IMPL_ISUPPORTS_INHERITED(SVGImageElement, SVGImageElementBase,
nsIDOMNode, nsIDOMElement,
- nsIDOMSVGElement,
imgINotificationObserver,
nsIImageLoadingContent)
//----------------------------------------------------------------------
// Implementation
SVGImageElement::SVGImageElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: SVGImageElementBase(aNodeInfo)
--- a/dom/svg/SVGMPathElement.cpp
+++ b/dom/svg/SVGMPathElement.cpp
@@ -46,17 +46,16 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
//----------------------------------------------------------------------
// nsISupports methods
NS_IMPL_ISUPPORTS_CYCLE_COLLECTION_INHERITED(SVGMPathElement,
SVGMPathElementBase,
nsIDOMNode,
nsIDOMElement,
- nsIDOMSVGElement,
nsIMutationObserver)
// Constructor
SVGMPathElement::SVGMPathElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: SVGMPathElementBase(aNodeInfo)
, mPathTracker(this)
{
}
--- a/dom/svg/SVGSVGElement.cpp
+++ b/dom/svg/SVGSVGElement.cpp
@@ -64,17 +64,17 @@ DOMSVGPoint*
DOMSVGTranslatePoint::Copy()
{
return new DOMSVGPoint(mPt.GetX(), mPt.GetY());
}
nsISupports*
DOMSVGTranslatePoint::GetParentObject()
{
- return static_cast<nsIDOMSVGElement*>(mElement);
+ return static_cast<nsIDOMElement*>(mElement);
}
void
DOMSVGTranslatePoint::SetX(float aValue, ErrorResult& rv)
{
mElement->SetCurrentTranslate(aValue, mPt.GetY());
}
@@ -118,18 +118,17 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_
if (tmp->mTimedDocumentRoot) {
tmp->mTimedDocumentRoot->Traverse(&cb);
}
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
NS_IMPL_ISUPPORTS_CYCLE_COLLECTION_INHERITED(SVGSVGElement,
SVGSVGElementBase,
nsIDOMNode,
- nsIDOMElement,
- nsIDOMSVGElement)
+ nsIDOMElement)
SVGView::SVGView()
{
mZoomAndPan.Init(SVGSVGElement::ZOOMANDPAN,
SVG_ZOOMANDPAN_MAGNIFY);
mViewBox.Init();
mPreserveAspectRatio.Init();
}
--- a/dom/svg/SVGScriptElement.cpp
+++ b/dom/svg/SVGScriptElement.cpp
@@ -28,17 +28,16 @@ nsSVGElement::StringInfo SVGScriptElemen
{ &nsGkAtoms::href, kNameSpaceID_XLink, false }
};
//----------------------------------------------------------------------
// nsISupports methods
NS_IMPL_ISUPPORTS_INHERITED(SVGScriptElement, SVGScriptElementBase,
nsIDOMNode, nsIDOMElement,
- nsIDOMSVGElement,
nsIScriptLoaderObserver,
nsIScriptElement, nsIMutationObserver)
//----------------------------------------------------------------------
// Implementation
SVGScriptElement::SVGScriptElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo,
FromParser aFromParser)
--- a/dom/svg/SVGSymbolElement.cpp
+++ b/dom/svg/SVGSymbolElement.cpp
@@ -18,17 +18,17 @@ SVGSymbolElement::WrapNode(JSContext *aC
return SVGSymbolElementBinding::Wrap(aCx, this, aGivenProto);
}
//----------------------------------------------------------------------
// nsISupports methods
NS_IMPL_ISUPPORTS_INHERITED(SVGSymbolElement, SVGSymbolElementBase,
nsIDOMNode, nsIDOMElement,
- nsIDOMSVGElement, mozilla::dom::SVGTests)
+ mozilla::dom::SVGTests)
//----------------------------------------------------------------------
// Implementation
SVGSymbolElement::SVGSymbolElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: SVGSymbolElementBase(aNodeInfo)
{
}
--- a/dom/svg/SVGTests.cpp
+++ b/dom/svg/SVGTests.cpp
@@ -25,38 +25,32 @@ nsStaticAtom** SVGTests::sStringListName
SVGTests::SVGTests()
{
mStringListAttributes[LANGUAGE].SetIsCommaSeparated(true);
}
already_AddRefed<DOMSVGStringList>
SVGTests::RequiredFeatures()
{
- nsCOMPtr<nsIDOMSVGElement> elem = do_QueryInterface(this);
- nsSVGElement* element = static_cast<nsSVGElement*>(elem.get());
return DOMSVGStringList::GetDOMWrapper(
- &mStringListAttributes[FEATURES], element, true, FEATURES);
+ &mStringListAttributes[FEATURES], AsSVGElement(), true, FEATURES);
}
already_AddRefed<DOMSVGStringList>
SVGTests::RequiredExtensions()
{
- nsCOMPtr<nsIDOMSVGElement> elem = do_QueryInterface(this);
- nsSVGElement* element = static_cast<nsSVGElement*>(elem.get());
return DOMSVGStringList::GetDOMWrapper(
- &mStringListAttributes[EXTENSIONS], element, true, EXTENSIONS);
+ &mStringListAttributes[EXTENSIONS], AsSVGElement(), true, EXTENSIONS);
}
already_AddRefed<DOMSVGStringList>
SVGTests::SystemLanguage()
{
- nsCOMPtr<nsIDOMSVGElement> elem = do_QueryInterface(this);
- nsSVGElement* element = static_cast<nsSVGElement*>(elem.get());
return DOMSVGStringList::GetDOMWrapper(
- &mStringListAttributes[LANGUAGE], element, true, LANGUAGE);
+ &mStringListAttributes[LANGUAGE], AsSVGElement(), true, LANGUAGE);
}
bool
SVGTests::HasExtension(const nsAString& aExtension)
{
return nsSVGFeatures::HasExtension(aExtension, IsInChromeDoc());
}
@@ -219,20 +213,17 @@ SVGTests::GetAttrValue(uint8_t aAttrEnum
MOZ_ASSERT(aAttrEnum < ArrayLength(sStringListNames),
"aAttrEnum out of range");
aValue.SetTo(mStringListAttributes[aAttrEnum], nullptr);
}
void
SVGTests::MaybeInvalidate()
{
- nsCOMPtr<nsIDOMSVGElement> elem = do_QueryInterface(this);
- nsSVGElement* element = static_cast<nsSVGElement*>(elem.get());
-
- nsIContent* parent = element->GetFlattenedTreeParent();
+ nsIContent* parent = AsSVGElement()->GetFlattenedTreeParent();
if (parent &&
parent->NodeInfo()->Equals(nsGkAtoms::svgSwitch, kNameSpaceID_SVG)) {
static_cast<dom::SVGSwitchElement*>(parent)->MaybeInvalidate();
}
}
} // namespace dom
--- a/dom/svg/SVGTests.h
+++ b/dom/svg/SVGTests.h
@@ -9,16 +9,17 @@
#include "nsStringFwd.h"
#include "SVGStringList.h"
#include "nsCOMPtr.h"
class nsAttrValue;
class nsAtom;
class nsStaticAtom;
+class nsSVGElement;
namespace mozilla {
class DOMSVGStringList;
#define MOZILLA_DOMSVGTESTS_IID \
{ 0x92370da8, 0xda28, 0x4895, \
{0x9b, 0x1b, 0xe0, 0x06, 0x0d, 0xb7, 0x3f, 0xc3 } }
@@ -91,16 +92,17 @@ public:
// WebIDL
already_AddRefed<DOMSVGStringList> RequiredFeatures();
already_AddRefed<DOMSVGStringList> RequiredExtensions();
already_AddRefed<DOMSVGStringList> SystemLanguage();
bool HasExtension(const nsAString& aExtension);
virtual bool IsInChromeDoc() const = 0;
+ virtual nsSVGElement* AsSVGElement() = 0;
protected:
virtual ~SVGTests() {}
private:
enum { FEATURES, EXTENSIONS, LANGUAGE };
SVGStringList mStringListAttributes[3];
static nsStaticAtom** sStringListNames[3];
--- a/dom/svg/SVGTitleElement.cpp
+++ b/dom/svg/SVGTitleElement.cpp
@@ -18,17 +18,16 @@ SVGTitleElement::WrapNode(JSContext *aCx
return SVGTitleElementBinding::Wrap(aCx, this, aGivenProto);
}
//----------------------------------------------------------------------
// nsISupports methods
NS_IMPL_ISUPPORTS_INHERITED(SVGTitleElement, SVGTitleElementBase,
nsIDOMNode, nsIDOMElement,
- nsIDOMSVGElement,
nsIMutationObserver)
//----------------------------------------------------------------------
// Implementation
SVGTitleElement::SVGTitleElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
: SVGTitleElementBase(aNodeInfo)
{
--- a/dom/svg/nsSVGElement.cpp
+++ b/dom/svg/nsSVGElement.cpp
@@ -106,25 +106,16 @@ nsSVGElement::~nsSVGElement()
JSObject*
nsSVGElement::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aGivenProto)
{
return SVGElementBinding::Wrap(aCx, this, aGivenProto);
}
//----------------------------------------------------------------------
-
-NS_IMETHODIMP
-nsSVGElement::GetSVGClassName(nsISupports** aClassName)
-{
- *aClassName = ClassName().take();
- return NS_OK;
-}
-
-//----------------------------------------------------------------------
// nsSVGElement methods
void
nsSVGElement::DidAnimateClass()
{
// For Servo, snapshot the element before we change it.
nsIPresShell* shell = OwnerDoc()->GetShell();
if (shell) {
@@ -242,18 +233,17 @@ nsSVGElement::Init()
return NS_OK;
}
//----------------------------------------------------------------------
// nsISupports methods
NS_IMPL_ISUPPORTS_INHERITED(nsSVGElement, nsSVGElementBase,
- nsIDOMNode, nsIDOMElement,
- nsIDOMSVGElement)
+ nsIDOMNode, nsIDOMElement)
//----------------------------------------------------------------------
// Implementation
//----------------------------------------------------------------------
// nsIContent methods
nsresult
@@ -1094,24 +1084,16 @@ nsSVGElement::sMaskMap[] = {
//----------------------------------------------------------------------
// nsIDOMElement methods
// forwarded to Element implementations
//----------------------------------------------------------------------
-// nsIDOMSVGElement methods
-
-NS_IMETHODIMP
-nsSVGElement::GetOwnerSVGElement(nsIDOMSVGElement * *aOwnerSVGElement)
-{
- NS_IF_ADDREF(*aOwnerSVGElement = GetOwnerSVGElement());
- return NS_OK;
-}
SVGSVGElement*
nsSVGElement::GetOwnerSVGElement()
{
nsIContent* ancestor = GetFlattenedTreeParent();
while (ancestor && ancestor->IsSVGElement()) {
if (ancestor->IsSVGElement(nsGkAtoms::foreignObject)) {
@@ -1122,24 +1104,16 @@ nsSVGElement::GetOwnerSVGElement()
}
ancestor = ancestor->GetFlattenedTreeParent();
}
// we don't have an ancestor <svg> element...
return nullptr;
}
-NS_IMETHODIMP
-nsSVGElement::GetViewportElement(nsIDOMSVGElement * *aViewportElement)
-{
- nsSVGElement* elem = GetViewportElement();
- NS_ADDREF(*aViewportElement = elem);
- return NS_OK;
-}
-
nsSVGElement*
nsSVGElement::GetViewportElement()
{
return SVGContentUtils::GetNearestViewportElement(this);
}
already_AddRefed<SVGAnimatedString>
nsSVGElement::ClassName()
@@ -2474,17 +2448,17 @@ nsSVGElement::GetStringListInfo()
}
nsAttrValue
nsSVGElement::WillChangeStringList(bool aIsConditionalProcessingAttribute,
uint8_t aAttrEnum)
{
nsAtom* name;
if (aIsConditionalProcessingAttribute) {
- nsCOMPtr<SVGTests> tests(do_QueryInterface(static_cast<nsIDOMSVGElement*>(this)));
+ nsCOMPtr<SVGTests> tests(do_QueryInterface(static_cast<nsIDOMElement*>(this)));
name = tests->GetAttrName(aAttrEnum);
} else {
name = *GetStringListInfo().mStringListInfo[aAttrEnum].mName;
}
return WillChangeValue(name);
}
void
--- a/dom/svg/nsSVGElement.h
+++ b/dom/svg/nsSVGElement.h
@@ -19,17 +19,17 @@
#include "nsCycleCollectionParticipant.h"
#include "nsError.h"
#include "mozilla/dom/DOMRect.h"
#include "mozilla/dom/Element.h"
#include "mozilla/gfx/MatrixFwd.h"
#include "nsISupportsImpl.h"
#include "nsStyledElement.h"
#include "nsSVGClass.h"
-#include "nsIDOMSVGElement.h"
+#include "nsIDOMElement.h"
#include "SVGContentUtils.h"
#include "gfxMatrix.h"
class nsSVGAngle;
class nsSVGBoolean;
class nsSVGEnum;
class nsSVGInteger;
class nsSVGIntegerPair;
@@ -65,17 +65,17 @@ class DOMSVGStringList;
} // namespace mozilla
struct nsSVGEnumMapping;
typedef nsStyledElement nsSVGElementBase;
class nsSVGElement : public nsSVGElementBase // nsIContent
- , public nsIDOMSVGElement
+ , public nsIDOMElement
{
protected:
explicit nsSVGElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
friend nsresult NS_NewSVGElement(mozilla::dom::Element **aResult,
already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);
nsresult Init();
virtual ~nsSVGElement();
@@ -131,17 +131,17 @@ public:
static const MappedAttributeEntry sViewportsMap[];
static const MappedAttributeEntry sMarkersMap[];
static const MappedAttributeEntry sColorMap[];
static const MappedAttributeEntry sFiltersMap[];
static const MappedAttributeEntry sFEFloodMap[];
static const MappedAttributeEntry sLightingEffectsMap[];
static const MappedAttributeEntry sMaskMap[];
- NS_DECL_NSIDOMSVGELEMENT
+ NS_DECL_NSIDOMELEMENT
NS_IMPL_FROMCONTENT(nsSVGElement, kNameSpaceID_SVG)
// Gets the element that establishes the rectangular viewport against which
// we should resolve percentage lengths (our "coordinate context"). Returns
// nullptr for outer <svg> or SVG without an <svg> parent (invalid SVG).
mozilla::dom::SVGViewportElement* GetCtx() const;
--- a/dom/svg/nsSVGFilters.h
+++ b/dom/svg/nsSVGFilters.h
@@ -184,17 +184,17 @@ protected:
public:
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
virtual bool AttributeAffectsRendering(
int32_t aNameSpaceID, nsAtom* aAttribute) const override;
virtual nsSVGString& GetResultImageName() override { return mStringAttributes[RESULT]; }
virtual void GetSourceImageNames(nsTArray<nsSVGStringInfo>& aSources) override;
- NS_FORWARD_NSIDOMSVGELEMENT(nsSVGFELightingElementBase::)
+ NS_FORWARD_NSIDOMELEMENT(nsSVGFELightingElementBase::)
NS_IMETHOD_(bool) IsAttributeMapped(const nsAtom* aAttribute) const override;
protected:
virtual bool OperatesOnSRGB(int32_t aInputIndex,
bool aInputIsAlreadySRGB) override { return true; }
virtual NumberAttributesInfo GetNumberInfo() override;
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -475,17 +475,16 @@
@BINPATH@/res/fonts/*.properties
#endif
; Content-accessible resources.
@BINPATH@/contentaccessible/*
; svg
@BINPATH@/res/svg.css
-@BINPATH@/components/dom_svg.xpt
@BINPATH@/components/dom_smil.xpt
; [Personal Security Manager]
;
@BINPATH@/components/pipnss.xpt
; For process sandboxing
#if defined(MOZ_SANDBOX)
--- a/xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp
+++ b/xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp
@@ -53,17 +53,16 @@
#include "nsIDOMPaintRequest.h"
#include "nsIDOMParser.h"
#include "nsIDOMProcessingInstruction.h"
#include "nsIDOMRange.h"
#include "nsIDOMScreen.h"
#include "nsIDOMScrollAreaEvent.h"
#include "nsIDOMSerializer.h"
#include "nsIDOMSimpleGestureEvent.h"
-#include "nsIDOMSVGElement.h"
#include "nsIDOMText.h"
#include "nsIDOMTimeEvent.h"
#include "nsIDOMTimeRanges.h"
#include "nsIDOMTransitionEvent.h"
#include "nsIDOMUIEvent.h"
#include "nsIDOMValidityState.h"
#include "nsIDOMWheelEvent.h"
#include "nsIDOMXMLDocument.h"
@@ -275,17 +274,16 @@ const ComponentsInterfaceShimEntry kComp
DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsIDOMParser, DOMParser),
DEFINE_SHIM(ProcessingInstruction),
DEFINE_SHIM(Range),
DEFINE_SHIM(Screen),
DEFINE_SHIM(ScrollAreaEvent),
DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsIScrollBoxObject, ScrollBoxObject),
DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsIDOMSerializer, XMLSerializer),
DEFINE_SHIM(SimpleGestureEvent),
- DEFINE_SHIM(SVGElement),
DEFINE_SHIM(Text),
DEFINE_SHIM(TimeEvent),
DEFINE_SHIM(TimeRanges),
DEFINE_SHIM(TransitionEvent),
DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsITreeBoxObject, TreeBoxObject),
DEFINE_SHIM(UIEvent),
DEFINE_SHIM(ValidityState),
DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsIWebBrowserPersistable, FrameLoader),