Backout fcb3a7884fa9 (bug 705640) for build failures

dom/base/DOMError.cpp

@@ -1,70 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; 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 "DOMError.h"
-
-#include "nsDOMClassInfo.h"
-
-using mozilla::dom::DOMError;
-
-// static
-already_AddRefed<nsIDOMDOMError>
-DOMError::CreateForDOMExceptionCode(PRUint16 aDOMExceptionCode)
-{
-  struct NameMap { PRUint16 code; char* name; };
-  static const NameMap kNames[] = {
-    {  1, "IndexSizeError" },
-    {  3, "HierarchyRequestError" },
-    {  4, "WrongDocumentError" },
-    {  5, "InvalidCharacterError" },
-    {  7, "NoModificationAllowedError" },
-    {  8, "NotFoundError" },
-    {  9, "NotSupportedError" },
-    { 11, "InvalidStateError" },
-    { 12, "SyntaxError" },
-    { 13, "InvalidModificationError" },
-    { 14, "NamespaceError" },
-    { 15, "InvalidAccessError" },
-    { 17, "TypeMismatchError" },
-    { 18, "SecurityError" },
-    { 19, "NetworkError" },
-    { 20, "AbortError" },
-    { 21, "URLMismatchError" },
-    { 22, "QuotaExceededError" },
-    { 23, "TimeoutError" },
-    { 24, "InvalidNodeTypeError" },
-    { 25, "DataCloneError" }, 
-  };
-
-  for (size_t index = 0; index < ArrayLength(kNames); index++) {
-    if (kNames[index].code == aDOMExceptionCode) {
-      nsString name;
-      name.AssignASCII(kNames[index].name);
-      return CreateWithName(name);
-    }
-  }
-
-  NS_NOTREACHED("Unknown DOMException code!");
-  return nsnull;
-}
-
-NS_IMPL_ADDREF(DOMError)
-NS_IMPL_RELEASE(DOMError)
-
-NS_INTERFACE_MAP_BEGIN(DOMError)
-  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(DOMError)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMDOMError)
-  NS_INTERFACE_MAP_ENTRY(nsISupports)
-NS_INTERFACE_MAP_END
-
-DOMCI_DATA(DOMError, DOMError)
-
-NS_IMETHODIMP
-DOMError::GetName(nsAString& aName)
-{
-  aName = mName;
-  return NS_OK;
-}

dom/base/DOMError.h

@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; 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/. */
-
-#ifndef mozilla_dom_domerror_h__
-#define mozilla_dom_domerror_h__
-
-#include "nsIDOMDOMError.h"
-
-#include "nsCOMPtr.h"
-#include "nsStringGlue.h"
-
-namespace mozilla {
-namespace dom {
-
-class DOMError : public nsIDOMDOMError
-{
-  nsString mName;
-
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIDOMDOMERROR
-
-  static already_AddRefed<nsIDOMDOMError>
-  CreateForDOMExceptionCode(PRUint16 aDOMExceptionCode);
-
-  static already_AddRefed<nsIDOMDOMError>
-  CreateWithName(const nsAString& aName)
-  {
-    nsCOMPtr<nsIDOMDOMError> error = new DOMError(aName);
-    return error.forget();
-  }
-
-protected:
-  DOMError(const nsAString& aName)
-  : mName(aName)
-  { }
-
-  virtual ~DOMError()
-  { }
-};
-
-} // namespace dom
-} // namespace mozilla
-
-#endif // mozilla_dom_domerror_h__

dom/base/Makefile.in

@@ -66,7 +66,6 @@ EXTRA_JS_MODULES += Webapps.jsm \
 endif
 
 XPIDLSRCS = \
-  nsIDOMDOMError.idl \
   nsIEntropyCollector.idl \
   nsIScriptChannel.idl \
   $(NULL)
@@ -104,7 +103,6 @@ EXPORTS = \
 
 EXPORTS_NAMESPACES = mozilla/dom
 EXPORTS_mozilla/dom = \
-  DOMError.h \
   StructuredCloneTags.h \
   $(NULL)
 
@@ -134,7 +132,6 @@ CPPSRCS =			\
 	nsDOMNavigationTiming.cpp \
 	nsPerformance.cpp	\
 	nsDOMMemoryReporter.cpp \
-	DOMError.cpp \
 	Navigator.cpp \
 	$(NULL)
 

dom/base/nsDOMClassInfo.cpp

@@ -527,8 +527,6 @@
 #include "CallEvent.h"
 #endif
 
-#include "DOMError.h"
-
 using namespace mozilla;
 using namespace mozilla::dom;
 
@@ -1587,9 +1585,6 @@ static nsDOMClassInfoData sClassInfoData[] = {
   NS_DEFINE_CLASSINFO_DATA(CallEvent, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
 #endif
-
-  NS_DEFINE_CLASSINFO_DATA(DOMError, nsDOMGenericSH,
-                           DOM_DEFAULT_SCRIPTABLE_FLAGS)
 };
 
 // Objects that should be constructable through |new Name();|
@@ -4323,10 +4318,6 @@ nsDOMClassInfo::Init()
   DOM_CLASSINFO_MAP_END
 #endif
 
-  DOM_CLASSINFO_MAP_BEGIN(DOMError, nsIDOMDOMError)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMDOMError)
-  DOM_CLASSINFO_MAP_END
-
 #ifdef NS_DEBUG
   {
     PRUint32 i = ArrayLength(sClassInfoData);

dom/base/nsDOMClassInfoClasses.h

@@ -537,5 +537,3 @@ DOMCI_CLASS(Telephony)
 DOMCI_CLASS(TelephonyCall)
 DOMCI_CLASS(CallEvent)
 #endif
-
-DOMCI_CLASS(DOMError)

dom/base/nsIDOMDOMError.idl

@@ -1,13 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; 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 "nsISupports.idl"
-
-[scriptable, builtinclass, uuid(e4e28307-d409-4cf7-93cd-6ea8e889f87a)]
-interface nsIDOMDOMError : nsISupports
-{
-  readonly attribute DOMString name;
-};

dom/interfaces/core/nsIDOMDOMError.idl

@@ -0,0 +1,62 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2002
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Boris Zbarsky <bzbarsky@mit.edu>  (original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "domstubs.idl"
+
+/**
+ * The nsIDOMDOMError interface is "An non-zero implementation
+ * dependent error code describing the error, or 0 if there is no
+ * error." [sic]
+ *
+ * For more information on this interface please see
+ * http://www.w3.org/TR/2002/WD-DOM-Level-3-Core-20020409/core.html
+ */
+
+[scriptable, uuid(475790ce-d8fa-4e02-a167-e6308ba9b120)]
+interface nsIDOMDOMError : nsISupports
+{
+  const unsigned short      SEVERITY_WARNING               = 0;
+  const unsigned short      SEVERITY_ERROR                 = 1;
+  const unsigned short      SEVERITY_FATAL_ERROR           = 2;
+  readonly attribute unsigned short    severity;
+  readonly attribute DOMString         message;
+  // XXX This should be a DOMObject, not an nsISupports; do we need to
+  // do some magic to make that work?
+  readonly attribute nsISupports       relatedException;
+  readonly attribute nsIDOMDOMLocator  location;
+};

dom/interfaces/core/nsIDOMDOMErrorHandler.idl

@@ -0,0 +1,54 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2002
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Boris Zbarsky <bzbarsky@mit.edu>  (original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "domstubs.idl"
+
+/**
+ * The nsIDOMDOMErrorHandler interface is a basic interface for DOM
+ * error handlers
+ *
+ * For more information on this interface please see
+ * http://www.w3.org/TR/2002/WD-DOM-Level-3-Core-20020409/core.html
+ */
+
+[scriptable, uuid(2d958bdf-740d-43f4-9e5c-5d930f4f3876)]
+interface nsIDOMDOMErrorHandler : nsISupports
+{
+  boolean            handleError(in nsIDOMDOMError error);
+};
+

js/xpconnect/src/dom_quickstubs.qsconf

@@ -467,8 +467,6 @@ members = [
     'nsIIDBVersionChangeEvent.*',
     'nsIIndexedDatabaseUsageCallback.*',
     'nsIIndexedDatabaseManager.*',
-
-    'nsIDOMDOMError.*',
     ]
 
 # Most interfaces can be found by searching the includePath; to find