From e5ab052440aa62addfcc3fc407d0c3aad0842d1a Mon Sep 17 00:00:00 2001 From: Mounir Lamouri Date: Sat, 19 Nov 2011 11:43:57 +0100 Subject: [PATCH] Bug 701517 - Moz-prefix Battery API interfaces. rs+sr=smaug --- dom/base/Navigator.cpp | 4 ++-- dom/base/Navigator.h | 4 ++-- dom/base/nsDOMClassInfo.cpp | 8 ++++---- dom/base/nsDOMClassInfoClasses.h | 2 +- dom/battery/BatteryManager.cpp | 6 +++--- dom/battery/BatteryManager.h | 4 ++-- dom/battery/nsIDOMBatteryManager.idl | 4 ++-- dom/battery/nsIDOMNavigatorBattery.idl | 8 ++++---- dom/battery/test/test_battery_basics.html | 6 ++++++ 9 files changed, 26 insertions(+), 20 deletions(-) diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp index a71dc99abdd5..659bacd55f29 100644 --- a/dom/base/Navigator.cpp +++ b/dom/base/Navigator.cpp @@ -113,7 +113,7 @@ NS_INTERFACE_MAP_BEGIN(Navigator) NS_INTERFACE_MAP_ENTRY(nsIDOMNavigator) NS_INTERFACE_MAP_ENTRY(nsIDOMClientInformation) NS_INTERFACE_MAP_ENTRY(nsIDOMNavigatorGeolocation) - NS_INTERFACE_MAP_ENTRY(nsIDOMNavigatorBattery) + NS_INTERFACE_MAP_ENTRY(nsIDOMMozNavigatorBattery) NS_INTERFACE_MAP_ENTRY(nsIDOMNavigatorDesktopNotification) NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(Navigator) NS_INTERFACE_MAP_END @@ -746,7 +746,7 @@ NS_IMETHODIMP Navigator::GetMozNotification(nsIDOMDesktopNotificationCenter** aR //***************************************************************************** NS_IMETHODIMP -Navigator::GetMozBattery(nsIDOMBatteryManager** aBattery) +Navigator::GetMozBattery(nsIDOMMozBatteryManager** aBattery) { if (!mBatteryManager) { *aBattery = nsnull; diff --git a/dom/base/Navigator.h b/dom/base/Navigator.h index ea014f6623bc..32e561b91ab1 100644 --- a/dom/base/Navigator.h +++ b/dom/base/Navigator.h @@ -71,7 +71,7 @@ class Navigator : public nsIDOMNavigator, public nsIDOMClientInformation, public nsIDOMNavigatorGeolocation, public nsIDOMNavigatorDesktopNotification, - public nsIDOMNavigatorBattery + public nsIDOMMozNavigatorBattery { public: Navigator(nsIDocShell *aDocShell); @@ -82,7 +82,7 @@ public: NS_DECL_NSIDOMCLIENTINFORMATION NS_DECL_NSIDOMNAVIGATORGEOLOCATION NS_DECL_NSIDOMNAVIGATORDESKTOPNOTIFICATION - NS_DECL_NSIDOMNAVIGATORBATTERY + NS_DECL_NSIDOMMOZNAVIGATORBATTERY static void Init(); diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp index 4c2a077f525f..3be0597396d5 100644 --- a/dom/base/nsDOMClassInfo.cpp +++ b/dom/base/nsDOMClassInfo.cpp @@ -1385,7 +1385,7 @@ static nsDOMClassInfoData sClassInfoData[] = { NS_DEFINE_CLASSINFO_DATA(GeoPositionError, nsDOMGenericSH, DOM_DEFAULT_SCRIPTABLE_FLAGS) - NS_DEFINE_CLASSINFO_DATA(BatteryManager, nsDOMGenericSH, + NS_DEFINE_CLASSINFO_DATA(MozBatteryManager, nsDOMGenericSH, DOM_DEFAULT_SCRIPTABLE_FLAGS) NS_DEFINE_CLASSINFO_DATA(CSSFontFaceRule, nsDOMGenericSH, @@ -2287,7 +2287,7 @@ nsDOMClassInfo::Init() DOM_CLASSINFO_MAP_CONDITIONAL_ENTRY(nsIDOMNavigatorDesktopNotification, Navigator::HasDesktopNotificationSupport()) DOM_CLASSINFO_MAP_ENTRY(nsIDOMClientInformation) - DOM_CLASSINFO_MAP_CONDITIONAL_ENTRY(nsIDOMNavigatorBattery, + DOM_CLASSINFO_MAP_CONDITIONAL_ENTRY(nsIDOMMozNavigatorBattery, battery::BatteryManager::HasSupport()) DOM_CLASSINFO_MAP_END @@ -3866,8 +3866,8 @@ nsDOMClassInfo::Init() DOM_CLASSINFO_MAP_ENTRY(nsIDOMGeoPositionError) DOM_CLASSINFO_MAP_END - DOM_CLASSINFO_MAP_BEGIN(BatteryManager, nsIDOMBatteryManager) - DOM_CLASSINFO_MAP_ENTRY(nsIDOMBatteryManager) + DOM_CLASSINFO_MAP_BEGIN(MozBatteryManager, nsIDOMMozBatteryManager) + DOM_CLASSINFO_MAP_ENTRY(nsIDOMMozBatteryManager) DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget) DOM_CLASSINFO_MAP_END diff --git a/dom/base/nsDOMClassInfoClasses.h b/dom/base/nsDOMClassInfoClasses.h index 893228bac28e..20a5530209c9 100644 --- a/dom/base/nsDOMClassInfoClasses.h +++ b/dom/base/nsDOMClassInfoClasses.h @@ -426,7 +426,7 @@ DOMCI_CLASS(GeoPositionCoords) DOMCI_CLASS(GeoPositionAddress) DOMCI_CLASS(GeoPositionError) -DOMCI_CLASS(BatteryManager) +DOMCI_CLASS(MozBatteryManager) // @font-face in CSS DOMCI_CLASS(CSSFontFaceRule) diff --git a/dom/battery/BatteryManager.cpp b/dom/battery/BatteryManager.cpp index 2e7fb298c614..e331ba563022 100644 --- a/dom/battery/BatteryManager.cpp +++ b/dom/battery/BatteryManager.cpp @@ -52,7 +52,7 @@ #define DISCHARGINGTIMECHANGE_EVENT_NAME NS_LITERAL_STRING("dischargingtimechange") #define CHARGINGTIMECHANGE_EVENT_NAME NS_LITERAL_STRING("chargingtimechange") -DOMCI_DATA(BatteryManager, mozilla::dom::battery::BatteryManager) +DOMCI_DATA(MozBatteryManager, mozilla::dom::battery::BatteryManager) namespace mozilla { namespace dom { @@ -77,8 +77,8 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(BatteryManager, NS_IMPL_CYCLE_COLLECTION_UNLINK_END NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(BatteryManager) - NS_INTERFACE_MAP_ENTRY(nsIDOMBatteryManager) - NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(BatteryManager) + NS_INTERFACE_MAP_ENTRY(nsIDOMMozBatteryManager) + NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(MozBatteryManager) NS_INTERFACE_MAP_END_INHERITING(nsDOMEventTargetWrapperCache) NS_IMPL_ADDREF_INHERITED(BatteryManager, nsDOMEventTargetWrapperCache) diff --git a/dom/battery/BatteryManager.h b/dom/battery/BatteryManager.h index 2b34ca225110..a3ae3ae83070 100644 --- a/dom/battery/BatteryManager.h +++ b/dom/battery/BatteryManager.h @@ -57,12 +57,12 @@ namespace dom { namespace battery { class BatteryManager : public nsDOMEventTargetWrapperCache - , public nsIDOMBatteryManager + , public nsIDOMMozBatteryManager , public BatteryObserver { public: NS_DECL_ISUPPORTS - NS_DECL_NSIDOMBATTERYMANAGER + NS_DECL_NSIDOMMOZBATTERYMANAGER NS_FORWARD_NSIDOMEVENTTARGET(nsDOMEventTargetWrapperCache::) BatteryManager(); diff --git a/dom/battery/nsIDOMBatteryManager.idl b/dom/battery/nsIDOMBatteryManager.idl index 27a51e591de3..c6c2db3e0799 100644 --- a/dom/battery/nsIDOMBatteryManager.idl +++ b/dom/battery/nsIDOMBatteryManager.idl @@ -38,8 +38,8 @@ interface nsIDOMEventListener; -[scriptable, function, uuid(6dcb803b-e968-4c02-88f5-049a3f2a2efb)] -interface nsIDOMBatteryManager : nsIDOMEventTarget +[scriptable, function, uuid(98b6237b-9654-43de-97e0-acf4b091b4e7)] +interface nsIDOMMozBatteryManager : nsIDOMEventTarget { readonly attribute double level; readonly attribute boolean charging; diff --git a/dom/battery/nsIDOMNavigatorBattery.idl b/dom/battery/nsIDOMNavigatorBattery.idl index 729f450aef3a..1b9a03691eb3 100644 --- a/dom/battery/nsIDOMNavigatorBattery.idl +++ b/dom/battery/nsIDOMNavigatorBattery.idl @@ -36,10 +36,10 @@ #include "nsISupports.idl" -interface nsIDOMBatteryManager; +interface nsIDOMMozBatteryManager; -[scriptable, uuid(a19eedd7-6c26-4676-bd34-7ca74ca5f565)] -interface nsIDOMNavigatorBattery : nsISupports +[scriptable, uuid(c295f049-be3d-4f83-9f7c-5c3e91d6ecb9)] +interface nsIDOMMozNavigatorBattery : nsISupports { - readonly attribute nsIDOMBatteryManager mozBattery; + readonly attribute nsIDOMMozBatteryManager mozBattery; }; diff --git a/dom/battery/test/test_battery_basics.html b/dom/battery/test/test_battery_basics.html index 8abbff90313f..239ce672b7c4 100644 --- a/dom/battery/test/test_battery_basics.html +++ b/dom/battery/test/test_battery_basics.html @@ -14,6 +14,12 @@ /** Test for Battery API **/ +// Testing prefixing. +ok(!("NavigatorBattery" in window), "NavigatorBattery shouldn't be visible"); +ok(("MozNavigatorBattery" in window), "MozNavigatorBattery should be visible"); +ok(!("BatteryManager" in window), "BatteryManager shouldn't be visible"); +ok(("MozBatteryManager" in window), "MozBatteryManager should be visible"); + ok('mozBattery' in navigator, "navigator.mozBattery should exist"); var battery = navigator.mozBattery;