From 52d34a89db12132a1c6160c3c2483a77f0eb01c0 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:30:28 +0200 Subject: [PATCH] Bug 903796 - Remove remaining traces of GeoPositionError; r=jst --- dom/base/nsDOMClassInfo.cpp | 8 -------- dom/base/nsDOMClassInfoClasses.h | 1 - dom/src/geolocation/nsGeolocation.cpp | 1 - dom/tests/mochitest/general/test_interfaces.html | 1 - js/xpconnect/tests/mochitest/test_bug790732.html | 1 - 5 files changed, 12 deletions(-) diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp index a826ea8cff4..c4c451f80ac 100644 --- a/dom/base/nsDOMClassInfo.cpp +++ b/dom/base/nsDOMClassInfo.cpp @@ -80,7 +80,6 @@ #include "nsIDOMDOMException.h" #include "nsIDOMDOMStringList.h" #include "nsIDOMUserDataHandler.h" -#include "nsIDOMGeoPositionError.h" #include "nsIDOMLoadStatus.h" #include "nsIDOMXPathNamespace.h" #include "nsIDOMXULButtonElement.h" @@ -574,8 +573,6 @@ static nsDOMClassInfoData sClassInfoData[] = { NS_DEFINE_CLASSINFO_DATA(UserDataHandler, nsDOMGenericSH, DOM_DEFAULT_SCRIPTABLE_FLAGS) - NS_DEFINE_CLASSINFO_DATA(GeoPositionError, nsDOMGenericSH, - DOM_DEFAULT_SCRIPTABLE_FLAGS) NS_DEFINE_CLASSINFO_DATA(LoadStatus, nsDOMGenericSH, DOM_DEFAULT_SCRIPTABLE_FLAGS) NS_DEFINE_CLASSINFO_DATA(XPathNamespace, nsDOMGenericSH, @@ -1474,10 +1471,6 @@ nsDOMClassInfo::Init() DOM_CLASSINFO_MAP_ENTRY(nsIDOMUserDataHandler) DOM_CLASSINFO_MAP_END - DOM_CLASSINFO_MAP_BEGIN(GeoPositionError, nsIDOMGeoPositionError) - DOM_CLASSINFO_MAP_ENTRY(nsIDOMGeoPositionError) - DOM_CLASSINFO_MAP_END - DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(LoadStatus, nsIDOMLoadStatus) DOM_CLASSINFO_MAP_ENTRY(nsIDOMLoadStatus) DOM_CLASSINFO_MAP_END @@ -3559,7 +3552,6 @@ const InterfaceShimEntry kInterfaceShimMap[] = { "nsIDOMMutationEvent", "MutationEvent" }, { "nsIDOMSimpleGestureEvent", "SimpleGestureEvent" }, { "nsIDOMUIEvent", "UIEvent" }, - { "nsIDOMGeoPositionError", "GeoPositionError" }, { "nsIDOMHTMLMediaElement", "HTMLMediaElement" }, { "nsIDOMMediaError", "MediaError" }, { "nsIDOMLoadStatus", "LoadStatus" }, diff --git a/dom/base/nsDOMClassInfoClasses.h b/dom/base/nsDOMClassInfoClasses.h index effc66496dd..1d6cd8d7d40 100644 --- a/dom/base/nsDOMClassInfoClasses.h +++ b/dom/base/nsDOMClassInfoClasses.h @@ -150,7 +150,6 @@ DOMCI_CLASS(LockedFile) DOMCI_CLASS(CSSFontFeatureValuesRule) DOMCI_CLASS(UserDataHandler) -DOMCI_CLASS(GeoPositionError) DOMCI_CLASS(LoadStatus) DOMCI_CLASS(XPathNamespace) DOMCI_CLASS(XULControlElement) diff --git a/dom/src/geolocation/nsGeolocation.cpp b/dom/src/geolocation/nsGeolocation.cpp index a4a2570b3c2..c7e85f0e543 100644 --- a/dom/src/geolocation/nsGeolocation.cpp +++ b/dom/src/geolocation/nsGeolocation.cpp @@ -201,7 +201,6 @@ private: //////////////////////////////////////////////////// // PositionError //////////////////////////////////////////////////// -DOMCI_DATA(GeoPositionError, PositionError) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(PositionError) NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY diff --git a/dom/tests/mochitest/general/test_interfaces.html b/dom/tests/mochitest/general/test_interfaces.html index d12dae39017..69fc3400f2e 100644 --- a/dom/tests/mochitest/general/test_interfaces.html +++ b/dom/tests/mochitest/general/test_interfaces.html @@ -119,7 +119,6 @@ var interfaceNamesInGlobalScope = "GamepadAxisMoveEvent", "GamepadButtonEvent", "GamepadEvent", - "GeoPositionError", "HashChangeEvent", "History", "HTMLAnchorElement", diff --git a/js/xpconnect/tests/mochitest/test_bug790732.html b/js/xpconnect/tests/mochitest/test_bug790732.html index a830165baf3..c918f525a80 100644 --- a/js/xpconnect/tests/mochitest/test_bug790732.html +++ b/js/xpconnect/tests/mochitest/test_bug790732.html @@ -36,7 +36,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=790732 is(Ci.nsIDOMMutationEvent, MutationEvent); is(Ci.nsIDOMSimpleGestureEvent, SimpleGestureEvent); is(Ci.nsIDOMUIEvent, UIEvent); - is(Ci.nsIDOMGeoPositionError, GeoPositionError); is(Ci.nsIDOMHTMLMediaElement, HTMLMediaElement); is(Ci.nsIDOMMediaError, MediaError); is(Ci.nsIDOMLoadStatus, LoadStatus);