author | Boris Zbarsky <bzbarsky@mit.edu> |
Mon, 05 Nov 2012 10:20:03 -0500 | |
changeset 112307 | f8eab1766c2c398616795731b80ec212413ad9d3 |
parent 112306 | dc1d29a3f2a7045f905a1b56f5de987028fb4061 |
child 112308 | 0b9b3b2b89712b7f256dd76c5b55719a15dc0dd8 |
push id | 23812 |
push user | emorley@mozilla.com |
push date | Tue, 06 Nov 2012 14:01:34 +0000 |
treeherder | mozilla-central@f4aeed115e54 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | jlebar |
bugs | 807222 |
milestone | 19.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/b2g/confvars.sh +++ b/b2g/confvars.sh @@ -37,11 +37,12 @@ else MOZ_XULRUNNER= MOZ_PLACES=1 fi MOZ_APP_ID={3c2e2abc-06d4-11e1-ac3b-374f68613e61} MOZ_EXTENSION_MANAGER=1 MOZ_SYS_MSG=1 +MOZ_TIME_MANAGER=1 MOZ_PAY=1 MOZ_TOOLKIT_SEARCH=
--- a/configure.in +++ b/configure.in @@ -4288,16 +4288,17 @@ NECKO_PROTOCOLS_DEFAULT="about data file USE_ARM_KUSER= BUILD_CTYPES=1 MOZ_USE_NATIVE_POPUP_WINDOWS= MOZ_ANDROID_HISTORY= MOZ_WEBSMS_BACKEND= MOZ_GRAPHITE=1 ACCESSIBILITY=1 MOZ_SYS_MSG= +MOZ_TIME_MANAGER= MOZ_PAY= case "$target_os" in mingw*) NS_ENABLE_TSF=1 AC_DEFINE(NS_ENABLE_TSF) ;; esac @@ -7448,16 +7449,24 @@ dnl ==================================== dnl = Enable Support for System Messages API dnl ======================================================== if test -n "$MOZ_SYS_MSG"; then AC_DEFINE(MOZ_SYS_MSG) fi AC_SUBST(MOZ_SYS_MSG) dnl ======================================================== +dnl = Enable Support for Time Manager API +dnl ======================================================== +if test -n "$MOZ_TIME_MANAGER"; then + AC_DEFINE(MOZ_TIME_MANAGER) +fi +AC_SUBST(MOZ_TIME_MANAGER) + +dnl ======================================================== dnl = Enable Camera Interface for B2G (Gonk usually) dnl ======================================================== MOZ_ARG_ENABLE_BOOL(b2g-camera, [ --enable-b2g-camera Set compile flags necessary for compiling camera API for B2G ], MOZ_B2G_CAMERA=1, MOZ_B2G_CAMERA= ) if test -n "$MOZ_B2G_CAMERA"; then AC_DEFINE(MOZ_B2G_CAMERA)
--- a/dom/base/Navigator.cpp +++ b/dom/base/Navigator.cpp @@ -124,17 +124,19 @@ NS_INTERFACE_MAP_BEGIN(Navigator) #ifdef MOZ_B2G_RIL NS_INTERFACE_MAP_ENTRY(nsIMozNavigatorMobileConnection) #endif #ifdef MOZ_B2G_BT NS_INTERFACE_MAP_ENTRY(nsIDOMNavigatorBluetooth) #endif NS_INTERFACE_MAP_ENTRY(nsIDOMNavigatorCamera) NS_INTERFACE_MAP_ENTRY(nsIDOMNavigatorSystemMessages) +#ifdef MOZ_TIME_MANAGER NS_INTERFACE_MAP_ENTRY(nsIDOMMozNavigatorTime) +#endif NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(Navigator) NS_INTERFACE_MAP_END NS_IMPL_ADDREF(Navigator) NS_IMPL_RELEASE(Navigator) void Navigator::Invalidate() @@ -1329,32 +1331,34 @@ Navigator::MozSetMessageHandler(const ns #else return NS_ERROR_NOT_IMPLEMENTED; #endif } //***************************************************************************** // Navigator::nsIDOMNavigatorTime //***************************************************************************** +#ifdef MOZ_TIME_MANAGER NS_IMETHODIMP Navigator::GetMozTime(nsIDOMMozTimeManager** aTime) { *aTime = nullptr; if (!CheckPermission("time")) { return NS_ERROR_DOM_SECURITY_ERR; } if (!mTimeManager) { mTimeManager = new time::TimeManager(); } NS_ADDREF(*aTime = mTimeManager); return NS_OK; } +#endif //***************************************************************************** // nsNavigator::nsIDOMNavigatorCamera //***************************************************************************** NS_IMETHODIMP Navigator::GetMozCameras(nsIDOMCameraManager** aCameraManager) {
--- a/dom/base/Navigator.h +++ b/dom/base/Navigator.h @@ -97,17 +97,19 @@ class Navigator : public nsIDOMNavigator #ifdef MOZ_B2G_RIL , public nsIMozNavigatorMobileConnection #endif #ifdef MOZ_B2G_BT , public nsIDOMNavigatorBluetooth #endif , public nsIDOMNavigatorCamera , public nsIDOMNavigatorSystemMessages +#ifdef MOZ_TIME_MANAGER , public nsIDOMMozNavigatorTime +#endif { public: Navigator(nsPIDOMWindow *aInnerWindow); virtual ~Navigator(); NS_DECL_ISUPPORTS NS_DECL_NSIDOMNAVIGATOR NS_DECL_NSIDOMCLIENTINFORMATION @@ -127,17 +129,19 @@ public: #ifdef MOZ_B2G_RIL NS_DECL_NSIMOZNAVIGATORMOBILECONNECTION #endif #ifdef MOZ_B2G_BT NS_DECL_NSIDOMNAVIGATORBLUETOOTH #endif NS_DECL_NSIDOMNAVIGATORSYSTEMMESSAGES +#ifdef MOZ_TIME_MANAGER NS_DECL_NSIDOMMOZNAVIGATORTIME +#endif static void Init(); void Invalidate(); nsPIDOMWindow *GetWindow(); void RefreshMIMEArray();
--- a/dom/base/nsDOMClassInfo.cpp +++ b/dom/base/nsDOMClassInfo.cpp @@ -521,17 +521,19 @@ using mozilla::dom::indexedDB::IDBWrappe #include "BluetoothPropertyEvent.h" #endif #include "nsIDOMNavigatorSystemMessages.h" #ifdef MOZ_SYS_MSG #include "mozilla/dom/Activity.h" #endif +#ifdef MOZ_TIME_MANAGER #include "TimeManager.h" +#endif #include "DOMCameraManager.h" #include "DOMCameraControl.h" #include "DOMCameraCapabilities.h" #include "DOMError.h" #include "DOMRequest.h" #include "nsIOpenWindowEventDetail.h" @@ -1693,18 +1695,20 @@ static nsDOMClassInfoData sClassInfoData EVENTTARGET_SCRIPTABLE_FLAGS) NS_DEFINE_CLASSINFO_DATA(LockedFile, nsEventTargetSH, EVENTTARGET_SCRIPTABLE_FLAGS) #ifdef MOZ_SYS_MSG NS_DEFINE_CLASSINFO_DATA(MozActivity, nsEventTargetSH, EVENTTARGET_SCRIPTABLE_FLAGS) #endif +#ifdef MOZ_TIME_MANAGER NS_DEFINE_CLASSINFO_DATA(MozTimeManager, nsDOMGenericSH, DOM_DEFAULT_SCRIPTABLE_FLAGS) +#endif #ifdef MOZ_WEBRTC NS_DEFINE_CLASSINFO_DATA(DataChannel, nsEventTargetSH, EVENTTARGET_SCRIPTABLE_FLAGS) #endif }; // Objects that should be constructable through |new Name();| @@ -2473,17 +2477,19 @@ nsDOMClassInfo::Init() #endif #ifdef MOZ_B2G_BT DOM_CLASSINFO_MAP_ENTRY(nsIDOMNavigatorBluetooth) #endif DOM_CLASSINFO_MAP_ENTRY(nsIDOMNavigatorCamera) #ifdef MOZ_SYS_MSG DOM_CLASSINFO_MAP_ENTRY(nsIDOMNavigatorSystemMessages) #endif +#ifdef MOZ_TIME_MANAGER DOM_CLASSINFO_MAP_ENTRY(nsIDOMMozNavigatorTime) +#endif 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) @@ -4456,19 +4462,21 @@ nsDOMClassInfo::Init() #ifdef MOZ_SYS_MSG DOM_CLASSINFO_MAP_BEGIN(MozActivity, nsIDOMMozActivity) DOM_CLASSINFO_MAP_ENTRY(nsIDOMMozActivity) DOM_CLASSINFO_MAP_ENTRY(nsIDOMDOMRequest) DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget) DOM_CLASSINFO_MAP_END #endif +#ifdef MOZ_TIME_MANAGER DOM_CLASSINFO_MAP_BEGIN(MozTimeManager, nsIDOMMozTimeManager) DOM_CLASSINFO_MAP_ENTRY(nsIDOMMozTimeManager) DOM_CLASSINFO_MAP_END +#endif #ifdef MOZ_WEBRTC DOM_CLASSINFO_MAP_BEGIN(DataChannel, nsIDOMDataChannel) DOM_CLASSINFO_MAP_ENTRY(nsIDOMDataChannel) DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget) DOM_CLASSINFO_MAP_END #endif
--- a/dom/base/nsDOMClassInfoClasses.h +++ b/dom/base/nsDOMClassInfoClasses.h @@ -518,13 +518,15 @@ DOMCI_CLASS(OpenWindowEventDetail) DOMCI_CLASS(DOMFileHandle) DOMCI_CLASS(FileRequest) DOMCI_CLASS(LockedFile) #ifdef MOZ_SYS_MSG DOMCI_CLASS(MozActivity) #endif +#ifdef MOZ_TIME_MANAGER DOMCI_CLASS(MozTimeManager) +#endif #ifdef MOZ_WEBRTC DOMCI_CLASS(DataChannel) #endif
--- a/dom/time/TimeManager.cpp +++ b/dom/time/TimeManager.cpp @@ -2,26 +2,30 @@ * 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 "jsapi.h" #include "nsIDOMClassInfo.h" #include "nsITimeService.h" #include "TimeManager.h" +#ifdef MOZ_TIME_MANAGER DOMCI_DATA(MozTimeManager, mozilla::dom::time::TimeManager) +#endif namespace mozilla { namespace dom { namespace time { NS_INTERFACE_MAP_BEGIN(TimeManager) NS_INTERFACE_MAP_ENTRY(nsIDOMMozTimeManager) NS_INTERFACE_MAP_ENTRY(nsISupports) +#ifdef MOZ_TIME_MANAGER NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(MozTimeManager) +#endif NS_INTERFACE_MAP_END NS_IMPL_ADDREF(TimeManager) NS_IMPL_RELEASE(TimeManager) nsresult TimeManager::Set(const JS::Value& date, JSContext* ctx) { double dateMSec;