--- a/accessible/src/base/a11yGeneric.h
+++ b/accessible/src/base/a11yGeneric.h
@@ -15,19 +15,16 @@
// change it so that it works. Yuck.
#define NS_INTERFACE_MAP_STATIC_AMBIGUOUS(_class) \
if (aIID.Equals(NS_GET_IID(_class))) { \
NS_ADDREF(this); \
*aInstancePtr = this; \
return NS_OK; \
} else
-#define NS_OK_DEFUNCT_OBJECT \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_GENERAL, 0x22)
-
#define NS_ENSURE_A11Y_SUCCESS(res, ret) \
PR_BEGIN_MACRO \
nsresult __rv = res; /* Don't evaluate |res| more than once */ \
if (NS_FAILED(__rv)) { \
NS_ENSURE_SUCCESS_BODY(res, ret) \
return ret; \
} \
if (__rv == NS_OK_DEFUNCT_OBJECT) \
--- a/accessible/src/base/nsAccessiblePivot.h
+++ b/accessible/src/base/nsAccessiblePivot.h
@@ -12,20 +12,16 @@
#include "nsAutoPtr.h"
#include "nsTObserverArray.h"
#include "nsCycleCollectionParticipant.h"
#include "mozilla/Attributes.h"
class Accessible;
class nsIAccessibleTraversalRule;
-// raised when current pivot's position is needed but it is not in the tree.
-#define NS_ERROR_NOT_IN_TREE \
-NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GENERAL, 0x26)
-
/**
* Class represents an accessible pivot.
*/
class nsAccessiblePivot MOZ_FINAL : public nsIAccessiblePivot
{
public:
nsAccessiblePivot(Accessible* aRoot);
--- a/accessible/src/base/nsTextEquivUtils.cpp
+++ b/accessible/src/base/nsTextEquivUtils.cpp
@@ -14,19 +14,16 @@
#include "nsStyleStructInlines.h"
#include "nsIDOMXULLabeledControlEl.h"
#include "nsArrayUtils.h"
using namespace mozilla::a11y;
-#define NS_OK_NO_NAME_CLAUSE_HANDLED \
-NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_GENERAL, 0x24)
-
////////////////////////////////////////////////////////////////////////////////
// nsTextEquivUtils. Public.
nsresult
nsTextEquivUtils::GetNameFromSubtree(Accessible* aAccessible,
nsAString& aName)
{
aName.Truncate();
--- a/accessible/src/generic/Accessible.h
+++ b/accessible/src/generic/Accessible.h
@@ -73,28 +73,16 @@ struct nsRect;
class nsIContent;
class nsIFrame;
class nsIAtom;
class nsIView;
typedef nsRefPtrHashtable<nsPtrHashKey<const void>, Accessible>
AccessibleHashtable;
-// see Accessible::GetAttrValue
-#define NS_OK_NO_ARIA_VALUE \
-NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_GENERAL, 0x21)
-
-// see Accessible::GetNameInternal
-#define NS_OK_EMPTY_NAME \
-NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_GENERAL, 0x23)
-
-// see Accessible::GetNameInternal
-#define NS_OK_NAME_FROM_TOOLTIP \
-NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_GENERAL, 0x25)
-
#define NS_ACCESSIBLE_IMPL_IID \
{ /* 133c8bf4-4913-4355-bd50-426bd1d6e1ad */ \
0x133c8bf4, \
0x4913, \
0x4355, \
{ 0xbd, 0x50, 0x42, 0x6b, 0xd1, 0xd6, 0xe1, 0xad } \
}
--- a/accessible/src/html/HTMLTableAccessible.cpp
+++ b/accessible/src/html/HTMLTableAccessible.cpp
@@ -28,17 +28,17 @@
#include "nsIDOMHTMLTableElement.h"
#include "nsIDOMHTMLTableRowElement.h"
#include "nsIDOMHTMLTableSectionElem.h"
#include "nsIDocument.h"
#include "nsIPresShell.h"
#include "nsITableLayout.h"
#include "nsITableCellLayout.h"
#include "nsFrameSelection.h"
-#include "nsLayoutErrors.h"
+#include "nsError.h"
#include "nsArrayUtils.h"
#include "nsComponentManagerUtils.h"
using namespace mozilla;
using namespace mozilla::a11y;
////////////////////////////////////////////////////////////////////////////////
// HTMLTableCellAccessible
--- a/caps/src/nsNullPrincipal.cpp
+++ b/caps/src/nsNullPrincipal.cpp
@@ -14,17 +14,17 @@
#include "nsNullPrincipal.h"
#include "nsNullPrincipalURI.h"
#include "nsMemory.h"
#include "nsIUUIDGenerator.h"
#include "nsID.h"
#include "nsNetUtil.h"
#include "nsIClassInfoImpl.h"
#include "nsNetCID.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIScriptSecurityManager.h"
#include "nsScriptSecurityManager.h"
using namespace mozilla;
NS_IMPL_CLASSINFO(nsNullPrincipal, NULL, nsIClassInfo::MAIN_THREAD_ONLY,
NS_NULLPRINCIPAL_CID)
NS_IMPL_QUERY_INTERFACE2_CI(nsNullPrincipal,
--- a/caps/src/nsPrincipal.cpp
+++ b/caps/src/nsPrincipal.cpp
@@ -15,17 +15,17 @@
#include "nsIProtocolHandler.h"
#include "nsNetUtil.h"
#include "nsJSPrincipals.h"
#include "nsVoidArray.h"
#include "nsHashtable.h"
#include "nsIObjectInputStream.h"
#include "nsIObjectOutputStream.h"
#include "nsIClassInfoImpl.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIContentSecurityPolicy.h"
#include "nsContentUtils.h"
#include "jswrapper.h"
#include "nsPrincipal.h"
#include "mozilla/Preferences.h"
#include "mozilla/HashFunctions.h"
--- a/caps/src/nsScriptSecurityManager.cpp
+++ b/caps/src/nsScriptSecurityManager.cpp
@@ -17,17 +17,17 @@
#include "nsJSPrincipals.h"
#include "nsSystemPrincipal.h"
#include "nsPrincipal.h"
#include "nsNullPrincipal.h"
#include "nsXPIDLString.h"
#include "nsCRT.h"
#include "nsCRTGlue.h"
#include "nsIJSContextStack.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsDOMCID.h"
#include "jsdbgapi.h"
#include "nsIXPConnect.h"
#include "nsIXPCSecurityManager.h"
#include "nsTextFormatter.h"
#include "nsIStringBundle.h"
#include "nsNetUtil.h"
#include "nsIProperties.h"
--- a/chrome/src/nsChromeRegistry.cpp
+++ b/chrome/src/nsChromeRegistry.cpp
@@ -9,17 +9,17 @@
#include "nsChromeRegistryContent.h"
#include <string.h>
#include "prio.h"
#include "prprf.h"
#include "nsCOMPtr.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsEscape.h"
#include "nsLayoutCID.h"
#include "nsNetUtil.h"
#include "nsString.h"
#include "nsUnicharUtils.h"
#include "nsCSSStyleSheet.h"
#include "nsIConsoleService.h"
--- a/content/base/public/Makefile.in
+++ b/content/base/public/Makefile.in
@@ -13,17 +13,16 @@ MODULE = content
XPIDL_MODULE = content_base
GRE_MODULE = 1
EXPORTS = \
mozFlushType.h \
nsIContent.h \
nsIAttribute.h \
nsIContentIterator.h \
-nsContentErrors.h \
nsContentPolicyUtils.h \
nsContentUtils.h \
nsIDocument.h \
nsDeprecatedOperationList.h \
nsIDocumentObserver.h \
nsIMutationObserver.h \
nsINameSpaceManager.h \
nsINode.h \
deleted file mode 100644
--- a/content/base/public/nsContentErrors.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-// vim: ft=cpp sw=2 ts=2 tw=78 et
-/* 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/. */
-
-#ifndef nsContentErrors_h___
-#define nsContentErrors_h___
-
-/** Error codes for nsHTMLStyleSheet */
-// XXX this is not really used
-#define NS_HTML_STYLE_PROPERTY_NOT_THERE \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_CONTENT, 2)
-
-/** Error codes for image loading */
-#define NS_ERROR_IMAGE_SRC_CHANGED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_CONTENT, 4)
-
-#define NS_ERROR_IMAGE_BLOCKED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_CONTENT, 5)
-
-/** Error codes for content policy blocking */
-#define NS_ERROR_CONTENT_BLOCKED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_CONTENT, 6)
-
-#define NS_ERROR_CONTENT_BLOCKED_SHOW_ALT \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_CONTENT, 7)
-
-/** Success variations of content policy blocking */
-#define NS_CONTENT_BLOCKED \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_CONTENT, 8)
-
-#define NS_CONTENT_BLOCKED_SHOW_ALT \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_CONTENT, 9)
-
-#define NS_PROPTABLE_PROP_NOT_THERE \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_CONTENT, 10)
-
-#define NS_PROPTABLE_PROP_OVERWRITTEN \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_CONTENT, 11)
-
-/* Error codes for FindBroadcaster in nsXULDocument.cpp */
-
-#define NS_FINDBROADCASTER_NOT_FOUND \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_CONTENT, 12)
-
-#define NS_FINDBROADCASTER_FOUND \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_CONTENT, 13)
-
-#define NS_FINDBROADCASTER_AWAIT_OVERLAYS \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_CONTENT, 14)
-
-/* Error codes for CSP */
-#define NS_ERROR_CSP_FRAME_ANCESTOR_VIOLATION \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, 99)
-
-/* Error codes for XBL */
-#define NS_ERROR_XBL_BLOCKED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_CONTENT, 15)
-
-#endif // nsContentErrors_h___
--- a/content/base/src/FileIOObject.cpp
+++ b/content/base/src/FileIOObject.cpp
@@ -1,16 +1,16 @@
/* -*- Mode: C++; 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 "FileIOObject.h"
#include "nsDOMFile.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIDOMEvent.h"
#include "nsIDOMProgressEvent.h"
#include "nsComponentManagerUtils.h"
#include "nsEventDispatcher.h"
#define ERROR_STR "error"
#define ABORT_STR "abort"
#define PROGRESS_STR "progress"
--- a/content/base/src/FragmentOrElement.cpp
+++ b/content/base/src/FragmentOrElement.cpp
@@ -40,17 +40,17 @@
#include "nsDOMCID.h"
#include "nsIServiceManager.h"
#include "nsIDOMCSSStyleDeclaration.h"
#include "nsDOMCSSAttrDeclaration.h"
#include "nsINameSpaceManager.h"
#include "nsContentList.h"
#include "nsDOMTokenList.h"
#include "nsXBLPrototypeBinding.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsDOMString.h"
#include "nsIScriptSecurityManager.h"
#include "nsIDOMMutationEvent.h"
#include "nsMutationEvent.h"
#include "nsNodeUtils.h"
#include "nsDocument.h"
#include "nsAttrValueOrString.h"
#ifdef MOZ_XUL
--- a/content/base/src/nsBlobProtocolHandler.cpp
+++ b/content/base/src/nsBlobProtocolHandler.cpp
@@ -1,15 +1,15 @@
/* 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 "nsBlobProtocolHandler.h"
#include "nsBlobURI.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsClassHashtable.h"
#include "nsNetUtil.h"
#include "nsIPrincipal.h"
#include "nsIDOMFile.h"
// -----------------------------------------------------------------------
// Hash table
struct FileDataInfo
--- a/content/base/src/nsCSPService.cpp
+++ b/content/base/src/nsCSPService.cpp
@@ -11,17 +11,17 @@
#include "nsIObserver.h"
#include "nsIContent.h"
#include "nsCSPService.h"
#include "nsIContentSecurityPolicy.h"
#include "nsIChannelPolicy.h"
#include "nsIChannelEventSink.h"
#include "nsIPropertyBag2.h"
#include "nsIWritablePropertyBag2.h"
-#include "nsNetError.h"
+#include "nsError.h"
#include "nsChannelProperties.h"
#include "nsIAsyncVerifyRedirectCallback.h"
#include "nsAsyncRedirectVerifyHelper.h"
#include "mozilla/Preferences.h"
#include "nsIScriptError.h"
#include "nsContentUtils.h"
using namespace mozilla;
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -80,17 +80,17 @@ static NS_DEFINE_CID(kXTFServiceCID, NS_
#include "nsIURL.h"
#include "nsICharsetConverterManager.h"
#include "nsEventListenerManager.h"
#include "nsAttrName.h"
#include "nsIDOMUserDataHandler.h"
#include "nsContentCreatorFunctions.h"
#include "nsMutationEvent.h"
#include "nsIMEStateManager.h"
-#include "nsContentErrors.h"
+#include "nsError.h"
#include "nsUnicharUtilCIID.h"
#include "nsINativeKeyBindings.h"
#include "nsXULPopupManager.h"
#include "nsIPermissionManager.h"
#include "nsIScriptObjectPrincipal.h"
#include "nsNullPrincipal.h"
#include "nsIRunnable.h"
#include "nsDOMJSUtils.h"
--- a/content/base/src/nsCrossSiteListenerProxy.cpp
+++ b/content/base/src/nsCrossSiteListenerProxy.cpp
@@ -1,17 +1,17 @@
/* -*- Mode: C++; 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 "nsCrossSiteListenerProxy.h"
#include "nsIChannel.h"
#include "nsIHttpChannel.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsContentUtils.h"
#include "nsIScriptSecurityManager.h"
#include "nsNetUtil.h"
#include "nsMimeTypes.h"
#include "nsIStreamConverterService.h"
#include "nsStringStream.h"
#include "nsGkAtoms.h"
#include "nsWhitespaceTokenizer.h"
--- a/content/base/src/nsDOMAttribute.cpp
+++ b/content/base/src/nsDOMAttribute.cpp
@@ -7,17 +7,17 @@
* Implementation of DOM Core's nsIDOMAttr node.
*/
#include "nsDOMAttribute.h"
#include "nsGenericElement.h"
#include "mozilla/dom/Element.h"
#include "nsContentCreatorFunctions.h"
#include "nsINameSpaceManager.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsUnicharUtils.h"
#include "nsDOMString.h"
#include "nsIDocument.h"
#include "nsIDOMDocument.h"
#include "nsIDOMUserDataHandler.h"
#include "nsEventDispatcher.h"
#include "nsGkAtoms.h"
#include "nsCOMArray.h"
--- a/content/base/src/nsDOMAttributeMap.cpp
+++ b/content/base/src/nsDOMAttributeMap.cpp
@@ -8,17 +8,17 @@
*/
#include "nsDOMAttributeMap.h"
#include "nsDOMAttribute.h"
#include "nsIDOMDocument.h"
#include "nsGenericElement.h"
#include "nsIDocument.h"
#include "nsINameSpaceManager.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsContentUtils.h"
#include "nsNodeInfoManager.h"
#include "nsAttrName.h"
#include "nsUnicharUtils.h"
//----------------------------------------------------------------------
nsDOMAttributeMap::nsDOMAttributeMap(Element* aContent)
--- a/content/base/src/nsDOMFile.cpp
+++ b/content/base/src/nsDOMFile.cpp
@@ -4,17 +4,17 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsDOMFile.h"
#include "nsCExternalHandlerService.h"
#include "nsContentCID.h"
#include "nsContentUtils.h"
#include "nsDOMClassInfoID.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsICharsetDetector.h"
#include "nsICharsetConverterManager.h"
#include "nsIClassInfo.h"
#include "nsIConverterInputStream.h"
#include "nsIDocument.h"
#include "nsIFileStreams.h"
#include "nsIInputStream.h"
#include "nsIIPCSerializable.h"
--- a/content/base/src/nsDOMFileReader.cpp
+++ b/content/base/src/nsDOMFileReader.cpp
@@ -4,17 +4,17 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsDOMFileReader.h"
#include "nsContentCID.h"
#include "nsContentUtils.h"
#include "nsDOMClassInfoID.h"
#include "nsDOMFile.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsCharsetAlias.h"
#include "nsICharsetConverterManager.h"
#include "nsIConverterInputStream.h"
#include "nsIFile.h"
#include "nsIFileStreams.h"
#include "nsIInputStream.h"
#include "nsIMIMEService.h"
#include "nsIUnicodeDecoder.h"
--- a/content/base/src/nsDOMLists.cpp
+++ b/content/base/src/nsDOMLists.cpp
@@ -3,17 +3,17 @@
* 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/. */
/*
* Implementation of nsIDOMDOMStringList, used by various DOM stuff.
*/
#include "nsDOMLists.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsDOMClassInfoID.h"
#include "nsINode.h"
nsDOMStringList::nsDOMStringList()
{
}
nsDOMStringList::~nsDOMStringList()
--- a/content/base/src/nsDOMMutationObserver.cpp
+++ b/content/base/src/nsDOMMutationObserver.cpp
@@ -1,17 +1,17 @@
/* -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 8; -*- */
/* vim: set sw=4 ts=8 et tw=80 : */
/* 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 "nsDOMMutationObserver.h"
#include "nsDOMClassInfoID.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIClassInfo.h"
#include "nsIXPCScriptable.h"
#include "nsIScriptGlobalObject.h"
#include "nsContentUtils.h"
#include "nsThreadUtils.h"
#include "nsIDOMMutationEvent.h"
#include "nsTextFragment.h"
#include "jsapi.h"
--- a/content/base/src/nsDOMParser.cpp
+++ b/content/base/src/nsDOMParser.cpp
@@ -17,17 +17,17 @@
#include "nsDOMClassInfoID.h"
#include "nsReadableUtils.h"
#include "nsCRT.h"
#include "nsStreamUtils.h"
#include "nsThreadUtils.h"
#include "nsNetCID.h"
#include "nsContentUtils.h"
#include "nsDOMJSUtils.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIDOMWindow.h"
#include "nsPIDOMWindow.h"
#include "mozilla/AutoRestore.h"
using namespace mozilla;
nsDOMParser::nsDOMParser()
: mAttemptedInit(false)
--- a/content/base/src/nsDOMSerializer.cpp
+++ b/content/base/src/nsDOMSerializer.cpp
@@ -8,17 +8,17 @@
#include "nsDOMClassInfoID.h"
#include "nsIOutputStream.h"
#include "nsIDocument.h"
#include "nsIDOMDocument.h"
#include "nsIDocumentEncoder.h"
#include "nsString.h"
#include "nsContentCID.h"
#include "nsContentUtils.h"
-#include "nsDOMError.h"
+#include "nsError.h"
nsDOMSerializer::nsDOMSerializer()
{
}
nsDOMSerializer::~nsDOMSerializer()
{
}
--- a/content/base/src/nsDOMTokenList.cpp
+++ b/content/base/src/nsDOMTokenList.cpp
@@ -5,17 +5,17 @@
/*
* Implementation of nsIDOMDOMTokenList specified by HTML5.
*/
#include "nsDOMTokenList.h"
#include "nsAttrValue.h"
#include "nsContentUtils.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsGenericElement.h"
#include "dombindings.h"
using namespace mozilla;
using namespace mozilla::dom;
nsDOMTokenList::nsDOMTokenList(nsGenericElement* aElement, nsIAtom* aAttrAtom)
: mElement(aElement),
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -56,17 +56,17 @@
#include "nsIDOMComment.h"
#include "nsDOMDocumentType.h"
#include "nsNodeIterator.h"
#include "nsTreeWalker.h"
#include "nsIServiceManager.h"
#include "nsContentCID.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIPresShell.h"
#include "nsPresContext.h"
#include "nsIJSON.h"
#include "nsThreadUtils.h"
#include "nsNodeInfoManager.h"
#include "nsIFileChannel.h"
#include "nsIMultiPartChannel.h"
#include "nsIRefreshURI.h"
@@ -124,17 +124,16 @@
#include "nsCycleCollector.h"
#include "nsCCUncollectableMarker.h"
#include "nsIContentPolicy.h"
#include "nsContentPolicyUtils.h"
#include "nsICategoryManager.h"
#include "nsIDocumentLoaderFactory.h"
#include "nsIContentViewer.h"
#include "nsIXMLContentSink.h"
-#include "nsContentErrors.h"
#include "nsIXULDocument.h"
#include "nsIPrompt.h"
#include "nsIPropertyBag2.h"
#include "nsIDOMPageTransitionEvent.h"
#include "nsFrameLoader.h"
#include "nsEscape.h"
#include "nsObjectLoadingContent.h"
#include "nsHtml5TreeOpExecutor.h"
--- a/content/base/src/nsDocumentFragment.cpp
+++ b/content/base/src/nsDocumentFragment.cpp
@@ -8,17 +8,17 @@
*/
#include "nsIDOMDocumentFragment.h"
#include "mozilla/dom/FragmentOrElement.h"
#include "nsGenericElement.h" // for DOMCI_NODE_DATA
#include "nsINameSpaceManager.h"
#include "nsINodeInfo.h"
#include "nsNodeInfoManager.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsGkAtoms.h"
#include "nsDOMString.h"
#include "nsContentUtils.h"
using namespace mozilla;
using namespace mozilla::dom;
class nsDocumentFragment : public FragmentOrElement,
--- a/content/base/src/nsEventSource.cpp
+++ b/content/base/src/nsEventSource.cpp
@@ -28,17 +28,17 @@
#include "nsContentUtils.h"
#include "mozilla/Preferences.h"
#include "xpcpublic.h"
#include "nsCrossSiteListenerProxy.h"
#include "nsWrapperCacheInlines.h"
#include "nsDOMEventTargetHelper.h"
#include "mozilla/Attributes.h"
#include "nsDOMClassInfoID.h"
-#include "nsDOMError.h"
+#include "nsError.h"
using namespace mozilla;
#define REPLACEMENT_CHAR (PRUnichar)0xFFFD
#define BOM_CHAR (PRUnichar)0xFEFF
#define SPACE_CHAR (PRUnichar)0x0020
#define CR_CHAR (PRUnichar)0x000D
#define LF_CHAR (PRUnichar)0x000A
--- a/content/base/src/nsFrameLoader.cpp
+++ b/content/base/src/nsFrameLoader.cpp
@@ -41,17 +41,17 @@
#include "nsIScriptGlobalObject.h"
#include "nsIScriptSecurityManager.h"
#include "nsIScrollable.h"
#include "nsFrameLoader.h"
#include "nsIDOMEventTarget.h"
#include "nsIFrame.h"
#include "nsIScrollableFrame.h"
#include "nsSubDocumentFrame.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsGUIEvent.h"
#include "nsEventDispatcher.h"
#include "nsISHistory.h"
#include "nsISHistoryInternal.h"
#include "nsIDocShellHistory.h"
#include "nsIDOMHTMLDocument.h"
#include "nsIXULWindow.h"
#include "nsIEditor.h"
--- a/content/base/src/nsFrameMessageManager.cpp
+++ b/content/base/src/nsFrameMessageManager.cpp
@@ -5,17 +5,17 @@
#include "base/basictypes.h"
#include "nsFrameMessageManager.h"
#include "ContentChild.h"
#include "ContentParent.h"
#include "nsContentUtils.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIXPConnect.h"
#include "jsapi.h"
#include "nsJSUtils.h"
#include "nsJSPrincipals.h"
#include "nsNetUtil.h"
#include "nsScriptLoader.h"
#include "nsIJSContextStack.h"
#include "nsIXULRuntime.h"
--- a/content/base/src/nsGenericDOMDataNode.h
+++ b/content/base/src/nsGenericDOMDataNode.h
@@ -9,17 +9,17 @@
*/
#ifndef nsGenericDOMDataNode_h___
#define nsGenericDOMDataNode_h___
#include "nsIContent.h"
#include "nsTextFragment.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsEventListenerManager.h"
#include "nsGenericElement.h"
#include "nsCycleCollectionParticipant.h"
#include "nsISMILAttr.h"
// This bit is set to indicate that if the text node changes to
// non-whitespace, we may need to create a frame for it. This bit must
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -40,17 +40,17 @@
#include "nsDOMCID.h"
#include "nsIServiceManager.h"
#include "nsIDOMCSSStyleDeclaration.h"
#include "nsDOMCSSAttrDeclaration.h"
#include "nsINameSpaceManager.h"
#include "nsContentList.h"
#include "nsDOMTokenList.h"
#include "nsXBLPrototypeBinding.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsDOMString.h"
#include "nsIScriptSecurityManager.h"
#include "nsIDOMMutationEvent.h"
#include "nsMutationEvent.h"
#include "nsNodeUtils.h"
#include "mozilla/dom/DirectionalityUtils.h"
#include "nsDocument.h"
#include "nsAttrValueOrString.h"
--- a/content/base/src/nsINode.cpp
+++ b/content/base/src/nsINode.cpp
@@ -25,17 +25,17 @@
#include "nsContentUtils.h"
#include "nsCycleCollectionParticipant.h"
#include "nsCycleCollector.h"
#include "nsDocument.h"
#include "nsDOMAttribute.h"
#include "nsDOMAttributeMap.h"
#include "nsDOMCID.h"
#include "nsDOMCSSAttrDeclaration.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsDOMMutationObserver.h"
#include "nsDOMString.h"
#include "nsDOMTokenList.h"
#include "nsEventDispatcher.h"
#include "nsEventListenerManager.h"
#include "nsEventStateManager.h"
#include "nsFocusManager.h"
#include "nsFrameManager.h"
--- a/content/base/src/nsImageLoadingContent.cpp
+++ b/content/base/src/nsImageLoadingContent.cpp
@@ -7,17 +7,17 @@
/*
* A base class which implements nsIImageLoadingContent and can be
* subclassed by various content nodes that want to provide image
* loading functionality (eg <img>, <object>, etc).
*/
#include "nsImageLoadingContent.h"
#include "nsAutoPtr.h"
-#include "nsContentErrors.h"
+#include "nsError.h"
#include "nsIContent.h"
#include "nsIDocument.h"
#include "nsIScriptGlobalObject.h"
#include "nsIDOMWindow.h"
#include "nsServiceManagerUtils.h"
#include "nsContentPolicyUtils.h"
#include "nsIURI.h"
#include "nsILoadGroup.h"
--- a/content/base/src/nsNodeIterator.cpp
+++ b/content/base/src/nsNodeIterator.cpp
@@ -7,17 +7,17 @@
/*
* Implementation of DOM Traversal's nsIDOMNodeIterator
*/
#include "nsNodeIterator.h"
#include "nsIDOMNode.h"
#include "nsIDOMNodeFilter.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIContent.h"
#include "nsIDocument.h"
#include "nsDOMClassInfoID.h"
#include "nsContentUtils.h"
#include "nsCOMPtr.h"
/*
--- a/content/base/src/nsObjectLoadingContent.cpp
+++ b/content/base/src/nsObjectLoadingContent.cpp
@@ -33,17 +33,17 @@
#include "nsIURL.h"
#include "nsIWebNavigation.h"
#include "nsIWebNavigationInfo.h"
#include "nsIScriptChannel.h"
#include "nsIBlocklistService.h"
#include "nsIAsyncVerifyRedirectCallback.h"
#include "nsIAppShell.h"
-#include "nsPluginError.h"
+#include "nsError.h"
// Util headers
#include "prenv.h"
#include "prlog.h"
#include "nsAutoPtr.h"
#include "nsCURILoader.h"
#include "nsContentPolicyUtils.h"
--- a/content/base/src/nsPropertyTable.cpp
+++ b/content/base/src/nsPropertyTable.cpp
@@ -17,17 +17,17 @@
* nsPropertyTable allows a set of arbitrary key/value pairs to be stored
* for any number of nodes, in a global hashtable rather than on the nodes
* themselves. Nodes can be any type of object; the hashtable keys are
* nsIAtom pointers, and the values are void pointers.
*/
#include "nsPropertyTable.h"
#include "pldhash.h"
-#include "nsContentErrors.h"
+#include "nsError.h"
#include "nsIAtom.h"
struct PropertyListMapEntry : public PLDHashEntryHdr {
const void *key;
void *value;
};
//----------------------------------------------------------------------
--- a/content/base/src/nsRange.cpp
+++ b/content/base/src/nsRange.cpp
@@ -14,17 +14,17 @@
#include "nsReadableUtils.h"
#include "nsIDOMNode.h"
#include "nsIDOMDocument.h"
#include "nsIDOMDocumentFragment.h"
#include "nsIDOMDocumentType.h"
#include "nsIContent.h"
#include "nsIDocument.h"
#include "nsIDOMText.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIContentIterator.h"
#include "nsIDOMNodeList.h"
#include "nsGkAtoms.h"
#include "nsContentUtils.h"
#include "nsGenericDOMDataNode.h"
#include "nsClientRect.h"
#include "nsLayoutUtils.h"
#include "nsTextFrame.h"
--- a/content/base/src/nsScriptLoader.cpp
+++ b/content/base/src/nsScriptLoader.cpp
@@ -26,17 +26,17 @@
#include "nsIHttpChannel.h"
#include "nsIScriptElement.h"
#include "nsIDOMHTMLScriptElement.h"
#include "nsIDocShell.h"
#include "nsContentUtils.h"
#include "nsUnicharUtils.h"
#include "nsAutoPtr.h"
#include "nsIXPConnect.h"
-#include "nsContentErrors.h"
+#include "nsError.h"
#include "nsThreadUtils.h"
#include "nsDocShellCID.h"
#include "nsIContentSecurityPolicy.h"
#include "prlog.h"
#include "nsIChannelPolicy.h"
#include "nsChannelPolicy.h"
#include "nsCRT.h"
#include "nsContentCreatorFunctions.h"
--- a/content/base/src/nsTraversal.cpp
+++ b/content/base/src/nsTraversal.cpp
@@ -3,17 +3,17 @@
* 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 "nsTraversal.h"
#include "nsIDOMNode.h"
#include "nsIDOMNodeFilter.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsINode.h"
#include "nsGkAtoms.h"
nsTraversal::nsTraversal(nsINode *aRoot,
PRUint32 aWhatToShow,
nsIDOMNodeFilter *aFilter) :
mRoot(aRoot),
--- a/content/base/src/nsTreeWalker.cpp
+++ b/content/base/src/nsTreeWalker.cpp
@@ -7,17 +7,17 @@
/*
* Implementation of DOM Traversal's nsIDOMTreeWalker
*/
#include "nsTreeWalker.h"
#include "nsIDOMNode.h"
#include "nsIDOMNodeFilter.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsINode.h"
#include "nsDOMClassInfoID.h"
#include "nsContentUtils.h"
/*
* Factories, constructors and destructors
*/
--- a/content/base/src/nsWebSocket.cpp
+++ b/content/base/src/nsWebSocket.cpp
@@ -10,17 +10,17 @@
#include "nsIScriptGlobalObject.h"
#include "nsIDOMWindow.h"
#include "nsIDocument.h"
#include "nsXPCOM.h"
#include "nsIXPConnect.h"
#include "nsContentUtils.h"
#include "nsEventDispatcher.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIScriptObjectPrincipal.h"
#include "nsDOMClassInfoID.h"
#include "jsapi.h"
#include "nsIURL.h"
#include "nsICharsetConverterManager.h"
#include "nsIUnicodeEncoder.h"
#include "nsThreadUtils.h"
#include "nsIDOMMessageEvent.h"
@@ -37,17 +37,16 @@
#include "nsJSUtils.h"
#include "nsIScriptError.h"
#include "nsNetUtil.h"
#include "nsILoadGroup.h"
#include "mozilla/Preferences.h"
#include "nsDOMLists.h"
#include "xpcpublic.h"
#include "nsContentPolicyUtils.h"
-#include "nsContentErrors.h"
#include "jsfriendapi.h"
#include "prmem.h"
#include "nsDOMFile.h"
#include "nsWrapperCacheInlines.h"
#include "nsDOMEventTargetHelper.h"
#include "nsIObserverService.h"
#include "GeneratedEvents.h"
--- a/content/base/src/nsXMLHttpRequest.cpp
+++ b/content/base/src/nsXMLHttpRequest.cpp
@@ -46,20 +46,19 @@
#include "nsContentUtils.h"
#include "nsEventDispatcher.h"
#include "nsDOMJSUtils.h"
#include "nsCOMArray.h"
#include "nsIScriptableUConv.h"
#include "nsCycleCollectionParticipant.h"
#include "nsIContentPolicy.h"
#include "nsContentPolicyUtils.h"
-#include "nsContentErrors.h"
+#include "nsError.h"
#include "nsLayoutStatics.h"
#include "nsCrossSiteListenerProxy.h"
-#include "nsDOMError.h"
#include "nsIHTMLDocument.h"
#include "nsIMultiPartChannel.h"
#include "nsIScriptObjectPrincipal.h"
#include "nsIStorageStream.h"
#include "nsIPromptFactory.h"
#include "nsIWindowWatcher.h"
#include "nsCharSeparatedTokenizer.h"
#include "nsIConsoleService.h"
--- a/content/canvas/src/CustomQS_Canvas2D.h
+++ b/content/canvas/src/CustomQS_Canvas2D.h
@@ -1,14 +1,14 @@
/* -*- Mode: C++; tab-width: 40; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* 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 "nsDOMError.h"
+#include "nsError.h"
#include "nsIDOMCanvasRenderingContext2D.h"
#include "mozilla/CheckedInt.h"
#include "nsMathUtils.h"
#include "CustomQS_Canvas.h"
#include "jsapi.h"
#include "jsfriendapi.h"
--- a/content/canvas/src/WebGLContext.cpp
+++ b/content/canvas/src/WebGLContext.cpp
@@ -6,17 +6,17 @@
#include "WebGLContext.h"
#include "WebGLExtensions.h"
#include "nsIConsoleService.h"
#include "nsServiceManagerUtils.h"
#include "nsIClassInfoImpl.h"
#include "nsContentUtils.h"
#include "nsIXPConnect.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIGfxInfo.h"
#include "nsIPropertyBag.h"
#include "nsIVariant.h"
#include "imgIEncoder.h"
#include "gfxContext.h"
--- a/content/canvas/src/WebGLContextGL.cpp
+++ b/content/canvas/src/WebGLContextGL.cpp
@@ -8,17 +8,17 @@
#include "nsString.h"
#include "nsDebug.h"
#include "gfxImageSurface.h"
#include "gfxContext.h"
#include "gfxPlatform.h"
#include "nsContentUtils.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsLayoutUtils.h"
#include "CanvasUtils.h"
#include "jsfriendapi.h"
#include "WebGLTexelConversions.h"
#include "WebGLValidateStrings.h"
--- a/content/canvas/src/nsCanvasRenderingContext2D.cpp
+++ b/content/canvas/src/nsCanvasRenderingContext2D.cpp
@@ -21,17 +21,17 @@
#include "nsICanvasRenderingContextInternal.h"
#include "nsHTMLCanvasElement.h"
#include "nsSVGEffects.h"
#include "nsPresContext.h"
#include "nsIPresShell.h"
#include "nsIVariant.h"
#include "nsIInterfaceRequestorUtils.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIScriptError.h"
#include "nsCSSParser.h"
#include "mozilla/css/StyleRule.h"
#include "mozilla/css/Declaration.h"
#include "nsComputedDOMStyle.h"
#include "nsStyleSet.h"
--- a/content/canvas/src/nsCanvasRenderingContext2DAzure.cpp
+++ b/content/canvas/src/nsCanvasRenderingContext2DAzure.cpp
@@ -20,17 +20,17 @@
#include "nsHTMLCanvasElement.h"
#include "nsSVGEffects.h"
#include "nsPresContext.h"
#include "nsIPresShell.h"
#include "nsIVariant.h"
#include "nsIInterfaceRequestorUtils.h"
#include "nsIFrame.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIScriptError.h"
#include "nsCSSParser.h"
#include "mozilla/css/StyleRule.h"
#include "mozilla/css/Declaration.h"
#include "nsComputedDOMStyle.h"
#include "nsStyleSet.h"
--- a/content/events/src/nsDOMDataTransfer.cpp
+++ b/content/events/src/nsDOMDataTransfer.cpp
@@ -12,17 +12,17 @@
#include "nsIServiceManager.h"
#include "nsIInterfaceRequestorUtils.h"
#include "nsIVariant.h"
#include "nsISupportsPrimitives.h"
#include "nsDOMClassInfoID.h"
#include "nsIScriptSecurityManager.h"
#include "nsDOMLists.h"
#include "nsGUIEvent.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIDragService.h"
#include "nsIScriptableRegion.h"
#include "nsContentUtils.h"
#include "nsIContent.h"
#include "nsCRT.h"
#include "nsIScriptObjectPrincipal.h"
#include "nsIWebNavigation.h"
#include "nsIDocShellTreeItem.h"
--- a/content/events/src/nsDOMEvent.cpp
+++ b/content/events/src/nsDOMEvent.cpp
@@ -5,17 +5,17 @@
#include "base/basictypes.h"
/* This must occur *after* base/basictypes.h to avoid typedefs conflicts. */
#include "mozilla/Util.h"
#include "IPC/IPCMessageUtils.h"
#include "nsCOMPtr.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsDOMEvent.h"
#include "nsEventStateManager.h"
#include "nsIFrame.h"
#include "nsIContent.h"
#include "nsIPresShell.h"
#include "nsIDocument.h"
#include "nsIInterfaceRequestor.h"
#include "nsIInterfaceRequestorUtils.h"
--- a/content/events/src/nsDOMNotifyAudioAvailableEvent.cpp
+++ b/content/events/src/nsDOMNotifyAudioAvailableEvent.cpp
@@ -1,15 +1,15 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim:set ts=2 sw=2 sts=2 et cindent: */
/* 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 "nsDOMError.h"
+#include "nsError.h"
#include "nsDOMNotifyAudioAvailableEvent.h"
#include "nsDOMClassInfoID.h" // DOMCI_DATA, NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO
#include "nsContentUtils.h" // NS_DROP_JS_OBJECTS
#include "jsfriendapi.h"
nsDOMNotifyAudioAvailableEvent::nsDOMNotifyAudioAvailableEvent(nsPresContext* aPresContext,
nsEvent* aEvent,
PRUint32 aEventType,
--- a/content/events/src/nsEventDispatcher.cpp
+++ b/content/events/src/nsEventDispatcher.cpp
@@ -4,17 +4,17 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsEventDispatcher.h"
#include "nsDOMEvent.h"
#include "nsIDOMEventTarget.h"
#include "nsPresContext.h"
#include "nsEventListenerManager.h"
#include "nsContentUtils.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "mozilla/FunctionTimer.h"
#include "nsMutationEvent.h"
#include NEW_H
#include "nsFixedSizeAllocator.h"
#include "nsINode.h"
#include "nsPIDOMWindow.h"
#include "nsFrameLoader.h"
#include "nsDOMTouchEvent.h"
--- a/content/events/src/nsEventListenerManager.cpp
+++ b/content/events/src/nsEventListenerManager.cpp
@@ -27,17 +27,17 @@
#include "nsIContent.h"
#include "mozilla/dom/Element.h"
#include "nsIFrame.h"
#include "nsIView.h"
#include "nsIViewManager.h"
#include "nsCOMPtr.h"
#include "nsIServiceManager.h"
#include "nsIScriptSecurityManager.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIJSContextStack.h"
#include "nsIDocument.h"
#include "nsIPresShell.h"
#include "nsMutationEvent.h"
#include "nsIXPConnect.h"
#include "nsDOMCID.h"
#include "nsFocusManager.h"
#include "nsIDOMElement.h"
--- a/content/html/content/public/nsHTMLCanvasElement.h
+++ b/content/html/content/public/nsHTMLCanvasElement.h
@@ -5,17 +5,17 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#if !defined(nsHTMLCanvasElement_h__)
#define nsHTMLCanvasElement_h__
#include "nsIDOMHTMLCanvasElement.h"
#include "nsGenericHTMLElement.h"
#include "nsGkAtoms.h"
#include "nsSize.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsNodeInfoManager.h"
#include "nsICanvasElementExternal.h"
#include "nsLayoutUtils.h"
class nsICanvasRenderingContextInternal;
class nsIDOMFile;
class nsIPropertyBag;
--- a/content/html/content/src/nsDOMStringMap.cpp
+++ b/content/html/content/src/nsDOMStringMap.cpp
@@ -1,15 +1,15 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set ts=2 et sw=2 tw=80: */
/* 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 "nsDOMError.h"
+#include "nsError.h"
#include "nsDOMStringMap.h"
#include "nsDOMClassInfoID.h"
#include "nsGenericHTMLElement.h"
#include "nsContentUtils.h"
DOMCI_DATA(DOMStringMap, nsDOMStringMap)
--- a/content/html/content/src/nsFormSubmission.cpp
+++ b/content/html/content/src/nsFormSubmission.cpp
@@ -10,17 +10,17 @@
#include "nsCOMPtr.h"
#include "nsIForm.h"
#include "nsILinkHandler.h"
#include "nsIDocument.h"
#include "nsGkAtoms.h"
#include "nsIFormControl.h"
#include "nsIDOMHTMLFormElement.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsGenericHTMLElement.h"
#include "nsISaveAsCharset.h"
#include "nsIFile.h"
#include "nsIDOMFile.h"
#include "nsDirectoryServiceDefs.h"
#include "nsStringStream.h"
#include "nsIURI.h"
#include "nsIURL.h"
--- a/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/content/html/content/src/nsGenericHTMLElement.cpp
@@ -39,17 +39,17 @@
#include "nsIViewManager.h"
#include "nsIWidget.h"
#include "nsRange.h"
#include "nsIPresShell.h"
#include "nsPresContext.h"
#include "nsIDocShell.h"
#include "nsIDocShellTreeItem.h"
#include "nsINameSpaceManager.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsScriptLoader.h"
#include "nsRuleData.h"
#include "nsPresState.h"
#include "nsILayoutHistoryState.h"
#include "nsHTMLParts.h"
#include "nsContentUtils.h"
--- a/content/html/content/src/nsHTMLAudioElement.cpp
+++ b/content/html/content/src/nsHTMLAudioElement.cpp
@@ -1,14 +1,14 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim:set ts=2 sw=2 sts=2 et cindent: */
/* 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 "nsDOMError.h"
+#include "nsError.h"
#include "nsIDOMHTMLAudioElement.h"
#include "nsHTMLAudioElement.h"
#include "nsGenericHTMLElement.h"
#include "nsGkAtoms.h"
#include "nsIDocument.h"
#include "jsfriendapi.h"
#include "nsContentUtils.h"
--- a/content/html/content/src/nsHTMLButtonElement.cpp
+++ b/content/html/content/src/nsHTMLButtonElement.cpp
@@ -20,17 +20,17 @@
#include "nsIFormControlFrame.h"
#include "nsIDOMEvent.h"
#include "nsIDocument.h"
#include "nsGUIEvent.h"
#include "nsUnicharUtils.h"
#include "nsLayoutUtils.h"
#include "nsEventDispatcher.h"
#include "nsPresState.h"
-#include "nsLayoutErrors.h"
+#include "nsError.h"
#include "nsFocusManager.h"
#include "nsHTMLFormElement.h"
#include "nsIConstraintValidation.h"
#include "mozAutoDocUpdate.h"
using namespace mozilla::dom;
#define NS_IN_SUBMIT_CLICK (1 << 0)
--- a/content/html/content/src/nsHTMLFormElement.cpp
+++ b/content/html/content/src/nsHTMLFormElement.cpp
@@ -7,17 +7,17 @@
#include "nsIDOMEventTarget.h"
#include "nsEventStateManager.h"
#include "nsEventStates.h"
#include "nsGkAtoms.h"
#include "nsStyleConsts.h"
#include "nsPresContext.h"
#include "nsIDocument.h"
#include "nsIFormControlFrame.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsContentUtils.h"
#include "nsInterfaceHashtable.h"
#include "nsContentList.h"
#include "nsGUIEvent.h"
#include "nsCOMArray.h"
#include "nsAutoPtr.h"
#include "nsTArray.h"
#include "nsIMutableArray.h"
--- a/content/html/content/src/nsHTMLFrameElement.cpp
+++ b/content/html/content/src/nsHTMLFrameElement.cpp
@@ -3,17 +3,17 @@
* 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 "mozilla/Util.h"
#include "nsIDOMHTMLFrameElement.h"
#include "nsGenericHTMLFrameElement.h"
#include "nsGkAtoms.h"
-#include "nsDOMError.h"
+#include "nsError.h"
class nsIDOMDocument;
using namespace mozilla;
using namespace mozilla::dom;
class nsHTMLFrameElement : public nsGenericHTMLFrameElement,
public nsIDOMHTMLFrameElement
--- a/content/html/content/src/nsHTMLIFrameElement.cpp
+++ b/content/html/content/src/nsHTMLIFrameElement.cpp
@@ -4,17 +4,17 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/Util.h"
#include "nsHTMLIFrameElement.h"
#include "nsIDOMSVGDocument.h"
#include "nsGkAtoms.h"
#include "nsMappedAttributes.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsRuleData.h"
#include "nsStyleConsts.h"
using namespace mozilla;
using namespace mozilla::dom;
NS_IMPL_NS_NEW_HTML_ELEMENT_CHECK_PARSER(IFrame)
--- a/content/html/content/src/nsHTMLInputElement.cpp
+++ b/content/html/content/src/nsHTMLInputElement.cpp
@@ -31,25 +31,24 @@
#include "nsIDocument.h"
#include "nsIPresShell.h"
#include "nsIFormControlFrame.h"
#include "nsITextControlFrame.h"
#include "nsIFrame.h"
#include "nsEventStates.h"
#include "nsIServiceManager.h"
#include "nsIScriptSecurityManager.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIEditor.h"
#include "nsGUIEvent.h"
#include "nsIIOService.h"
#include "nsDocument.h"
#include "nsAttrValueOrString.h"
#include "nsPresState.h"
-#include "nsLayoutErrors.h"
#include "nsIDOMEvent.h"
#include "nsIDOMNodeList.h"
#include "nsIDOMHTMLCollection.h"
#include "nsLinebreakConverter.h" //to strip out carriage returns
#include "nsReadableUtils.h"
#include "nsUnicharUtils.h"
#include "nsEventDispatcher.h"
#include "nsLayoutUtils.h"
--- a/content/html/content/src/nsHTMLMediaElement.cpp
+++ b/content/html/content/src/nsHTMLMediaElement.cpp
@@ -13,17 +13,17 @@
#include "nsGenericHTMLElement.h"
#include "nsPresContext.h"
#include "nsIPresShell.h"
#include "nsGkAtoms.h"
#include "nsSize.h"
#include "nsIFrame.h"
#include "nsIDocument.h"
#include "nsIDOMDocument.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsNodeInfoManager.h"
#include "nsNetUtil.h"
#include "nsXPCOMStrings.h"
#include "xpcpublic.h"
#include "nsThreadUtils.h"
#include "nsIThreadInternal.h"
#include "nsContentUtils.h"
#include "nsIRequest.h"
@@ -39,17 +39,16 @@
#include "nsMediaError.h"
#include "nsICategoryManager.h"
#include "nsCharSeparatedTokenizer.h"
#include "MediaResource.h"
#include "nsIDOMHTMLVideoElement.h"
#include "nsIContentPolicy.h"
#include "nsContentPolicyUtils.h"
-#include "nsContentErrors.h"
#include "nsCrossSiteListenerProxy.h"
#include "nsCycleCollectionParticipant.h"
#include "nsICachingChannel.h"
#include "nsLayoutUtils.h"
#include "nsVideoFrame.h"
#include "BasicLayers.h"
#include <limits>
#include "nsIDocShellTreeItem.h"
--- a/content/html/content/src/nsHTMLMenuElement.cpp
+++ b/content/html/content/src/nsHTMLMenuElement.cpp
@@ -6,17 +6,17 @@
#include "nsHTMLMenuElement.h"
#include "nsIDOMHTMLMenuItemElement.h"
#include "nsXULContextMenuBuilder.h"
#include "nsGUIEvent.h"
#include "nsEventDispatcher.h"
#include "nsHTMLMenuItemElement.h"
#include "nsContentUtils.h"
-#include "nsDOMError.h"
+#include "nsError.h"
enum MenuType
{
MENU_TYPE_CONTEXT = 1,
MENU_TYPE_TOOLBAR,
MENU_TYPE_LIST
};
--- a/content/html/content/src/nsHTMLObjectElement.cpp
+++ b/content/html/content/src/nsHTMLObjectElement.cpp
@@ -5,17 +5,17 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/Util.h"
#include "nsAutoPtr.h"
#include "nsGenericHTMLElement.h"
#include "nsObjectLoadingContent.h"
#include "nsGkAtoms.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIDocument.h"
#include "nsIDOMDocument.h"
#include "nsIDOMSVGDocument.h"
#include "nsIDOMGetSVGDocument.h"
#include "nsIDOMHTMLObjectElement.h"
#include "nsFormSubmission.h"
#include "nsIObjectFrame.h"
#include "nsNPAPIPluginInstance.h"
--- a/content/html/content/src/nsHTMLScriptElement.cpp
+++ b/content/html/content/src/nsHTMLScriptElement.cpp
@@ -14,17 +14,17 @@
#include "nsNetUtil.h"
#include "nsContentUtils.h"
#include "nsUnicharUtils.h" // for nsCaseInsensitiveStringComparator()
#include "jsapi.h"
#include "nsIScriptContext.h"
#include "nsIScriptGlobalObject.h"
#include "nsIXPConnect.h"
#include "nsServiceManagerUtils.h"
-#include "nsContentErrors.h"
+#include "nsError.h"
#include "nsIArray.h"
#include "nsTArray.h"
#include "nsDOMJSUtils.h"
using namespace mozilla;
using namespace mozilla::dom;
class nsHTMLScriptElement : public nsGenericHTMLElement,
--- a/content/html/content/src/nsHTMLSelectElement.cpp
+++ b/content/html/content/src/nsHTMLSelectElement.cpp
@@ -24,17 +24,17 @@
// Notify/query select frame for selectedIndex
#include "nsIDocument.h"
#include "nsIFormControlFrame.h"
#include "nsIComboboxControlFrame.h"
#include "nsIListControlFrame.h"
#include "nsIFrame.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsServiceManagerUtils.h"
#include "nsRuleData.h"
#include "nsEventDispatcher.h"
#include "mozilla/dom/Element.h"
#include "mozAutoDocUpdate.h"
#include "dombindings.h"
using namespace mozilla;
--- a/content/html/content/src/nsHTMLSelectElement.h
+++ b/content/html/content/src/nsHTMLSelectElement.h
@@ -16,17 +16,17 @@
#include "nsIHTMLCollection.h"
#include "nsIConstraintValidation.h"
// PresState
#include "nsXPCOM.h"
#include "nsPresState.h"
#include "nsIComponentManager.h"
#include "nsCheapSets.h"
-#include "nsLayoutErrors.h"
+#include "nsError.h"
#include "nsHTMLOptionElement.h"
#include "nsHTMLFormElement.h"
class nsHTMLSelectElement;
/**
* The collection of options in the select (what you get back when you do
* select.options in DOM)
--- a/content/html/content/src/nsHTMLSharedObjectElement.cpp
+++ b/content/html/content/src/nsHTMLSharedObjectElement.cpp
@@ -4,17 +4,17 @@
* 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 "mozilla/Util.h"
#include "nsGenericHTMLElement.h"
#include "nsObjectLoadingContent.h"
#include "nsGkAtoms.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIDocument.h"
#include "nsIDOMDocument.h"
#include "nsIDOMHTMLAppletElement.h"
#include "nsIDOMHTMLEmbedElement.h"
#include "nsThreadUtils.h"
#include "nsIDOMGetSVGDocument.h"
#include "nsIDOMSVGDocument.h"
#include "nsIScriptError.h"
--- a/content/html/content/src/nsHTMLTableElement.cpp
+++ b/content/html/content/src/nsHTMLTableElement.cpp
@@ -5,17 +5,17 @@
#include "mozilla/Util.h"
#include "nsHTMLTableElement.h"
#include "nsIDOMHTMLTableCaptionElem.h"
#include "nsIDOMHTMLTableSectionElem.h"
#include "nsCOMPtr.h"
#include "nsIDOMEventTarget.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsContentList.h"
#include "nsGenericHTMLElement.h"
#include "nsGkAtoms.h"
#include "nsStyleConsts.h"
#include "nsPresContext.h"
#include "nsHTMLParts.h"
#include "nsRuleData.h"
#include "nsStyleContext.h"
--- a/content/html/content/src/nsHTMLTableRowElement.cpp
+++ b/content/html/content/src/nsHTMLTableRowElement.cpp
@@ -5,17 +5,17 @@
#include "mozilla/Util.h"
#include "nsIDOMHTMLTableRowElement.h"
#include "nsIDOMHTMLTableElement.h"
#include "nsIDOMHTMLTableSectionElem.h"
#include "nsIDOMHTMLTableCellElement.h"
#include "nsIDOMEventTarget.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsMappedAttributes.h"
#include "nsGenericHTMLElement.h"
#include "nsContentList.h"
#include "nsGkAtoms.h"
#include "nsStyleConsts.h"
#include "nsHTMLParts.h"
#include "nsRuleData.h"
#include "nsContentUtils.h"
--- a/content/html/content/src/nsHTMLTableSectionElement.cpp
+++ b/content/html/content/src/nsHTMLTableSectionElement.cpp
@@ -9,17 +9,17 @@
#include "nsIDOMEventTarget.h"
#include "nsMappedAttributes.h"
#include "nsGenericHTMLElement.h"
#include "nsGkAtoms.h"
#include "nsHTMLParts.h"
#include "nsStyleConsts.h"
#include "nsContentList.h"
#include "nsRuleData.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsContentUtils.h"
using namespace mozilla;
// you will see the phrases "rowgroup" and "section" used interchangably
class nsHTMLTableSectionElement : public nsGenericHTMLElement,
public nsIDOMHTMLTableSectionElement
--- a/content/html/content/src/nsHTMLTextAreaElement.cpp
+++ b/content/html/content/src/nsHTMLTextAreaElement.cpp
@@ -31,19 +31,18 @@
#include "nsLinebreakConverter.h"
#include "nsIDocument.h"
#include "nsIFrame.h"
#include "nsGUIEvent.h"
#include "nsPresState.h"
#include "nsReadableUtils.h"
#include "nsEventDispatcher.h"
#include "nsLayoutUtils.h"
-#include "nsLayoutErrors.h"
+#include "nsError.h"
#include "nsStubMutationObserver.h"
-#include "nsDOMError.h"
#include "mozAutoDocUpdate.h"
#include "nsISupportsPrimitives.h"
#include "nsContentCreatorFunctions.h"
#include "nsIConstraintValidation.h"
#include "nsHTMLFormElement.h"
#include "nsTextEditorState.h"
--- a/content/html/content/src/nsHTMLVideoElement.cpp
+++ b/content/html/content/src/nsHTMLVideoElement.cpp
@@ -7,17 +7,17 @@
#include "mozilla/Util.h"
#include "nsIDOMHTMLVideoElement.h"
#include "nsIDOMHTMLSourceElement.h"
#include "nsHTMLVideoElement.h"
#include "nsGenericHTMLElement.h"
#include "nsGkAtoms.h"
#include "nsSize.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsNodeInfoManager.h"
#include "plbase64.h"
#include "nsNetUtil.h"
#include "prmem.h"
#include "nsXPCOMStrings.h"
#include "prlock.h"
#include "nsThreadUtils.h"
--- a/content/html/content/src/nsTimeRanges.cpp
+++ b/content/html/content/src/nsTimeRanges.cpp
@@ -1,17 +1,17 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim:set ts=2 sw=2 sts=2 et cindent: */
/* 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 "nsTimeRanges.h"
#include "nsDOMClassInfoID.h"
-#include "nsDOMError.h"
+#include "nsError.h"
NS_IMPL_ADDREF(nsTimeRanges)
NS_IMPL_RELEASE(nsTimeRanges)
DOMCI_DATA(TimeRanges, nsTimeRanges)
NS_INTERFACE_MAP_BEGIN(nsTimeRanges)
NS_INTERFACE_MAP_ENTRY(nsISupports)
--- a/content/html/document/src/ImageDocument.cpp
+++ b/content/html/document/src/ImageDocument.cpp
@@ -25,17 +25,17 @@
#include "nsAutoPtr.h"
#include "nsStyleSet.h"
#include "nsIChannel.h"
#include "nsIContentPolicy.h"
#include "nsContentPolicyUtils.h"
#include "nsPIDOMWindow.h"
#include "nsIDOMElement.h"
#include "nsIDOMHTMLElement.h"
-#include "nsContentErrors.h"
+#include "nsError.h"
#include "nsURILoader.h"
#include "nsIDocShell.h"
#include "nsIContentViewer.h"
#include "nsIMarkupDocumentViewer.h"
#include "nsIDocShellTreeItem.h"
#include "nsThreadUtils.h"
#include "nsIScrollableFrame.h"
#include "nsContentUtils.h"
--- a/content/html/document/src/nsHTMLContentSink.cpp
+++ b/content/html/document/src/nsHTMLContentSink.cpp
@@ -61,17 +61,17 @@
#include "nsTextFragment.h"
#include "nsIScriptGlobalObject.h"
#include "nsIScriptGlobalObjectOwner.h"
#include "nsIParserService.h"
#include "nsIStyleSheetLinkingElement.h"
#include "nsITimer.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsContentPolicyUtils.h"
#include "nsIScriptContext.h"
#include "nsStyleLinkElement.h"
#include "nsWeakReference.h" // nsHTMLElementFactory supports weak references
#include "nsIPrompt.h"
#include "nsLayoutCID.h"
#include "nsIDocShellTreeItem.h"
--- a/content/html/document/src/nsHTMLDocument.cpp
+++ b/content/html/document/src/nsHTMLDocument.cpp
@@ -35,17 +35,17 @@
#include "nsIDocShellTreeItem.h"
#include "nsDocShellLoadTypes.h"
#include "nsIWebNavigation.h"
#include "nsIBaseWindow.h"
#include "nsIWebShellServices.h"
#include "nsIScriptContext.h"
#include "nsIXPConnect.h"
#include "nsContentList.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIPrincipal.h"
#include "nsJSPrincipals.h"
#include "nsIScriptSecurityManager.h"
#include "nsAttrName.h"
#include "nsNodeUtils.h"
#include "nsNetCID.h"
#include "nsICookieService.h"
--- a/content/media/MediaResource.cpp
+++ b/content/media/MediaResource.cpp
@@ -17,17 +17,17 @@
#include "nsISeekableStream.h"
#include "nsIInputStream.h"
#include "nsIOutputStream.h"
#include "nsIRequestObserver.h"
#include "nsIStreamListener.h"
#include "nsIScriptSecurityManager.h"
#include "nsCrossSiteListenerProxy.h"
#include "nsHTMLMediaElement.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsICachingChannel.h"
#include "nsURILoader.h"
#include "nsIAsyncVerifyRedirectCallback.h"
#include "mozilla/Util.h" // for DebugOnly
#include "nsContentUtils.h"
static const PRUint32 HTTP_OK_CODE = 200;
static const PRUint32 HTTP_PARTIAL_RESPONSE_CODE = 206;
--- a/content/media/nsMediaDecoder.cpp
+++ b/content/media/nsMediaDecoder.cpp
@@ -3,17 +3,17 @@
/* 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 "nsMediaDecoder.h"
#include "MediaResource.h"
#include "nsHTMLMediaElement.h"
-#include "nsDOMError.h"
+#include "nsError.h"
using namespace mozilla;
// Number of milliseconds between progress events as defined by spec
static const PRUint32 PROGRESS_MS = 350;
// Number of milliseconds of no data before a stall event is fired as defined by spec
static const PRUint32 STALL_MS = 3000;
--- a/content/smil/nsSMILMappedAttribute.cpp
+++ b/content/smil/nsSMILMappedAttribute.cpp
@@ -1,17 +1,17 @@
/* -*- Mode: C++; 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/. */
/* representation of a SMIL-animatable mapped attribute on an element */
#include "nsSMILMappedAttribute.h"
#include "nsAttrValue.h"
-#include "nsContentErrors.h" // For NS_PROPTABLE_PROP_OVERWRITTEN
+#include "nsError.h" // For NS_PROPTABLE_PROP_OVERWRITTEN
#include "nsSMILValue.h"
#include "nsSMILCSSValueType.h"
#include "nsIDocument.h"
#include "nsIPresShell.h"
#include "nsCSSProps.h"
#include "mozilla/dom/Element.h"
// Callback function, for freeing string buffers stored in property table
--- a/content/svg/content/src/DOMSVGLength.cpp
+++ b/content/svg/content/src/DOMSVGLength.cpp
@@ -5,17 +5,17 @@
#include "DOMSVGLength.h"
#include "DOMSVGLengthList.h"
#include "DOMSVGAnimatedLengthList.h"
#include "SVGLength.h"
#include "SVGAnimatedLengthList.h"
#include "nsSVGElement.h"
#include "nsIDOMSVGLength.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsMathUtils.h"
// See the architecture comment in DOMSVGAnimatedLengthList.h.
namespace mozilla {
// We could use NS_IMPL_CYCLE_COLLECTION_1, except that in Unlink() we need to
// clear our list's weak ref to us to be safe. (The other option would be to
--- a/content/svg/content/src/DOMSVGLengthList.cpp
+++ b/content/svg/content/src/DOMSVGLengthList.cpp
@@ -1,17 +1,17 @@
/* -*- Mode: C++; 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 "nsSVGElement.h"
#include "DOMSVGLengthList.h"
#include "DOMSVGLength.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "SVGAnimatedLengthList.h"
#include "nsCOMPtr.h"
#include "nsContentUtils.h"
#include "dombindings.h"
// See the comment in this file's header.
// local helper functions
--- a/content/svg/content/src/DOMSVGMatrix.cpp
+++ b/content/svg/content/src/DOMSVGMatrix.cpp
@@ -1,16 +1,16 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
* vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
* 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 "DOMSVGMatrix.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include <math.h>
#include "nsContentUtils.h"
const double radPerDegree = 2.0*3.1415926535 / 360.0;
namespace mozilla {
//----------------------------------------------------------------------
--- a/content/svg/content/src/DOMSVGNumber.cpp
+++ b/content/svg/content/src/DOMSVGNumber.cpp
@@ -4,17 +4,17 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "DOMSVGNumber.h"
#include "DOMSVGNumberList.h"
#include "DOMSVGAnimatedNumberList.h"
#include "SVGAnimatedNumberList.h"
#include "nsSVGElement.h"
#include "nsIDOMSVGNumber.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsContentUtils.h"
// See the architecture comment in DOMSVGAnimatedNumberList.h.
using namespace mozilla;
// We could use NS_IMPL_CYCLE_COLLECTION_1, except that in Unlink() we need to
// clear our list's weak ref to us to be safe. (The other option would be to
--- a/content/svg/content/src/DOMSVGNumberList.cpp
+++ b/content/svg/content/src/DOMSVGNumberList.cpp
@@ -1,17 +1,17 @@
/* -*- Mode: C++; 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 "nsSVGElement.h"
#include "DOMSVGNumberList.h"
#include "DOMSVGNumber.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "SVGAnimatedNumberList.h"
#include "nsCOMPtr.h"
#include "nsContentUtils.h"
#include "dombindings.h"
// See the comment in this file's header.
namespace mozilla {
--- a/content/svg/content/src/DOMSVGPathSeg.cpp
+++ b/content/svg/content/src/DOMSVGPathSeg.cpp
@@ -6,17 +6,17 @@
#include "mozilla/Util.h"
#include "DOMSVGPathSeg.h"
#include "DOMSVGPathSegList.h"
#include "SVGPathSegUtils.h"
#include "SVGAnimatedPathSegList.h"
#include "nsSVGElement.h"
#include "nsIDOMSVGPathSeg.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsContentUtils.h"
// See the architecture comment in DOMSVGPathSegList.h.
using namespace mozilla;
// We could use NS_IMPL_CYCLE_COLLECTION_1, except that in Unlink() we need to
// clear our list's weak ref to us to be safe. (The other option would be to
--- a/content/svg/content/src/DOMSVGPathSegList.cpp
+++ b/content/svg/content/src/DOMSVGPathSegList.cpp
@@ -1,17 +1,17 @@
/* -*- Mode: C++; 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 "nsSVGElement.h"
#include "DOMSVGPathSegList.h"
#include "DOMSVGPathSeg.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "SVGAnimatedPathSegList.h"
#include "nsCOMPtr.h"
#include "nsSVGAttrTearoffTable.h"
#include "SVGPathSegUtils.h"
#include "dombindings.h"
#include "nsContentUtils.h"
// See the comment in this file's header.
--- a/content/svg/content/src/DOMSVGPoint.cpp
+++ b/content/svg/content/src/DOMSVGPoint.cpp
@@ -4,17 +4,17 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "DOMSVGPoint.h"
#include "DOMSVGPointList.h"
#include "SVGPoint.h"
#include "SVGAnimatedPointList.h"
#include "nsSVGElement.h"
#include "nsIDOMSVGPoint.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIDOMSVGMatrix.h"
#include "nsContentUtils.h" // NS_ENSURE_FINITE
#include "DOMSVGMatrix.h"
// See the architecture comment in DOMSVGPointList.h.
using namespace mozilla;
--- a/content/svg/content/src/DOMSVGPointList.cpp
+++ b/content/svg/content/src/DOMSVGPointList.cpp
@@ -1,17 +1,17 @@
/* -*- Mode: C++; 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 "nsSVGElement.h"
#include "DOMSVGPointList.h"
#include "DOMSVGPoint.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "SVGAnimatedPointList.h"
#include "nsCOMPtr.h"
#include "nsSVGAttrTearoffTable.h"
#include "nsContentUtils.h"
#include "dombindings.h"
// See the comment in this file's header.
--- a/content/svg/content/src/DOMSVGStringList.cpp
+++ b/content/svg/content/src/DOMSVGStringList.cpp
@@ -1,16 +1,16 @@
/* -*- Mode: C++; 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 "DOMSVGStringList.h"
#include "DOMSVGTests.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsCOMPtr.h"
#include "nsSVGAttrTearoffTable.h"
// See the architecture comment in this file's header.
namespace mozilla {
static nsSVGAttrTearoffTable<SVGStringList, DOMSVGStringList>
--- a/content/svg/content/src/DOMSVGTests.cpp
+++ b/content/svg/content/src/DOMSVGTests.cpp
@@ -1,16 +1,16 @@
/* -*- Mode: C++; 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 "DOMSVGTests.h"
#include "DOMSVGStringList.h"
-#include "nsContentErrors.h" // For NS_PROPTABLE_PROP_OVERWRITTEN
+#include "nsError.h" // For NS_PROPTABLE_PROP_OVERWRITTEN
#include "nsSVGFeatures.h"
#include "nsSVGSwitchElement.h"
#include "nsCharSeparatedTokenizer.h"
#include "nsStyleUtil.h"
#include "nsSVGUtils.h"
#include "mozilla/Preferences.h"
using namespace mozilla;
--- a/content/svg/content/src/DOMSVGTransform.cpp
+++ b/content/svg/content/src/DOMSVGTransform.cpp
@@ -2,17 +2,17 @@
* vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
* 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 "DOMSVGTransform.h"
#include "DOMSVGMatrix.h"
#include "SVGAnimatedTransformList.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include <math.h>
#include "nsContentUtils.h"
namespace mozilla {
//----------------------------------------------------------------------
// nsISupports methods:
--- a/content/svg/content/src/DOMSVGTransformList.cpp
+++ b/content/svg/content/src/DOMSVGTransformList.cpp
@@ -5,17 +5,17 @@
#include "DOMSVGTransformList.h"
#include "DOMSVGTransform.h"
#include "DOMSVGMatrix.h"
#include "SVGAnimatedTransformList.h"
#include "nsSVGElement.h"
#include "nsContentUtils.h"
#include "dombindings.h"
-#include "nsDOMError.h"
+#include "nsError.h"
// local helper functions
namespace {
void UpdateListIndicesFromIndex(
nsTArray<mozilla::DOMSVGTransform*>& aItemsArray,
PRUint32 aStartingIndex)
{
--- a/content/svg/content/src/SVGAnimatedPreserveAspectRatio.h
+++ b/content/svg/content/src/SVGAnimatedPreserveAspectRatio.h
@@ -3,17 +3,16 @@
* 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/. */
#ifndef MOZILLA_SVGANIMATEDPRESERVEASPECTRATIO_H__
#define MOZILLA_SVGANIMATEDPRESERVEASPECTRATIO_H__
#include "nsAutoPtr.h"
#include "nsCycleCollectionParticipant.h"
-#include "nsDOMError.h"
#include "nsError.h"
#include "nsIDOMSVGAnimPresAspRatio.h"
#include "nsIDOMSVGPresAspectRatio.h"
#include "nsISMILAttr.h"
#include "nsSVGElement.h"
#include "mozilla/Attributes.h"
class nsISMILAnimationElement;
--- a/content/svg/content/src/SVGLengthList.cpp
+++ b/content/svg/content/src/SVGLengthList.cpp
@@ -2,17 +2,17 @@
/* 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 "SVGLengthList.h"
#include "SVGAnimatedLengthList.h"
#include "SVGLength.h"
#include "nsSVGElement.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsString.h"
#include "nsSVGUtils.h"
#include "nsCharSeparatedTokenizer.h"
#include "string.h"
namespace mozilla {
nsresult
--- a/content/svg/content/src/SVGNumberList.cpp
+++ b/content/svg/content/src/SVGNumberList.cpp
@@ -3,17 +3,17 @@
* 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 "mozilla/Util.h"
#include "SVGNumberList.h"
#include "SVGAnimatedNumberList.h"
#include "nsSVGElement.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsString.h"
#include "nsSVGUtils.h"
#include "string.h"
#include "prdtoa.h"
#include "nsTextFormatter.h"
#include "nsCharSeparatedTokenizer.h"
#include "nsMathUtils.h"
--- a/content/svg/content/src/SVGPathData.cpp
+++ b/content/svg/content/src/SVGPathData.cpp
@@ -1,17 +1,17 @@
/* -*- Mode: C++; 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 "SVGPathData.h"
#include "SVGPathSegUtils.h"
#include "nsSVGElement.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsString.h"
#include "nsSVGUtils.h"
#include "string.h"
#include "nsSVGPathDataParser.h"
#include "nsSVGPathGeometryElement.h" // for nsSVGMark
#include "gfxPlatform.h"
#include <stdarg.h>
--- a/content/svg/content/src/SVGPointList.cpp
+++ b/content/svg/content/src/SVGPointList.cpp
@@ -3,17 +3,17 @@
* 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 "mozilla/Util.h"
#include "SVGPointList.h"
#include "SVGAnimatedPointList.h"
#include "nsSVGElement.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsString.h"
#include "nsSVGUtils.h"
#include "string.h"
#include "prdtoa.h"
#include "nsTextFormatter.h"
#include "nsCharSeparatedTokenizer.h"
#include "nsMathUtils.h"
--- a/content/svg/content/src/SVGStringList.cpp
+++ b/content/svg/content/src/SVGStringList.cpp
@@ -2,17 +2,17 @@
/* 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 "mozilla/Util.h"
#include "SVGStringList.h"
#include "nsSVGElement.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsString.h"
#include "nsSVGUtils.h"
#include "nsTextFormatter.h"
#include "nsWhitespaceTokenizer.h"
#include "nsCharSeparatedTokenizer.h"
#include "nsMathUtils.h"
namespace mozilla {
--- a/content/svg/content/src/SVGTransform.cpp
+++ b/content/svg/content/src/SVGTransform.cpp
@@ -1,15 +1,15 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
* vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
* 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 "nsDOMError.h"
+#include "nsError.h"
#include "SVGTransform.h"
#include "nsContentUtils.h"
#include "nsTextFormatter.h"
namespace {
const double radPerDegree = 2.0*3.1415926535 / 360.0;
}
--- a/content/svg/content/src/SVGTransformList.cpp
+++ b/content/svg/content/src/SVGTransformList.cpp
@@ -2,17 +2,17 @@
* vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
* 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 "SVGTransformList.h"
#include "SVGTransformListParser.h"
#include "nsString.h"
-#include "nsDOMError.h"
+#include "nsError.h"
namespace mozilla {
gfxMatrix
SVGTransformList::GetConsolidationMatrix() const
{
// To benefit from Return Value Optimization and avoid copy constructor calls
// due to our use of return-by-value, we must return the exact same object
--- a/content/svg/content/src/SVGTransformListParser.cpp
+++ b/content/svg/content/src/SVGTransformListParser.cpp
@@ -4,17 +4,17 @@
* 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 "mozilla/Util.h"
#include "SVGTransformListParser.h"
#include "SVGTransform.h"
#include "prdtoa.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsGkAtoms.h"
#include "nsCRT.h"
#include "nsDOMClassInfoID.h"
#include "nsIAtom.h"
using namespace mozilla;
//----------------------------------------------------------------------
--- a/content/svg/content/src/nsSVGAngle.h
+++ b/content/svg/content/src/nsSVGAngle.h
@@ -3,17 +3,16 @@
* 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/. */
#ifndef __NS_SVGANGLE_H__
#define __NS_SVGANGLE_H__
#include "nsAutoPtr.h"
#include "nsCycleCollectionParticipant.h"
-#include "nsDOMError.h"
#include "nsError.h"
#include "nsIDOMSVGAngle.h"
#include "nsIDOMSVGAnimatedAngle.h"
#include "nsISMILAttr.h"
#include "nsSVGElement.h"
#include "mozilla/Attributes.h"
class nsISMILAnimationElement;
--- a/content/svg/content/src/nsSVGBoolean.cpp
+++ b/content/svg/content/src/nsSVGBoolean.cpp
@@ -1,14 +1,14 @@
/* -*- Mode: C++; 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 "nsDOMError.h"
+#include "nsError.h"
#include "nsSVGBoolean.h"
#include "nsSMILValue.h"
#include "SMILBoolType.h"
using namespace mozilla;
NS_SVG_VAL_IMPL_CYCLE_COLLECTION(nsSVGBoolean::DOMAnimatedBoolean, mSVGElement)
--- a/content/svg/content/src/nsSVGClass.h
+++ b/content/svg/content/src/nsSVGClass.h
@@ -3,17 +3,17 @@
* 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/. */
#ifndef __NS_SVGCLASS_H__
#define __NS_SVGCLASS_H__
#include "nsAutoPtr.h"
#include "nsCycleCollectionParticipant.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIDOMSVGAnimatedString.h"
#include "nsISMILAttr.h"
#include "nsString.h"
#include "mozilla/Attributes.h"
class nsSVGStylableElement;
class nsSVGClass
--- a/content/svg/content/src/nsSVGDataParser.h
+++ b/content/svg/content/src/nsSVGDataParser.h
@@ -2,18 +2,17 @@
/* 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/. */
#ifndef __NS_SVGDATAPARSER_H__
#define __NS_SVGDATAPARSER_H__
#include "nsError.h"
-
-class nsAString;
+#include "nsStringGlue.h"
//----------------------------------------------------------------------
// helper macros
#define ENSURE_MATCHED(exp) { nsresult rv = exp; if (NS_FAILED(rv)) return rv; }
////////////////////////////////////////////////////////////////////////
// nsSVGDataParser: a simple abstract class for parsing values
// for path and transform values.
--- a/content/svg/content/src/nsSVGElement.cpp
+++ b/content/svg/content/src/nsSVGElement.cpp
@@ -13,17 +13,17 @@
#include "nsIDOMAttr.h"
#include "nsIDOMEventTarget.h"
#include "nsIDOMMutationEvent.h"
#include "nsMutationEvent.h"
#include "nsXBLPrototypeBinding.h"
#include "nsBindingManager.h"
#include "nsXBLBinding.h"
#include "nsStyleConsts.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIPresShell.h"
#include "nsIServiceManager.h"
#include "nsGkAtoms.h"
#include "mozilla/css/StyleRule.h"
#include "nsRuleWalker.h"
#include "mozilla/css/Declaration.h"
#include "nsCSSProps.h"
#include "nsCSSParser.h"
--- a/content/svg/content/src/nsSVGEnum.cpp
+++ b/content/svg/content/src/nsSVGEnum.cpp
@@ -1,14 +1,14 @@
/* -*- Mode: C++; 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 "nsDOMError.h"
+#include "nsError.h"
#include "nsSVGEnum.h"
#include "nsIAtom.h"
#include "nsSVGElement.h"
#include "nsSMILValue.h"
#include "SMILEnumType.h"
using namespace mozilla;
--- a/content/svg/content/src/nsSVGGraphicElement.cpp
+++ b/content/svg/content/src/nsSVGGraphicElement.cpp
@@ -11,17 +11,17 @@
#include "DOMSVGMatrix.h"
#include "nsGkAtoms.h"
#include "nsIDOMEventTarget.h"
#include "nsIDOMMutationEvent.h"
#include "nsIFrame.h"
#include "nsISVGChildFrame.h"
#include "nsIDOMSVGPoint.h"
#include "nsSVGUtils.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsSVGRect.h"
#include "nsContentUtils.h"
using namespace mozilla;
//----------------------------------------------------------------------
// nsISupports methods
--- a/content/svg/content/src/nsSVGInteger.cpp
+++ b/content/svg/content/src/nsSVGInteger.cpp
@@ -1,14 +1,14 @@
/* -*- Mode: C++; 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 "nsDOMError.h"
+#include "nsError.h"
#include "nsSVGInteger.h"
#include "nsSMILValue.h"
#include "SMILIntegerType.h"
using namespace mozilla;
NS_SVG_VAL_IMPL_CYCLE_COLLECTION(nsSVGInteger::DOMAnimatedInteger, mSVGElement)
--- a/content/svg/content/src/nsSVGIntegerPair.cpp
+++ b/content/svg/content/src/nsSVGIntegerPair.cpp
@@ -1,17 +1,17 @@
/* -*- Mode: C++; 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 "nsSVGIntegerPair.h"
#include "nsSVGUtils.h"
#include "nsCharSeparatedTokenizer.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsMathUtils.h"
#include "nsSMILValue.h"
#include "SVGIntegerPairSMILType.h"
using namespace mozilla;
NS_SVG_VAL_IMPL_CYCLE_COLLECTION(nsSVGIntegerPair::DOMAnimatedInteger, mSVGElement)
--- a/content/svg/content/src/nsSVGLength2.h
+++ b/content/svg/content/src/nsSVGLength2.h
@@ -4,17 +4,16 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef __NS_SVGLENGTH2_H__
#define __NS_SVGLENGTH2_H__
#include "nsAutoPtr.h"
#include "nsCoord.h"
#include "nsCycleCollectionParticipant.h"
-#include "nsDOMError.h"
#include "nsError.h"
#include "nsIDOMSVGAnimatedLength.h"
#include "nsIDOMSVGLength.h"
#include "nsISMILAttr.h"
#include "nsMathUtils.h"
#include "nsSVGElement.h"
#include "nsSVGUtils.h"
--- a/content/svg/content/src/nsSVGMarkerElement.cpp
+++ b/content/svg/content/src/nsSVGMarkerElement.cpp
@@ -3,17 +3,17 @@
* 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 "mozilla/Util.h"
#include "nsGkAtoms.h"
#include "nsCOMPtr.h"
#include "SVGAnimatedPreserveAspectRatio.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsSVGUtils.h"
#include "nsSVGMarkerElement.h"
#include "gfxMatrix.h"
#include "nsContentUtils.h" // NS_ENSURE_FINITE
using namespace mozilla;
nsSVGElement::LengthInfo nsSVGMarkerElement::sLengthInfo[4] =
--- a/content/svg/content/src/nsSVGNumber2.cpp
+++ b/content/svg/content/src/nsSVGNumber2.cpp
@@ -1,14 +1,14 @@
/* -*- Mode: C++; 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 "nsDOMError.h"
+#include "nsError.h"
#include "nsSVGNumber2.h"
#include "nsSVGUtils.h"
#include "nsTextFormatter.h"
#include "prdtoa.h"
#include "nsMathUtils.h"
#include "nsContentUtils.h" // NS_ENSURE_FINITE
#include "nsSMILValue.h"
#include "nsSMILFloatType.h"
--- a/content/svg/content/src/nsSVGNumberPair.cpp
+++ b/content/svg/content/src/nsSVGNumberPair.cpp
@@ -2,17 +2,17 @@
/* 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 "nsSVGNumberPair.h"
#include "nsSVGUtils.h"
#include "nsCharSeparatedTokenizer.h"
#include "prdtoa.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsMathUtils.h"
#include "nsSMILValue.h"
#include "SVGNumberPairSMILType.h"
using namespace mozilla;
NS_SVG_VAL_IMPL_CYCLE_COLLECTION(nsSVGNumberPair::DOMAnimatedNumber, mSVGElement)
--- a/content/svg/content/src/nsSVGSVGElement.cpp
+++ b/content/svg/content/src/nsSVGSVGElement.cpp
@@ -17,22 +17,21 @@
#include "nsIDocument.h"
#include "nsPresContext.h"
#include "DOMSVGMatrix.h"
#include "DOMSVGPoint.h"
#include "nsIDOMEventTarget.h"
#include "nsIFrame.h"
#include "nsISVGSVGFrame.h" //XXX
#include "nsSVGRect.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsISVGChildFrame.h"
#include "nsGUIEvent.h"
#include "nsSVGUtils.h"
#include "nsSVGSVGElement.h"
-#include "nsContentErrors.h" // For NS_PROPTABLE_PROP_OVERWRITTEN
#include "nsStyleUtil.h"
#include "nsEventDispatcher.h"
#include "nsSMILTimeContainer.h"
#include "nsSMILAnimationController.h"
#include "nsSMILTypes.h"
#include "nsIContentIterator.h"
--- a/content/svg/content/src/nsSVGString.h
+++ b/content/svg/content/src/nsSVGString.h
@@ -1,17 +1,17 @@
/* -*- Mode: C++; 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/. */
#ifndef __NS_SVGSTRING_H__
#define __NS_SVGSTRING_H__
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIDOMSVGAnimatedString.h"
#include "nsSVGElement.h"
#include "mozilla/Attributes.h"
class nsSVGString
{
public:
--- a/content/svg/content/src/nsSVGTextElement.cpp
+++ b/content/svg/content/src/nsSVGTextElement.cpp
@@ -6,17 +6,17 @@
#include "mozilla/Util.h"
#include "nsSVGGraphicElement.h"
#include "nsGkAtoms.h"
#include "nsIDOMSVGTextElement.h"
#include "nsCOMPtr.h"
#include "nsSVGSVGElement.h"
#include "nsSVGTextPositioningElement.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "SVGAnimatedLengthList.h"
#include "DOMSVGAnimatedLengthList.h"
#include "SVGLengthList.h"
#include "SVGNumberList.h"
#include "SVGAnimatedNumberList.h"
#include "DOMSVGAnimatedNumberList.h"
#include "DOMSVGPoint.h"
#include "DOMSVGTests.h"
--- a/content/svg/content/src/nsSVGTextPathElement.cpp
+++ b/content/svg/content/src/nsSVGTextPathElement.cpp
@@ -6,17 +6,17 @@
#include "mozilla/Util.h"
#include "nsSVGStylableElement.h"
#include "nsGkAtoms.h"
#include "nsIDOMSVGTextPathElement.h"
#include "nsIDOMSVGURIReference.h"
#include "nsIFrame.h"
#include "nsSVGTextPathElement.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsContentUtils.h"
using namespace mozilla;
nsSVGElement::LengthInfo nsSVGTextPathElement::sLengthInfo[1] =
{
{ &nsGkAtoms::startOffset, 0, nsIDOMSVGLength::SVG_LENGTHTYPE_NUMBER, nsSVGUtils::X },
};
--- a/content/svg/content/src/nsSVGViewBox.h
+++ b/content/svg/content/src/nsSVGViewBox.h
@@ -3,17 +3,16 @@
* 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/. */
#ifndef __NS_SVGVIEWBOX_H__
#define __NS_SVGVIEWBOX_H__
#include "nsAutoPtr.h"
#include "nsCycleCollectionParticipant.h"
-#include "nsDOMError.h"
#include "nsError.h"
#include "nsIDOMSVGAnimatedRect.h"
#include "nsIDOMSVGRect.h"
#include "nsISMILAttr.h"
#include "nsSVGElement.h"
#include "mozilla/Attributes.h"
class nsISMILAnimationElement;
--- a/content/xbl/src/nsXBLService.cpp
+++ b/content/xbl/src/nsXBLService.cpp
@@ -32,17 +32,17 @@
#include "nsXBLBinding.h"
#include "nsXBLPrototypeBinding.h"
#include "nsXBLDocumentInfo.h"
#include "nsCRT.h"
#include "nsContentUtils.h"
#include "nsSyncLoadService.h"
#include "nsContentPolicyUtils.h"
#include "nsTArray.h"
-#include "nsContentErrors.h"
+#include "nsError.h"
#include "nsIPresShell.h"
#include "nsIDocumentObserver.h"
#include "nsFrameManager.h"
#include "nsStyleContext.h"
#include "nsIScriptSecurityManager.h"
#include "nsIScriptError.h"
#include "nsXBLSerialize.h"
--- a/content/xml/document/src/nsXMLContentSink.cpp
+++ b/content/xml/document/src/nsXMLContentSink.cpp
@@ -47,17 +47,17 @@
#include "nsIPrompt.h"
#include "nsIChannel.h"
#include "nsIPrincipal.h"
#include "nsXMLPrettyPrinter.h"
#include "nsNodeInfoManager.h"
#include "nsContentCreatorFunctions.h"
#include "nsIContentPolicy.h"
#include "nsContentPolicyUtils.h"
-#include "nsContentErrors.h"
+#include "nsError.h"
#include "nsIDOMProcessingInstruction.h"
#include "nsNodeUtils.h"
#include "nsIScriptGlobalObject.h"
#include "nsIHTMLDocument.h"
#include "mozAutoDocUpdate.h"
#include "nsMimeTypes.h"
#include "nsHtml5SVGLoadDispatcher.h"
--- a/content/xml/document/src/nsXMLDocument.cpp
+++ b/content/xml/document/src/nsXMLDocument.cpp
@@ -22,17 +22,17 @@
#include "nsIDOMDocumentType.h"
#include "nsINameSpaceManager.h"
#include "nsCOMPtr.h"
#include "nsXPIDLString.h"
#include "nsIHttpChannel.h"
#include "nsIURI.h"
#include "nsIServiceManager.h"
#include "nsNetUtil.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIScriptSecurityManager.h"
#include "nsIPrincipal.h"
#include "nsLayoutCID.h"
#include "nsDOMAttribute.h"
#include "nsGUIEvent.h"
#include "nsCExternalHandlerService.h"
#include "nsMimeTypes.h"
#include "nsEventListenerManager.h"
@@ -40,17 +40,16 @@
#include "nsThreadUtils.h"
#include "nsJSUtils.h"
#include "nsCRT.h"
#include "nsIAuthPrompt.h"
#include "nsIScriptGlobalObjectOwner.h"
#include "nsIJSContextStack.h"
#include "nsContentCreatorFunctions.h"
#include "nsContentPolicyUtils.h"
-#include "nsContentErrors.h"
#include "nsIDOMUserDataHandler.h"
#include "nsEventDispatcher.h"
#include "nsNodeUtils.h"
#include "nsIConsoleService.h"
#include "nsIScriptError.h"
#include "nsIHTMLDocument.h"
#include "nsGenericElement.h"
--- a/content/xml/document/src/nsXMLFragmentContentSink.cpp
+++ b/content/xml/document/src/nsXMLFragmentContentSink.cpp
@@ -10,17 +10,17 @@
#include "nsIExpatSink.h"
#include "nsIDTD.h"
#include "nsIDocument.h"
#include "nsIDOMDocumentFragment.h"
#include "nsIContent.h"
#include "nsGkAtoms.h"
#include "nsINodeInfo.h"
#include "nsContentCreatorFunctions.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIConsoleService.h"
#include "nsIScriptError.h"
#include "nsNetUtil.h"
#include "nsTHashtable.h"
#include "nsHashKeys.h"
#include "nsTArray.h"
#include "nsCycleCollectionParticipant.h"
#include "nsIDocShell.h"
deleted file mode 100644
--- a/content/xslt/src/base/txError.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* 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/. */
-
-#ifndef __TX_ERROR
-#define __TX_ERROR
-
-/*
- * Error value mockup for standalone.
- * See nsError.h for details.
- */
-
-#include "nsError.h"
-
-#define NS_ERROR_XPATH_INVALID_ARG NS_ERROR_INVALID_ARG
-
-#define NS_XSLT_GET_NEW_HANDLER \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_XSLT, 1)
-
-#define NS_ERROR_XSLT_PARSE_FAILURE \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XSLT, 1)
-
-#define NS_ERROR_XPATH_PARSE_FAILURE \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XSLT, 2)
-
-#define NS_ERROR_XSLT_ALREADY_SET \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XSLT, 3)
-
-#define NS_ERROR_XSLT_EXECUTION_FAILURE \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XSLT, 4)
-
-#define NS_ERROR_XPATH_UNKNOWN_FUNCTION \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XSLT, 5)
-
-#define NS_ERROR_XSLT_BAD_RECURSION \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XSLT, 6)
-
-#define NS_ERROR_XSLT_BAD_VALUE \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XSLT, 7)
-
-#define NS_ERROR_XSLT_NODESET_EXPECTED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XSLT, 8)
-
-#define NS_ERROR_XSLT_ABORTED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XSLT, 9)
-
-#define NS_ERROR_XSLT_NETWORK_ERROR \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XSLT, 10)
-
-#define NS_ERROR_XSLT_WRONG_MIME_TYPE \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XSLT, 11)
-
-#define NS_ERROR_XSLT_LOAD_RECURSION \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XSLT, 12)
-
-#define NS_ERROR_XPATH_BAD_ARGUMENT_COUNT \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XSLT, 13)
-
-#define NS_ERROR_XPATH_BAD_EXTENSION_FUNCTION \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XSLT, 14)
-
-#define NS_ERROR_XPATH_PAREN_EXPECTED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XSLT, 15)
-
-#define NS_ERROR_XPATH_INVALID_AXIS \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XSLT, 16)
-
-#define NS_ERROR_XPATH_NO_NODE_TYPE_TEST \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XSLT, 17)
-
-#define NS_ERROR_XPATH_BRACKET_EXPECTED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XSLT, 18)
-
-#define NS_ERROR_XPATH_INVALID_VAR_NAME \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XSLT, 19)
-
-#define NS_ERROR_XPATH_UNEXPECTED_END \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XSLT, 20)
-
-#define NS_ERROR_XPATH_OPERATOR_EXPECTED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XSLT, 21)
-
-#define NS_ERROR_XPATH_UNCLOSED_LITERAL \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XSLT, 22)
-
-#define NS_ERROR_XPATH_BAD_COLON \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XSLT, 23)
-
-#define NS_ERROR_XPATH_BAD_BANG \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XSLT, 24)
-
-#define NS_ERROR_XPATH_ILLEGAL_CHAR \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XSLT, 25)
-
-#define NS_ERROR_XPATH_BINARY_EXPECTED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XSLT, 26)
-
-#define NS_ERROR_XSLT_LOAD_BLOCKED_ERROR \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XSLT, 27)
-
-#define NS_ERROR_XPATH_INVALID_EXPRESSION_EVALUATED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XSLT, 28)
-
-#define NS_ERROR_XPATH_UNBALANCED_CURLY_BRACE \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XSLT, 29)
-
-#define NS_ERROR_XSLT_BAD_NODE_NAME \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XSLT, 30)
-
-#define NS_ERROR_XSLT_VAR_ALREADY_SET \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XSLT, 31)
-
-#endif // __TX_ERROR
--- a/content/xslt/src/base/txExpandedNameMap.h
+++ b/content/xslt/src/base/txExpandedNameMap.h
@@ -1,17 +1,17 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* 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/. */
#ifndef TRANSFRMX_EXPANDEDNAMEMAP_H
#define TRANSFRMX_EXPANDEDNAMEMAP_H
-#include "txError.h"
+#include "nsError.h"
#include "txXMLUtils.h"
#include "nsTArray.h"
class txExpandedNameMap_base {
protected:
/**
* Adds an item, if an item with this key already exists an error is
* returned
--- a/content/xslt/src/xpath/nsXPathEvaluator.cpp
+++ b/content/xslt/src/xpath/nsXPathEvaluator.cpp
@@ -8,23 +8,22 @@
#include "nsIAtom.h"
#include "nsDOMClassInfoID.h"
#include "nsXPathExpression.h"
#include "nsXPathNSResolver.h"
#include "nsXPathResult.h"
#include "nsContentCID.h"
#include "txExpr.h"
#include "txExprParser.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "txURIUtils.h"
#include "nsIDocument.h"
#include "nsIDOMDocument.h"
#include "nsDOMString.h"
#include "nsINameSpaceManager.h"
-#include "txError.h"
#include "nsContentUtils.h"
// txIParseContext implementation
class nsXPathEvaluatorParseContext : public txIParseContext
{
public:
nsXPathEvaluatorParseContext(nsIDOMXPathNSResolver* aResolver,
nsTArray<PRInt32> *aNamespaceIDs,
--- a/content/xslt/src/xpath/nsXPathExpression.cpp
+++ b/content/xslt/src/xpath/nsXPathExpression.cpp
@@ -1,17 +1,17 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* 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 "nsXPathExpression.h"
#include "txExpr.h"
#include "txExprResult.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIDOMCharacterData.h"
#include "nsDOMClassInfoID.h"
#include "nsIDOMDocument.h"
#include "nsIDOMXPathNamespace.h"
#include "nsXPathResult.h"
#include "txURIUtils.h"
#include "txXPathTreeWalker.h"
--- a/content/xslt/src/xpath/nsXPathResult.cpp
+++ b/content/xslt/src/xpath/nsXPathResult.cpp
@@ -1,17 +1,17 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* 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 "nsXPathResult.h"
#include "txExprResult.h"
#include "txNodeSet.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "mozilla/dom/Element.h"
#include "nsIAttribute.h"
#include "nsDOMClassInfoID.h"
#include "nsIDOMNode.h"
#include "nsIDOMDocument.h"
#include "nsDOMString.h"
#include "txXPathTreeWalker.h"
#include "nsCycleCollectionParticipant.h"
--- a/content/xslt/src/xpath/txErrorExpr.cpp
+++ b/content/xslt/src/xpath/txErrorExpr.cpp
@@ -1,14 +1,14 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* 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 "txError.h"
+#include "nsError.h"
#include "txExpr.h"
#include "nsString.h"
#include "txIXPathContext.h"
nsresult
txErrorExpr::evaluate(txIEvalContext* aContext, txAExprResult** aResult)
{
*aResult = nullptr;
--- a/content/xslt/src/xpath/txExprLexer.cpp
+++ b/content/xslt/src/xpath/txExprLexer.cpp
@@ -5,17 +5,17 @@
/**
* Lexical analyzer for XPath expressions
*/
#include "txExprLexer.h"
#include "nsGkAtoms.h"
#include "nsString.h"
-#include "txError.h"
+#include "nsError.h"
#include "txXMLUtils.h"
/**
* Creates a new ExprLexer
*/
txExprLexer::txExprLexer()
: mCurrentItem(nullptr),
mFirstItem(nullptr),
--- a/content/xslt/src/xpath/txExprParser.cpp
+++ b/content/xslt/src/xpath/txExprParser.cpp
@@ -9,17 +9,17 @@
* @see ExprLexer
**/
#include "txExprParser.h"
#include "txExprLexer.h"
#include "txExpr.h"
#include "txStack.h"
#include "nsGkAtoms.h"
-#include "txError.h"
+#include "nsError.h"
#include "txIXPathContext.h"
#include "txStringUtils.h"
#include "txXPathNode.h"
#include "txXPathOptimizer.h"
/**
* Creates an Attribute Value Template using the given value
* This should move to XSLProcessor class
--- a/content/xslt/src/xpath/txNodeSet.h
+++ b/content/xslt/src/xpath/txNodeSet.h
@@ -6,17 +6,17 @@
/**
* Implementation of an XPath NodeSet
*/
#ifndef txNodeSet_h__
#define txNodeSet_h__
#include "txExprResult.h"
-#include "txError.h"
+#include "nsError.h"
#include "txXPathNode.h"
class txNodeSet : public txAExprResult
{
public:
/**
* Creates a new empty NodeSet
*/
--- a/content/xslt/src/xslt/txInstructions.cpp
+++ b/content/xslt/src/xslt/txInstructions.cpp
@@ -1,15 +1,15 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* 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 "txInstructions.h"
-#include "txError.h"
+#include "nsError.h"
#include "txExpr.h"
#include "txStylesheet.h"
#include "txNodeSetContext.h"
#include "txTextHandler.h"
#include "nsIConsoleService.h"
#include "nsServiceManagerUtils.h"
#include "txStringUtils.h"
#include "nsGkAtoms.h"
--- a/content/xslt/src/xslt/txMozillaStylesheetCompiler.cpp
+++ b/content/xslt/src/xslt/txMozillaStylesheetCompiler.cpp
@@ -33,17 +33,17 @@
#include "txLog.h"
#include "txMozillaXSLTProcessor.h"
#include "txStylesheetCompiler.h"
#include "txXMLUtils.h"
#include "nsAttrName.h"
#include "nsIScriptError.h"
#include "nsIURL.h"
#include "nsCrossSiteListenerProxy.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "mozilla/dom/Element.h"
#include "mozilla/Attributes.h"
using namespace mozilla;
static NS_DEFINE_CID(kCParserCID, NS_PARSER_CID);
static void
--- a/content/xslt/src/xslt/txMozillaXMLOutput.cpp
+++ b/content/xslt/src/xslt/txMozillaXMLOutput.cpp
@@ -32,17 +32,17 @@
#include "mozilla/css/Loader.h"
#include "mozilla/dom/Element.h"
#include "nsCharsetAlias.h"
#include "nsContentUtils.h"
#include "txXMLUtils.h"
#include "nsContentSink.h"
#include "nsINode.h"
#include "nsContentCreatorFunctions.h"
-#include "txError.h"
+#include "nsError.h"
#include "nsIFrame.h"
using namespace mozilla::dom;
#define TX_ENSURE_CURRENTNODE \
NS_ASSERTION(mCurrentNode, "mCurrentNode is NULL"); \
if (!mCurrentNode) \
return NS_ERROR_UNEXPECTED
--- a/content/xslt/src/xslt/txMozillaXSLTProcessor.cpp
+++ b/content/xslt/src/xslt/txMozillaXSLTProcessor.cpp
@@ -1,16 +1,16 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* 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 "txMozillaXSLTProcessor.h"
#include "nsContentCID.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIChannel.h"
#include "mozilla/dom/Element.h"
#include "nsIDOMElement.h"
#include "nsIDOMText.h"
#include "nsIDocument.h"
#include "nsDOMClassInfoID.h"
#include "nsIDOMDocument.h"
#include "nsIDOMDocumentFragment.h"
--- a/content/xslt/src/xslt/txPatternParser.cpp
+++ b/content/xslt/src/xslt/txPatternParser.cpp
@@ -1,17 +1,17 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* 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 "txPatternParser.h"
#include "txExprLexer.h"
#include "nsGkAtoms.h"
-#include "txError.h"
+#include "nsError.h"
#include "txStringUtils.h"
#include "txXSLTPatterns.h"
#include "txIXPathContext.h"
#include "txPatternOptimizer.h"
txPattern* txPatternParser::createPattern(const nsAFlatString& aPattern,
txIParseContext* aContext)
--- a/content/xslt/src/xslt/txStylesheetCompileHandlers.h
+++ b/content/xslt/src/xslt/txStylesheetCompileHandlers.h
@@ -1,17 +1,17 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* 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/. */
#ifndef TRANSFRMX_TXSTYLESHEETCOMPILEHANDLERS_H
#define TRANSFRMX_TXSTYLESHEETCOMPILEHANDLERS_H
-#include "txError.h"
+#include "nsError.h"
#include "txNamespaceMap.h"
#include "txExpandedNameMap.h"
struct txStylesheetAttr;
class txStylesheetCompilerState;
typedef nsresult (*HandleStartFn) (PRInt32 aNamespaceID,
nsIAtom* aLocalName,
--- a/content/xslt/src/xslt/txToplevelItems.h
+++ b/content/xslt/src/xslt/txToplevelItems.h
@@ -1,17 +1,17 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* 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/. */
#ifndef TRANSFRMX_TXTOPLEVELITEMS_H
#define TRANSFRMX_TXTOPLEVELITEMS_H
-#include "txError.h"
+#include "nsError.h"
#include "txOutputFormat.h"
#include "txXMLUtils.h"
#include "txStylesheet.h"
#include "txInstructions.h"
class txPattern;
class Expr;
--- a/content/xslt/src/xslt/txVariableMap.h
+++ b/content/xslt/src/xslt/txVariableMap.h
@@ -1,17 +1,17 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* 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/. */
#ifndef TRANSFRMX_VARIABLEMAP_H
#define TRANSFRMX_VARIABLEMAP_H
-#include "txError.h"
+#include "nsError.h"
#include "txXMLUtils.h"
#include "txExprResult.h"
#include "txExpandedNameMap.h"
class txVariableMap {
public:
txVariableMap();
~txVariableMap();
--- a/content/xslt/src/xslt/txXSLTEnvironmentFunctionCall.cpp
+++ b/content/xslt/src/xslt/txXSLTEnvironmentFunctionCall.cpp
@@ -1,16 +1,16 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* 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 "txIXPathContext.h"
#include "nsGkAtoms.h"
-#include "txError.h"
+#include "nsError.h"
#include "txXMLUtils.h"
#include "txXSLTFunctions.h"
#include "txNamespaceMap.h"
nsresult
txXSLTEnvironmentFunctionCall::evaluate(txIEvalContext* aContext,
txAExprResult** aResult)
{
--- a/content/xslt/src/xslt/txXSLTNumber.h
+++ b/content/xslt/src/xslt/txXSLTNumber.h
@@ -1,17 +1,17 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* 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/. */
#ifndef TRANSFRMX_TXXSLTNUMBER_H
#define TRANSFRMX_TXXSLTNUMBER_H
-#include "txError.h"
+#include "nsError.h"
#include "txList.h"
#include "nsString.h"
class Expr;
class txPattern;
class txIEvalContext;
class txIMatchContext;
class txXPathTreeWalker;
--- a/content/xul/content/src/nsXULElement.cpp
+++ b/content/xul/content/src/nsXULElement.cpp
@@ -13,17 +13,17 @@
*
* Date Modified by Description of modification
* 03/27/2000 IBM Corp. Added PR_CALLBACK for Optlink
* use in OS2
*/
#include "nsCOMPtr.h"
#include "nsDOMCID.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsDOMString.h"
#include "nsIDOMEvent.h"
#include "nsHashtable.h"
#include "nsIAtom.h"
#include "nsIBaseWindow.h"
#include "nsIDOMAttr.h"
#include "nsIDOMDocument.h"
#include "nsIDOMElement.h"
--- a/content/xul/content/src/nsXULPopupListener.cpp
+++ b/content/xul/content/src/nsXULPopupListener.cpp
@@ -36,17 +36,17 @@
#include "mozilla/dom/Element.h"
// for event firing in context menus
#include "nsPresContext.h"
#include "nsIPresShell.h"
#include "nsFocusManager.h"
#include "nsPIDOMWindow.h"
#include "nsIViewManager.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsMenuFrame.h"
using namespace mozilla;
// on win32 and os/2, context menus come up on mouse up. On other platforms,
// they appear on mouse down. Certain bits of code care about this difference.
#if defined(XP_WIN) || defined(XP_OS2)
#define NS_CONTEXT_MENU_IS_MOUSEUP 1
--- a/content/xul/document/src/nsXULCommandDispatcher.cpp
+++ b/content/xul/document/src/nsXULCommandDispatcher.cpp
@@ -26,17 +26,17 @@
#include "nsRDFCID.h"
#include "nsXULCommandDispatcher.h"
#include "prlog.h"
#include "nsIDOMEventTarget.h"
#include "nsGUIEvent.h"
#include "nsContentUtils.h"
#include "nsReadableUtils.h"
#include "nsCRT.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsEventDispatcher.h"
#include "nsDOMClassInfoID.h"
#ifdef PR_LOGGING
static PRLogModuleInfo* gLog;
#endif
////////////////////////////////////////////////////////////////////////
--- a/content/xul/document/src/nsXULDocument.cpp
+++ b/content/xul/document/src/nsXULDocument.cpp
@@ -21,17 +21,17 @@
*/
#include "mozilla/Util.h"
// Note the ALPHABETICAL ORDERING
#include "nsXULDocument.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIBoxObject.h"
#include "nsIChromeRegistry.h"
#include "nsIView.h"
#include "nsIViewManager.h"
#include "nsIContentViewer.h"
#include "nsGUIEvent.h"
#include "nsIDOMXULElement.h"
#include "nsIRDFNode.h"
@@ -75,17 +75,16 @@
#include "nsIParser.h"
#include "nsCharsetSource.h"
#include "nsIParserService.h"
#include "nsCSSStyleSheet.h"
#include "mozilla/css/Loader.h"
#include "nsIScriptError.h"
#include "nsIStyleSheetLinkingElement.h"
#include "nsEventDispatcher.h"
-#include "nsContentErrors.h"
#include "nsIObserverService.h"
#include "nsNodeUtils.h"
#include "nsIDocShellTreeItem.h"
#include "nsIDocShellTreeOwner.h"
#include "nsIXULWindow.h"
#include "nsXULPopupManager.h"
#include "nsCCUncollectableMarker.h"
#include "nsURILoader.h"
--- a/content/xul/templates/src/nsXULTreeBuilder.cpp
+++ b/content/xul/templates/src/nsXULTreeBuilder.cpp
@@ -1,15 +1,15 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* 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 "nscore.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIContent.h"
#include "nsINodeInfo.h"
#include "nsIDOMElement.h"
#include "nsILocalStore.h"
#include "nsIBoxObject.h"
#include "nsITreeBoxObject.h"
#include "nsITreeSelection.h"
#include "nsITreeColumns.h"
--- a/docshell/base/nsDSURIContentListener.cpp
+++ b/docshell/base/nsDSURIContentListener.cpp
@@ -9,17 +9,17 @@
#include "nsServiceManagerUtils.h"
#include "nsXPIDLString.h"
#include "nsDocShellCID.h"
#include "nsIWebNavigationInfo.h"
#include "nsIDOMWindow.h"
#include "nsAutoPtr.h"
#include "nsIHttpChannel.h"
#include "nsIScriptSecurityManager.h"
-#include "nsNetError.h"
+#include "nsError.h"
#include "nsCharSeparatedTokenizer.h"
#include "mozilla/Preferences.h"
using namespace mozilla;
//*****************************************************************************
//*** nsDSURIContentListener: Object Management
//*****************************************************************************
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -91,17 +91,17 @@
#include "nsDocShell.h"
#include "nsDocShellLoadInfo.h"
#include "nsCDefaultURIFixup.h"
#include "nsDocShellEnumerator.h"
#include "nsSHistory.h"
#include "nsDocShellEditorData.h"
// Helper Classes
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsEscape.h"
// Interfaces Needed
#include "nsIUploadChannel.h"
#include "nsIProgressEventSink.h"
#include "nsIWebProgress.h"
#include "nsILayoutHistoryState.h"
#include "nsITimer.h"
@@ -174,19 +174,17 @@
// for embedding
#include "nsIWebBrowserChromeFocus.h"
#if NS_PRINT_PREVIEW
#include "nsIDocumentViewerPrint.h"
#include "nsIWebBrowserPrint.h"
#endif
-#include "nsPluginError.h"
#include "nsContentUtils.h"
-#include "nsContentErrors.h"
#include "nsIChannelPolicy.h"
#include "nsIContentSecurityPolicy.h"
#include "nsXULAppAPI.h"
#include "nsDOMNavigationTiming.h"
#include "nsITimedChannel.h"
#include "mozilla/StartupTimeline.h"
@@ -224,22 +222,16 @@ nsIURIFixup *nsDocShell::sURIFixup = 0;
// the pref on the creation of the first docshell.
static PRUint32 gValidateOrigin = 0xffffffff;
// Hint for native dispatch of events on how long to delay after
// all documents have loaded in milliseconds before favoring normal
// native event dispatch priorites over performance
#define NS_EVENT_STARVATION_DELAY_HINT 2000
-// This is needed for displaying an error message
-// when navigation is attempted on a document when printing
-// The value arbitrary as long as it doesn't conflict with
-// any of the other values in the errors in DisplayLoadError
-#define NS_ERROR_DOCUMENT_IS_PRINTMODE NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GENERAL,2001)
-
#ifdef PR_LOGGING
#ifdef DEBUG
static PRLogModuleInfo* gDocShellLog;
#endif
static PRLogModuleInfo* gDocShellLeakLog;
#endif
const char kBrandBundleURL[] = "chrome://branding/locale/brand.properties";
--- a/docshell/base/nsDocShell.h
+++ b/docshell/base/nsDocShell.h
@@ -114,18 +114,16 @@ public:
PRInt32 mDelay;
bool mRepeat;
bool mMetaRefresh;
protected:
virtual ~nsRefreshTimer();
};
-#define NS_ERROR_DOCSHELL_REQUEST_REJECTED NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GENERAL,1001)
-
typedef enum {
eCharsetReloadInit,
eCharsetReloadRequested,
eCharsetReloadStopOrigional
} eCharsetReloadState;
//*****************************************************************************
//*** nsDocShell
--- a/docshell/base/nsIRefreshURI.idl
+++ b/docshell/base/nsIRefreshURI.idl
@@ -66,19 +66,8 @@ interface nsIRefreshURI : nsISupports {
*/
void cancelRefreshURITimers();
/**
* True when there are pending refreshes, false otherwise.
*/
readonly attribute boolean refreshPending;
};
-
-
-/**
- * This success code indicates that a refresh header was found and
- * successfully setup.
- */
-%{C++
-#define NS_REFRESHURI_HEADER_FOUND \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_URILOADER, \
- 2)
-%}
--- a/dom/base/Makefile.in
+++ b/dom/base/Makefile.in
@@ -39,17 +39,16 @@ XPIDLSRCS = \
nsIEntropyCollector.idl \
nsIScriptChannel.idl \
$(NULL)
EXPORTS = \
nsDOMCID.h \
nsDOMClassInfoClasses.h \
nsDOMClassInfoID.h \
- nsDOMError.h \
nsDOMJSUtils.h \
nsDOMScriptObjectHolder.h \
nsDOMString.h \
nsIDOMClassInfo.h \
nsIDOMScriptObjectFactory.h \
nsIJSEventListener.h \
nsIJSNativeInitializer.h \
nsIScriptContext.h \
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -98,17 +98,17 @@
#include "nsIDOMHistory.h"
#include "nsIDOMMediaList.h"
#include "nsIDOMChromeWindow.h"
#include "nsIDOMConstructor.h"
#include "nsClientRect.h"
#include "nsIDOMHTMLPropertiesCollection.h"
// DOM core includes
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIDOMDOMException.h"
#include "nsIDOMNode.h"
#include "nsIDOMNamedNodeMap.h"
#include "nsIDOMDOMStringList.h"
#include "nsIDOMDOMTokenList.h"
#include "nsIDOMDOMSettableTokenList.h"
#include "nsDOMStringMap.h"
deleted file mode 100644
--- a/dom/base/nsDOMError.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* -*- Mode: C++; 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/. */
-
-#ifndef nsDOMError_h__
-#define nsDOMError_h__
-
-#include "nsError.h"
-
-// XXX If you add a new error code, also add an error string to
-// dom/src/base/domerr.msg
-
-/* Standard DOM error codes: http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html */
-
-#define NS_ERROR_DOM_INDEX_SIZE_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,1)
-#define NS_ERROR_DOM_HIERARCHY_REQUEST_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,3)
-#define NS_ERROR_DOM_WRONG_DOCUMENT_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,4)
-#define NS_ERROR_DOM_INVALID_CHARACTER_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,5)
-#define NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,7)
-#define NS_ERROR_DOM_NOT_FOUND_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,8)
-#define NS_ERROR_DOM_NOT_SUPPORTED_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,9)
-#define NS_ERROR_DOM_INUSE_ATTRIBUTE_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,10)
-#define NS_ERROR_DOM_INVALID_STATE_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,11)
-#define NS_ERROR_DOM_SYNTAX_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,12)
-#define NS_ERROR_DOM_INVALID_MODIFICATION_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,13)
-#define NS_ERROR_DOM_NAMESPACE_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,14)
-#define NS_ERROR_DOM_INVALID_ACCESS_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,15)
-#define NS_ERROR_DOM_TYPE_MISMATCH_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,17)
-#define NS_ERROR_DOM_SECURITY_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,18)
-#define NS_ERROR_DOM_NETWORK_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,19)
-#define NS_ERROR_DOM_ABORT_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,20)
-#define NS_ERROR_DOM_URL_MISMATCH_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,21)
-#define NS_ERROR_DOM_QUOTA_EXCEEDED_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,22)
-#define NS_ERROR_DOM_TIMEOUT_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,23)
-#define NS_ERROR_DOM_INVALID_NODE_TYPE_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,24)
-#define NS_ERROR_DOM_DATA_CLONE_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,25)
-
-/* XXX Should be JavaScript native errors */
-
-#define NS_ERROR_TYPE_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,26)
-#define NS_ERROR_RANGE_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,27)
-
-/* SVG DOM error codes from http://www.w3.org/TR/SVG11/svgdom.html */
-
-#define NS_ERROR_DOM_SVG_WRONG_TYPE_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SVG,0)
-#define NS_ERROR_DOM_SVG_MATRIX_NOT_INVERTABLE NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SVG,2)
-
-/* DOM error codes from http://www.w3.org/TR/DOM-Level-3-XPath/ */
-
-#define NS_ERROR_DOM_INVALID_EXPRESSION_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM_XPATH, 51)
-#define NS_ERROR_DOM_TYPE_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM_XPATH, 52)
-
-/* IndexedDB error codes http://dvcs.w3.org/hg/IndexedDB/raw-file/tip/Overview.html */
-
-#define NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM_INDEXEDDB,1)
-#define NS_ERROR_DOM_INDEXEDDB_NOT_FOUND_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM_INDEXEDDB,3)
-#define NS_ERROR_DOM_INDEXEDDB_CONSTRAINT_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM_INDEXEDDB,4)
-#define NS_ERROR_DOM_INDEXEDDB_DATA_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM_INDEXEDDB,5)
-#define NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM_INDEXEDDB,6)
-#define NS_ERROR_DOM_INDEXEDDB_TRANSACTION_INACTIVE_ERR \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM_INDEXEDDB,7)
-#define NS_ERROR_DOM_INDEXEDDB_ABORT_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM_INDEXEDDB,8)
-#define NS_ERROR_DOM_INDEXEDDB_READ_ONLY_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM_INDEXEDDB,9)
-#define NS_ERROR_DOM_INDEXEDDB_TIMEOUT_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM_INDEXEDDB,10)
-#define NS_ERROR_DOM_INDEXEDDB_QUOTA_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM_INDEXEDDB,11)
-#define NS_ERROR_DOM_INDEXEDDB_VERSION_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM_INDEXEDDB,12)
-
-#define NS_ERROR_DOM_INDEXEDDB_RECOVERABLE_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM_INDEXEDDB,1001)
-
-/* DOM error codes defined by us */
-
-#define NS_ERROR_DOM_SECMAN_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,1001)
-#define NS_ERROR_DOM_WRONG_TYPE_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,1002)
-#define NS_ERROR_DOM_NOT_OBJECT_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,1003)
-#define NS_ERROR_DOM_NOT_XPC_OBJECT_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,1004)
-#define NS_ERROR_DOM_NOT_NUMBER_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,1005)
-#define NS_ERROR_DOM_NOT_BOOLEAN_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,1006)
-#define NS_ERROR_DOM_NOT_FUNCTION_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,1007)
-#define NS_ERROR_DOM_TOO_FEW_PARAMETERS_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,1008)
-#define NS_ERROR_DOM_BAD_DOCUMENT_DOMAIN NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,1009)
-#define NS_ERROR_DOM_PROP_ACCESS_DENIED NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,1010)
-#define NS_ERROR_DOM_XPCONNECT_ACCESS_DENIED NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,1011)
-#define NS_ERROR_DOM_BAD_URI NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,1012)
-#define NS_ERROR_DOM_RETVAL_UNDEFINED NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,1013)
-#define NS_ERROR_DOM_QUOTA_REACHED NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM,1014)
-
-#define NS_ERROR_DOM_FILE_NOT_FOUND_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM_FILE, 0)
-#define NS_ERROR_DOM_FILE_NOT_READABLE_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM_FILE, 1)
-#define NS_ERROR_DOM_FILE_ABORT_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM_FILE, 2)
-
-#define NS_ERROR_DOM_FILEHANDLE_UNKNOWN_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM_FILEHANDLE,1)
-#define NS_ERROR_DOM_FILEHANDLE_NOT_ALLOWED_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM_FILEHANDLE,2)
-#define NS_ERROR_DOM_FILEHANDLE_LOCKEDFILE_INACTIVE_ERR \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM_FILEHANDLE,3)
-#define NS_ERROR_DOM_FILEHANDLE_ABORT_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM_FILEHANDLE,4)
-#define NS_ERROR_DOM_FILEHANDLE_READ_ONLY_ERR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM_FILEHANDLE,5)
-
-#endif // nsDOMError_h__
--- a/dom/base/nsDOMException.cpp
+++ b/dom/base/nsDOMException.cpp
@@ -2,17 +2,17 @@
/* 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 "nsCOMPtr.h"
#include "nsCRTGlue.h"
#include "nsContentUtils.h"
#include "nsDOMClassInfoID.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsDOMException.h"
#include "nsIDOMDOMException.h"
#include "nsIDocument.h"
#include "nsString.h"
#include "prprf.h"
enum DOM4ErrorTypeCodeMap {
/* DOM4 errors from http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#domexception */
--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
@@ -1,17 +1,17 @@
/* -*- Mode: C++; 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 "nsIDocShell.h"
#include "nsPresContext.h"
#include "nsDOMClassInfoID.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIDOMEvent.h"
#include "nsDOMWindowUtils.h"
#include "nsQueryContentEventResult.h"
#include "nsGlobalWindow.h"
#include "nsIDocument.h"
#include "nsFocusManager.h"
#include "nsEventStateManager.h"
#include "nsFrameManager.h"
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -14,17 +14,17 @@
#include "Navigator.h"
#include "nsScreen.h"
#include "nsHistory.h"
#include "nsPerformance.h"
#include "nsDOMNavigationTiming.h"
#include "nsBarProps.h"
#include "nsDOMStorage.h"
#include "nsDOMOfflineResourceList.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIIdleService.h"
#ifdef XP_WIN
#ifdef GetClassName
#undef GetClassName
#endif // GetClassName
#endif // XP_WIN
@@ -127,17 +127,16 @@
#include "nsIWebBrowser.h"
#include "nsIWebBrowserChrome.h"
#include "nsIWebBrowserFind.h" // For window.find()
#include "nsIWebContentHandlerRegistrar.h"
#include "nsIWindowMediator.h" // For window.find()
#include "nsComputedDOMStyle.h"
#include "nsIEntropyCollector.h"
#include "nsDOMCID.h"
-#include "nsDOMError.h"
#include "nsDOMWindowUtils.h"
#include "nsIWindowWatcher.h"
#include "nsPIWindowWatcher.h"
#include "nsIContentViewer.h"
#include "nsIJSNativeInitializer.h"
#include "nsIScriptError.h"
#include "nsIConsoleService.h"
#include "nsIControllers.h"
--- a/dom/base/nsHistory.cpp
+++ b/dom/base/nsHistory.cpp
@@ -18,17 +18,17 @@
#include "nsIWebNavigation.h"
#include "nsIHistoryEntry.h"
#include "nsIURI.h"
#include "nsIServiceManager.h"
#include "nsIInterfaceRequestorUtils.h"
#include "nsXPIDLString.h"
#include "nsReadableUtils.h"
#include "nsDOMClassInfoID.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsContentUtils.h"
#include "nsISHistoryInternal.h"
#include "mozilla/Preferences.h"
using namespace mozilla;
static const char* sAllowPushStatePrefStr =
"browser.history.allowPushState";
--- a/dom/base/nsJSEnvironment.cpp
+++ b/dom/base/nsJSEnvironment.cpp
@@ -1,15 +1,15 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set ts=2 sw=2 et tw=78: */
/* 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 "nsDOMError.h"
+#include "nsError.h"
#include "nsJSEnvironment.h"
#include "nsIScriptGlobalObject.h"
#include "nsIScriptObjectPrincipal.h"
#include "nsIDOMChromeWindow.h"
#include "nsPIDOMWindow.h"
#include "nsIScriptSecurityManager.h"
#include "nsDOMCID.h"
#include "nsIServiceManager.h"
--- a/dom/base/nsJSTimeoutHandler.cpp
+++ b/dom/base/nsJSTimeoutHandler.cpp
@@ -10,17 +10,17 @@
#include "nsIScriptTimeoutHandler.h"
#include "nsIXPConnect.h"
#include "nsIJSRuntimeService.h"
#include "nsJSUtils.h"
#include "nsDOMJSUtils.h"
#include "nsContentUtils.h"
#include "nsJSEnvironment.h"
#include "nsServiceManagerUtils.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsGlobalWindow.h"
#include "nsIContentSecurityPolicy.h"
#include "nsAlgorithm.h"
#include "mozilla/Attributes.h"
static const char kSetIntervalStr[] = "setInterval";
static const char kSetTimeoutStr[] = "setTimeout";
--- a/dom/base/nsLocation.cpp
+++ b/dom/base/nsLocation.cpp
@@ -24,17 +24,17 @@
#include "nsEscape.h"
#include "nsIDOMWindow.h"
#include "nsIDOMDocument.h"
#include "nsIDocument.h"
#include "nsIPresShell.h"
#include "nsPresContext.h"
#include "nsIJSContextStack.h"
#include "nsXPIDLString.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsDOMClassInfoID.h"
#include "nsCRT.h"
#include "nsIProtocolHandler.h"
#include "nsReadableUtils.h"
#include "nsITextToSubURI.h"
#include "nsJSUtils.h"
#include "jsfriendapi.h"
#include "nsContentUtils.h"
--- a/dom/base/nsPluginArray.cpp
+++ b/dom/base/nsPluginArray.cpp
@@ -8,17 +8,17 @@
#include "Navigator.h"
#include "nsIScriptGlobalObject.h"
#include "nsIDOMNavigator.h"
#include "nsIDOMMimeType.h"
#include "nsIPluginHost.h"
#include "nsIDocShell.h"
#include "nsIWebNavigation.h"
#include "nsDOMClassInfoID.h"
-#include "nsPluginError.h"
+#include "nsError.h"
#include "nsPluginHost.h"
using namespace mozilla;
using namespace mozilla::dom;
nsPluginArray::nsPluginArray(Navigator* navigator,
nsIDocShell *aDocShell)
: mNavigator(navigator),
--- a/dom/file/FileHelper.cpp
+++ b/dom/file/FileHelper.cpp
@@ -3,24 +3,23 @@
/* 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 "FileHelper.h"
#include "nsIFileStorage.h"
-#include "nsNetError.h"
+#include "nsError.h"
#include "nsProxyRelease.h"
#include "FileHandle.h"
#include "FileRequest.h"
#include "FileService.h"
#include "nsIRequest.h"
-#include "nsDOMError.h"
USING_FILE_NAMESPACE
namespace {
LockedFile* gCurrentLockedFile = nullptr;
} // anonymous namespace
--- a/dom/file/FileRequest.cpp
+++ b/dom/file/FileRequest.cpp
@@ -5,17 +5,17 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "FileRequest.h"
#include "nsIJSContextStack.h"
#include "nsContentUtils.h"
#include "nsEventDispatcher.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsDOMProgressEvent.h"
#include "nsDOMClassInfoID.h"
#include "FileHelper.h"
#include "LockedFile.h"
USING_FILE_NAMESPACE
FileRequest::FileRequest(nsIDOMWindow* aWindow)
--- a/dom/file/LockedFile.cpp
+++ b/dom/file/LockedFile.cpp
@@ -25,17 +25,17 @@
#include "AsyncHelper.h"
#include "FileHandle.h"
#include "FileHelper.h"
#include "FileRequest.h"
#include "FileService.h"
#include "FileStreamWrappers.h"
#include "MemoryStreams.h"
#include "MetadataHelper.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsContentUtils.h"
#define STREAM_COPY_BLOCK_SIZE 32768
USING_FILE_NAMESPACE
namespace {
--- a/dom/indexedDB/IndexedDatabase.h
+++ b/dom/indexedDB/IndexedDatabase.h
@@ -9,17 +9,17 @@
#include "nsIProgrammingLanguage.h"
#include "mozilla/Attributes.h"
#include "jsapi.h"
#include "nsAutoPtr.h"
#include "nsCOMPtr.h"
#include "nsDebug.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsStringGlue.h"
#include "nsTArray.h"
#define BEGIN_INDEXEDDB_NAMESPACE \
namespace mozilla { namespace dom { namespace indexedDB {
#define END_INDEXEDDB_NAMESPACE \
} /* namespace indexedDB */ } /* namepsace dom */ } /* namespace mozilla */
--- a/dom/plugins/base/Makefile.in
+++ b/dom/plugins/base/Makefile.in
@@ -33,17 +33,16 @@ XPIDLSRCS = \
$(NULL)
EXPORTS = \
npapi.h \
npfunctions.h \
nptypes.h \
npruntime.h \
nsPluginLogging.h \
- nsPluginError.h \
nsPluginNativeWindow.h \
nsPluginsCID.h \
nsNPAPIPluginInstance.h \
nsPluginsDir.h \
nsPluginTags.h \
nsPluginDirServiceProvider.h \
nsPluginHost.h \
nsPluginInstanceOwner.h \
deleted file mode 100644
--- a/dom/plugins/base/nsPluginError.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* 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/. */
-
-/* Plugin Module Logging usage instructions and includes */
-////////////////////////////////////////////////////////////////////////////////
-#ifndef nsPluginError_h__
-#define nsPluginError_h__
-
-#include "nsError.h"
-
-#define NS_ERROR_PLUGINS_PLUGINSNOTCHANGED NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_PLUGINS,1000)
-#define NS_ERROR_PLUGIN_DISABLED NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_PLUGINS,1001)
-#define NS_ERROR_PLUGIN_BLOCKLISTED NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_PLUGINS,1002)
-#define NS_ERROR_PLUGIN_TIME_RANGE_NOT_SUPPORTED NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_PLUGINS,1003)
-#define NS_ERROR_PLUGIN_CLICKTOPLAY NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_PLUGINS,1004)
-
-#endif // nsPluginError_h__
--- a/dom/plugins/base/nsPluginHost.cpp
+++ b/dom/plugins/base/nsPluginHost.cpp
@@ -94,34 +94,33 @@
#include "nsICharsetConverterManager.h"
#include "nsIPlatformCharset.h"
#include "nsIDirectoryService.h"
#include "nsDirectoryServiceDefs.h"
#include "nsXULAppAPI.h"
#include "nsAppDirectoryServiceDefs.h"
#include "nsPluginDirServiceProvider.h"
-#include "nsPluginError.h"
+#include "nsError.h"
#include "nsUnicharUtils.h"
#include "nsPluginManifestLineReader.h"
#include "nsIWeakReferenceUtils.h"
#include "nsIDOMElement.h"
#include "nsIDOMHTMLObjectElement.h"
#include "nsIDOMHTMLEmbedElement.h"
#include "nsIPresShell.h"
#include "nsIWebNavigation.h"
#include "nsISupportsArray.h"
#include "nsIDocShell.h"
#include "nsPluginNativeWindow.h"
#include "nsIScriptSecurityManager.h"
#include "nsIContentPolicy.h"
#include "nsContentPolicyUtils.h"
-#include "nsContentErrors.h"
#include "mozilla/TimeStamp.h"
#include "mozilla/Telemetry.h"
#include "nsIImageLoadingContent.h"
#include "mozilla/Preferences.h"
#include "nsVersionComparator.h"
#if defined(XP_WIN)
#include "nsIWindowMediator.h"
--- a/dom/plugins/ipc/PluginLibrary.h
+++ b/dom/plugins/ipc/PluginLibrary.h
@@ -7,17 +7,17 @@
#ifndef mozilla_PluginLibrary_h
#define mozilla_PluginLibrary_h 1
#include "prlink.h"
#include "npapi.h"
#include "npfunctions.h"
#include "nscore.h"
#include "nsTArray.h"
-#include "nsPluginError.h"
+#include "nsError.h"
class gfxASurface;
class gfxContext;
class nsCString;
struct nsIntRect;
struct nsIntSize;
class nsNPAPIPlugin;
class nsGUIEvent;
--- a/dom/power/PowerManager.cpp
+++ b/dom/power/PowerManager.cpp
@@ -9,17 +9,17 @@
#include "nsDOMClassInfoID.h"
#include "nsIDOMWakeLockListener.h"
#include "nsIDocument.h"
#include "nsIPermissionManager.h"
#include "nsIPowerManagerService.h"
#include "nsIPrincipal.h"
#include "nsPIDOMWindow.h"
#include "nsServiceManagerUtils.h"
-#include "nsDOMError.h"
+#include "nsError.h"
DOMCI_DATA(MozPowerManager, mozilla::dom::power::PowerManager)
namespace mozilla {
namespace dom {
namespace power {
NS_INTERFACE_MAP_BEGIN(PowerManager)
--- a/dom/power/WakeLock.cpp
+++ b/dom/power/WakeLock.cpp
@@ -1,17 +1,17 @@
/* -*- Mode: C++; tab-width: 40; 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 "mozilla/Hal.h"
#include "mozilla/HalWakeLock.h"
#include "nsDOMClassInfoID.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIDOMWindow.h"
#include "nsIDOMEvent.h"
#include "nsIDOMDocument.h"
#include "nsIDOMEventTarget.h"
#include "nsPIDOMWindow.h"
#include "PowerManager.h"
#include "WakeLock.h"
--- a/dom/sms/src/SmsCursor.cpp
+++ b/dom/sms/src/SmsCursor.cpp
@@ -1,16 +1,16 @@
/* -*- Mode: C++; 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 "SmsCursor.h"
#include "nsIDOMClassInfo.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIDOMSmsMessage.h"
#include "nsIDOMSmsRequest.h"
#include "SmsRequest.h"
#include "SmsRequestManager.h"
#include "nsISmsDatabaseService.h"
DOMCI_DATA(MozSmsCursor, mozilla::dom::sms::SmsCursor)
--- a/dom/src/jsurl/nsJSProtocolHandler.cpp
+++ b/dom/src/jsurl/nsJSProtocolHandler.cpp
@@ -2,17 +2,17 @@
/* vim: set ts=4 sw=4 et tw=78: */
/* 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 "nsCOMPtr.h"
#include "nsAutoPtr.h"
#include "jsapi.h"
#include "nsCRT.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsXPIDLString.h"
#include "nsReadableUtils.h"
#include "nsJSProtocolHandler.h"
#include "nsStringStream.h"
#include "nsNetUtil.h"
#include "nsIComponentManager.h"
#include "nsIServiceManager.h"
--- a/dom/src/offline/nsDOMOfflineResourceList.cpp
+++ b/dom/src/offline/nsDOMOfflineResourceList.cpp
@@ -1,17 +1,17 @@
/* -*- Mode: C++; 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 "nsDOMOfflineResourceList.h"
#include "nsDOMClassInfoID.h"
#include "nsIScriptSecurityManager.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsDOMLists.h"
#include "nsIPrefetchService.h"
#include "nsCPrefetchService.h"
#include "nsNetUtil.h"
#include "nsNetCID.h"
#include "nsICacheSession.h"
#include "nsICacheService.h"
#include "nsIOfflineCacheUpdate.h"
--- a/dom/src/storage/StorageChild.cpp
+++ b/dom/src/storage/StorageChild.cpp
@@ -1,17 +1,17 @@
/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */
/* vim: set sw=4 ts=8 et tw=80 ft=cpp : */
/* 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 "StorageChild.h"
#include "mozilla/dom/ContentChild.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "sampler.h"
namespace mozilla {
namespace dom {
NS_IMPL_CYCLE_COLLECTION_1(StorageChild, mStorage)
--- a/dom/src/storage/nsDOMStorage.cpp
+++ b/dom/src/storage/nsDOMStorage.cpp
@@ -7,17 +7,17 @@
#include "StorageParent.h"
#include "mozilla/dom/ContentChild.h"
#include "nsXULAppAPI.h"
using mozilla::dom::StorageChild;
using mozilla::dom::ContentChild;
#include "prnetdb.h"
#include "nsCOMPtr.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsDOMClassInfoID.h"
#include "nsDOMJSUtils.h"
#include "nsUnicharUtils.h"
#include "nsDOMStorage.h"
#include "nsEscape.h"
#include "nsContentUtils.h"
#include "nsIScriptSecurityManager.h"
#include "nsIPrincipal.h"
--- a/dom/src/storage/nsDOMStorageDBWrapper.cpp
+++ b/dom/src/storage/nsDOMStorageDBWrapper.cpp
@@ -1,15 +1,15 @@
/* -*- Mode: C++; 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 "nsCOMPtr.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsDOMStorage.h"
#include "nsDOMStorageDBWrapper.h"
#include "nsIFile.h"
#include "nsIURL.h"
#include "nsIVariant.h"
#include "nsIEffectiveTLDService.h"
#include "nsAppDirectoryServiceDefs.h"
#include "mozStorageCID.h"
--- a/dom/src/storage/nsDOMStorageMemoryDB.cpp
+++ b/dom/src/storage/nsDOMStorageMemoryDB.cpp
@@ -1,15 +1,15 @@
/* -*- Mode: C++; 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 "nsCOMPtr.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsDOMStorage.h"
#include "nsDOMStorageMemoryDB.h"
#include "nsNetUtil.h"
nsresult
nsDOMStorageMemoryDB::Init(nsDOMStoragePersistentDB* aPreloadDB)
{
mData.Init(20);
--- a/dom/src/storage/nsDOMStoragePersistentDB.cpp
+++ b/dom/src/storage/nsDOMStoragePersistentDB.cpp
@@ -1,15 +1,15 @@
/* -*- Mode: C++; 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 "nsCOMPtr.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsDOMStorage.h"
#include "nsDOMStorageDBWrapper.h"
#include "nsDOMStoragePersistentDB.h"
#include "nsIFile.h"
#include "nsIVariant.h"
#include "nsIEffectiveTLDService.h"
#include "nsAppDirectoryServiceDefs.h"
#include "mozStorageCID.h"
--- a/dom/workers/File.cpp
+++ b/dom/workers/File.cpp
@@ -3,17 +3,17 @@
/* 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 "File.h"
#include "nsIDOMFile.h"
#include "nsDOMBlobBuilder.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "jsapi.h"
#include "jsatom.h"
#include "jsfriendapi.h"
#include "nsCOMPtr.h"
#include "nsJSUtils.h"
#include "nsStringGlue.h"
--- a/dom/workers/FileReaderSync.cpp
+++ b/dom/workers/FileReaderSync.cpp
@@ -2,17 +2,17 @@
/* vim: set ts=2 et sw=2 tw=80: */
/* 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 "FileReaderSync.h"
#include "nsIDOMFile.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "jsapi.h"
#include "jsatom.h"
#include "jsfriendapi.h"
#include "nsJSUtils.h"
#include "Exceptions.h"
#include "File.h"
--- a/dom/workers/FileReaderSyncPrivate.cpp
+++ b/dom/workers/FileReaderSyncPrivate.cpp
@@ -5,17 +5,17 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "FileReaderSyncPrivate.h"
#include "nsCExternalHandlerService.h"
#include "nsComponentManagerUtils.h"
#include "nsCOMPtr.h"
#include "nsDOMClassInfoID.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIDOMFile.h"
#include "nsCharsetAlias.h"
#include "nsICharsetDetector.h"
#include "nsIConverterInputStream.h"
#include "nsIInputStream.h"
#include "nsIPlatformCharset.h"
#include "nsISeekableStream.h"
#include "nsISupportsImpl.h"
--- a/dom/workers/ScriptLoader.cpp
+++ b/dom/workers/ScriptLoader.cpp
@@ -13,35 +13,32 @@
#include "nsIIOService.h"
#include "nsIProtocolHandler.h"
#include "nsIScriptSecurityManager.h"
#include "nsIStreamLoader.h"
#include "nsIURI.h"
#include "jsapi.h"
#include "nsChannelPolicy.h"
-#include "nsContentErrors.h"
+#include "nsError.h"
#include "nsContentPolicyUtils.h"
#include "nsContentUtils.h"
#include "nsDocShellCID.h"
#include "nsISupportsPrimitives.h"
-#include "nsNetError.h"
#include "nsNetUtil.h"
#include "nsScriptLoader.h"
#include "nsStringGlue.h"
#include "nsTArray.h"
#include "nsThreadUtils.h"
#include "nsXPCOM.h"
#include "Principal.h"
#include "WorkerFeature.h"
#include "WorkerPrivate.h"
-#include "nsDOMError.h"
-
#define MAX_CONCURRENT_SCRIPTS 1000
USING_WORKERS_NAMESPACE
namespace {
class ScriptLoaderRunnable;
--- a/dom/workers/WorkerPrivate.cpp
+++ b/dom/workers/WorkerPrivate.cpp
@@ -26,17 +26,17 @@
#include "jsfriendapi.h"
#include "jsdbgapi.h"
#include "jsfriendapi.h"
#include "jsprf.h"
#include "js/MemoryMetrics.h"
#include "nsAlgorithm.h"
#include "nsContentUtils.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsDOMJSUtils.h"
#include "nsGUIEvent.h"
#include "nsJSEnvironment.h"
#include "nsJSUtils.h"
#include "nsNetUtil.h"
#include "nsThreadUtils.h"
#include "xpcpublic.h"
#include "mozilla/Attributes.h"
--- a/editor/idl/nsIHTMLEditor.idl
+++ b/editor/idl/nsIHTMLEditor.idl
@@ -8,19 +8,16 @@
interface nsIAtom;
interface nsIContent;
interface nsISupportsArray;
interface nsISelection;
interface nsIContentFilter;
%{C++
-#define NS_EDITOR_ELEMENT_NOT_FOUND \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_EDITOR, 1)
-
namespace mozilla {
namespace dom {
class Element;
}
}
%}
[ptr] native Element (mozilla::dom::Element);
--- a/editor/libeditor/base/nsEditor.cpp
+++ b/editor/libeditor/base/nsEditor.cpp
@@ -107,19 +107,16 @@
#include "nsThreadUtils.h" // for nsRunnable
#include "nsTransactionManager.h" // for nsTransactionManager
#include "prtime.h" // for PR_Now
class nsIOutputStream;
class nsIParserService;
class nsITransferable;
-#define NS_ERROR_EDITOR_NO_SELECTION NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_EDITOR,1)
-#define NS_ERROR_EDITOR_NO_TEXTNODE NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_EDITOR,2)
-
#ifdef NS_DEBUG_EDITOR
static bool gNoisy = false;
#endif
#ifdef DEBUG
#include "nsIDOMHTMLDocument.h" // for nsIDOMHTMLDocument
#endif
--- a/editor/libeditor/html/nsHTMLDataTransfer.cpp
+++ b/editor/libeditor/html/nsHTMLDataTransfer.cpp
@@ -101,18 +101,16 @@ class nsILoadContext;
class nsISupports;
using namespace mozilla;
const PRUnichar nbsp = 160;
#define kInsertCookie "_moz_Insert Here_moz_"
-#define NS_FOUND_TARGET NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_EDITOR, 3)
-
// some little helpers
static bool FindIntegerAfterString(const char *aLeadingString,
nsCString &aCStr, PRInt32 &foundNumber);
static nsresult RemoveFragComments(nsCString &theStr);
static void RemoveBodyAndHead(nsIDOMNode *aNode);
static nsresult FindTargetNode(nsIDOMNode *aStart, nsCOMPtr<nsIDOMNode> &aResult);
static nsCOMPtr<nsIDOMNode> GetListParent(nsIDOMNode* aNode)
--- a/editor/libeditor/html/nsTableEditor.cpp
+++ b/editor/libeditor/html/nsTableEditor.cpp
@@ -28,17 +28,16 @@
#include "nsIFrame.h"
#include "nsIHTMLEditor.h"
#include "nsINode.h"
#include "nsIPresShell.h"
#include "nsISupportsUtils.h"
#include "nsITableCellLayout.h" // For efficient access to table cell
#include "nsITableEditor.h"
#include "nsITableLayout.h" // data owned by the table and cell frames
-#include "nsLayoutErrors.h"
#include "nsLiteralString.h"
#include "nsQueryFrame.h"
#include "nsString.h"
#include "nsTArray.h"
#include "nscore.h"
#include "prtypes.h"
using namespace mozilla;
--- a/embedding/browser/webBrowser/nsEmbedStream.cpp
+++ b/embedding/browser/webBrowser/nsEmbedStream.cpp
@@ -4,17 +4,17 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsIAsyncInputStream.h"
#include "nsIDocShell.h"
#include "nsIInterfaceRequestorUtils.h"
#include "nsIPipe.h"
#include "nsEmbedStream.h"
-#include "nsNetError.h"
+#include "nsError.h"
#include "nsString.h"
NS_IMPL_ISUPPORTS0(nsEmbedStream)
nsEmbedStream::nsEmbedStream()
{
mOwner = nullptr;
}
--- a/embedding/components/find/src/nsWebBrowserFind.cpp
+++ b/embedding/components/find/src/nsWebBrowserFind.cpp
@@ -31,17 +31,17 @@
#include "nsIDOMHTMLElement.h"
#include "nsIDOMHTMLDocument.h"
#include "nsIContent.h"
#include "nsContentCID.h"
#include "nsIServiceManager.h"
#include "nsIObserverService.h"
#include "nsISupportsPrimitives.h"
#include "nsFind.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsFocusManager.h"
#include "mozilla/Services.h"
#if DEBUG
#include "nsIWebNavigation.h"
#include "nsXPIDLString.h"
#endif
--- a/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp
+++ b/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp
@@ -90,18 +90,16 @@
#include "nsWebBrowserPersist.h"
using namespace mozilla;
// Buffer file writes in 32kb chunks
#define BUFFERED_OUTPUT_SIZE (1024 * 32)
-#define NS_SUCCESS_DONT_FIXUP NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_GENERAL, 1)
-
// Information about a DOM document
struct DocData
{
nsCOMPtr<nsIURI> mBaseURI;
nsCOMPtr<nsIDOMDocument> mDocument;
nsCOMPtr<nsIURI> mFile;
nsCOMPtr<nsIURI> mDataPath;
bool mDataPathIsRelative;
--- a/gfx/thebes/gfxTypes.h
+++ b/gfx/thebes/gfxTypes.h
@@ -13,27 +13,16 @@
* Currently needs to be 'double' for Cairo compatibility. Could
* become 'float', perhaps, in some configurations.
*/
typedef double gfxFloat;
# define THEBES_API
/**
- * gfx errors
- */
-
-/* nsIDeviceContextSpec.h defines a set of printer errors */
-#define NS_ERROR_GFX_GENERAL_BASE (50)
-
-/* Font cmap is strangely structured - avoid this font! */
-#define NS_ERROR_GFX_CMAP_MALFORMED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_GENERAL_BASE+1)
-
-/**
* Priority of a line break opportunity.
*
* eNoBreak The line has no break opportunities
* eWordWrapBreak The line has a break opportunity only within a word. With
* word-wrap: break-word we will break at this point only if
* there are no other break opportunities in the line.
* eNormalBreak The line has a break opportunity determined by the standard
* line-breaking algorithm.
--- a/image/decoders/nsIconDecoder.cpp
+++ b/image/decoders/nsIconDecoder.cpp
@@ -6,17 +6,17 @@
#include "nsIconDecoder.h"
#include "nsIInputStream.h"
#include "RasterImage.h"
#include "imgIContainerObserver.h"
#include "nspr.h"
#include "nsRect.h"
-#include "ImageErrors.h"
+#include "nsError.h"
namespace mozilla {
namespace image {
nsIconDecoder::nsIconDecoder(RasterImage &aImage, imgIDecoderObserver* aObserver)
: Decoder(aImage, aObserver),
mWidth(-1),
mHeight(-1),
deleted file mode 100644
--- a/image/public/ImageErrors.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* -*- Mode: C++; 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 "nsError.h"
-
-/**
- * imagelib specific nsresult success and error codes
- */
-#define NS_IMAGELIB_SUCCESS_LOAD_FINISHED NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_IMGLIB, 0)
-#define NS_IMAGELIB_CHANGING_OWNER NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_IMGLIB, 1)
-
-#define NS_IMAGELIB_ERROR_FAILURE NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_IMGLIB, 5)
-#define NS_IMAGELIB_ERROR_NO_DECODER NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_IMGLIB, 6)
-#define NS_IMAGELIB_ERROR_NOT_FINISHED NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_IMGLIB, 7)
-#define NS_IMAGELIB_ERROR_NO_ENCODER NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_IMGLIB, 9)
-
--- a/image/public/Makefile.in
+++ b/image/public/Makefile.in
@@ -8,17 +8,17 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = imglib2
GRE_MODULE = 1
-EXPORTS = ImageErrors.h ImageLogging.h
+EXPORTS = ImageLogging.h
XPIDLSRCS = \
imgICache.idl \
imgIContainer.idl \
imgIContainerDebug.idl \
imgIContainerObserver.idl \
imgIDecoderObserver.idl \
imgIEncoder.idl \
--- a/image/src/RasterImage.cpp
+++ b/image/src/RasterImage.cpp
@@ -1,17 +1,17 @@
/* -*- Mode: C++; 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 "base/histogram.h"
#include "nsComponentManagerUtils.h"
#include "imgIContainerObserver.h"
-#include "ImageErrors.h"
+#include "nsError.h"
#include "Decoder.h"
#include "imgIDecoderObserver.h"
#include "RasterImage.h"
#include "nsIInterfaceRequestor.h"
#include "nsIInterfaceRequestorUtils.h"
#include "nsAutoPtr.h"
#include "nsStringStream.h"
#include "prmem.h"
--- a/image/src/imgRequest.h
+++ b/image/src/imgRequest.h
@@ -19,17 +19,17 @@
#include "nsIPrincipal.h"
#include "nsITimedChannel.h"
#include "nsCategoryCache.h"
#include "nsCOMPtr.h"
#include "nsString.h"
#include "nsTObserverArray.h"
#include "nsWeakReference.h"
-#include "ImageErrors.h"
+#include "nsError.h"
#include "imgIRequest.h"
#include "imgStatusTracker.h"
#include "nsIAsyncVerifyRedirectCallback.h"
class imgCacheValidator;
class imgRequestProxy;
class imgCacheEntry;
--- a/image/src/imgRequestProxy.cpp
+++ b/image/src/imgRequestProxy.cpp
@@ -12,17 +12,17 @@
#include "nsIMultiPartChannel.h"
#include "nsString.h"
#include "nsXPIDLString.h"
#include "nsReadableUtils.h"
#include "nsCRT.h"
#include "Image.h"
-#include "ImageErrors.h"
+#include "nsError.h"
#include "ImageLogging.h"
#include "nspr.h"
using namespace mozilla::image;
NS_IMPL_ADDREF(imgRequestProxy)
NS_IMPL_RELEASE(imgRequestProxy)
--- a/image/src/imgTools.cpp
+++ b/image/src/imgTools.cpp
@@ -2,17 +2,17 @@
*
* 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 "imgTools.h"
#include "nsCOMPtr.h"
#include "nsString.h"
-#include "ImageErrors.h"
+#include "nsError.h"
#include "imgIContainer.h"
#include "imgIEncoder.h"
#include "imgIDecoderObserver.h"
#include "imgIContainerObserver.h"
#include "gfxContext.h"
#include "nsStringStream.h"
#include "nsComponentManagerUtils.h"
#include "nsWeakReference.h"
--- a/intl/uconv/public/nsEncoderDecoderUtils.h
+++ b/intl/uconv/public/nsEncoderDecoderUtils.h
@@ -1,22 +1,16 @@
/* -*- Mode: C; tab-width: 4; 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/. */
#ifndef nsEncoderDecoderUtils_h__
#define nsEncoderDecoderUtils_h__
-#define NS_ERROR_UCONV_NOCONV \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_UCONV, 0x01)
-
-#define NS_SUCCESS_USING_FALLBACK_LOCALE \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_UCONV, 0x02)
-
#define NS_UNICODEDECODER_NAME "Charset Decoders"
#define NS_UNICODEENCODER_NAME "Charset Encoders"
#define NS_DATA_BUNDLE_CATEGORY "uconv-charset-data"
#define NS_TITLE_BUNDLE_CATEGORY "uconv-charset-titles"
#define NS_CONVERTER_REGISTRY_START \
static const mozilla::Module::CategoryEntry kUConvCategories[] = {
--- a/intl/uconv/public/nsIUnicodeDecoder.h
+++ b/intl/uconv/public/nsIUnicodeDecoder.h
@@ -13,47 +13,16 @@
// {25359602-FC70-4d13-A9AB-8086D3827C0D}
//NS_DECLARE_ID(kIUnicodeDecoderIID,
// 0x25359602, 0xfc70, 0x4d13, 0xa9, 0xab, 0x80, 0x86, 0xd3, 0x82, 0x7c, 0xd);
#define NS_IUNICODEDECODER_IID \
{ 0x25359602, 0xfc70, 0x4d13, \
{ 0xa9, 0xab, 0x80, 0x86, 0xd3, 0x82, 0x7c, 0xd }}
-// XXX deprecated
-/*---------- BEGIN DEPRECATED */
-#define NS_EXACT_LENGTH \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_UCONV, 11)
-
-#define NS_PARTIAL_MORE_INPUT \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_UCONV, 12)
-
-#define NS_PARTIAL_MORE_OUTPUT \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_UCONV, 13)
-
-#define NS_ERROR_ILLEGAL_INPUT \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_UCONV, 14)
-/*---------- END DEPRECATED */
-
-// XXX make us hex! (same digits though)
-#define NS_OK_UDEC_EXACTLENGTH \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_UCONV, 11)
-
-#define NS_OK_UDEC_MOREINPUT \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_UCONV, 12)
-
-#define NS_OK_UDEC_MOREOUTPUT \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_UCONV, 13)
-
-#define NS_ERROR_UDEC_ILLEGALINPUT \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_UCONV, 14)
-
-#define NS_OK_UDEC_NOBOMFOUND \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_UCONV, 14)
-
#define NS_UNICODEDECODER_CONTRACTID_BASE "@mozilla.org/intl/unicode/decoder;1?charset="
/**
* Interface for a Converter from a Charset into Unicode.
*
* @created 23/Nov/1998
* @author Catalin Rotaru [CATA]
--- a/intl/uconv/public/nsIUnicodeEncoder.h
+++ b/intl/uconv/public/nsIUnicodeEncoder.h
@@ -17,28 +17,16 @@
{ 0x8a, 0xa1, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36 }}
// Interface ID for our Unicode Character Encoder interface
// {299BCCD0-C6DF-11d2-8AA8-00600811A836}
#define NS_IUNICHARENCODER_IID \
{ 0x299bccd0, 0xc6df, 0x11d2, \
{0x8a, 0xa8, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36 }}
-#define NS_OK_UENC_EXACTLENGTH \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_UCONV, 0x21)
-
-#define NS_OK_UENC_MOREOUTPUT \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_UCONV, 0x22)
-
-#define NS_ERROR_UENC_NOMAPPING \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_UCONV, 0x23)
-
-#define NS_OK_UENC_MOREINPUT \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_UCONV, 0x24)
-
#define NS_UNICODEENCODER_CONTRACTID_BASE "@mozilla.org/intl/unicode/encoder;1?charset="
/**
* Interface which converts a single character from Unicode into a given
* charset.
*
* @created 17/Feb/1999
--- a/intl/unicharutil/src/nsUnicodeNormalizer.cpp
+++ b/intl/unicharutil/src/nsUnicodeNormalizer.cpp
@@ -69,23 +69,16 @@ nsUnicodeNormalizer::nsUnicodeNormalizer
}
nsUnicodeNormalizer::~nsUnicodeNormalizer()
{
}
-#define NS_ERROR_UNORM_MOREOUTPUT \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GENERAL, 0x21)
-
-#define NS_SUCCESS_UNORM_NOTFOUND \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_GENERAL, 0x11)
-
-
#define END_BIT 0x80000000
/*
* Some constants for Hangul decomposition/composition.
* These things were taken from unicode book.
*/
#define SBase 0xac00
--- a/js/xpconnect/idl/nsIXPCScriptable.idl
+++ b/js/xpconnect/idl/nsIXPCScriptable.idl
@@ -2,39 +2,16 @@
*
* 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 "nsISupports.idl"
#include "nsIXPConnect.idl"
-%{ C++
-#define NS_SUCCESS_I_DID_SOMETHING \
- (NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_XPCONNECT,1))
-
-/**
- * Classes that want to only be touched by chrome (or from code whose filename
- * begins with chrome://global/) shoudl return this from their scriptable
- * helper's PreCreate hook.
- */
-#define NS_SUCCESS_CHROME_ACCESS_ONLY \
- (NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_XPCONNECT,2))
-
-/**
- * Classes that want slim wrappers should return NS_SUCCESS_ALLOW_SLIM_WRAPPERS
- * from their scriptable helper's PreCreate hook. They must also force a parent
- * for their wrapper (from the PreCreate hook), they must implement
- * nsWrapperCache and their scriptable helper must implement nsXPCClassInfo and
- * must return DONT_ASK_INSTANCE_FOR_SCRIPTABLE in the flags.
- */
-#define NS_SUCCESS_ALLOW_SLIM_WRAPPERS \
- (NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_XPCONNECT,3))
-%}
-
/**
* Note: This is not really an XPCOM interface. For example, callers must
* guarantee that they set the *_retval of the various methods that return a
* boolean to PR_TRUE before making the call. Implementations may skip writing
* to *_retval unless they want to return PR_FALSE.
*/
[uuid(c4788e02-3239-490a-8aeb-60fad08303fd)]
--- a/js/xpconnect/idl/nsIXPConnect.idl
+++ b/js/xpconnect/idl/nsIXPConnect.idl
@@ -42,81 +42,16 @@ class nsWrapperCache;
[ptr] native voidPtrPtr(void*);
[ptr] native nsScriptObjectTracerPtr(nsScriptObjectTracer);
[ref] native nsCCTraversalCallbackRef(nsCycleCollectionTraversalCallback);
[ptr] native nsAXPCNativeCallContextPtr(nsAXPCNativeCallContext);
[ptr] native nsWrapperCachePtr(nsWrapperCache);
/***************************************************************************/
-%{ C++
-/***************************************************************************/
-#define GENERATE_XPC_FAILURE(x) \
- (NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XPCONNECT,x))
-
-#define NS_ERROR_XPC_NOT_ENOUGH_ARGS GENERATE_XPC_FAILURE( 1)
-#define NS_ERROR_XPC_NEED_OUT_OBJECT GENERATE_XPC_FAILURE( 2)
-#define NS_ERROR_XPC_CANT_SET_OUT_VAL GENERATE_XPC_FAILURE( 3)
-#define NS_ERROR_XPC_NATIVE_RETURNED_FAILURE GENERATE_XPC_FAILURE( 4)
-#define NS_ERROR_XPC_CANT_GET_INTERFACE_INFO GENERATE_XPC_FAILURE( 5)
-#define NS_ERROR_XPC_CANT_GET_PARAM_IFACE_INFO GENERATE_XPC_FAILURE( 6)
-#define NS_ERROR_XPC_CANT_GET_METHOD_INFO GENERATE_XPC_FAILURE( 7)
-#define NS_ERROR_XPC_UNEXPECTED GENERATE_XPC_FAILURE( 8)
-#define NS_ERROR_XPC_BAD_CONVERT_JS GENERATE_XPC_FAILURE( 9)
-#define NS_ERROR_XPC_BAD_CONVERT_NATIVE GENERATE_XPC_FAILURE(10)
-#define NS_ERROR_XPC_BAD_CONVERT_JS_NULL_REF GENERATE_XPC_FAILURE(11)
-#define NS_ERROR_XPC_BAD_OP_ON_WN_PROTO GENERATE_XPC_FAILURE(12)
-#define NS_ERROR_XPC_CANT_CONVERT_WN_TO_FUN GENERATE_XPC_FAILURE(13)
-#define NS_ERROR_XPC_CANT_DEFINE_PROP_ON_WN GENERATE_XPC_FAILURE(14)
-#define NS_ERROR_XPC_CANT_WATCH_WN_STATIC GENERATE_XPC_FAILURE(15)
-#define NS_ERROR_XPC_CANT_EXPORT_WN_STATIC GENERATE_XPC_FAILURE(16)
-#define NS_ERROR_XPC_SCRIPTABLE_CALL_FAILED GENERATE_XPC_FAILURE(17)
-#define NS_ERROR_XPC_SCRIPTABLE_CTOR_FAILED GENERATE_XPC_FAILURE(18)
-#define NS_ERROR_XPC_CANT_CALL_WO_SCRIPTABLE GENERATE_XPC_FAILURE(19)
-#define NS_ERROR_XPC_CANT_CTOR_WO_SCRIPTABLE GENERATE_XPC_FAILURE(20)
-#define NS_ERROR_XPC_CI_RETURNED_FAILURE GENERATE_XPC_FAILURE(21)
-#define NS_ERROR_XPC_GS_RETURNED_FAILURE GENERATE_XPC_FAILURE(22)
-#define NS_ERROR_XPC_BAD_CID GENERATE_XPC_FAILURE(23)
-#define NS_ERROR_XPC_BAD_IID GENERATE_XPC_FAILURE(24)
-#define NS_ERROR_XPC_CANT_CREATE_WN GENERATE_XPC_FAILURE(25)
-#define NS_ERROR_XPC_JS_THREW_EXCEPTION GENERATE_XPC_FAILURE(26)
-#define NS_ERROR_XPC_JS_THREW_NATIVE_OBJECT GENERATE_XPC_FAILURE(27)
-#define NS_ERROR_XPC_JS_THREW_JS_OBJECT GENERATE_XPC_FAILURE(28)
-#define NS_ERROR_XPC_JS_THREW_NULL GENERATE_XPC_FAILURE(29)
-#define NS_ERROR_XPC_JS_THREW_STRING GENERATE_XPC_FAILURE(30)
-#define NS_ERROR_XPC_JS_THREW_NUMBER GENERATE_XPC_FAILURE(31)
-#define NS_ERROR_XPC_JAVASCRIPT_ERROR GENERATE_XPC_FAILURE(32)
-#define NS_ERROR_XPC_JAVASCRIPT_ERROR_WITH_DETAILS GENERATE_XPC_FAILURE(33)
-#define NS_ERROR_XPC_CANT_CONVERT_PRIMITIVE_TO_ARRAY GENERATE_XPC_FAILURE(34)
-#define NS_ERROR_XPC_CANT_CONVERT_OBJECT_TO_ARRAY GENERATE_XPC_FAILURE(35)
-#define NS_ERROR_XPC_NOT_ENOUGH_ELEMENTS_IN_ARRAY GENERATE_XPC_FAILURE(36)
-#define NS_ERROR_XPC_CANT_GET_ARRAY_INFO GENERATE_XPC_FAILURE(37)
-#define NS_ERROR_XPC_NOT_ENOUGH_CHARS_IN_STRING GENERATE_XPC_FAILURE(38)
-#define NS_ERROR_XPC_SECURITY_MANAGER_VETO GENERATE_XPC_FAILURE(39)
-#define NS_ERROR_XPC_INTERFACE_NOT_SCRIPTABLE GENERATE_XPC_FAILURE(40)
-#define NS_ERROR_XPC_INTERFACE_NOT_FROM_NSISUPPORTS GENERATE_XPC_FAILURE(41)
-#define NS_ERROR_XPC_CANT_GET_JSOBJECT_OF_DOM_OBJECT GENERATE_XPC_FAILURE(42)
-#define NS_ERROR_XPC_CANT_SET_READ_ONLY_CONSTANT GENERATE_XPC_FAILURE(43)
-#define NS_ERROR_XPC_CANT_SET_READ_ONLY_ATTRIBUTE GENERATE_XPC_FAILURE(44)
-#define NS_ERROR_XPC_CANT_SET_READ_ONLY_METHOD GENERATE_XPC_FAILURE(45)
-#define NS_ERROR_XPC_CANT_ADD_PROP_TO_WRAPPED_NATIVE GENERATE_XPC_FAILURE(46)
-#define NS_ERROR_XPC_CALL_TO_SCRIPTABLE_FAILED GENERATE_XPC_FAILURE(47)
-#define NS_ERROR_XPC_JSOBJECT_HAS_NO_FUNCTION_NAMED GENERATE_XPC_FAILURE(48)
-#define NS_ERROR_XPC_BAD_ID_STRING GENERATE_XPC_FAILURE(49)
-#define NS_ERROR_XPC_BAD_INITIALIZER_NAME GENERATE_XPC_FAILURE(50)
-#define NS_ERROR_XPC_HAS_BEEN_SHUTDOWN GENERATE_XPC_FAILURE(51)
-#define NS_ERROR_XPC_CANT_MODIFY_PROP_ON_WN GENERATE_XPC_FAILURE(52)
-#define NS_ERROR_XPC_BAD_CONVERT_JS_ZERO_ISNOT_NULL GENERATE_XPC_FAILURE(53)
-
-// any new errors here should have an associated entry added in xpc.msg
-/***************************************************************************/
-%}
-
-/***************************************************************************/
-
// forward declarations...
interface nsIXPCScriptable;
interface nsIXPConnect;
interface nsIXPConnectWrappedNative;
interface nsIInterfaceInfo;
interface nsIXPCSecurityManager;
interface nsIPrincipal;
--- a/js/xpconnect/src/XPCException.cpp
+++ b/js/xpconnect/src/XPCException.cpp
@@ -2,19 +2,17 @@
*
* 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/. */
/* An implementaion of nsIException. */
#include "xpcprivate.h"
-#include "nsNetError.h"
-#include "mozStorage.h"
-#include "nsPluginError.h"
+#include "nsError.h"
#include "nsIUnicodeDecoder.h"
/***************************************************************************/
/* Quick and dirty mapping of well known result codes to strings. We only
* call this when building an exception object, so iterating the short array
* is not too bad.
*
* It sure would be nice to have exceptions declared in idl and available
--- a/js/xpconnect/src/dictionary_helper_gen.py
+++ b/js/xpconnect/src/dictionary_helper_gen.py
@@ -105,17 +105,17 @@ def print_header(idl, fd, conf, dictname
write_header(p, fd)
def print_header_file(fd, conf):
fd.write("/* THIS FILE IS AUTOGENERATED - DO NOT EDIT */\n\n"
"#ifndef _gen_mozilla_idl_dictionary_helpers_h_\n"
"#define _gen_mozilla_idl_dictionary_helpers_h_\n\n")
fd.write("#include \"jsapi.h\"\n"
- "#include \"nsDOMError.h\"\n"
+ "#include \"nsError.h\"\n"
"#include \"nsString.h\"\n"
"#include \"nsCOMPtr.h\"\n\n")
# win32 namespace issues
fd.write("#undef near\n"
"\n\n")
forwards = []
--- a/layout/base/Makefile.in
+++ b/layout/base/Makefile.in
@@ -41,17 +41,16 @@ EXPORTS = \
nsFrameManager.h \
nsFrameManagerBase.h \
nsFrameIterator.h \
nsILayoutDebugger.h \
nsILayoutHistoryState.h \
nsIPercentHeightObserver.h \
nsIPresShell.h \
nsIReflowCallback.h \
- nsLayoutErrors.h \
nsLayoutUtils.h \
nsPresArena.h \
nsPresContext.h \
nsPresState.h \
nsRefreshDriver.h \
nsStyleChangeList.h \
nsStyleConsts.h \
StackArena.h \
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -65,24 +65,23 @@
#include "nsIScriptError.h"
#include "nsIDocShell.h"
#include "nsIDocShellTreeItem.h"
#include "nsObjectFrame.h"
#include "nsRuleNode.h"
#include "nsIDOMMutationEvent.h"
#include "nsChildIterator.h"
#include "nsCSSRendering.h"
-#include "nsLayoutErrors.h"
+#include "nsError.h"
#include "nsLayoutUtils.h"
#include "nsAutoPtr.h"
#include "nsBoxFrame.h"
#include "nsBoxLayout.h"
#include "nsImageFrame.h"
#include "nsIObjectLoadingContent.h"
-#include "nsContentErrors.h"
#include "nsIPrincipal.h"
#include "nsStyleUtil.h"
#include "nsBox.h"
#include "nsTArray.h"
#include "nsGenericDOMDataNode.h"
#include "mozilla/dom/Element.h"
#include "FrameLayerBuilder.h"
#include "nsAutoLayoutPhase.h"
--- a/layout/base/nsFrameManager.cpp
+++ b/layout/base/nsFrameManager.cpp
@@ -46,17 +46,17 @@
#include "nsIDOMHTMLCollection.h"
#include "nsIFormControl.h"
#include "nsIDOMElement.h"
#include "nsIDOMHTMLFormElement.h"
#include "nsIForm.h"
#include "nsContentUtils.h"
#include "nsReadableUtils.h"
#include "nsUnicharUtils.h"
-#include "nsLayoutErrors.h"
+#include "nsError.h"
#include "nsLayoutUtils.h"
#include "nsAutoPtr.h"
#include "imgIRequest.h"
#include "nsTransitionManager.h"
#include "RestyleTracker.h"
#include "nsAbsoluteContainingBlock.h"
#include "nsFrameManager.h"
deleted file mode 100644
--- a/layout/base/nsLayoutErrors.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- Mode: C++; 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/. */
-
-#ifndef nsLayoutErrors_h___
-#define nsLayoutErrors_h___
-
-/** Error codes for nsITableLayout */
-#define NS_TABLELAYOUT_CELL_NOT_FOUND \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_LAYOUT, 0)
-
-/** Error codes for nsFrame::GetNextPrevLineFromeBlockFrame */
-#define NS_POSITION_BEFORE_TABLE \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_LAYOUT, 3)
-
-/** Error codes for nsPresState::GetProperty() */
-
-/** Returned if the property exists */
-#define NS_STATE_PROPERTY_EXISTS NS_OK
-
-/** Returned if the property does not exist */
-#define NS_STATE_PROPERTY_NOT_THERE \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_LAYOUT, 5)
-
-
-#endif // nsLayoutErrors_h___
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -79,17 +79,17 @@
#include "nsILayoutHistoryState.h"
#include "nsILineIterator.h" // for ScrollContentIntoView
#include "nsWeakPtr.h"
#include "pldhash.h"
#include "nsDOMTouchEvent.h"
#include "nsIObserverService.h"
#include "nsIDocShell.h" // for reflow observation
#include "nsIBaseWindow.h"
-#include "nsLayoutErrors.h"
+#include "nsError.h"
#include "nsLayoutUtils.h"
#include "nsCSSRendering.h"
// for |#ifdef DEBUG| code
#include "prenv.h"
#include "nsAlgorithm.h"
#include "nsIAttribute.h"
#include "nsIGlobalHistory2.h"
#include "nsDisplayList.h"
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -31,27 +31,26 @@
#include "prprf.h"
#include "nsStyleChangeList.h"
#include "nsFrameSelection.h"
#include "nsFloatManager.h"
#include "nsIntervalSet.h"
#include "prenv.h"
#include "plstr.h"
#include "nsGUIEvent.h"
-#include "nsLayoutErrors.h"
+#include "nsError.h"
#include "nsAutoPtr.h"
#include "nsIServiceManager.h"
#include "nsIScrollableFrame.h"
#ifdef ACCESSIBILITY
#include "nsIDOMHTMLDocument.h"
#include "nsAccessibilityService.h"
#endif
#include "nsLayoutUtils.h"
#include "nsDisplayList.h"
-#include "nsContentErrors.h"
#include "nsCSSAnonBoxes.h"
#include "nsCSSFrameConstructor.h"
#include "nsCSSRendering.h"
#include "FrameLayerBuilder.h"
#include "nsRenderingContext.h"
#include "TextOverflow.h"
#include "nsStyleStructInlines.h"
#include "mozilla/Util.h" // for DebugOnly
--- a/layout/generic/nsContainerFrame.cpp
+++ b/layout/generic/nsContainerFrame.cpp
@@ -23,19 +23,18 @@
#include "nsCSSAnonBoxes.h"
#include "nsIViewManager.h"
#include "nsIWidget.h"
#include "nsGfxCIID.h"
#include "nsIServiceManager.h"
#include "nsCSSRendering.h"
#include "nsTransform2D.h"
#include "nsRegion.h"
-#include "nsLayoutErrors.h"
+#include "nsError.h"
#include "nsDisplayList.h"
-#include "nsContentErrors.h"
#include "nsListControlFrame.h"
#include "nsIBaseWindow.h"
#include "nsThemeConstants.h"
#include "nsBoxLayoutState.h"
#include "nsRenderingContext.h"
#include "nsCSSFrameConstructor.h"
#include "mozilla/dom/Element.h"
--- a/layout/generic/nsFloatManager.cpp
+++ b/layout/generic/nsFloatManager.cpp
@@ -5,17 +5,17 @@
/* class that manages rules for positioning floats */
#include "nsFloatManager.h"
#include "nsIPresShell.h"
#include "nsMemory.h"
#include "nsHTMLReflowState.h"
#include "nsBlockDebugFlags.h"
-#include "nsContentErrors.h"
+#include "nsError.h"
using namespace mozilla;
PRInt32 nsFloatManager::sCachedFloatManagerCount = 0;
void* nsFloatManager::sCachedFloatManagers[NS_FLOAT_MANAGER_CACHE_SIZE];
/////////////////////////////////////////////////////////////////////////////
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -68,18 +68,17 @@
#endif
// For triple-click pref
#include "nsIServiceManager.h"
#include "imgIContainer.h"
#include "imgIRequest.h"
#include "nsLayoutCID.h"
#include "nsUnicharUtils.h"
-#include "nsLayoutErrors.h"
-#include "nsContentErrors.h"
+#include "nsError.h"
#include "nsContainerFrame.h"
#include "nsBoxLayoutState.h"
#include "nsBlockFrame.h"
#include "nsDisplayList.h"
#include "nsIObjectLoadingContent.h"
#include "nsExpirationTracker.h"
#include "nsSVGIntegrationUtils.h"
#include "nsSVGEffects.h"
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -55,17 +55,17 @@
#include "imgILoader.h"
#include "nsCSSFrameConstructor.h"
#include "nsIDOMRange.h"
#include "nsIContentPolicy.h"
#include "nsContentPolicyUtils.h"
#include "nsEventStates.h"
-#include "nsLayoutErrors.h"
+#include "nsError.h"
#include "nsBidiUtils.h"
#include "nsBidiPresUtils.h"
#include "gfxRect.h"
#include "ImageLayers.h"
#include "mozilla/Preferences.h"
#include "mozilla/Util.h" // for DebugOnly
--- a/layout/generic/nsSelection.cpp
+++ b/layout/generic/nsSelection.cpp
@@ -72,17 +72,17 @@
#include "nsAutoCopyListener.h"
#include "nsCopySupport.h"
#include "nsIClipboard.h"
#ifdef IBMBIDI
#include "nsIBidiKeyboard.h"
#endif // IBMBIDI
-#include "nsDOMError.h"
+#include "nsError.h"
#include "mozilla/dom/Element.h"
using namespace mozilla;
//#define DEBUG_TABLE 1
static NS_DEFINE_IID(kCContentIteratorCID, NS_CONTENTITERATOR_CID);
--- a/layout/printing/nsPrintEngine.cpp
+++ b/layout/printing/nsPrintEngine.cpp
@@ -11,17 +11,17 @@
#include "nsISelection.h"
#include "nsIScriptGlobalObject.h"
#include "nsPIDOMWindow.h"
#include "nsIDocShell.h"
#include "nsIFrame.h"
#include "nsIURI.h"
#include "nsITextToSubURI.h"
-#include "nsContentErrors.h"
+#include "nsError.h"
// Print Options
#include "nsIPrintSettings.h"
#include "nsIPrintSettingsService.h"
#include "nsIPrintOptions.h"
#include "nsIPrintSession.h"
#include "nsGfxCIID.h"
#include "nsIServiceManager.h"
--- a/layout/style/Loader.cpp
+++ b/layout/style/Loader.cpp
@@ -54,17 +54,17 @@
#ifdef MOZ_XUL
#include "nsXULPrototypeCache.h"
#endif
#include "nsIMediaList.h"
#include "nsIDOMStyleSheet.h"
#include "nsIDOMCSSStyleSheet.h"
-#include "nsContentErrors.h"
+#include "nsError.h"
#include "nsIChannelPolicy.h"
#include "nsIContentSecurityPolicy.h"
#include "mozilla/FunctionTimer.h"
/**
* OVERALL ARCHITECTURE
--- a/layout/style/StyleRule.cpp
+++ b/layout/style/StyleRule.cpp
@@ -32,17 +32,17 @@
#include "nsCSSPseudoElements.h"
#include "nsIPrincipal.h"
#include "nsComponentManagerUtils.h"
#include "nsCSSPseudoClasses.h"
#include "nsCSSAnonBoxes.h"
#include "nsTArray.h"
#include "nsDOMClassInfoID.h"
#include "nsContentUtils.h"
-#include "nsContentErrors.h"
+#include "nsError.h"
#include "mozAutoDocUpdate.h"
#include "prlog.h"
namespace css = mozilla::css;
#define NS_IF_CLONE(member_) \
PR_BEGIN_MACRO \
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -29,25 +29,24 @@
#include "nsCOMArray.h"
#include "nsColor.h"
#include "nsCSSPseudoClasses.h"
#include "nsCSSPseudoElements.h"
#include "nsCSSAnonBoxes.h"
#include "nsINameSpaceManager.h"
#include "nsXMLNameSpaceMap.h"
#include "nsThemeConstants.h"
-#include "nsContentErrors.h"
+#include "nsError.h"
#include "nsIMediaList.h"
#include "mozilla/LookAndFeel.h"
#include "nsStyleUtil.h"
#include "nsIPrincipal.h"
#include "prprf.h"
#include "math.h"
#include "nsContentUtils.h"
-#include "nsDOMError.h"
#include "nsAutoPtr.h"
#include "prlog.h"
#include "CSSCalc.h"
#include "nsMediaFeatures.h"
#include "nsLayoutUtils.h"
#include "mozilla/Util.h"
--- a/layout/style/nsCSSRuleProcessor.cpp
+++ b/layout/style/nsCSSRuleProcessor.cpp
@@ -27,17 +27,17 @@
#include "mozilla/css/StyleRule.h"
#include "mozilla/css/GroupRule.h"
#include "nsIDocument.h"
#include "nsPresContext.h"
#include "nsEventStateManager.h"
#include "nsGkAtoms.h"
#include "nsString.h"
#include "nsUnicharUtils.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsRuleWalker.h"
#include "nsCSSPseudoClasses.h"
#include "nsCSSPseudoElements.h"
#include "nsIContent.h"
#include "nsCOMPtr.h"
#include "nsHashKeys.h"
#include "nsStyleUtil.h"
#include "nsQuickSort.h"
--- a/layout/style/nsCSSRules.cpp
+++ b/layout/style/nsCSSRules.cpp
@@ -24,17 +24,17 @@
#include "nsIMediaList.h"
#include "nsICSSRuleList.h"
#include "nsIDocument.h"
#include "nsPresContext.h"
#include "nsRuleNode.h"
#include "nsContentUtils.h"
#include "nsStyleConsts.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsStyleUtil.h"
#include "mozilla/css/Declaration.h"
#include "nsCSSParser.h"
#include "nsPrintfCString.h"
#include "nsDOMClassInfoID.h"
namespace css = mozilla::css;
--- a/layout/style/nsCSSStyleSheet.cpp
+++ b/layout/style/nsCSSStyleSheet.cpp
@@ -19,17 +19,17 @@
#include "nsPresContext.h"
#include "nsGkAtoms.h"
#include "nsString.h"
#include "nsTArray.h"
#include "nsIDOMCSSStyleSheet.h"
#include "nsICSSRuleList.h"
#include "nsIDOMMediaList.h"
#include "nsIDOMNode.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsCSSParser.h"
#include "mozilla/css/Loader.h"
#include "nsICSSLoaderObserver.h"
#include "nsINameSpaceManager.h"
#include "nsXMLNameSpaceMap.h"
#include "nsCOMPtr.h"
#include "nsContentUtils.h"
#include "nsIScriptSecurityManager.h"
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -5,17 +5,17 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* DOM object returned from element.getComputedStyle() */
#include "mozilla/Util.h"
#include "nsComputedDOMStyle.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsDOMString.h"
#include "nsIDOMCSS2Properties.h"
#include "nsIDOMElement.h"
#include "nsIDOMCSSPrimitiveValue.h"
#include "nsStyleContext.h"
#include "nsIScrollableFrame.h"
#include "nsContentUtils.h"
#include "prprf.h"
--- a/layout/style/nsDOMCSSValueList.cpp
+++ b/layout/style/nsDOMCSSValueList.cpp
@@ -1,17 +1,17 @@
/* 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/. */
/* DOM object representing lists of values in DOM computed style */
#include "nsDOMCSSValueList.h"
#include "nsCOMPtr.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "prtypes.h"
#include "nsContentUtils.h"
#include "nsDOMClassInfoID.h"
nsDOMCSSValueList::nsDOMCSSValueList(bool aCommaDelimited, bool aReadonly)
: mCommaDelimited(aCommaDelimited), mReadonly(aReadonly)
{
}
--- a/layout/style/nsFontFaceLoader.cpp
+++ b/layout/style/nsFontFaceLoader.cpp
@@ -8,17 +8,16 @@
#ifdef MOZ_LOGGING
#define FORCE_PR_LOG /* Allow logging in the release build */
#endif /* MOZ_LOGGING */
#include "prlog.h"
#include "nsFontFaceLoader.h"
-#include "nsDOMError.h"
#include "nsError.h"
#include "nsIFile.h"
#include "nsIStreamListener.h"
#include "nsNetUtil.h"
#include "nsIChannelEventSink.h"
#include "nsIInterfaceRequestor.h"
#include "nsContentUtils.h"
#include "mozilla/Preferences.h"
@@ -27,17 +26,16 @@
#include "nsIPresShell.h"
#include "nsIPrincipal.h"
#include "nsIScriptSecurityManager.h"
#include "nsDirectoryServiceUtils.h"
#include "nsDirectoryServiceDefs.h"
#include "nsIContentPolicy.h"
#include "nsContentPolicyUtils.h"
-#include "nsContentErrors.h"
#include "nsCrossSiteListenerProxy.h"
#include "nsIContentSecurityPolicy.h"
#include "nsIChannelPolicy.h"
#include "nsChannelPolicy.h"
#include "nsIConsoleService.h"
#include "nsStyleSet.h"
--- a/layout/style/nsHTMLStyleSheet.cpp
+++ b/layout/style/nsHTMLStyleSheet.cpp
@@ -28,17 +28,17 @@
#include "nsPresContext.h"
#include "nsEventStates.h"
#include "nsIDocument.h"
#include "nsIPresShell.h"
#include "nsStyleConsts.h"
#include "nsCSSAnonBoxes.h"
#include "nsRuleWalker.h"
#include "nsRuleData.h"
-#include "nsContentErrors.h"
+#include "nsError.h"
#include "nsRuleProcessorData.h"
#include "nsCSSRuleProcessor.h"
#include "mozilla/dom/Element.h"
#include "nsCSSFrameConstructor.h"
using namespace mozilla::dom;
NS_IMPL_ISUPPORTS1(nsHTMLStyleSheet::HTMLColorRule, nsIStyleRule)
--- a/layout/style/nsROCSSPrimitiveValue.cpp
+++ b/layout/style/nsROCSSPrimitiveValue.cpp
@@ -8,17 +8,17 @@
#include "nsROCSSPrimitiveValue.h"
#include "nsPresContext.h"
#include "nsStyleUtil.h"
#include "nsDOMCSSRGBColor.h"
#include "nsIDOMRect.h"
#include "nsDOMClassInfoID.h" // DOMCI_DATA
#include "nsIURI.h"
-#include "nsDOMError.h"
+#include "nsError.h"
nsROCSSPrimitiveValue::nsROCSSPrimitiveValue()
: mType(CSS_PX)
{
mValue.mAppUnits = 0;
}
--- a/layout/svg/base/src/nsSVGGlyphFrame.cpp
+++ b/layout/svg/base/src/nsSVGGlyphFrame.cpp
@@ -9,17 +9,17 @@
// Keep others in (case-insensitive) order:
#include "DOMSVGPoint.h"
#include "gfxContext.h"
#include "gfxMatrix.h"
#include "gfxPlatform.h"
#include "mozilla/LookAndFeel.h"
#include "nsBidiPresUtils.h"
#include "nsDisplayList.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsIDOMSVGRect.h"
#include "nsRenderingContext.h"
#include "nsSVGEffects.h"
#include "nsSVGIntegrationUtils.h"
#include "nsSVGPaintServerFrame.h"
#include "nsSVGRect.h"
#include "nsSVGTextPathFrame.h"
#include "nsSVGUtils.h"
--- a/layout/svg/base/src/nsSVGTextContainerFrame.cpp
+++ b/layout/svg/base/src/nsSVGTextContainerFrame.cpp
@@ -2,17 +2,17 @@
/* 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/. */
// Main header first:
#include "nsSVGContainerFrame.h"
// Keep others in (case-insensitive) order:
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsSVGGlyphFrame.h"
#include "nsSVGTextFrame.h"
#include "nsSVGUtils.h"
#include "SVGAnimatedNumberList.h"
#include "SVGLengthList.h"
#include "SVGNumberList.h"
using namespace mozilla;
--- a/layout/tables/nsTableFrame.cpp
+++ b/layout/tables/nsTableFrame.cpp
@@ -26,17 +26,17 @@
#include "nsCSSRendering.h"
#include "nsGkAtoms.h"
#include "nsCSSAnonBoxes.h"
#include "nsIPresShell.h"
#include "nsIDOMElement.h"
#include "nsIDOMHTMLElement.h"
#include "nsIDOMHTMLBodyElement.h"
#include "nsFrameManager.h"
-#include "nsLayoutErrors.h"
+#include "nsError.h"
#include "nsAutoPtr.h"
#include "nsCSSFrameConstructor.h"
#include "nsStyleSet.h"
#include "nsDisplayList.h"
#include "nsIScrollableFrame.h"
#include "nsCSSProps.h"
using namespace mozilla;
--- a/layout/xul/base/src/nsResizerFrame.cpp
+++ b/layout/xul/base/src/nsResizerFrame.cpp
@@ -22,17 +22,17 @@
#include "nsIBaseWindow.h"
#include "nsPIDOMWindow.h"
#include "nsGUIEvent.h"
#include "nsEventDispatcher.h"
#include "nsContentUtils.h"
#include "nsMenuPopupFrame.h"
#include "nsIScreenManager.h"
#include "mozilla/dom/Element.h"
-#include "nsContentErrors.h"
+#include "nsError.h"
using namespace mozilla;
//
// NS_NewResizerFrame
//
// Creates a new Resizer frame and returns it
//
--- a/layout/xul/base/src/tree/src/nsTreeBoxObject.cpp
+++ b/layout/xul/base/src/tree/src/nsTreeBoxObject.cpp
@@ -6,17 +6,17 @@
#include "nsTreeBoxObject.h"
#include "nsCOMPtr.h"
#include "nsIDOMXULElement.h"
#include "nsIXULTemplateBuilder.h"
#include "nsTreeContentView.h"
#include "nsITreeSelection.h"
#include "nsChildIterator.h"
#include "nsContentUtils.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsTreeBodyFrame.h"
NS_IMPL_CYCLE_COLLECTION_1(nsTreeBoxObject, mView)
NS_IMPL_ADDREF_INHERITED(nsTreeBoxObject, nsBoxObject)
NS_IMPL_RELEASE_INHERITED(nsTreeBoxObject, nsBoxObject)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsTreeBoxObject)
--- a/layout/xul/base/src/tree/src/nsTreeContentView.cpp
+++ b/layout/xul/base/src/tree/src/nsTreeContentView.cpp
@@ -5,17 +5,17 @@
#include "nsINameSpaceManager.h"
#include "nsGkAtoms.h"
#include "nsIBoxObject.h"
#include "nsTreeUtils.h"
#include "nsTreeContentView.h"
#include "nsChildIterator.h"
#include "nsDOMClassInfoID.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsEventStates.h"
#include "nsINodeInfo.h"
#include "nsIXULSortService.h"
#include "nsContentUtils.h"
#include "nsTreeBodyFrame.h"
#include "mozilla/dom/Element.h"
#include "nsServiceManagerUtils.h"
--- a/modules/libjar/zipwriter/src/nsZipWriter.cpp
+++ b/modules/libjar/zipwriter/src/nsZipWriter.cpp
@@ -7,17 +7,17 @@
#include "nsZipWriter.h"
#include "nsZipDataStream.h"
#include "nsISeekableStream.h"
#include "nsIAsyncStreamCopier.h"
#include "nsIStreamListener.h"
#include "nsIInputStreamPump.h"
#include "nsComponentManagerUtils.h"
#include "nsMemory.h"
-#include "nsNetError.h"
+#include "nsError.h"
#include "nsStreamUtils.h"
#include "nsThreadUtils.h"
#include "nsNetUtil.h"
#include "prio.h"
#define ZIP_EOCDR_HEADER_SIZE 22
#define ZIP_EOCDR_HEADER_SIGNATURE 0x06054b50
--- a/netwerk/base/public/Makefile.in
+++ b/netwerk/base/public/Makefile.in
@@ -120,17 +120,16 @@ XPIDLSRCS = \
$(NULL)
ifdef MOZ_TOOLKIT_SEARCH
XPIDLSRCS += nsIBrowserSearchService.idl
endif
EXPORTS = \
netCore.h \
- nsNetError.h \
nsNetUtil.h \
nsNetStrings.h \
nsChannelProperties.h \
nsURIHashKey.h \
nsReadLine.h \
nsASocketHandler.h \
nsAsyncRedirectVerifyHelper.h \
nsStreamListenerWrapper.h \
--- a/netwerk/base/public/netCore.h
+++ b/netwerk/base/public/netCore.h
@@ -1,14 +1,14 @@
/* -*- Mode: C++; tab-width: 4; 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/. */
#ifndef __netCore_h__
#define __netCore_h__
-#include "nsNetError.h"
+#include "nsError.h"
// Where most necko status messages come from:
#define NECKO_MSGS_URL "chrome://necko/locale/necko.properties"
#endif // __netCore_h__
--- a/netwerk/base/public/nsIAuthModule.idl
+++ b/netwerk/base/public/nsIAuthModule.idl
@@ -127,17 +127,9 @@ interface nsIAuthModule : nsISupports
%{C++
/**
* nsIAuthModule implementations are registered under the following contract
* ID prefix:
*/
#define NS_AUTH_MODULE_CONTRACTID_PREFIX \
"@mozilla.org/network/auth-module;1?name="
-
-/**
- * This success code may be returned by nsIAuthModule::getNextToken to
- * indicate that the authentication is finished and thus there's no need
- * to call getNextToken again.
- */
-#define NS_SUCCESS_AUTH_FINISHED \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_NETWORK, 40)
%}
--- a/netwerk/base/public/nsISocketTransport.idl
+++ b/netwerk/base/public/nsISocketTransport.idl
@@ -156,28 +156,8 @@ interface nsISocketTransport : nsITransp
* services require expedited-forwarding).
* Not setting this value will leave the socket with the default
* ToS value, which on most systems if IPTOS_CLASS_CS0 (formerly
* IPTOS_PREC_ROUTINE).
*/
attribute octet QoSBits;
};
-
-%{C++
-/**
- * #define's with the correct type, for use by C++ code
- */
-#define NS_NET_STATUS_RESOLVING_HOST \
- static_cast<nsresult>(nsISocketTransport::STATUS_RESOLVING)
-#define NS_NET_STATUS_RESOLVED_HOST \
- static_cast<nsresult>(nsISocketTransport::STATUS_RESOLVED)
-#define NS_NET_STATUS_CONNECTED_TO \
- static_cast<nsresult>(nsISocketTransport::STATUS_CONNECTED_TO)
-#define NS_NET_STATUS_SENDING_TO \
- static_cast<nsresult>(nsISocketTransport::STATUS_SENDING_TO)
-#define NS_NET_STATUS_RECEIVING_FROM \
- static_cast<nsresult>(nsISocketTransport::STATUS_RECEIVING_FROM)
-#define NS_NET_STATUS_CONNECTING_TO \
- static_cast<nsresult>(nsISocketTransport::STATUS_CONNECTING_TO)
-#define NS_NET_STATUS_WAITING_FOR \
- static_cast<nsresult>(nsISocketTransport::STATUS_WAITING_FOR)
-%}
--- a/netwerk/base/public/nsITransport.idl
+++ b/netwerk/base/public/nsITransport.idl
@@ -156,15 +156,8 @@ interface nsITransportEventSink : nsISup
* the maximum amount of data that will be read or written. if
* unknown, 0xFFFFFFFF will be passed.
*/
void onTransportStatus(in nsITransport aTransport,
in nsresult aStatus,
in unsigned long long aProgress,
in unsigned long long aProgressMax);
};
-
-%{C++
-#define NS_NET_STATUS_READING \
- static_cast<nsresult>(nsITransport::STATUS_READING)
-#define NS_NET_STATUS_WRITING \
- static_cast<nsresult>(nsITransport::STATUS_WRITING)
-%}
deleted file mode 100644
--- a/netwerk/base/public/nsNetError.h
+++ /dev/null
@@ -1,372 +0,0 @@
-/* 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/. */
-
-#ifndef nsNetError_h__
-#define nsNetError_h__
-
-#include "nsError.h"
-
-
-/* NETWORKING ERROR CODES */
-
-
-/******************************************************************************
- * General async request error codes:
- *
- * These error codes are commonly passed through callback methods to indicate
- * the status of some requested async request.
- *
- * For example, see nsIRequestObserver::onStopRequest.
- */
-
-/**
- * The async request completed successfully.
- */
-#define NS_BINDING_SUCCEEDED \
- NS_OK
-
-/**
- * The async request failed for some unknown reason.
- */
-#define NS_BINDING_FAILED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 1)
-
-/**
- * The async request failed because it was aborted by some user action.
- */
-#define NS_BINDING_ABORTED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 2)
-
-/**
- * The async request has been "redirected" to a different async request.
- * (e.g., an HTTP redirect occurred).
- *
- * This error code is used with load groups to notify the load group observer
- * when a request in the load group is redirected to another request.
- */
-#define NS_BINDING_REDIRECTED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 3)
-
-/**
- * The async request has been "retargeted" to a different "handler."
- *
- * This error code is used with load groups to notify the load group observer
- * when a request in the load group is removed from the load group and added
- * to a different load group.
- */
-#define NS_BINDING_RETARGETED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 4)
-
-
-/******************************************************************************
- * Miscellaneous error codes:
- *
- * These errors are not typically passed via onStopRequest.
- */
-
-/**
- * The URI is malformed.
- */
-#define NS_ERROR_MALFORMED_URI \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 10)
-
-/**
- * The URI scheme corresponds to an unknown protocol handler.
- */
-#define NS_ERROR_UNKNOWN_PROTOCOL \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 18)
-
-/**
- * Returned from nsIChannel::asyncOpen to indicate that OnDataAvailable will
- * not be called because there is no content available.
- *
- * This is used by helper app style protocols (e.g., mailto).
- *
- * XXX perhaps this should be a success code.
- */
-#define NS_ERROR_NO_CONTENT \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 17)
-
-/**
- * The requested action could not be completed while the object is busy.
- *
- * Implementations of nsIChannel::asyncOpen will commonly return this error
- * if the channel has already been opened (and has not yet been closed).
- */
-#define NS_ERROR_IN_PROGRESS \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 15)
-
-/**
- * Returned from nsIChannel::asyncOpen when trying to open the channel again
- * (reopening is not supported).
- */
-#define NS_ERROR_ALREADY_OPENED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 73)
-
-/**
- * The content encoding of the source document was incorrect, for example
- * returning a plain HTML document advertised as Content-Encoding: gzip
- */
-#define NS_ERROR_INVALID_CONTENT_ENCODING \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 27)
-
-/**
- * A transport level corruption was found in the source document. for example
- * a document with a calculated checksum that does not match the Content-MD5
- * http header.
- */
-#define NS_ERROR_CORRUPTED_CONTENT \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 29)
-
-/**
- * While parsing for the first component of a header field using
- * syntax as in Content-Disposition or Content-Type, the first component
- * was found to be empty, such as in:
- *
- * Content-Disposition: ; filename=foo
- */
-#define NS_ERROR_FIRST_HEADER_FIELD_COMPONENT_EMPTY \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 34)
-
-
-/******************************************************************************
- * Connectivity error codes:
- */
-
-/**
- * The connection is already established.
- * XXX currently unused - consider removing.
- */
-#define NS_ERROR_ALREADY_CONNECTED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 11)
-
-/**
- * The connection does not exist.
- * XXX currently unused - consider removing.
- */
-#define NS_ERROR_NOT_CONNECTED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 12)
-
-/**
- * The connection attempt failed, for example, because no server was listening
- * at specified host:port.
- */
-#define NS_ERROR_CONNECTION_REFUSED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 13)
-
-/**
- * The connection attempt to a proxy failed.
- */
-#define NS_ERROR_PROXY_CONNECTION_REFUSED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 72)
-
-/**
- * The connection was lost due to a timeout error.
- */
-#define NS_ERROR_NET_TIMEOUT \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 14)
-
-/**
- * The requested action could not be completed while the networking library
- * is in the offline state.
- */
-#define NS_ERROR_OFFLINE \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 16)
-
-/**
- * The requested action was prohibited because it would have caused the
- * networking library to establish a connection to an unsafe or otherwise
- * banned port.
- */
-#define NS_ERROR_PORT_ACCESS_NOT_ALLOWED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 19)
-
-/**
- * The connection was established, but no data was ever received.
- */
-#define NS_ERROR_NET_RESET \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 20)
-
-/**
- * The connection was established, but the data transfer was interrupted.
- */
-#define NS_ERROR_NET_INTERRUPT \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 71)
-
-// XXX really need to better rationalize these error codes. are consumers of
-// necko really expected to know how to discern the meaning of these??
-
-
-/**
- * This request is not resumable, but it was tried to resume it, or to
- * request resume-specific data.
- */
-#define NS_ERROR_NOT_RESUMABLE \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 25)
-
-/**
- * It was attempted to resume the request, but the entity has changed in the
- * meantime.
- */
-#define NS_ERROR_ENTITY_CHANGED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 32)
-
-/**
- * The request failed as a result of a detected redirection loop.
- */
-#define NS_ERROR_REDIRECT_LOOP \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 31)
-
-/**
- * The request failed because the content type returned by the server was
- * not a type expected by the channel (for nested channels such as the JAR
- * channel).
- */
-#define NS_ERROR_UNSAFE_CONTENT_TYPE \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 74)
-
-/**
- * The request failed because the user tried to access to a remote XUL document
- * from a website that is not in its white-list.
- */
-#define NS_ERROR_REMOTE_XUL \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 75)
-
-
-/******************************************************************************
- * FTP specific error codes:
- *
- * XXX document me
- */
-
-#define NS_ERROR_FTP_LOGIN \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 21)
-
-#define NS_ERROR_FTP_CWD \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 22)
-
-#define NS_ERROR_FTP_PASV \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 23)
-
-#define NS_ERROR_FTP_PWD \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 24)
-
-#define NS_ERROR_FTP_LIST \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 28)
-
-/******************************************************************************
- * DNS specific error codes:
- */
-
-/**
- * The lookup of a hostname failed. This generally refers to the hostname
- * from the URL being loaded.
- */
-#define NS_ERROR_UNKNOWN_HOST \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 30)
-
-/**
- * A low or medium priority DNS lookup failed because the pending
- * queue was already full. High priorty (the default) always
- * makes room
- */
-#define NS_ERROR_DNS_LOOKUP_QUEUE_FULL \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 33)
-
-/**
- * The lookup of a proxy hostname failed.
- *
- * If a channel is configured to speak to a proxy server, then it will
- * generate this error if the proxy hostname cannot be resolved.
- */
-#define NS_ERROR_UNKNOWN_PROXY_HOST \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 42)
-
-
-/******************************************************************************
- * Socket specific error codes:
- */
-
-/**
- * The specified socket type does not exist.
- */
-#define NS_ERROR_UNKNOWN_SOCKET_TYPE \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 51)
-
-/**
- * The specified socket type could not be created.
- */
-#define NS_ERROR_SOCKET_CREATE_FAILED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 52)
-
-
-/******************************************************************************
- * Cache specific error codes:
- *
- * XXX document me
- */
-
-#define NS_ERROR_CACHE_KEY_NOT_FOUND \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 61)
-
-#define NS_ERROR_CACHE_DATA_IS_STREAM \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 62)
-
-#define NS_ERROR_CACHE_DATA_IS_NOT_STREAM \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 63)
-
-#define NS_ERROR_CACHE_WAIT_FOR_VALIDATION \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 64)
-
-#define NS_ERROR_CACHE_ENTRY_DOOMED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 65)
-
-#define NS_ERROR_CACHE_READ_ACCESS_DENIED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 66)
-
-#define NS_ERROR_CACHE_WRITE_ACCESS_DENIED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 67)
-
-#define NS_ERROR_CACHE_IN_USE \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 68)
-
-/**
- * Error passed through onStopRequest if the document could not be fetched
- * from the cache.
- */
-#define NS_ERROR_DOCUMENT_NOT_CACHED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 70)
-
-
-/******************************************************************************
- * Effective TLD Service specific error codes:
- */
-
-/**
- * The requested number of domain levels exceeds those present in the host string.
- */
-#define NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 80)
-
-/**
- * The host string is an IP address.
- */
-#define NS_ERROR_HOST_IS_IP_ADDRESS \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 81)
-
-
-/******************************************************************************
- * StreamLoader specific result codes:
- */
-
-/**
- * Result code returned by nsIStreamLoaderObserver to indicate that
- * the observer is taking over responsibility for the data buffer,
- * and the loader should NOT free it.
- */
-#define NS_SUCCESS_ADOPTED_DATA \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_NETWORK, 90)
-
-
-#endif // !nsNetError_h__
--- a/netwerk/base/public/nsNetUtil.h
+++ b/netwerk/base/public/nsNetUtil.h
@@ -2,17 +2,17 @@
/* vim:set ts=4 sw=4 sts=4 et cin: */
/* 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/. */
#ifndef nsNetUtil_h__
#define nsNetUtil_h__
-#include "nsNetError.h"
+#include "nsError.h"
#include "nsNetCID.h"
#include "nsStringGlue.h"
#include "nsMemory.h"
#include "nsCOMPtr.h"
#include "prio.h" // for read/write flags, permissions, etc.
#include "nsHashKeys.h"
#include "plstr.h"
--- a/netwerk/base/src/nsIncrementalDownload.cpp
+++ b/netwerk/base/src/nsIncrementalDownload.cpp
@@ -20,26 +20,16 @@
#include "nsITimer.h"
#include "nsNetUtil.h"
#include "nsAutoPtr.h"
#include "nsWeakReference.h"
#include "nsChannelProperties.h"
#include "prio.h"
#include "prprf.h"
-// Error code used internally by the incremental downloader to cancel the
-// network channel when the download is already complete.
-#define NS_ERROR_DOWNLOAD_COMPLETE \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GENERAL, 1)
-
-// Error code used internally by the incremental downloader to cancel the
-// network channel when the response to a range request is 200 instead of 206.
-#define NS_ERROR_DOWNLOAD_NOT_PARTIAL \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GENERAL, 2)
-
// Default values used to initialize a nsIncrementalDownload object.
#define DEFAULT_CHUNK_SIZE (4096 * 16) // bytes
#define DEFAULT_INTERVAL 60 // seconds
#define UPDATE_PROGRESS_INTERVAL PRTime(500 * PR_USEC_PER_MSEC) // 500ms
// Number of times to retry a failed byte-range request.
#define MAX_RETRY_COUNT 20
--- a/netwerk/base/src/nsServerSocket.cpp
+++ b/netwerk/base/src/nsServerSocket.cpp
@@ -3,17 +3,17 @@
* 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 "nsIServiceManager.h"
#include "nsSocketTransport2.h"
#include "nsServerSocket.h"
#include "nsProxyRelease.h"
#include "nsAutoPtr.h"
-#include "nsNetError.h"
+#include "nsError.h"
#include "nsNetCID.h"
#include "prnetdb.h"
#include "prio.h"
#include "mozilla/Attributes.h"
using namespace mozilla;
static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID);
--- a/netwerk/base/src/nsSimpleURI.cpp
+++ b/netwerk/base/src/nsSimpleURI.cpp
@@ -12,17 +12,17 @@
#include "nsReadableUtils.h"
#include "prmem.h"
#include "prprf.h"
#include "nsURLHelper.h"
#include "nsNetCID.h"
#include "nsIObjectInputStream.h"
#include "nsIObjectOutputStream.h"
#include "nsEscape.h"
-#include "nsNetError.h"
+#include "nsError.h"
#include "nsIProgrammingLanguage.h"
#include "mozilla/Util.h" // for DebugOnly
static NS_DEFINE_CID(kThisSimpleURIImplementationCID,
NS_THIS_SIMPLEURI_IMPLEMENTATION_CID);
static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID);
////////////////////////////////////////////////////////////////////////////////
--- a/netwerk/base/src/nsSocketTransportService2.cpp
+++ b/netwerk/base/src/nsSocketTransportService2.cpp
@@ -5,17 +5,17 @@
#ifdef MOZ_LOGGING
#define FORCE_PR_LOG
#endif
#include "nsSocketTransportService2.h"
#include "nsSocketTransport2.h"
#include "nsReadableUtils.h"
-#include "nsNetError.h"
+#include "nsError.h"
#include "prnetdb.h"
#include "prerror.h"
#include "plstr.h"
#include "nsIPrefService.h"
#include "nsIPrefBranch.h"
#include "nsServiceManagerUtils.h"
#include "nsIOService.h"
--- a/netwerk/base/src/nsStreamLoader.cpp
+++ b/netwerk/base/src/nsStreamLoader.cpp
@@ -1,17 +1,17 @@
/* -*- Mode: C++; 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 "nsStreamLoader.h"
#include "nsIInputStream.h"
#include "nsIChannel.h"
-#include "nsNetError.h"
+#include "nsError.h"
#include "sampler.h"
nsStreamLoader::nsStreamLoader()
: mData(nullptr),
mAllocated(0),
mLength(0)
{
}
--- a/netwerk/base/src/nsStreamTransportService.cpp
+++ b/netwerk/base/src/nsStreamTransportService.cpp
@@ -2,17 +2,17 @@
* 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 "nsStreamTransportService.h"
#include "nsXPCOMCIDInternal.h"
#include "nsNetSegmentUtils.h"
#include "nsTransportUtils.h"
#include "nsStreamUtils.h"
-#include "nsNetError.h"
+#include "nsError.h"
#include "nsNetCID.h"
#include "nsIServiceManager.h"
#include "nsIAsyncInputStream.h"
#include "nsIAsyncOutputStream.h"
#include "nsISeekableStream.h"
#include "nsIPipe.h"
#include "nsITransport.h"
--- a/netwerk/cache/nsICache.idl
+++ b/netwerk/cache/nsICache.idl
@@ -138,10 +138,10 @@ interface nsICache
/**
* Constant meaning no expiration time.
*/
const unsigned long NO_EXPIRATION_TIME = 0xFFFFFFFF;
};
%{C++
-#include "nsNetError.h"
+#include "nsError.h"
%}
--- a/netwerk/dns/nsDNSService2.cpp
+++ b/netwerk/dns/nsDNSService2.cpp
@@ -10,17 +10,17 @@
#include "nsIPrefService.h"
#include "nsIPrefBranch.h"
#include "nsIServiceManager.h"
#include "nsProxyRelease.h"
#include "nsReadableUtils.h"
#include "nsString.h"
#include "nsAutoPtr.h"
#include "nsNetCID.h"
-#include "nsNetError.h"
+#include "nsError.h"
#include "nsDNSPrefetch.h"
#include "nsThreadUtils.h"
#include "nsIProtocolProxyService.h"
#include "prsystem.h"
#include "prnetdb.h"
#include "prmon.h"
#include "prio.h"
#include "plstr.h"
--- a/netwerk/dns/nsHostResolver.cpp
+++ b/netwerk/dns/nsHostResolver.cpp
@@ -13,17 +13,17 @@
#include <arpa/inet.h>
#include <arpa/nameser.h>
#include <resolv.h>
#define RES_RETRY_ON_FAILURE
#endif
#include <stdlib.h>
#include "nsHostResolver.h"
-#include "nsNetError.h"
+#include "nsError.h"
#include "nsISupportsBase.h"
#include "nsISupportsUtils.h"
#include "nsAutoPtr.h"
#include "pratom.h"
#include "prthread.h"
#include "prerror.h"
#include "prtime.h"
#include "prlong.h"
--- a/netwerk/mime/nsMIMEHeaderParamImpl.cpp
+++ b/netwerk/mime/nsMIMEHeaderParamImpl.cpp
@@ -15,17 +15,17 @@
#include "nsCOMPtr.h"
#include "nsEscape.h"
#include "nsIUTF8ConverterService.h"
#include "nsUConvCID.h"
#include "nsIServiceManager.h"
#include "nsMIMEHeaderParamImpl.h"
#include "nsReadableUtils.h"
#include "nsNativeCharsetUtils.h"
-#include "nsNetError.h"
+#include "nsError.h"
#include "nsIUnicodeDecoder.h"
// static functions declared below are moved from mailnews/mime/src/comi18n.cpp
static char *DecodeQ(const char *, PRUint32);
static bool Is7bitNonAsciiString(const char *, PRUint32);
static void CopyRawHeader(const char *, PRUint32, const char *, nsACString &);
static nsresult DecodeRFC2047Str(const char *, const char *, bool, nsACString&);
--- a/netwerk/protocol/about/nsAboutProtocolHandler.cpp
+++ b/netwerk/protocol/about/nsAboutProtocolHandler.cpp
@@ -12,17 +12,17 @@
#include "nsCRT.h"
#include "nsIComponentManager.h"
#include "nsIServiceManager.h"
#include "nsIAboutModule.h"
#include "nsString.h"
#include "nsReadableUtils.h"
#include "nsNetCID.h"
#include "nsAboutProtocolUtils.h"
-#include "nsNetError.h"
+#include "nsError.h"
#include "nsNetUtil.h"
#include "nsIObjectInputStream.h"
#include "nsIObjectOutputStream.h"
#include "nsAutoPtr.h"
#include "nsIWritablePropertyBag2.h"
static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID);
static NS_DEFINE_CID(kNestedAboutURICID, NS_NESTEDABOUTURI_CID);
--- a/netwerk/protocol/data/nsDataHandler.cpp
+++ b/netwerk/protocol/data/nsDataHandler.cpp
@@ -9,17 +9,17 @@
#include "nsIURL.h"
#include "nsCRT.h"
#include "nsIComponentManager.h"
#include "nsIServiceManager.h"
#include "nsIInterfaceRequestor.h"
#include "nsIInterfaceRequestorUtils.h"
#include "nsIProgressEventSink.h"
#include "nsNetCID.h"
-#include "nsNetError.h"
+#include "nsError.h"
static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID);
////////////////////////////////////////////////////////////////////////////////
nsDataHandler::nsDataHandler() {
}
--- a/netwerk/protocol/ftp/ftpCore.h
+++ b/netwerk/protocol/ftp/ftpCore.h
@@ -1,20 +1,15 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* 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/. */
#ifndef __ftpCore_h___
#define __ftpCore_h___
-#include "nsNetError.h"
+#include "nsError.h"
/**
* Status nsresult codes
*/
-#define NS_NET_STATUS_BEGIN_FTP_TRANSACTION \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_NETWORK, 27)
-
-#define NS_NET_STATUS_END_FTP_TRANSACTION \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_NETWORK, 28)
#endif // __ftpCore_h___
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -22,17 +22,17 @@
#include "nsEscape.h"
#include "nsStreamUtils.h"
#include "nsIOService.h"
#include "nsICacheService.h"
#include "nsDNSPrefetch.h"
#include "nsChannelClassifier.h"
#include "nsIRedirectResultListener.h"
#include "mozilla/TimeStamp.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsAlgorithm.h"
#include "sampler.h"
#include "nsIConsoleService.h"
#include "base/compiler_specific.h"
#include "NullHttpTransaction.h"
#include "mozilla/Attributes.h"
namespace mozilla { namespace net {
--- a/netwerk/protocol/websocket/WebSocketChannel.cpp
+++ b/netwerk/protocol/websocket/WebSocketChannel.cpp
@@ -23,17 +23,17 @@
#include "nsAutoPtr.h"
#include "nsStandardURL.h"
#include "nsNetCID.h"
#include "nsServiceManagerUtils.h"
#include "nsXPIDLString.h"
#include "nsCRT.h"
#include "nsThreadUtils.h"
-#include "nsNetError.h"
+#include "nsError.h"
#include "nsStringStream.h"
#include "nsAlgorithm.h"
#include "nsProxyRelease.h"
#include "nsNetUtil.h"
#include "mozilla/Attributes.h"
#include "TimeStamp.h"
#include "plbase64.h"
--- a/netwerk/socket/nsSOCKSSocketProvider.cpp
+++ b/netwerk/socket/nsSOCKSSocketProvider.cpp
@@ -3,17 +3,17 @@
* 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 "nsIServiceManager.h"
#include "nsSOCKSSocketProvider.h"
#include "nsSOCKSIOLayer.h"
#include "nsCOMPtr.h"
-#include "nsNetError.h"
+#include "nsError.h"
//////////////////////////////////////////////////////////////////////////
NS_IMPL_THREADSAFE_ISUPPORTS1(nsSOCKSSocketProvider, nsISocketProvider)
nsresult
nsSOCKSSocketProvider::CreateV4(nsISupports *aOuter, REFNSIID aIID, void **aResult)
{
--- a/netwerk/socket/nsSocketProviderService.cpp
+++ b/netwerk/socket/nsSocketProviderService.cpp
@@ -2,17 +2,17 @@
/* 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 "nsString.h"
#include "nsIServiceManager.h"
#include "nsISocketProvider.h"
#include "nsSocketProviderService.h"
-#include "nsNetError.h"
+#include "nsError.h"
////////////////////////////////////////////////////////////////////////////////
nsresult
nsSocketProviderService::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
{
nsresult rv;
nsCOMPtr<nsISocketProviderService> inst = new nsSocketProviderService();
--- a/netwerk/streamconv/converters/nsHTTPCompressConv.cpp
+++ b/netwerk/streamconv/converters/nsHTTPCompressConv.cpp
@@ -6,17 +6,17 @@
#include "nsHTTPCompressConv.h"
#include "nsMemory.h"
#include "plstr.h"
#include "prlog.h"
#include "nsIChannel.h"
#include "nsCOMPtr.h"
#include "nsReadableUtils.h"
-#include "nsNetError.h"
+#include "nsError.h"
#include "nsStreamUtils.h"
#include "nsStringStream.h"
#include "nsComponentManagerUtils.h"
// nsISupports implementation
NS_IMPL_THREADSAFE_ISUPPORTS3(nsHTTPCompressConv,
nsIStreamConverter,
nsIStreamListener,
--- a/parser/html/nsHtml5TreeBuilderCppSupplement.h
+++ b/parser/html/nsHtml5TreeBuilderCppSupplement.h
@@ -1,15 +1,15 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set ts=2 sw=2 et tw=78: */
/* 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 "nsContentErrors.h"
+#include "nsError.h"
#include "nsIPresShell.h"
#include "nsEvent.h"
#include "nsGUIEvent.h"
#include "nsEventDispatcher.h"
#include "nsNodeUtils.h"
#include "nsIFrame.h"
class nsPresContext;
--- a/parser/html/nsHtml5TreeOpExecutor.cpp
+++ b/parser/html/nsHtml5TreeOpExecutor.cpp
@@ -1,15 +1,15 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set sw=2 ts=2 et tw=79: */
/* 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 "nsDOMError.h"
+#include "nsError.h"
#include "nsHtml5TreeOpExecutor.h"
#include "nsScriptLoader.h"
#include "nsIMarkupDocumentViewer.h"
#include "nsIContentViewer.h"
#include "nsIDocShellTreeItem.h"
#include "nsIStyleSheetLinkingElement.h"
#include "nsStyleLinkElement.h"
#include "nsIDocShell.h"
--- a/parser/htmlparser/public/nsIElementObserver.h
+++ b/parser/htmlparser/public/nsIElementObserver.h
@@ -37,13 +37,10 @@ public:
const nsTArray<nsString>* aKeys,
const nsTArray<nsString>* aValues,
const PRUint32 aFlags) = 0;
};
NS_DEFINE_STATIC_IID_ACCESSOR(nsIElementObserver, NS_IELEMENTOBSERVER_IID)
-#define NS_HTMLPARSER_VALID_META_CHARSET NS_ERROR_GENERATE_SUCCESS( \
- NS_ERROR_MODULE_HTMLPARSER,3000)
-
#endif /* nsIElementObserver_h__ */
--- a/parser/htmlparser/public/nsIParser.h
+++ b/parser/htmlparser/public/nsIParser.h
@@ -254,52 +254,28 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsIParser,
/* ===========================================================*
Some useful constants...
* ===========================================================*/
#include "prtypes.h"
#include "nsError.h"
-#define NS_ERROR_HTMLPARSER_EOF NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER,1000)
-#define NS_ERROR_HTMLPARSER_UNKNOWN NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER,1001)
-#define NS_ERROR_HTMLPARSER_CANTPROPAGATE NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER,1002)
-#define NS_ERROR_HTMLPARSER_CONTEXTMISMATCH NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER,1003)
-#define NS_ERROR_HTMLPARSER_BADFILENAME NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER,1004)
-#define NS_ERROR_HTMLPARSER_BADURL NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER,1005)
-#define NS_ERROR_HTMLPARSER_INVALIDPARSERCONTEXT NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER,1006)
-#define NS_ERROR_HTMLPARSER_INTERRUPTED NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER,1007)
-#define NS_ERROR_HTMLPARSER_BLOCK NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER,1008)
-#define NS_ERROR_HTMLPARSER_BADTOKENIZER NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER,1009)
-#define NS_ERROR_HTMLPARSER_BADATTRIBUTE NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER,1010)
-#define NS_ERROR_HTMLPARSER_UNRESOLVEDDTD NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER,1011)
-#define NS_ERROR_HTMLPARSER_MISPLACEDTABLECONTENT NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER,1012)
-#define NS_ERROR_HTMLPARSER_BADDTD NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER,1013)
-#define NS_ERROR_HTMLPARSER_BADCONTEXT NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER,1014)
-#define NS_ERROR_HTMLPARSER_STOPPARSING NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER,1015)
-#define NS_ERROR_HTMLPARSER_UNTERMINATEDSTRINGLITERAL NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER,1016)
-#define NS_ERROR_HTMLPARSER_HIERARCHYTOODEEP NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER,1017)
-#define NS_ERROR_HTMLPARSER_FAKE_ENDTAG NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER,1018)
-#define NS_ERROR_HTMLPARSER_INVALID_COMMENT NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER,1019)
-
-#define NS_ERROR_HTMLPARSER_CONTINUE NS_OK
-
-
-const PRUint32 kEOF = NS_ERROR_HTMLPARSER_EOF;
-const PRUint32 kUnknownError = NS_ERROR_HTMLPARSER_UNKNOWN;
-const PRUint32 kCantPropagate = NS_ERROR_HTMLPARSER_CANTPROPAGATE;
-const PRUint32 kContextMismatch = NS_ERROR_HTMLPARSER_CONTEXTMISMATCH;
-const PRUint32 kBadFilename = NS_ERROR_HTMLPARSER_BADFILENAME;
-const PRUint32 kBadURL = NS_ERROR_HTMLPARSER_BADURL;
-const PRUint32 kInvalidParserContext = NS_ERROR_HTMLPARSER_INVALIDPARSERCONTEXT;
-const PRUint32 kBlocked = NS_ERROR_HTMLPARSER_BLOCK;
-const PRUint32 kBadStringLiteral = NS_ERROR_HTMLPARSER_UNTERMINATEDSTRINGLITERAL;
-const PRUint32 kHierarchyTooDeep = NS_ERROR_HTMLPARSER_HIERARCHYTOODEEP;
-const PRUint32 kFakeEndTag = NS_ERROR_HTMLPARSER_FAKE_ENDTAG;
-const PRUint32 kNotAComment = NS_ERROR_HTMLPARSER_INVALID_COMMENT;
+const nsresult kEOF = NS_ERROR_HTMLPARSER_EOF;
+const nsresult kUnknownError = NS_ERROR_HTMLPARSER_UNKNOWN;
+const nsresult kCantPropagate = NS_ERROR_HTMLPARSER_CANTPROPAGATE;
+const nsresult kContextMismatch = NS_ERROR_HTMLPARSER_CONTEXTMISMATCH;
+const nsresult kBadFilename = NS_ERROR_HTMLPARSER_BADFILENAME;
+const nsresult kBadURL = NS_ERROR_HTMLPARSER_BADURL;
+const nsresult kInvalidParserContext = NS_ERROR_HTMLPARSER_INVALIDPARSERCONTEXT;
+const nsresult kBlocked = NS_ERROR_HTMLPARSER_BLOCK;
+const nsresult kBadStringLiteral = NS_ERROR_HTMLPARSER_UNTERMINATEDSTRINGLITERAL;
+const nsresult kHierarchyTooDeep = NS_ERROR_HTMLPARSER_HIERARCHYTOODEEP;
+const nsresult kFakeEndTag = NS_ERROR_HTMLPARSER_FAKE_ENDTAG;
+const nsresult kNotAComment = NS_ERROR_HTMLPARSER_INVALID_COMMENT;
#define NS_IPARSER_FLAG_UNKNOWN_MODE 0x00000000
#define NS_IPARSER_FLAG_QUIRKS_MODE 0x00000002
#define NS_IPARSER_FLAG_STRICT_MODE 0x00000004
#define NS_IPARSER_FLAG_AUTO_DETECT_MODE 0x00000010
#define NS_IPARSER_FLAG_VIEW_NORMAL 0x00000020
#define NS_IPARSER_FLAG_VIEW_SOURCE 0x00000040
#define NS_IPARSER_FLAG_VIEW_ERRORS 0x00000080
--- a/parser/htmlparser/public/nsToken.h
+++ b/parser/htmlparser/public/nsToken.h
@@ -36,19 +36,16 @@
#ifndef CTOKEN__
#define CTOKEN__
#include "prtypes.h"
#include "nsString.h"
#include "nsError.h"
#include "nsFixedSizeAllocator.h"
-#define NS_HTMLTOKENS_NOT_AN_ENTITY \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_HTMLPARSER,2000)
-
class nsScanner;
class nsTokenAllocator;
enum eContainerInfo {
eWellFormed,
eMalformed,
eFormUnknown
};
--- a/parser/htmlparser/src/nsExpatDriver.cpp
+++ b/parser/htmlparser/src/nsExpatDriver.cpp
@@ -19,17 +19,17 @@
#include "prmem.h"
#include "nsTextFormatter.h"
#include "nsDirectoryServiceDefs.h"
#include "nsCRT.h"
#include "nsIConsoleService.h"
#include "nsIScriptError.h"
#include "nsIContentPolicy.h"
#include "nsContentPolicyUtils.h"
-#include "nsContentErrors.h"
+#include "nsError.h"
#include "nsXPCOMCIDInternal.h"
#include "nsUnicharInputStream.h"
#define kExpatSeparatorChar 0xFFFF
static const PRUnichar kUTF16[] = { 'U', 'T', 'F', '-', '1', '6', '\0' };
#ifdef PR_LOGGING
--- a/parser/htmlparser/src/nsParserService.cpp
+++ b/parser/htmlparser/src/nsParserService.cpp
@@ -1,15 +1,15 @@
/* -*- Mode: C++; 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 "nsDOMError.h"
+#include "nsError.h"
#include "nsIAtom.h"
#include "nsParserService.h"
#include "nsHTMLEntities.h"
#include "nsElementTable.h"
#include "nsICategoryManager.h"
#include "nsCategoryManagerUtils.h"
nsParserService::nsParserService()
--- a/rdf/base/public/rdf.h
+++ b/rdf/base/public/rdf.h
@@ -35,43 +35,16 @@ static const char kURI##prefix##_##name[
* Core RDF vocabularies that we use to define semantics
*/
#define RDF_NAMESPACE_URI "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
#define WEB_NAMESPACE_URI "http://home.netscape.com/WEB-rdf#"
#define NC_NAMESPACE_URI "http://home.netscape.com/NC-rdf#"
#define DEVMO_NAMESPACE_URI_PREFIX "http://developer.mozilla.org/rdf/vocabulary/"
-/**
- * @name Standard RDF error codes
- */
-
-/*@{*/
-
-/* Returned from nsIRDFCursor::Advance() if the cursor has no more
- elements to enuemrate */
-#define NS_RDF_CURSOR_EMPTY NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_RDF, 1)
-
-/* Returned from nsIRDFDataSource::GetSource() and GetTarget() if the source/target
- has no value */
-#define NS_RDF_NO_VALUE NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_RDF, 2)
-
-/* Returned from nsIRDFDataSource::Assert() and Unassert() if the assertion (or
- unassertion was accepted by the datasource*/
-#define NS_RDF_ASSERTION_ACCEPTED NS_OK
-
-/* Returned from nsIRDFDataSource::Assert() and Unassert() if the assertion (or
- unassertion) was rejected by the datasource; i.e., the datasource was not
- willing to record the statement. */
-#define NS_RDF_ASSERTION_REJECTED NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_RDF, 3)
-
-/* Return this from rdfITripleVisitor to stop cycling */
-#define NS_RDF_STOP_VISIT NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_RDF, 4)
-
-
/* ContractID prefixes for RDF DLL registration. */
#define NS_RDF_CONTRACTID "@mozilla.org/rdf"
#define NS_RDF_DATASOURCE_CONTRACTID NS_RDF_CONTRACTID "/datasource;1"
#define NS_RDF_DATASOURCE_CONTRACTID_PREFIX NS_RDF_DATASOURCE_CONTRACTID "?name="
#define NS_RDF_RESOURCE_FACTORY_CONTRACTID "@mozilla.org/rdf/resource-factory;1"
#define NS_RDF_RESOURCE_FACTORY_CONTRACTID_PREFIX NS_RDF_RESOURCE_FACTORY_CONTRACTID "?name="
#define NS_RDF_INFER_DATASOURCE_CONTRACTID_PREFIX NS_RDF_CONTRACTID "/infer-datasource;1?engine="
--- a/security/manager/ssl/public/nsICMSMessageErrors.idl
+++ b/security/manager/ssl/public/nsICMSMessageErrors.idl
@@ -28,66 +28,8 @@ interface nsICMSMessageErrors : nsISuppo
const long VERIFY_MALFORMED_SIGNATURE = 1037;
const long VERIFY_HEADER_MISMATCH = 1038;
const long VERIFY_NOT_YET_ATTEMPTED = 1039;
const long VERIFY_CERT_WITHOUT_ADDRESS = 1040;
const long ENCRYPT_NO_BULK_ALG = 1056;
const long ENCRYPT_INCOMPLETE = 1057;
};
-
-%{ C++
-/**
- * CMS specific nsresult error codes
- */
-
-#define NS_ERROR_CMS_VERIFY_NOT_SIGNED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
- nsICMSMessageErrors::VERIFY_NOT_SIGNED)
-#define NS_ERROR_CMS_VERIFY_NO_CONTENT_INFO \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
- nsICMSMessageErrors::VERIFY_NO_CONTENT_INFO)
-#define NS_ERROR_CMS_VERIFY_BAD_DIGEST \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
- nsICMSMessageErrors::VERIFY_BAD_DIGEST)
-#define NS_ERROR_CMS_VERIFY_NOCERT \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
- nsICMSMessageErrors::VERIFY_NOCERT)
-#define NS_ERROR_CMS_VERIFY_UNTRUSTED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
- nsICMSMessageErrors::VERIFY_UNTRUSTED)
-#define NS_ERROR_CMS_VERIFY_ERROR_UNVERIFIED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
- nsICMSMessageErrors::VERIFY_ERROR_UNVERIFIED)
-#define NS_ERROR_CMS_VERIFY_ERROR_PROCESSING \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
- nsICMSMessageErrors::VERIFY_ERROR_PROCESSING)
-#define NS_ERROR_CMS_VERIFY_BAD_SIGNATURE \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
- nsICMSMessageErrors::VERIFY_BAD_SIGNATURE)
-#define NS_ERROR_CMS_VERIFY_DIGEST_MISMATCH \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
- nsICMSMessageErrors::VERIFY_DIGEST_MISMATCH)
-#define NS_ERROR_CMS_VERIFY_UNKNOWN_ALGO \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
- nsICMSMessageErrors::VERIFY_UNKNOWN_ALGO)
-#define NS_ERROR_CMS_VERIFY_UNSUPPORTED_ALGO \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
- nsICMSMessageErrors::VERIFY_UNSUPPORTED_ALGO)
-#define NS_ERROR_CMS_VERIFY_MALFORMED_SIGNATURE \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
- nsICMSMessageErrors::VERIFY_MALFORMED_SIGNATURE)
-#define NS_ERROR_CMS_VERIFY_HEADER_MISMATCH \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
- nsICMSMessageErrors::VERIFY_HEADER_MISMATCH)
-#define NS_ERROR_CMS_VERIFY_NOT_YET_ATTEMPTED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
- nsICMSMessageErrors::VERIFY_NOT_YET_ATTEMPTED)
-#define NS_ERROR_CMS_VERIFY_CERT_WITHOUT_ADDRESS \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
- nsICMSMessageErrors::VERIFY_CERT_WITHOUT_ADDRESS)
-#define NS_ERROR_CMS_ENCRYPT_NO_BULK_ALG \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
- nsICMSMessageErrors::ENCRYPT_NO_BULK_ALG)
-#define NS_ERROR_CMS_ENCRYPT_INCOMPLETE \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_SECURITY, \
- nsICMSMessageErrors::ENCRYPT_INCOMPLETE)
-%}
--- a/security/manager/ssl/src/nsSSLSocketProvider.cpp
+++ b/security/manager/ssl/src/nsSSLSocketProvider.cpp
@@ -1,17 +1,17 @@
/* -*- Mode: C++; 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 "nsSSLSocketProvider.h"
#include "nsNSSIOLayer.h"
-#include "nsNetError.h"
+#include "nsError.h"
nsSSLSocketProvider::nsSSLSocketProvider()
{
}
nsSSLSocketProvider::~nsSSLSocketProvider()
{
}
--- a/security/manager/ssl/src/nsTLSSocketProvider.cpp
+++ b/security/manager/ssl/src/nsTLSSocketProvider.cpp
@@ -1,17 +1,17 @@
/* -*- Mode: C++; 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 "nsTLSSocketProvider.h"
#include "nsNSSIOLayer.h"
-#include "nsNetError.h"
+#include "nsError.h"
nsTLSSocketProvider::nsTLSSocketProvider()
{
}
nsTLSSocketProvider::~nsTLSSocketProvider()
{
}
--- a/storage/public/Makefile.in
+++ b/storage/public/Makefile.in
@@ -40,17 +40,16 @@ XPIDLSRCS = \
mozIStorageVacuumParticipant.idl \
$(NULL)
# SEE ABOVE NOTE!
EXPORTS_NAMESPACES = mozilla mozilla/storage
EXPORTS = \
mozStorageHelper.h \
- mozStorage.h \
$(NULL)
EXPORTS_mozilla = storage.h
# NOTE When adding something to this list, you probably need to add it to the
# storage.h file too.
EXPORTS_mozilla/storage = \
StatementCache.h \
deleted file mode 100644
--- a/storage/public/mozStorage.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* 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/. */
-
-/**
- * To add additional errors to Storage, please append entries to the bottom of
- * the list in the following format:
- * '#define NS_ERROR_STORAGE_YOUR_ERR \
- * NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_STORAGE, n)'
- * where n is the next unique positive integer. You must also add an entry to
- * js/xpconnect/src/xpc.msg under the code block beginning with the comment
- * 'storage related codes (from mozStorage.h)', in the following format:
- * 'XPC_MSG_DEF(NS_ERROR_STORAGE_YOUR_ERR, "brief description of your error")'
- */
-
-#ifndef MOZSTORAGE_H
-#define MOZSTORAGE_H
-
-#define NS_ERROR_STORAGE_BUSY \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_STORAGE, 1)
-
-#define NS_ERROR_STORAGE_IOERR \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_STORAGE, 2)
-
-#define NS_ERROR_STORAGE_CONSTRAINT \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_STORAGE, 3)
-
-#endif /* MOZSTORAGE_H */
--- a/storage/public/mozStorageHelper.h
+++ b/storage/public/mozStorageHelper.h
@@ -5,17 +5,17 @@
#ifndef MOZSTORAGEHELPER_H
#define MOZSTORAGEHELPER_H
#include "nsAutoPtr.h"
#include "mozIStorageConnection.h"
#include "mozIStorageStatement.h"
-#include "mozStorage.h"
+#include "nsError.h"
/**
* This class wraps a transaction inside a given C++ scope, guaranteeing that
* the transaction will be completed even if you have an exception or
* return early.
*
* aCommitOnComplete controls whether the transaction is committed or rolled
--- a/storage/src/mozStoragePrivateHelpers.h
+++ b/storage/src/mozStoragePrivateHelpers.h
@@ -8,17 +8,17 @@
#define mozStoragePrivateHelpers_h
/**
* This file contains convenience methods for mozStorage.
*/
#include "sqlite3.h"
#include "nsIVariant.h"
-#include "mozStorage.h"
+#include "nsError.h"
#include "jsapi.h"
#include "nsAutoPtr.h"
class mozIStorageCompletionCallback;
class mozIStorageBaseStatement;
class mozIStorageBindingParams;
class nsIRunnable;
--- a/toolkit/components/startup/public/nsIAppStartup.idl
+++ b/toolkit/components/startup/public/nsIAppStartup.idl
@@ -147,18 +147,8 @@ interface nsIAppStartup : nsISupports
*/
[implicit_jscontext] jsval getStartupInfo();
/**
* True if startup was interrupted by an interactive prompt.
*/
attribute boolean interrupted;
};
-
-%{C++
-/**
- * This success code may be returned by nsIAppStartup::Run to indicate that the
- * application should be restarted. This condition corresponds to the case in
- * which nsIAppStartup::Quit was called with the eRestart flag.
- */
-#define NS_SUCCESS_RESTART_APP \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_GENERAL, 1)
-%}
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -1479,18 +1479,16 @@ XRE_InitOmnijar(nsIFile* greOmni, nsIFil
}
nsresult
XRE_GetBinaryPath(const char* argv0, nsIFile* *aResult)
{
return mozilla::BinaryPath::GetFile(argv0, aResult);
}
-#define NS_ERROR_LAUNCHED_CHILD_PROCESS NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_PROFILE, 200)
-
#ifdef XP_WIN
#include "nsWindowsRestart.cpp"
#include <shellapi.h>
typedef BOOL (WINAPI* SetProcessDEPPolicyFunc)(DWORD dwFlags);
#endif
#if defined(XP_OS2) && (__KLIBC__ == 0 && __KLIBC_MINOR__ >= 6) // broken kLibc
--- a/uriloader/base/nsIContentHandler.idl
+++ b/uriloader/base/nsIContentHandler.idl
@@ -28,15 +28,8 @@ interface nsIContentHandler : nsISupport
* @throw NS_ERROR_WONT_HANDLE_CONTENT Indicates that this handler does not
* want to handle this content. A different way for handling this
* content should be tried.
*/
void handleContent(in string aContentType,
in nsIInterfaceRequestor aWindowContext,
in nsIRequest aRequest);
};
-
-
-%{C++
-
-#define NS_ERROR_WONT_HANDLE_CONTENT NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_URILOADER, 1)
-
-%}
--- a/uriloader/base/nsURILoader.cpp
+++ b/uriloader/base/nsURILoader.cpp
@@ -30,17 +30,17 @@
#include "nsIDocShell.h"
#include "nsIDocShellTreeItem.h"
#include "nsIDocShellTreeOwner.h"
#include "nsXPIDLString.h"
#include "nsString.h"
#include "nsNetUtil.h"
#include "nsReadableUtils.h"
-#include "nsDOMError.h"
+#include "nsError.h"
#include "nsICategoryManager.h"
#include "nsCExternalHandlerService.h" // contains contractids for the helper app service
#include "nsIMIMEHeaderParam.h"
#include "nsNetCID.h"
#include "nsMimeTypes.h"
--- a/uriloader/base/nsURILoader.h
+++ b/uriloader/base/nsURILoader.h
@@ -56,27 +56,9 @@ protected:
* NSPR logging. The module is called "URILoader"
*/
static PRLogModuleInfo* mLog;
#endif
friend class nsDocumentOpenInfo;
};
-/**
- * The load has been cancelled because it was found on a malware or phishing blacklist.
- * XXX: this belongs in an nsDocShellErrors.h file of some sort.
- */
-#define NS_ERROR_MALWARE_URI NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_URILOADER, 30)
-#define NS_ERROR_PHISHING_URI NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_URILOADER, 31)
-
-/**
- * Used when "Save Link As..." doesn't see the headers quickly enough to choose
- * a filename. See nsContextMenu.js.
- */
-#define NS_ERROR_SAVE_LINK_AS_TIMEOUT NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_URILOADER, 32)
-
-/** Used when the data from a channel has already been parsed and cached
- * so it doesn't need to be reparsed from the original source.
- */
-#define NS_ERROR_PARSED_DATA_CACHED NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_URILOADER, 33)
-
#endif /* nsURILoader_h__ */
--- a/widget/nsIDeviceContextSpec.h
+++ b/widget/nsIDeviceContextSpec.h
@@ -41,110 +41,9 @@ public:
NS_IMETHOD EndDocument() = 0;
NS_IMETHOD BeginPage() = 0;
NS_IMETHOD EndPage() = 0;
};
NS_DEFINE_STATIC_IID_ACCESSOR(nsIDeviceContextSpec,
NS_IDEVICE_CONTEXT_SPEC_IID)
-
-/* error codes for printer device contexts */
-#define NS_ERROR_GFX_PRINTER_BASE (1) /* adjustable :-) */
-/* Unix: print command (lp/lpr) not found */
-#define NS_ERROR_GFX_PRINTER_CMD_NOT_FOUND \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+1)
-/* Unix: print command returned an error */
-#define NS_ERROR_GFX_PRINTER_CMD_FAILURE \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+2)
-/* no printer available (e.g. cannot find _any_ printer) */
-#define NS_ERROR_GFX_PRINTER_NO_PRINTER_AVAILABLE \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+3)
-/* _specified_ (by name) printer not found */
-#define NS_ERROR_GFX_PRINTER_NAME_NOT_FOUND \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+4)
-/* access to printer denied */
-#define NS_ERROR_GFX_PRINTER_ACCESS_DENIED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+5)
-/* invalid printer attribute (for example: unsupported paper size etc.) */
-#define NS_ERROR_GFX_PRINTER_INVALID_ATTRIBUTE \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+6)
-/* printer not "ready" (offline ?) */
-#define NS_ERROR_GFX_PRINTER_PRINTER_NOT_READY \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+8)
-/* printer out of paper */
-#define NS_ERROR_GFX_PRINTER_OUT_OF_PAPER \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+9)
-/* generic printer I/O error */
-#define NS_ERROR_GFX_PRINTER_PRINTER_IO_ERROR \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+10)
-/* print-to-file: could not open output file */
-#define NS_ERROR_GFX_PRINTER_COULD_NOT_OPEN_FILE \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+11)
-/* print-to-file: I/O error while printing to file */
-#define NS_ERROR_GFX_PRINTER_FILE_IO_ERROR \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+12)
-/* print preview: needs at least one printer */
-#define NS_ERROR_GFX_PRINTER_PRINTPREVIEW \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+13)
-/* print: starting document */
-#define NS_ERROR_GFX_PRINTER_STARTDOC \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+14)
-/* print: ending document */
-#define NS_ERROR_GFX_PRINTER_ENDDOC \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+15)
-/* print: starting page */
-#define NS_ERROR_GFX_PRINTER_STARTPAGE \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+16)
-/* print: ending page */
-#define NS_ERROR_GFX_PRINTER_ENDPAGE \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+17)
-/* print: print while in print preview */
-#define NS_ERROR_GFX_PRINTER_PRINT_WHILE_PREVIEW \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+18)
-/* requested page size not supported by printer */
-#define NS_ERROR_GFX_PRINTER_PAPER_SIZE_NOT_SUPPORTED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+19)
-/* requested page orientation not supported */
-#define NS_ERROR_GFX_PRINTER_ORIENTATION_NOT_SUPPORTED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+20)
-/* requested colorspace not supported (like printing "color" on a
- "grayscale"-only printer) */
-#define NS_ERROR_GFX_PRINTER_COLORSPACE_NOT_SUPPORTED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+21)
-/* too many copies requested */
-#define NS_ERROR_GFX_PRINTER_TOO_MANY_COPIES \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+22)
-/* driver configuration error */
-#define NS_ERROR_GFX_PRINTER_DRIVER_CONFIGURATION_ERROR \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+23)
-/* The document is still being loaded, can't Print Preview */
-#define NS_ERROR_GFX_PRINTER_DOC_IS_BUSY_PP \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+24)
-/* The document was asked to be destroyed while we were preparing printing */
-#define NS_ERROR_GFX_PRINTER_DOC_WAS_DESTORYED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+25)
-/* Cannot Print or Print Preview XUL Documents */
-#define NS_ERROR_GFX_PRINTER_NO_XUL \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+26)
-/* The toolkit no longer supports the Print Dialog (for embedders) */
-#define NS_ERROR_GFX_NO_PRINTDIALOG_IN_TOOLKIT \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+27)
-/* The was wasn't any Print Prompt service registered (this shouldn't happen) */
-#define NS_ERROR_GFX_NO_PRINTROMPTSERVICE \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+28)
-/* requested plex mode not supported by printer */
-#define NS_ERROR_GFX_PRINTER_PLEX_NOT_SUPPORTED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+29)
-/* The document is still being loaded */
-#define NS_ERROR_GFX_PRINTER_DOC_IS_BUSY \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+30)
-/* Printing is not implemented */
-#define NS_ERROR_GFX_PRINTING_NOT_IMPLEMENTED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+31)
-/* Cannot load the matching print module */
-#define NS_ERROR_GFX_COULD_NOT_LOAD_PRINT_MODULE \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+32)
-/* requested resolution/quality mode not supported by printer */
-#define NS_ERROR_GFX_PRINTER_RESOLUTION_NOT_SUPPORTED \
- NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX,NS_ERROR_GFX_PRINTER_BASE+33)
-
#endif
--- a/widget/nsIWidget.h
+++ b/widget/nsIWidget.h
@@ -97,23 +97,16 @@ typedef nsEventStatus (* EVENT_CALLBACK)
#define NS_STYLE_WINDOW_SHADOW_NONE 0
#define NS_STYLE_WINDOW_SHADOW_DEFAULT 1
#define NS_STYLE_WINDOW_SHADOW_MENU 2
#define NS_STYLE_WINDOW_SHADOW_TOOLTIP 3
#define NS_STYLE_WINDOW_SHADOW_SHEET 4
/**
- * nsIWidget::OnIMEFocusChange should be called during blur,
- * but other OnIME*Change methods should not be called
- */
-#define NS_SUCCESS_IME_NO_UPDATES \
- NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_WIDGET, 1)
-
-/**
* Cursor types.
*/
enum nsCursor { ///(normal cursor, usually rendered as an arrow)
eCursor_standard,
///(system is busy, usually rendered as a hourglass or watch)
eCursor_wait,
///(Selecting something, usually rendered as an IBeam)
--- a/xpcom/base/nsError.h
+++ b/xpcom/base/nsError.h
@@ -108,162 +108,1285 @@ inline int NS_SUCCEEDED(nsresult _nsresu
*/
#define NS_ERROR_MODULE_BASE_OFFSET 0x45
/**
* @name Standard Error Generating Macros
*/
-#define NS_ERROR_GENERATE(sev,module,code) \
- ((nsresult) (((PRUint32)(sev) <<31) | ((PRUint32)(module+NS_ERROR_MODULE_BASE_OFFSET)<<16) | ((PRUint32)(code))))
+#define NS_ERROR_GENERATE(sev, module, code) \
+ (nsresult)(((PRUint32)(sev) << 31) | \
+ ((PRUint32)(module + NS_ERROR_MODULE_BASE_OFFSET) << 16) | \
+ ((PRUint32)(code)))
-#define NS_ERROR_GENERATE_SUCCESS(module,code) \
- ((nsresult) (((PRUint32)(NS_ERROR_SEVERITY_SUCCESS)<<31) | ((PRUint32)(module+NS_ERROR_MODULE_BASE_OFFSET)<<16) | ((PRUint32)(code))))
+#define NS_ERROR_GENERATE_SUCCESS(module, code) \
+ NS_ERROR_GENERATE(NS_ERROR_SEVERITY_SUCCESS, module, code)
-#define NS_ERROR_GENERATE_FAILURE(module,code) \
- ((nsresult) (((PRUint32)(NS_ERROR_SEVERITY_ERROR) <<31) | ((PRUint32)(module+NS_ERROR_MODULE_BASE_OFFSET)<<16) | ((PRUint32)(code))))
+#define NS_ERROR_GENERATE_FAILURE(module, code) \
+ NS_ERROR_GENERATE(NS_ERROR_SEVERITY_ERROR, module, code)
/**
* @name Standard Macros for retrieving error bits
*/
#define NS_ERROR_GET_CODE(err) ((err) & 0xffff)
-#define NS_ERROR_GET_MODULE(err) (((((err) >> 16) - NS_ERROR_MODULE_BASE_OFFSET) & 0x1fff))
+#define NS_ERROR_GET_MODULE(err) ((((err) >> 16) - NS_ERROR_MODULE_BASE_OFFSET) & 0x1fff)
#define NS_ERROR_GET_SEVERITY(err) (((err) >> 31) & 0x1)
/**
* @name Standard return values
*/
-/*@{*/
-
/* Standard "it worked" return value */
-#define NS_OK 0
-
-#define NS_ERROR_BASE ((nsresult) 0xC1F30000)
+#define NS_OK 0
+/* ======================================================================= */
+/* Core errors, not part of any modules */
+/* ======================================================================= */
+#define NS_ERROR_BASE 0xC1F30000
/* Returned when an instance is not initialized */
-#define NS_ERROR_NOT_INITIALIZED (NS_ERROR_BASE + 1)
-
+#define NS_ERROR_NOT_INITIALIZED NS_ERROR_BASE + 1
/* Returned when an instance is already initialized */
-#define NS_ERROR_ALREADY_INITIALIZED (NS_ERROR_BASE + 2)
-
+#define NS_ERROR_ALREADY_INITIALIZED NS_ERROR_BASE + 2
/* Returned by a not implemented function */
-#define NS_ERROR_NOT_IMPLEMENTED ((nsresult) 0x80004001L)
-
+#define NS_ERROR_NOT_IMPLEMENTED 0x80004001
/* Returned when a given interface is not supported. */
-#define NS_NOINTERFACE ((nsresult) 0x80004002L)
-#define NS_ERROR_NO_INTERFACE NS_NOINTERFACE
-
-#define NS_ERROR_INVALID_POINTER ((nsresult) 0x80004003L)
-#define NS_ERROR_NULL_POINTER NS_ERROR_INVALID_POINTER
-
+#define NS_NOINTERFACE 0x80004002
+#define NS_ERROR_NO_INTERFACE NS_NOINTERFACE
+#define NS_ERROR_INVALID_POINTER 0x80004003
+#define NS_ERROR_NULL_POINTER NS_ERROR_INVALID_POINTER
/* Returned when a function aborts */
-#define NS_ERROR_ABORT ((nsresult) 0x80004004L)
-
+#define NS_ERROR_ABORT 0x80004004
/* Returned when a function fails */
-#define NS_ERROR_FAILURE ((nsresult) 0x80004005L)
-
+#define NS_ERROR_FAILURE 0x80004005
/* Returned when an unexpected error occurs */
-#define NS_ERROR_UNEXPECTED ((nsresult) 0x8000ffffL)
-
+#define NS_ERROR_UNEXPECTED 0x8000ffff
/* Returned when a memory allocation fails */
-#define NS_ERROR_OUT_OF_MEMORY ((nsresult) 0x8007000eL)
-
+#define NS_ERROR_OUT_OF_MEMORY 0x8007000e
/* Returned when an illegal value is passed */
-#define NS_ERROR_ILLEGAL_VALUE ((nsresult) 0x80070057L)
-#define NS_ERROR_INVALID_ARG NS_ERROR_ILLEGAL_VALUE
-
+#define NS_ERROR_ILLEGAL_VALUE 0x80070057
+#define NS_ERROR_INVALID_ARG NS_ERROR_ILLEGAL_VALUE
/* Returned when a class doesn't allow aggregation */
-#define NS_ERROR_NO_AGGREGATION ((nsresult) 0x80040110L)
+#define NS_ERROR_NO_AGGREGATION 0x80040110
+/* Returned when an operation can't complete due to an unavailable resource */
+#define NS_ERROR_NOT_AVAILABLE 0x80040111
+/* Returned when a class is not registered */
+#define NS_ERROR_FACTORY_NOT_REGISTERED 0x80040154
+/* Returned when a class cannot be registered, but may be tried again later */
+#define NS_ERROR_FACTORY_REGISTER_AGAIN 0x80040155
+/* Returned when a dynamically loaded factory couldn't be found */
+#define NS_ERROR_FACTORY_NOT_LOADED 0x800401f8
+/* Returned when a factory doesn't support signatures */
+#define NS_ERROR_FACTORY_NO_SIGNATURE_SUPPORT NS_ERROR_BASE + 0x101
+/* Returned when a factory already is registered */
+#define NS_ERROR_FACTORY_EXISTS NS_ERROR_BASE + 0x100
+
+
+/* ======================================================================= */
+/* 1: NS_ERROR_MODULE_XPCOM */
+/* ======================================================================= */
+/* Result codes used by nsIVariant */
+#define NS_ERROR_CANNOT_CONVERT_DATA \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XPCOM, 1)
+#define NS_ERROR_OBJECT_IS_IMMUTABLE \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XPCOM, 2)
+#define NS_ERROR_LOSS_OF_SIGNIFICANT_DATA \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XPCOM, 3)
+/* Result code used by nsIThreadManager */
+#define NS_ERROR_NOT_SAME_THREAD \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XPCOM, 4)
+/* Various operations are not permitted during XPCOM shutdown and will fail
+ * with this exception. */
+#define NS_ERROR_ILLEGAL_DURING_SHUTDOWN \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XPCOM, 30)
+#define NS_ERROR_SERVICE_NOT_AVAILABLE \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_XPCOM, 22)
+
+#define NS_SUCCESS_LOSS_OF_INSIGNIFICANT_DATA \
+ NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_XPCOM, 1)
+/* Used by nsCycleCollectionParticipant */
+#define NS_SUCCESS_INTERRUPTED_TRAVERSE \
+ NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_XPCOM, 2)
+/* DEPRECATED */
+#define NS_ERROR_SERVICE_NOT_FOUND \
+ NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_XPCOM, 22)
+/* DEPRECATED */
+#define NS_ERROR_SERVICE_IN_USE \
+ NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_XPCOM, 23)
+
+
+/* ======================================================================= */
+/* 2: NS_ERROR_MODULE_BASE */
+/* ======================================================================= */
+/* I/O Errors */
+
+/* Stream closed */
+#define NS_BASE_STREAM_CLOSED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_BASE, 2)
+/* Error from the operating system */
+#define NS_BASE_STREAM_OSERROR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_BASE, 3)
+/* Illegal arguments */
+#define NS_BASE_STREAM_ILLEGAL_ARGS \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_BASE, 4)
+/* For unichar streams */
+#define NS_BASE_STREAM_NO_CONVERTER \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_BASE, 5)
+/* For unichar streams */
+#define NS_BASE_STREAM_BAD_CONVERSION \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_BASE, 6)
+#define NS_BASE_STREAM_WOULD_BLOCK \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_BASE, 7)
+
-/* Returned when an operation can't complete due to an unavailable resource */
-#define NS_ERROR_NOT_AVAILABLE ((nsresult) 0x80040111L)
+/* ======================================================================= */
+/* 3: NS_ERROR_MODULE_GFX */
+/* ======================================================================= */
+/* error codes for printer device contexts */
+/* Unix: print command (lp/lpr) not found */
+#define NS_ERROR_GFX_PRINTER_CMD_NOT_FOUND \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 2)
+/* Unix: print command returned an error */
+#define NS_ERROR_GFX_PRINTER_CMD_FAILURE \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 3)
+/* no printer available (e.g. cannot find _any_ printer) */
+#define NS_ERROR_GFX_PRINTER_NO_PRINTER_AVAILABLE \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 4)
+/* _specified_ (by name) printer not found */
+#define NS_ERROR_GFX_PRINTER_NAME_NOT_FOUND \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 5)
+/* access to printer denied */
+#define NS_ERROR_GFX_PRINTER_ACCESS_DENIED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 6)
+/* invalid printer attribute (for example: unsupported paper size etc.) */
+#define NS_ERROR_GFX_PRINTER_INVALID_ATTRIBUTE \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 7)
+/* printer not "ready" (offline ?) */
+#define NS_ERROR_GFX_PRINTER_PRINTER_NOT_READY \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 9)
+/* printer out of paper */
+#define NS_ERROR_GFX_PRINTER_OUT_OF_PAPER \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 10)
+/* generic printer I/O error */
+#define NS_ERROR_GFX_PRINTER_PRINTER_IO_ERROR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 11)
+/* print-to-file: could not open output file */
+#define NS_ERROR_GFX_PRINTER_COULD_NOT_OPEN_FILE \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 12)
+/* print-to-file: I/O error while printing to file */
+#define NS_ERROR_GFX_PRINTER_FILE_IO_ERROR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 13)
+/* print preview: needs at least one printer */
+#define NS_ERROR_GFX_PRINTER_PRINTPREVIEW \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 14)
+/* print: starting document */
+#define NS_ERROR_GFX_PRINTER_STARTDOC \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 15)
+/* print: ending document */
+#define NS_ERROR_GFX_PRINTER_ENDDOC \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 16)
+/* print: starting page */
+#define NS_ERROR_GFX_PRINTER_STARTPAGE \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 17)
+/* print: ending page */
+#define NS_ERROR_GFX_PRINTER_ENDPAGE \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 18)
+/* print: print while in print preview */
+#define NS_ERROR_GFX_PRINTER_PRINT_WHILE_PREVIEW \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 19)
+/* requested page size not supported by printer */
+#define NS_ERROR_GFX_PRINTER_PAPER_SIZE_NOT_SUPPORTED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 20)
+/* requested page orientation not supported */
+#define NS_ERROR_GFX_PRINTER_ORIENTATION_NOT_SUPPORTED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 21)
+/* requested colorspace not supported (like printing "color" on a
+ "grayscale"-only printer) */
+#define NS_ERROR_GFX_PRINTER_COLORSPACE_NOT_SUPPORTED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 22)
+/* too many copies requested */
+#define NS_ERROR_GFX_PRINTER_TOO_MANY_COPIES \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 23)
+/* driver configuration error */
+#define NS_ERROR_GFX_PRINTER_DRIVER_CONFIGURATION_ERROR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 24)
+/* The document is still being loaded, can't Print Preview */
+#define NS_ERROR_GFX_PRINTER_DOC_IS_BUSY_PP \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 25)
+/* The document was asked to be destroyed while we were preparing printing */
+#define NS_ERROR_GFX_PRINTER_DOC_WAS_DESTORYED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 26)
+/* Cannot Print or Print Preview XUL Documents */
+#define NS_ERROR_GFX_PRINTER_NO_XUL \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 27)
+/* The toolkit no longer supports the Print Dialog (for embedders) */
+#define NS_ERROR_GFX_NO_PRINTDIALOG_IN_TOOLKIT \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 28)
+/* The was wasn't any Print Prompt service registered (this shouldn't happen) */
+#define NS_ERROR_GFX_NO_PRINTROMPTSERVICE \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 29)
+/* requested plex mode not supported by printer */
+#define NS_ERROR_GFX_PRINTER_PLEX_NOT_SUPPORTED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 30)
+/* The document is still being loaded */
+#define NS_ERROR_GFX_PRINTER_DOC_IS_BUSY \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 31)
+/* Printing is not implemented */
+#define NS_ERROR_GFX_PRINTING_NOT_IMPLEMENTED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 32)
+/* Cannot load the matching print module */
+#define NS_ERROR_GFX_COULD_NOT_LOAD_PRINT_MODULE \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 33)
+/* requested resolution/quality mode not supported by printer */
+#define NS_ERROR_GFX_PRINTER_RESOLUTION_NOT_SUPPORTED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 34)
+/* Font cmap is strangely structured - avoid this font! */
+#define NS_ERROR_GFX_CMAP_MALFORMED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GFX, 51)
+
+
+/* ======================================================================= */
+/* 4: NS_ERROR_MODULE_WIDGET */
+/* ======================================================================= */
+/* nsIWidget::OnIMEFocusChange should be called during blur, but other
+ * OnIME*Change methods should not be called */
+#define NS_SUCCESS_IME_NO_UPDATES \
+ NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_WIDGET, 1)
+
+
+/* ======================================================================= */
+/* 6: NS_ERROR_MODULE_NETWORK */
+/* ======================================================================= */
+/* General async request error codes:
+ *
+ * These error codes are commonly passed through callback methods to indicate
+ * the status of some requested async request.
+ *
+ * For example, see nsIRequestObserver::onStopRequest.
+ */
+
+/* The async request completed successfully. */
+#define NS_BINDING_SUCCEEDED NS_OK
+
+/* The async request failed for some unknown reason. */
+#define NS_BINDING_FAILED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 1)
+/* The async request failed because it was aborted by some user action. */
+#define NS_BINDING_ABORTED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 2)
+/* The async request has been "redirected" to a different async request.
+ * (e.g., an HTTP redirect occurred).
+ *
+ * This error code is used with load groups to notify the load group observer
+ * when a request in the load group is redirected to another request. */
+#define NS_BINDING_REDIRECTED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 3)
+/* The async request has been "retargeted" to a different "handler."
+ *
+ * This error code is used with load groups to notify the load group observer
+ * when a request in the load group is removed from the load group and added
+ * to a different load group. */
+#define NS_BINDING_RETARGETED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 4)
+
+/* Miscellaneous error codes: These errors are not typically passed via
+ * onStopRequest. */
+
+/* The URI is malformed. */
+#define NS_ERROR_MALFORMED_URI \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 10)
+/* The requested action could not be completed while the object is busy.
+ * Implementations of nsIChannel::asyncOpen will commonly return this error
+ * if the channel has already been opened (and has not yet been closed). */
+#define NS_ERROR_IN_PROGRESS \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 15)
+/* Returned from nsIChannel::asyncOpen to indicate that OnDataAvailable will
+ * not be called because there is no content available. This is used by
+ * helper app style protocols (e.g., mailto). XXX perhaps this should be a
+ * success code. */
+#define NS_ERROR_NO_CONTENT \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 17)
+/* The URI scheme corresponds to an unknown protocol handler. */
+#define NS_ERROR_UNKNOWN_PROTOCOL \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 18)
+/* The content encoding of the source document was incorrect, for example
+ * returning a plain HTML document advertised as Content-Encoding: gzip */
+#define NS_ERROR_INVALID_CONTENT_ENCODING \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 27)
+/* A transport level corruption was found in the source document. for example
+ * a document with a calculated checksum that does not match the Content-MD5
+ * http header. */
+#define NS_ERROR_CORRUPTED_CONTENT \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 29)
+/* While parsing for the first component of a header field using syntax as in
+ * Content-Disposition or Content-Type, the first component was found to be
+ * empty, such as in: Content-Disposition: ; filename=foo */
+#define NS_ERROR_FIRST_HEADER_FIELD_COMPONENT_EMPTY \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 34)
+/* Returned from nsIChannel::asyncOpen when trying to open the channel again
+ * (reopening is not supported). */
+#define NS_ERROR_ALREADY_OPENED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 73)
+
+/* Connectivity error codes: */
-/* Returned when a class is not registered */
-#define NS_ERROR_FACTORY_NOT_REGISTERED ((nsresult) 0x80040154L)
+/* The connection is already established. XXX unused - consider removing. */
+#define NS_ERROR_ALREADY_CONNECTED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 11)
+/* The connection does not exist. XXX unused - consider removing. */
+#define NS_ERROR_NOT_CONNECTED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 12)
+/* The connection attempt failed, for example, because no server was
+ * listening at specified host:port. */
+#define NS_ERROR_CONNECTION_REFUSED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 13)
+/* The connection was lost due to a timeout error. */
+#define NS_ERROR_NET_TIMEOUT \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 14)
+/* The requested action could not be completed while the networking library
+ * is in the offline state. */
+#define NS_ERROR_OFFLINE \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 16)
+/* The requested action was prohibited because it would have caused the
+ * networking library to establish a connection to an unsafe or otherwise
+ * banned port. */
+#define NS_ERROR_PORT_ACCESS_NOT_ALLOWED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 19)
+/* The connection was established, but no data was ever received. */
+#define NS_ERROR_NET_RESET \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 20)
+/* The connection was established, but the data transfer was interrupted. */
+#define NS_ERROR_NET_INTERRUPT \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 71)
+/* The connection attempt to a proxy failed. */
+#define NS_ERROR_PROXY_CONNECTION_REFUSED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 72)
+
+/* XXX really need to better rationalize these error codes. are consumers of
+ * necko really expected to know how to discern the meaning of these?? */
+/* This request is not resumable, but it was tried to resume it, or to
+ * request resume-specific data. */
+#define NS_ERROR_NOT_RESUMABLE \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 25)
+/* The request failed as a result of a detected redirection loop. */
+#define NS_ERROR_REDIRECT_LOOP \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 31)
+/* It was attempted to resume the request, but the entity has changed in the
+ * meantime. */
+#define NS_ERROR_ENTITY_CHANGED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 32)
+/* The request failed because the content type returned by the server was not
+ * a type expected by the channel (for nested channels such as the JAR
+ * channel). */
+#define NS_ERROR_UNSAFE_CONTENT_TYPE \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 74)
+/* The request failed because the user tried to access to a remote XUL
+ * document from a website that is not in its white-list. */
+#define NS_ERROR_REMOTE_XUL \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 75)
+
+
+/* FTP specific error codes: */
+
+#define NS_ERROR_FTP_LOGIN \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 21)
+#define NS_ERROR_FTP_CWD \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 22)
+#define NS_ERROR_FTP_PASV \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 23)
+#define NS_ERROR_FTP_PWD \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 24)
+#define NS_ERROR_FTP_LIST \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 28)
+
+/* DNS specific error codes: */
-/* Returned when a class cannot be registered, but may be tried again later */
-#define NS_ERROR_FACTORY_REGISTER_AGAIN ((nsresult) 0x80040155L)
+/* The lookup of a hostname failed. This generally refers to the hostname
+ * from the URL being loaded. */
+#define NS_ERROR_UNKNOWN_HOST \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 30)
+/* A low or medium priority DNS lookup failed because the pending queue was
+ * already full. High priorty (the default) always makes room */
+#define NS_ERROR_DNS_LOOKUP_QUEUE_FULL \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 33)
+/* The lookup of a proxy hostname failed. If a channel is configured to
+ * speak to a proxy server, then it will generate this error if the proxy
+ * hostname cannot be resolved. */
+#define NS_ERROR_UNKNOWN_PROXY_HOST \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 42)
+
+
+/* Socket specific error codes: */
+
+/* The specified socket type does not exist. */
+#define NS_ERROR_UNKNOWN_SOCKET_TYPE \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 51)
+/* The specified socket type could not be created. */
+#define NS_ERROR_SOCKET_CREATE_FAILED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 52)
+
+
+/* Cache specific error codes: */
+#define NS_ERROR_CACHE_KEY_NOT_FOUND \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 61)
+#define NS_ERROR_CACHE_DATA_IS_STREAM \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 62)
+#define NS_ERROR_CACHE_DATA_IS_NOT_STREAM \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 63)
+#define NS_ERROR_CACHE_WAIT_FOR_VALIDATION \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 64)
+#define NS_ERROR_CACHE_ENTRY_DOOMED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 65)
+#define NS_ERROR_CACHE_READ_ACCESS_DENIED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 66)
+#define NS_ERROR_CACHE_WRITE_ACCESS_DENIED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 67)
+#define NS_ERROR_CACHE_IN_USE \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 68)
+/* Error passed through onStopRequest if the document could not be fetched
+ * from the cache. */
+#define NS_ERROR_DOCUMENT_NOT_CACHED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 70)
+
+/* Effective TLD Service specific error codes: */
+
+/* The requested number of domain levels exceeds those present in the host
+ * string. */
+#define NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 80)
+/* The host string is an IP address. */
+#define NS_ERROR_HOST_IS_IP_ADDRESS \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 81)
+
+
+/* StreamLoader specific result codes: */
+
+/* Result code returned by nsIStreamLoaderObserver to indicate that the
+ * observer is taking over responsibility for the data buffer, and the loader
+ * should NOT free it. */
+#define NS_SUCCESS_ADOPTED_DATA \
+ NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_NETWORK, 90)
+
+/* FTP */
+#define NS_NET_STATUS_BEGIN_FTP_TRANSACTION \
+ NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_NETWORK, 27)
+#define NS_NET_STATUS_END_FTP_TRANSACTION \
+ NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_NETWORK, 28)
+
+/* This success code may be returned by nsIAuthModule::getNextToken to
+ * indicate that the authentication is finished and thus there's no need
+ * to call getNextToken again. */
+#define NS_SUCCESS_AUTH_FINISHED \
+ NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_NETWORK, 40)
+
+/* These are really not "results", they're statuses, used by nsITransport and
+ * friends. This is abuse of nsresult, but we'll put up with it for now. */
+/* nsITransport */
+#define NS_NET_STATUS_READING \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 8)
+#define NS_NET_STATUS_WRITING \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 9)
-/* Returned when a dynamically loaded factory couldn't be found */
-#define NS_ERROR_FACTORY_NOT_LOADED ((nsresult) 0x800401f8L)
+/* nsISocketTransport */
+#define NS_NET_STATUS_RESOLVING_HOST \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 3)
+#define NS_NET_STATUS_RESOLVED_HOST \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 11)
+#define NS_NET_STATUS_CONNECTING_TO \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 7)
+#define NS_NET_STATUS_CONNECTED_TO \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 4)
+#define NS_NET_STATUS_SENDING_TO \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 5)
+#define NS_NET_STATUS_WAITING_FOR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 10)
+#define NS_NET_STATUS_RECEIVING_FROM \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 6)
+
+
+/* ======================================================================= */
+/* 7: NS_ERROR_MODULE_PLUGINS */
+/* ======================================================================= */
+#define NS_ERROR_PLUGINS_PLUGINSNOTCHANGED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_PLUGINS, 1000)
+#define NS_ERROR_PLUGIN_DISABLED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_PLUGINS, 1001)
+#define NS_ERROR_PLUGIN_BLOCKLISTED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_PLUGINS, 1002)
+#define NS_ERROR_PLUGIN_TIME_RANGE_NOT_SUPPORTED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_PLUGINS, 1003)
+#define NS_ERROR_PLUGIN_CLICKTOPLAY \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_PLUGINS, 1004)
+
+
+/* ======================================================================= */
+/* 8: NS_ERROR_MODULE_LAYOUT */
+/* ======================================================================= */
+/* Return code for nsITableLayout */
+#define NS_TABLELAYOUT_CELL_NOT_FOUND \
+ NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_LAYOUT, 0)
+/* Return code for nsFrame::GetNextPrevLineFromeBlockFrame */
+#define NS_POSITION_BEFORE_TABLE \
+ NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_LAYOUT, 3)
+/** Return codes for nsPresState::GetProperty() */
+/* Returned if the property exists */
+#define NS_STATE_PROPERTY_EXISTS NS_OK
+/* Returned if the property does not exist */
+#define NS_STATE_PROPERTY_NOT_THERE \
+ NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_LAYOUT, 5)
+
+
+/* ======================================================================= */
+/* 9: NS_ERROR_MODULE_HTMLPARSER */
+/* ======================================================================= */
+#define NS_ERROR_HTMLPARSER_CONTINUE NS_OK
-/* Returned when a factory doesn't support signatures */
-#define NS_ERROR_FACTORY_NO_SIGNATURE_SUPPORT \
- (NS_ERROR_BASE + 0x101)
+#define NS_ERROR_HTMLPARSER_EOF \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER, 1000)
+#define NS_ERROR_HTMLPARSER_UNKNOWN \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER, 1001)
+#define NS_ERROR_HTMLPARSER_CANTPROPAGATE \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER, 1002)
+#define NS_ERROR_HTMLPARSER_CONTEXTMISMATCH \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER, 1003)
+#define NS_ERROR_HTMLPARSER_BADFILENAME \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER, 1004)
+#define NS_ERROR_HTMLPARSER_BADURL \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER, 1005)
+#define NS_ERROR_HTMLPARSER_INVALIDPARSERCONTEXT \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER, 1006)
+#define NS_ERROR_HTMLPARSER_INTERRUPTED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER, 1007)
+#define NS_ERROR_HTMLPARSER_BLOCK \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER, 1008)
+#define NS_ERROR_HTMLPARSER_BADTOKENIZER \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER, 1009)
+#define NS_ERROR_HTMLPARSER_BADATTRIBUTE \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER, 1010)
+#define NS_ERROR_HTMLPARSER_UNRESOLVEDDTD \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER, 1011)
+#define NS_ERROR_HTMLPARSER_MISPLACEDTABLECONTENT \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER, 1012)
+#define NS_ERROR_HTMLPARSER_BADDTD \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER, 1013)
+#define NS_ERROR_HTMLPARSER_BADCONTEXT \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER, 1014)
+#define NS_ERROR_HTMLPARSER_STOPPARSING \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER, 1015)
+#define NS_ERROR_HTMLPARSER_UNTERMINATEDSTRINGLITERAL \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER, 1016)
+#define NS_ERROR_HTMLPARSER_HIERARCHYTOODEEP \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER, 1017)
+#define NS_ERROR_HTMLPARSER_FAKE_ENDTAG \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER, 1018)
+#define NS_ERROR_HTMLPARSER_INVALID_COMMENT \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_HTMLPARSER, 1019)
+
+#define NS_HTMLTOKENS_NOT_AN_ENTITY \
+ NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_HTMLPARSER, 2000)
+#define NS_HTMLPARSER_VALID_META_CHARSET \
+ NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_HTMLPARSER, 3000)
+
-/* Returned when a factory already is registered */
-#define NS_ERROR_FACTORY_EXISTS (NS_ERROR_BASE + 0x100)
+/* ======================================================================= */
+/* 10: NS_ERROR_MODULE_RDF */
+/* ======================================================================= */
+/* Returned from nsIRDFDataSource::Assert() and Unassert() if the assertion
+ * (or unassertion was accepted by the datasource */
+#define NS_RDF_ASSERTION_ACCEPTED NS_OK
+/* Returned from nsIRDFCursor::Advance() if the cursor has no more
+ * elements to enumerate */
+#define NS_RDF_CURSOR_EMPTY \
+ NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_RDF, 1)
+/* Returned from nsIRDFDataSource::GetSource() and GetTarget() if the
+ * source/target has no value */
+#define NS_RDF_NO_VALUE \
+ NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_RDF, 2)
+/* Returned from nsIRDFDataSource::Assert() and Unassert() if the assertion
+ * (or unassertion) was rejected by the datasource; i.e., the datasource was
+ * not willing to record the statement. */
+#define NS_RDF_ASSERTION_REJECTED \
+ NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_RDF, 3)
+/* Return this from rdfITripleVisitor to stop cycling */
+#define NS_RDF_STOP_VISIT \
+ NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_RDF, 4)
+
+
+/* ======================================================================= */
+/* 11: NS_ERROR_MODULE_UCONV */
+/* ======================================================================= */
+#define NS_ERROR_UCONV_NOCONV \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_UCONV, 1)
+#define NS_ERROR_UDEC_ILLEGALINPUT \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_UCONV, 14)
+
+#define NS_SUCCESS_USING_FALLBACK_LOCALE \
+ NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_UCONV, 2)
+#define NS_OK_UDEC_EXACTLENGTH \
+ NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_UCONV, 11)
+#define NS_OK_UDEC_MOREINPUT \
+ NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_UCONV, 12)
+#define NS_OK_UDEC_MOREOUTPUT \
+ NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_UCONV, 13)
+#define NS_OK_UDEC_NOBOMFOUND \
+ NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_UCONV, 14)
+#define NS_OK_UENC_EXACTLENGTH \
+ NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_UCONV, 33)
+#define NS_OK_UENC_MOREOUTPUT \
+ NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_UCONV, 34)
+#define NS_ERROR_UENC_NOMAPPING \
+ NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_UCONV, 35)
+#define NS_OK_UENC_MOREINPUT \
+ NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_UCONV, 36)
+
+/* BEGIN DEPRECATED */
+#define NS_EXACT_LENGTH NS_OK_UDEC_EXACTLENGTH
+#define NS_PARTIAL_MORE_INPUT NS_OK_UDEC_MOREINPUT
+#define NS_PARTIAL_MORE_OUTPUT NS_OK_UDEC_MOREOUTPUT
+#define NS_ERROR_ILLEGAL_INPUT NS_ERROR_UDEC_ILLEGALINPUT
+/* END DEPRECATED */
-/*@}*/
+/* ======================================================================= */
+/* 13: NS_ERROR_MODULE_FILES */
+/* ======================================================================= */
+#define NS_ERROR_FILE_UNRECOGNIZED_PATH \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 1)
+#define NS_ERROR_FILE_UNRESOLVABLE_SYMLINK \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 2)
+#define NS_ERROR_FILE_EXECUTION_FAILED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 3)
+#define NS_ERROR_FILE_UNKNOWN_TYPE \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 4)
+#define NS_ERROR_FILE_DESTINATION_NOT_DIR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 5)
+#define NS_ERROR_FILE_TARGET_DOES_NOT_EXIST \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 6)
+#define NS_ERROR_FILE_COPY_OR_MOVE_FAILED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 7)
+#define NS_ERROR_FILE_ALREADY_EXISTS \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 8)
+#define NS_ERROR_FILE_INVALID_PATH \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 9)
+#define NS_ERROR_FILE_DISK_FULL \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 10)
+#define NS_ERROR_FILE_CORRUPTED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 11)
+#define NS_ERROR_FILE_NOT_DIRECTORY \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 12)
+#define NS_ERROR_FILE_IS_DIRECTORY \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 13)
+#define NS_ERROR_FILE_IS_LOCKED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 14)
+#define NS_ERROR_FILE_TOO_BIG \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 15)
+#define NS_ERROR_FILE_NO_DEVICE_SPACE \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 16)
+#define NS_ERROR_FILE_NAME_TOO_LONG \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 17)
+#define NS_ERROR_FILE_NOT_FOUND \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 18)
+#define NS_ERROR_FILE_READ_ONLY \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 19)
+#define NS_ERROR_FILE_DIR_NOT_EMPTY \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 20)
+#define NS_ERROR_FILE_ACCESS_DENIED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_FILES, 21)
+
+#define NS_SUCCESS_FILE_DIRECTORY_EMPTY \
+ NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_FILES, 1)
+/* Result codes used by nsIDirectoryServiceProvider2 */
+#define NS_SUCCESS_AGGREGATE_RESULT \
+ NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_FILES, 2)
+
+
+/* ======================================================================= */
+/* 14: NS_ERROR_MODULE_DOM */
+/* ======================================================================= */
+/* XXX If you add a new DOM error code, also add an error string to
+ * dom/src/base/domerr.msg */
- /* I/O Errors */
+/* Standard DOM error codes: http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html */
+#define NS_ERROR_DOM_INDEX_SIZE_ERR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 1)
+#define NS_ERROR_DOM_HIERARCHY_REQUEST_ERR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 3)
+#define NS_ERROR_DOM_WRONG_DOCUMENT_ERR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 4)
+#define NS_ERROR_DOM_INVALID_CHARACTER_ERR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 5)
+#define NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 7)
+#define NS_ERROR_DOM_NOT_FOUND_ERR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 8)
+#define NS_ERROR_DOM_NOT_SUPPORTED_ERR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 9)
+#define NS_ERROR_DOM_INUSE_ATTRIBUTE_ERR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 10)
+#define NS_ERROR_DOM_INVALID_STATE_ERR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 11)
+#define NS_ERROR_DOM_SYNTAX_ERR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 12)
+#define NS_ERROR_DOM_INVALID_MODIFICATION_ERR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 13)
+#define NS_ERROR_DOM_NAMESPACE_ERR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 14)
+#define NS_ERROR_DOM_INVALID_ACCESS_ERR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 15)
+#define NS_ERROR_DOM_TYPE_MISMATCH_ERR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 17)
+#define NS_ERROR_DOM_SECURITY_ERR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 18)
+#define NS_ERROR_DOM_NETWORK_ERR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 19)
+#define NS_ERROR_DOM_ABORT_ERR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 20)
+#define NS_ERROR_DOM_URL_MISMATCH_ERR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 21)
+#define NS_ERROR_DOM_QUOTA_EXCEEDED_ERR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 22)
+#define NS_ERROR_DOM_TIMEOUT_ERR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 23)
+#define NS_ERROR_DOM_INVALID_NODE_TYPE_ERR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 24)
+#define NS_ERROR_DOM_DATA_CLONE_ERR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 25)
+/* XXX Should be JavaScript native errors */
+#define NS_ERROR_TYPE_ERR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 26)
+#define NS_ERROR_RANGE_ERR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 27)
+/* DOM error codes defined by us */
+#define NS_ERROR_DOM_SECMAN_ERR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 1001)
+#define NS_ERROR_DOM_WRONG_TYPE_ERR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 1002)
+#define NS_ERROR_DOM_NOT_OBJECT_ERR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 1003)
+#define NS_ERROR_DOM_NOT_XPC_OBJECT_ERR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 1004)
+#define NS_ERROR_DOM_NOT_NUMBER_ERR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 1005)
+#define NS_ERROR_DOM_NOT_BOOLEAN_ERR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 1006)
+#define NS_ERROR_DOM_NOT_FUNCTION_ERR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 1007)
+#define NS_ERROR_DOM_TOO_FEW_PARAMETERS_ERR \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 1008)
+#define NS_ERROR_DOM_BAD_DOCUMENT_DOMAIN \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 1009)
+#define NS_ERROR_DOM_PROP_ACCESS_DENIED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 1010)
+#define NS_ERROR_DOM_XPCONNECT_ACCESS_DENIED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 1011)
+#define NS_ERROR_DOM_BAD_URI \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 1012)
+#define NS_ERROR_DOM_RETVAL_UNDEFINED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 1013)
+#define NS_ERROR_DOM_QUOTA_REACHED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_DOM, 1014)
+
+
+/* ======================================================================= */
+/* 15: NS_ERROR_MODULE_IMGLIB */
+/* ======================================================================= */
+#define NS_IMAGELIB_SUCCESS_LOAD_FINISHED \
+ NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_IMGLIB, 0)
+#define NS_IMAGELIB_CHANGING_OWNER \
+ NS_ERROR_GENERATE_SUCCESS(NS_ERROR_MODULE_IMGLIB, 1)
- /* Stream closed */
-#define NS_BASE_STREAM_CLOSED NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_BASE, 2)
- /* Error from the operating system */
-#define NS_BASE_STREAM_OSERROR NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_BASE, 3)
- /* Illegal arguments */
-#define NS_BASE_STREAM_ILLEGAL_ARGS NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_BASE, 4)
- /* For unichar streams */
-#define NS_BASE_STREAM_NO_CONVERTER NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_BASE, 5)
- /* For unichar streams */
-#define NS_BASE_STREAM_BAD_CONVERSION NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_BASE, 6)
+#define NS_IMAGELIB_ERROR_FAILURE \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_IMGLIB, 5)
+#define NS_IMAGELIB_ERROR_NO_DECODER \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_IMGLIB, 6)
+#define NS_IMAGELIB_ERROR_NOT_FINISHED \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_IMGLIB, 7)
+#define NS_IMAGELIB_ERROR_NO_ENCODER \
+ NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_IMGLIB, 9)
+
+
+/* ======================================================================= */
+/* 17: NS_ERROR_MODULE_EDITOR */
+/* ======================================================================= */
