diff --git a/dom/base/DOMException.cpp b/dom/base/DOMException.cpp index 2fcc367faea9..7dcd13709ff9 100644 --- a/dom/base/DOMException.cpp +++ b/dom/base/DOMException.cpp @@ -12,7 +12,6 @@ #include "nsContentUtils.h" #include "nsCOMPtr.h" #include "nsIDocument.h" -#include "nsIDOMDOMException.h" #include "nsIException.h" #include "nsMemory.h" #include "xpcprivate.h" @@ -356,12 +355,6 @@ Exception::Stringify(JSContext* aCx, nsString& retval) CopyUTF8toUTF16(str, retval); } -NS_IMPL_ADDREF_INHERITED(DOMException, Exception) -NS_IMPL_RELEASE_INHERITED(DOMException, Exception) -NS_INTERFACE_MAP_BEGIN(DOMException) - NS_INTERFACE_MAP_ENTRY(nsIDOMDOMException) -NS_INTERFACE_MAP_END_INHERITING(Exception) - DOMException::DOMException(nsresult aRv, const nsACString& aMessage, const nsACString& aName, uint16_t aCode) : Exception(aMessage, aRv, aName, nullptr, nullptr), diff --git a/dom/base/DOMException.h b/dom/base/DOMException.h index 5cfd9d043f0f..25eb0df3d64e 100644 --- a/dom/base/DOMException.h +++ b/dom/base/DOMException.h @@ -18,7 +18,6 @@ #include "nsCOMPtr.h" #include "nsCycleCollectionParticipant.h" #include "nsID.h" -#include "nsIDOMDOMException.h" #include "nsWrapperCache.h" #include "nsIException.h" #include "nsString.h" @@ -144,15 +143,13 @@ protected: NS_DEFINE_STATIC_IID_ACCESSOR(Exception, MOZILLA_EXCEPTION_IID) -class DOMException : public Exception, - public nsIDOMDOMException +class DOMException : public Exception { public: DOMException(nsresult aRv, const nsACString& aMessage, const nsACString& aName, uint16_t aCode); - NS_DECL_ISUPPORTS_INHERITED - NS_DECL_NSIDOMDOMEXCEPTION + NS_INLINE_DECL_REFCOUNTING_INHERITED(DOMException, Exception) // nsWrapperCache overrides virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) diff --git a/dom/interfaces/core/moz.build b/dom/interfaces/core/moz.build index a807ade9b748..0f0c4de63980 100644 --- a/dom/interfaces/core/moz.build +++ b/dom/interfaces/core/moz.build @@ -10,7 +10,6 @@ with Files("**"): XPIDL_SOURCES += [ 'nsIDOMDocument.idl', 'nsIDOMDocumentFragment.idl', - 'nsIDOMDOMException.idl', 'nsIDOMElement.idl', 'nsIDOMNode.idl', 'nsIDOMNodeList.idl', diff --git a/dom/interfaces/core/nsIDOMDOMException.idl b/dom/interfaces/core/nsIDOMDOMException.idl deleted file mode 100644 index 4b1d5e3e5186..000000000000 --- a/dom/interfaces/core/nsIDOMDOMException.idl +++ /dev/null @@ -1,24 +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 "domstubs.idl" - -/** - * In general, DOM methods return specific error values in ordinary - * processing situations, such as out-of-bound errors. - * However, DOM operations can raise exceptions in "exceptional" - * circumstances, i.e., when an operation is impossible to perform - * (either for logical reasons, because data is lost, or because the - * implementation has become unstable) - * - * For more information on this interface please see - * http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#domexception - */ - -[uuid(5bd766d3-57a9-4833-995d-dbe21da29595)] -interface nsIDOMDOMException : nsISupports -{ -}; - diff --git a/dom/ipc/StructuredCloneData.cpp b/dom/ipc/StructuredCloneData.cpp index e0fb5c17fbfd..e88a1cf0deeb 100644 --- a/dom/ipc/StructuredCloneData.cpp +++ b/dom/ipc/StructuredCloneData.cpp @@ -6,7 +6,6 @@ #include "StructuredCloneData.h" -#include "nsIDOMDOMException.h" #include "nsIMutable.h" #include "nsIXPConnect.h" diff --git a/xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp b/xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp index f3368e765ece..18f7f94a0a51 100644 --- a/xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp +++ b/xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp @@ -7,7 +7,6 @@ #include "ShimInterfaceInfo.h" -#include "nsIDOMDOMException.h" #include "nsIDOMDOMRequest.h" #include "nsIDOMDocument.h" #include "nsIDOMDocumentFragment.h" @@ -35,7 +34,6 @@ #include "mozilla/dom/CSSStyleSheetBinding.h" #include "mozilla/dom/CSSValueBinding.h" #include "mozilla/dom/CSSValueListBinding.h" -#include "mozilla/dom/DOMExceptionBinding.h" #include "mozilla/dom/DOMParserBinding.h" #include "mozilla/dom/DOMRequestBinding.h" #include "mozilla/dom/DocumentBinding.h" @@ -128,7 +126,6 @@ struct ComponentsInterfaceShimEntry { const ComponentsInterfaceShimEntry kComponentsInterfaceShimMap[] = { DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsIContentFrameMessageManager, ContentFrameMessageManager), - DEFINE_SHIM(DOMException), DEFINE_SHIM(DOMRequest), DEFINE_SHIM(Document), DEFINE_SHIM(DocumentFragment),