Skip to content

Commit

Permalink
Bug 1309723 - Remove DOM/voicemail and related code. r=Ehsan
Browse files Browse the repository at this point in the history
MozReview-Commit-ID: JDSqQnYD6xL

--HG--
extra : rebase_source : 43008cd2eaf97d77d32a6faa9fb4854e3d1f29a8
  • Loading branch information
Michelangelo De Simone committed Oct 13, 2016
1 parent 88cf93f commit 42dd1f7
Show file tree
Hide file tree
Showing 44 changed files with 1 addition and 2,424 deletions.
2 changes: 1 addition & 1 deletion b2g/chrome/content/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ SettingsListener.observe('language.current', 'en-US', function(value) {
// =================== RIL ====================
(function RILSettingsToPrefs() {
// DSDS default service IDs
['mms', 'sms', 'telephony', 'voicemail'].forEach(function(key) {
['mms', 'sms', 'telephony'].forEach(function(key) {
SettingsListener.observe('ril.' + key + '.defaultServiceId', 0,
function(value) {
if (value != null) {
Expand Down
3 changes: 0 additions & 3 deletions b2g/installer/package-manifest.in
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,6 @@
@RESPATH@/components/dom_tv.xpt
@RESPATH@/components/dom_inputport.xpt
@RESPATH@/components/dom_views.xpt
@RESPATH@/components/dom_voicemail.xpt
#ifdef MOZ_WEBSPEECH
@RESPATH@/components/dom_webspeechrecognition.xpt
#endif
Expand Down Expand Up @@ -490,8 +489,6 @@
#ifndef DISABLE_MOZ_RIL_GEOLOC
@RESPATH@/components/TelephonyService.js
@RESPATH@/components/TelephonyService.manifest
@RESPATH@/components/VoicemailService.js
@RESPATH@/components/VoicemailService.manifest
#endif
#endif // MOZ_WIDGET_GONK && MOZ_B2G_RIL

Expand Down
1 change: 0 additions & 1 deletion browser/installer/package-manifest.in
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,6 @@
@RESPATH@/components/dom_stylesheets.xpt
@RESPATH@/components/dom_telephony.xpt
@RESPATH@/components/dom_traversal.xpt
@RESPATH@/components/dom_voicemail.xpt
#ifdef MOZ_WEBSPEECH
@RESPATH@/components/dom_webspeechrecognition.xpt
#endif
Expand Down
5 changes: 0 additions & 5 deletions dom/apps/PermissionsTable.jsm
Original file line number Diff line number Diff line change
Expand Up @@ -253,11 +253,6 @@ this.PermissionsTable = { geolocation: {
privileged: ALLOW_ACTION,
certified: ALLOW_ACTION
},
"voicemail": {
app: DENY_ACTION,
privileged: DENY_ACTION,
certified: ALLOW_ACTION
},
"idle": {
app: DENY_ACTION,
privileged: DENY_ACTION,
Expand Down
22 changes: 0 additions & 22 deletions dom/base/Navigator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
#include "mozilla/dom/StorageManager.h"
#include "mozilla/dom/TCPSocket.h"
#include "mozilla/dom/Telephony.h"
#include "mozilla/dom/Voicemail.h"
#include "mozilla/dom/VRDisplay.h"
#include "mozilla/dom/workers/RuntimeService.h"
#include "mozilla/Hal.h"
Expand Down Expand Up @@ -219,7 +218,6 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(Navigator)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mIccManager)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mMobileMessageManager)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mTelephony)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mVoicemail)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mInputPortManager)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mConnection)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mStorageManager)
Expand Down Expand Up @@ -303,11 +301,6 @@ Navigator::Invalidate()
mTelephony = nullptr;
}

if (mVoicemail) {
mVoicemail->Shutdown();
mVoicemail = nullptr;
}

if (mInputPortManager) {
mInputPortManager = nullptr;
}
Expand Down Expand Up @@ -1707,21 +1700,6 @@ Navigator::GetMozMobileConnections(ErrorResult& aRv)

#endif // MOZ_B2G_RIL

Voicemail*
Navigator::GetMozVoicemail(ErrorResult& aRv)
{
if (!mVoicemail) {
if (!mWindow) {
aRv.Throw(NS_ERROR_UNEXPECTED);
return nullptr;
}

mVoicemail = Voicemail::Create(mWindow, aRv);
}

return mVoicemail;
}

IccManager*
Navigator::GetMozIccManager(ErrorResult& aRv)
{
Expand Down
3 changes: 0 additions & 3 deletions dom/base/Navigator.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ class MobileConnectionArray;
class PowerManager;
class IccManager;
class Telephony;
class Voicemail;
class InputPortManager;
class DeviceStorageAreaListener;
class Presentation;
Expand Down Expand Up @@ -225,7 +224,6 @@ class Navigator final : public nsIDOMNavigator
IccManager* GetMozIccManager(ErrorResult& aRv);
MobileMessageManager* GetMozMobileMessage();
Telephony* GetMozTelephony(ErrorResult& aRv);
Voicemail* GetMozVoicemail(ErrorResult& aRv);
InputPortManager* GetInputPortManager(ErrorResult& aRv);
already_AddRefed<LegacyMozTCPSocket> MozTCPSocket();
network::Connection* GetConnection(ErrorResult& aRv);
Expand Down Expand Up @@ -331,7 +329,6 @@ class Navigator final : public nsIDOMNavigator
RefPtr<IccManager> mIccManager;
RefPtr<MobileMessageManager> mMobileMessageManager;
RefPtr<Telephony> mTelephony;
RefPtr<Voicemail> mVoicemail;
RefPtr<InputPortManager> mInputPortManager;
RefPtr<network::Connection> mConnection;
#ifdef MOZ_B2G_RIL
Expand Down
8 changes: 0 additions & 8 deletions dom/bindings/Bindings.conf
Original file line number Diff line number Diff line change
Expand Up @@ -711,14 +711,6 @@ DOMInterfaces = {
'nativeType': 'mozilla::dom::time::TimeManager',
},

'MozVoicemail': {
'nativeType': 'mozilla::dom::Voicemail',
},

'MozVoicemailStatus': {
'nativeType': 'mozilla::dom::VoicemailStatus',
},

'MutationObserver': {
'nativeType': 'nsDOMMutationObserver',
},
Expand Down
4 changes: 0 additions & 4 deletions dom/events/test/test_all_synthetic_events.html
Original file line number Diff line number Diff line change
Expand Up @@ -364,10 +364,6 @@
return new MozStkCommandEvent(aName, aProps);
},
},
MozVoicemailEvent: { create: function (aName, aProps) {
return new MozVoicemailEvent(aName, aProps);
},
},
MozWifiConnectionInfoEvent: { create: function (aName, aProps) {
return new MozWifiConnectionInfoEvent(aName, aProps);
},
Expand Down
26 changes: 0 additions & 26 deletions dom/ipc/ContentChild.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@
#include "mozilla/dom/ipc/StructuredCloneData.h"
#include "mozilla/dom/telephony/PTelephonyChild.h"
#include "mozilla/dom/time/DateCacheCleaner.h"
#include "mozilla/dom/voicemail/VoicemailIPCService.h"
#include "mozilla/net/NeckoMessageUtils.h"
#include "mozilla/widget/PuppetBidiKeyboard.h"
#include "mozilla/RemoteSpellCheckEngineChild.h"
Expand All @@ -211,7 +210,6 @@ using namespace mozilla::dom::ipc;
using namespace mozilla::dom::mobileconnection;
using namespace mozilla::dom::mobilemessage;
using namespace mozilla::dom::telephony;
using namespace mozilla::dom::voicemail;
using namespace mozilla::dom::workers;
using namespace mozilla::media;
using namespace mozilla::embedding;
Expand Down Expand Up @@ -2005,30 +2003,6 @@ ContentChild::DeallocPTelephonyChild(PTelephonyChild* aActor)
return true;
}

PVoicemailChild*
ContentChild::AllocPVoicemailChild()
{
MOZ_CRASH("No one should be allocating PVoicemailChild actors");
}

PVoicemailChild*
ContentChild::SendPVoicemailConstructor(PVoicemailChild* aActor)
{
aActor = PContentChild::SendPVoicemailConstructor(aActor);
if (aActor) {
static_cast<VoicemailIPCService*>(aActor)->AddRef();
}

return aActor;
}

bool
ContentChild::DeallocPVoicemailChild(PVoicemailChild* aActor)
{
static_cast<VoicemailIPCService*>(aActor)->Release();
return true;
}

media::PMediaChild*
ContentChild::AllocPMediaChild()
{
Expand Down
6 changes: 0 additions & 6 deletions dom/ipc/ContentChild.h
Original file line number Diff line number Diff line change
Expand Up @@ -343,12 +343,6 @@ class ContentChild final : public PContentChild

virtual bool DeallocPTelephonyChild(PTelephonyChild*) override;

virtual PVoicemailChild* AllocPVoicemailChild() override;

PVoicemailChild* SendPVoicemailConstructor(PVoicemailChild* aActor);

virtual bool DeallocPVoicemailChild(PVoicemailChild*) override;

virtual PMediaChild* AllocPMediaChild() override;

virtual bool DeallocPMediaChild(PMediaChild* aActor) override;
Expand Down
27 changes: 0 additions & 27 deletions dom/ipc/ContentParent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
#include "mozilla/dom/quota/QuotaManagerService.h"
#include "mozilla/dom/telephony/TelephonyParent.h"
#include "mozilla/dom/time/DateCacheCleaner.h"
#include "mozilla/dom/voicemail/VoicemailParent.h"
#include "mozilla/embedding/printingui/PrintingParent.h"
#include "mozilla/gfx/gfxVars.h"
#include "mozilla/gfx/GPUProcessManager.h"
Expand Down Expand Up @@ -294,7 +293,6 @@ using namespace mozilla::dom::power;
using namespace mozilla::dom::mobileconnection;
using namespace mozilla::dom::mobilemessage;
using namespace mozilla::dom::telephony;
using namespace mozilla::dom::voicemail;
using namespace mozilla::media;
using namespace mozilla::embedding;
using namespace mozilla::gfx;
Expand Down Expand Up @@ -3475,31 +3473,6 @@ ContentParent::DeallocPTelephonyParent(PTelephonyParent* aActor)
return true;
}

PVoicemailParent*
ContentParent::AllocPVoicemailParent()
{
if (!AssertAppProcessPermission(this, "voicemail")) {
return nullptr;
}

VoicemailParent* actor = new VoicemailParent();
actor->AddRef();
return actor;
}

bool
ContentParent::RecvPVoicemailConstructor(PVoicemailParent* aActor)
{
return static_cast<VoicemailParent*>(aActor)->Init();
}

bool
ContentParent::DeallocPVoicemailParent(PVoicemailParent* aActor)
{
static_cast<VoicemailParent*>(aActor)->Release();
return true;
}

media::PMediaParent*
ContentParent::AllocPMediaParent()
{
Expand Down
6 changes: 0 additions & 6 deletions dom/ipc/ContentParent.h
Original file line number Diff line number Diff line change
Expand Up @@ -851,12 +851,6 @@ class ContentParent final : public PContentParent

virtual bool DeallocPTelephonyParent(PTelephonyParent*) override;

virtual PVoicemailParent* AllocPVoicemailParent() override;

virtual bool RecvPVoicemailConstructor(PVoicemailParent* aActor) override;

virtual bool DeallocPVoicemailParent(PVoicemailParent* aActor) override;

virtual PMediaParent* AllocPMediaParent() override;

virtual bool DeallocPMediaParent(PMediaParent* aActor) override;
Expand Down
4 changes: 0 additions & 4 deletions dom/ipc/PContent.ipdl
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ include protocol PSpeechSynthesis;
include protocol PStorage;
include protocol PTelephony;
include protocol PTestShell;
include protocol PVoicemail;
include protocol PJavaScript;
include protocol PRemoteSpellcheckEngine;
include protocol PWebBrowserPersistDocument;
Expand Down Expand Up @@ -377,7 +376,6 @@ nested(upto inside_cpow) sync protocol PContent
manages PStorage;
manages PTelephony;
manages PTestShell;
manages PVoicemail;
manages PJavaScript;
manages PRemoteSpellcheckEngine;
manages PWebBrowserPersistDocument;
Expand Down Expand Up @@ -827,8 +825,6 @@ parent:

async PTelephony();

async PVoicemail();

async PMedia();

async PBluetooth();
Expand Down
1 change: 0 additions & 1 deletion dom/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ DIRS += [
'smil',
'telephony',
'url',
'voicemail',
'inputmethod',
'webidl',
'xbl',
Expand Down
1 change: 0 additions & 1 deletion dom/permission/tests/mochitest-ril.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@
[test_mobileconnection.html]
[test_networkstats-manage.html]
[test_telephony.html]
[test_voicemail.html]
32 changes: 0 additions & 32 deletions dom/permission/tests/test_voicemail.html

This file was deleted.

Loading

0 comments on commit 42dd1f7

Please sign in to comment.