author | Mounir Lamouri <mounir.lamouri@gmail.com> |
Sat, 19 Nov 2011 11:43:57 +0100 | |
changeset 80540 | 4882413755d36956b8779360ff748b258196b7b2 |
parent 80539 | 56bf0f8537faabc8d261689e00757cb215d599c4 |
child 80541 | 85b2ee76f2c3d18e80b358d23dcd1ee9b59327bc |
push id | 21505 |
push user | mbrubeck@mozilla.com |
push date | Mon, 21 Nov 2011 16:45:45 +0000 |
treeherder | mozilla-central@9276e3274f18 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
bugs | 701517 |
milestone | 11.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/dom/base/Navigator.cpp +++ b/dom/base/Navigator.cpp @@ -108,17 +108,17 @@ Navigator::~Navigator() } } NS_INTERFACE_MAP_BEGIN(Navigator) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMNavigator) 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 NS_IMPL_ADDREF(Navigator) NS_IMPL_RELEASE(Navigator) void @@ -741,17 +741,17 @@ NS_IMETHODIMP Navigator::GetMozNotificat return NS_OK; } //***************************************************************************** // Navigator::nsIDOMNavigatorBattery //***************************************************************************** NS_IMETHODIMP -Navigator::GetMozBattery(nsIDOMBatteryManager** aBattery) +Navigator::GetMozBattery(nsIDOMMozBatteryManager** aBattery) { if (!mBatteryManager) { *aBattery = nsnull; nsCOMPtr<nsPIDOMWindow> window = do_GetInterface(mDocShell); NS_ENSURE_TRUE(window, NS_OK); nsCOMPtr<nsIDocument> document = do_GetInterface(mDocShell);
--- a/dom/base/Navigator.h +++ b/dom/base/Navigator.h @@ -66,28 +66,28 @@ namespace dom { namespace battery { class BatteryManager; } // namespace battery class Navigator : public nsIDOMNavigator, public nsIDOMClientInformation, public nsIDOMNavigatorGeolocation, public nsIDOMNavigatorDesktopNotification, - public nsIDOMNavigatorBattery + public nsIDOMMozNavigatorBattery { public: Navigator(nsIDocShell *aDocShell); virtual ~Navigator(); NS_DECL_ISUPPORTS NS_DECL_NSIDOMNAVIGATOR NS_DECL_NSIDOMCLIENTINFORMATION NS_DECL_NSIDOMNAVIGATORGEOLOCATION NS_DECL_NSIDOMNAVIGATORDESKTOPNOTIFICATION - NS_DECL_NSIDOMNAVIGATORBATTERY + NS_DECL_NSIDOMMOZNAVIGATORBATTERY static void Init(); void SetDocShell(nsIDocShell *aDocShell); nsIDocShell *GetDocShell() { return mDocShell; }
--- a/dom/base/nsDOMClassInfo.cpp +++ b/dom/base/nsDOMClassInfo.cpp @@ -1380,17 +1380,17 @@ static nsDOMClassInfoData sClassInfoData DOM_DEFAULT_SCRIPTABLE_FLAGS) NS_DEFINE_CLASSINFO_DATA(GeoPositionAddress, nsDOMGenericSH, DOM_DEFAULT_SCRIPTABLE_FLAGS) 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, DOM_DEFAULT_SCRIPTABLE_FLAGS) NS_DEFINE_CLASSINFO_DATA(CSSFontFaceStyleDecl, nsCSSStyleDeclSH, ARRAY_SCRIPTABLE_FLAGS) #if defined(MOZ_MEDIA) @@ -2282,17 +2282,17 @@ nsDOMClassInfo::Init() DOM_CLASSINFO_MAP_END DOM_CLASSINFO_MAP_BEGIN(Navigator, nsIDOMNavigator) DOM_CLASSINFO_MAP_ENTRY(nsIDOMNavigator) DOM_CLASSINFO_MAP_ENTRY(nsIDOMNavigatorGeolocation) 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 DOM_CLASSINFO_MAP_BEGIN(Plugin, nsIDOMPlugin) DOM_CLASSINFO_MAP_ENTRY(nsIDOMPlugin) DOM_CLASSINFO_MAP_END DOM_CLASSINFO_MAP_BEGIN(PluginArray, nsIDOMPluginArray) @@ -3861,18 +3861,18 @@ nsDOMClassInfo::Init() DOM_CLASSINFO_MAP_BEGIN(GeoPositionAddress, nsIDOMGeoPositionAddress) DOM_CLASSINFO_MAP_ENTRY(nsIDOMGeoPositionAddress) DOM_CLASSINFO_MAP_END DOM_CLASSINFO_MAP_BEGIN(GeoPositionError, nsIDOMGeoPositionError) 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 DOM_CLASSINFO_MAP_BEGIN(CSSFontFaceRule, nsIDOMCSSFontFaceRule) DOM_CLASSINFO_MAP_ENTRY(nsIDOMCSSFontFaceRule) DOM_CLASSINFO_MAP_END DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(CSSFontFaceStyleDecl,
--- a/dom/base/nsDOMClassInfoClasses.h +++ b/dom/base/nsDOMClassInfoClasses.h @@ -421,17 +421,17 @@ DOMCI_CLASS(MessageEvent) // Geolocation DOMCI_CLASS(GeoGeolocation) DOMCI_CLASS(GeoPosition) DOMCI_CLASS(GeoPositionCoords) DOMCI_CLASS(GeoPositionAddress) DOMCI_CLASS(GeoPositionError) -DOMCI_CLASS(BatteryManager) +DOMCI_CLASS(MozBatteryManager) // @font-face in CSS DOMCI_CLASS(CSSFontFaceRule) DOMCI_CLASS(CSSFontFaceStyleDecl) #if defined(MOZ_MEDIA) // WhatWG Video Element DOMCI_CLASS(HTMLVideoElement)
--- a/dom/battery/BatteryManager.cpp +++ b/dom/battery/BatteryManager.cpp @@ -47,17 +47,17 @@ * We have to use macros here because our leak analysis tool things we are * leaking strings when we have |static const nsString|. Sad :( */ #define LEVELCHANGE_EVENT_NAME NS_LITERAL_STRING("levelchange") #define CHARGINGCHANGE_EVENT_NAME NS_LITERAL_STRING("chargingchange") #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 { namespace battery { NS_IMPL_CYCLE_COLLECTION_CLASS(BatteryManager) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(BatteryManager, @@ -72,18 +72,18 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_IN nsDOMEventTargetWrapperCache) NS_CYCLE_COLLECTION_UNLINK_EVENT_HANDLER(levelchange) NS_CYCLE_COLLECTION_UNLINK_EVENT_HANDLER(chargingchange) NS_CYCLE_COLLECTION_UNLINK_EVENT_HANDLER(chargingtimechange) NS_CYCLE_COLLECTION_UNLINK_EVENT_HANDLER(dischargingtimechange) 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) NS_IMPL_RELEASE_INHERITED(BatteryManager, nsDOMEventTargetWrapperCache) BatteryManager::BatteryManager() : mLevel(kDefaultLevel) , mCharging(kDefaultCharging)
--- a/dom/battery/BatteryManager.h +++ b/dom/battery/BatteryManager.h @@ -52,22 +52,22 @@ namespace mozilla { namespace hal { class BatteryInformation; } // namespace hal 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(); virtual ~BatteryManager(); void Init(nsPIDOMWindow *aWindow, nsIScriptContext* aScriptContext); void Shutdown();
--- a/dom/battery/nsIDOMBatteryManager.idl +++ b/dom/battery/nsIDOMBatteryManager.idl @@ -33,18 +33,18 @@ * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMEventTarget.idl" 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; readonly attribute double dischargingTime; readonly attribute double chargingTime; attribute nsIDOMEventListener onlevelchange; attribute nsIDOMEventListener onchargingchange;
--- a/dom/battery/nsIDOMNavigatorBattery.idl +++ b/dom/battery/nsIDOMNavigatorBattery.idl @@ -31,15 +31,15 @@ * 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 "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; };
--- a/dom/battery/test/test_battery_basics.html +++ b/dom/battery/test/test_battery_basics.html @@ -9,16 +9,22 @@ <p id="display"></p> <div id="content" style="display: none"> </div> <pre id="test"> <script type="application/javascript"> /** 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; is(battery.level, 1.0, "Default battery level should be 1.0"); is(battery.charging, true, "Default charging value should be true"); is(battery.dischargingTime, Infinity, "Default dischargingTime should be Inifinity"); is(battery.chargingTime, Infinity, "Default chargingTime should be Inifinity");