Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 833229 - 2.b/4: build voicemail by default. r=smaug

Browse Source
This commit is contained in:
Vicamo Yang 2014-09-26 13:00:23 +08:00
parent 75cde724a4
commit bdae0f605d
6 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
b2g/installer/package-manifest.in
View File

@ -159,7 +159,6 @@
@BINPATH@/components/dom_system_gonk.xpt
#endif
#ifdef MOZ_B2G_RIL
@BINPATH@/components/dom_voicemail.xpt
@BINPATH@/components/dom_icc.xpt
@BINPATH@/components/dom_cellbroadcast.xpt
@BINPATH@/components/dom_wappush.xpt
@ -200,6 +199,7 @@
@BINPATH@/components/dom_threads.xpt
@BINPATH@/components/dom_traversal.xpt
@BINPATH@/components/dom_views.xpt
@BINPATH@/components/dom_voicemail.xpt
#ifdef MOZ_WEBSPEECH
@BINPATH@/components/dom_webspeechrecognition.xpt
#endif

1
browser/installer/package-manifest.in
View File

@ -211,6 +211,7 @@
@BINPATH@/components/dom_stylesheets.xpt
@BINPATH@/components/dom_telephony.xpt
@BINPATH@/components/dom_traversal.xpt
@BINPATH@/components/dom_voicemail.xpt
#ifdef MOZ_WEBSPEECH
@BINPATH@/components/dom_webspeechrecognition.xpt
#endif

16
dom/base/Navigator.cpp
View File

@ -36,6 +36,7 @@
#include "mozilla/dom/MobileMessageManager.h"
#include "mozilla/dom/ServiceWorkerContainer.h"
#include "mozilla/dom/Telephony.h"
#include "mozilla/dom/Voicemail.h"
#include "mozilla/Hal.h"
#include "nsISiteSpecificUserAgent.h"
#include "mozilla/ClearOnShutdown.h"
@ -50,7 +51,6 @@
#include "mozilla/dom/IccManager.h"
#include "mozilla/dom/CellBroadcast.h"
#include "mozilla/dom/MobileConnectionArray.h"
#include "mozilla/dom/Voicemail.h"
#endif
#include "nsIIdleObserver.h"
#include "nsIPermissionManager.h"
@ -175,12 +175,12 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(Navigator)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPowerManager)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mMobileMessageManager)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mTelephony)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mVoicemail)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mConnection)
#ifdef MOZ_B2G_RIL
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mMobileConnections)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mCellBroadcast)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mIccManager)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mVoicemail)
#endif
#ifdef MOZ_B2G_BT
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mBluetooth)
@ -251,6 +251,10 @@ Navigator::Invalidate()
mTelephony = nullptr;
}
if (mVoicemail) {
mVoicemail = nullptr;
}
if (mConnection) {
mConnection->Shutdown();
mConnection = nullptr;
@ -269,10 +273,6 @@ Navigator::Invalidate()
mIccManager->Shutdown();
mIccManager = nullptr;
}
if (mVoicemail) {
mVoicemail = nullptr;
}
#endif
#ifdef MOZ_B2G_BT
@ -1651,6 +1651,8 @@ Navigator::GetMozCellBroadcast(ErrorResult& aRv)
return mCellBroadcast;
}
#endif // MOZ_B2G_RIL
Voicemail*
Navigator::GetMozVoicemail(ErrorResult& aRv)
{
@ -1669,6 +1671,8 @@ Navigator::GetMozVoicemail(ErrorResult& aRv)
return mVoicemail;
}
#ifdef MOZ_B2G_RIL
IccManager*
Navigator::GetMozIccManager(ErrorResult& aRv)
{

6
dom/base/Navigator.h
View File

@ -88,11 +88,11 @@ class BluetoothManager;
class CellBroadcast;
class IccManager;
class MobileConnectionArray;
class Voicemail;
#endif
class PowerManager;
class Telephony;
class Voicemail;
namespace time {
class TimeManager;
@ -221,6 +221,7 @@ public:
DesktopNotificationCenter* GetMozNotification(ErrorResult& aRv);
MobileMessageManager* GetMozMobileMessage();
Telephony* GetMozTelephony(ErrorResult& aRv);
Voicemail* GetMozVoicemail(ErrorResult& aRv);
network::Connection* GetConnection(ErrorResult& aRv);
nsDOMCameraManager* GetMozCameras(ErrorResult& aRv);
void MozSetMessageHandler(const nsAString& aType,
@ -234,7 +235,6 @@ public:
#ifdef MOZ_B2G_RIL
MobileConnectionArray* GetMozMobileConnections(ErrorResult& aRv);
CellBroadcast* GetMozCellBroadcast(ErrorResult& aRv);
Voicemail* GetMozVoicemail(ErrorResult& aRv);
IccManager* GetMozIccManager(ErrorResult& aRv);
#endif // MOZ_B2G_RIL
#ifdef MOZ_GAMEPAD
@ -331,12 +331,12 @@ private:
nsRefPtr<PowerManager> mPowerManager;
nsRefPtr<MobileMessageManager> mMobileMessageManager;
nsRefPtr<Telephony> mTelephony;
nsRefPtr<Voicemail> mVoicemail;
nsRefPtr<network::Connection> mConnection;
#ifdef MOZ_B2G_RIL
nsRefPtr<MobileConnectionArray> mMobileConnections;
nsRefPtr<CellBroadcast> mCellBroadcast;
nsRefPtr<IccManager> mIccManager;
nsRefPtr<Voicemail> mVoicemail;
#endif
#ifdef MOZ_B2G_BT
nsRefPtr<bluetooth::BluetoothManager> mBluetooth;

2
dom/moz.build
View File

@ -90,6 +90,7 @@ DIRS += [
'promise',
'smil',
'telephony',
'voicemail',
'inputmethod',
'webidl',
'xbl',
@ -112,7 +113,6 @@ if CONFIG['MOZ_B2G_RIL']:
DIRS += [
'icc',
'cellbroadcast',
'voicemail',
'wappush',
]

6
dom/webidl/moz.build
View File

@ -275,6 +275,8 @@ WEBIDL_FILES = [
'MozSelfSupport.webidl',
'MozTetheringManager.webidl',
'MozTimeManager.webidl',
'MozVoicemail.webidl',
'MozVoicemailStatus.webidl',
'MozWakeLock.webidl',
'MutationEvent.webidl',
'MutationObserver.webidl',
@ -605,8 +607,6 @@ if CONFIG['MOZ_B2G_RIL']:
'MozCellBroadcast.webidl',
'MozIcc.webidl',
'MozIccManager.webidl',
'MozVoicemail.webidl',
'MozVoicemailStatus.webidl'
]
if CONFIG['MOZ_NFC']:
@ -672,6 +672,7 @@ GENERATED_EVENTS_WEBIDL_FILES = [
'MozSettingsTransactionEvent.webidl',
'MozSmsEvent.webidl',
'MozStkCommandEvent.webidl',
'MozVoicemailEvent.webidl',
'PageTransitionEvent.webidl',
'PopStateEvent.webidl',
'PopupBlockedEvent.webidl',
@ -725,7 +726,6 @@ if CONFIG['MOZ_B2G_BT']:
if CONFIG['MOZ_B2G_RIL']:
GENERATED_EVENTS_WEBIDL_FILES += [
'MozCellBroadcastEvent.webidl',
'MozVoicemailEvent.webidl',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':