Skip to content

Commit 8b35554

Browse files
author
Michelangelo De Simone
committed
Bug 1310864 - Remove DOM/(contacts, mobileconnection, icc) and related code. r=jst
MozReview-Commit-ID: 2tWZc6hMtk5 --HG-- extra : rebase_source : 609688dd1fa430827c18e1cd0095c07fb17fce67
1 parent 6314d37 commit 8b35554

File tree

234 files changed

+1
-37371
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

234 files changed

+1
-37371
lines changed

‎b2g/app/b2g.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ pref("privacy.item.syncAccount", true);
200200

201201
// base url for the wifi geolocation network provider
202202
pref("geo.provider.use_mls", false);
203-
pref("geo.cell.scan", true);
204203
pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
205204

206205
// base url for the stumbler

‎b2g/chrome/content/shell.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
window.performance.mark('gecko-shell-loadstart');
88

9-
Cu.import('resource://gre/modules/ContactService.jsm');
109
Cu.import('resource://gre/modules/NotificationDB.jsm');
1110
Cu.import("resource://gre/modules/AppsUtils.jsm");
1211
Cu.import('resource://gre/modules/UserAgentOverrides.jsm');

‎b2g/installer/package-manifest.in

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,7 @@
157157
@RESPATH@/components/dom_wifi.xpt
158158
@RESPATH@/components/dom_system_gonk.xpt
159159
#endif
160-
#ifdef MOZ_B2G_RIL
161-
@RESPATH@/components/dom_mobileconnection.xpt
162-
#endif
163160
@RESPATH@/components/dom_canvas.xpt
164-
@RESPATH@/components/dom_contacts.xpt
165161
@RESPATH@/components/dom_core.xpt
166162
@RESPATH@/components/dom_css.xpt
167163
@RESPATH@/components/dom_events.xpt
@@ -337,8 +333,6 @@
337333
@RESPATH@/components/BrowserElementParent.js
338334
@RESPATH@/components/BrowserElementProxy.manifest
339335
@RESPATH@/components/BrowserElementProxy.js
340-
@RESPATH@/components/ContactManager.js
341-
@RESPATH@/components/ContactManager.manifest
342336
@RESPATH@/components/PhoneNumberService.js
343337
@RESPATH@/components/PhoneNumberService.manifest
344338
@RESPATH@/components/NotificationStorage.js
@@ -450,8 +444,6 @@
450444
#ifndef DISABLE_MOZ_RIL_GEOLOC
451445
@RESPATH@/components/DataCallInterfaceService.js
452446
@RESPATH@/components/DataCallInterfaceService.manifest
453-
@RESPATH@/components/MobileConnectionService.js
454-
@RESPATH@/components/MobileConnectionService.manifest
455447
@RESPATH@/components/RadioInterfaceLayer.js
456448
@RESPATH@/components/RadioInterfaceLayer.manifest
457449
@RESPATH@/components/SmsService.js

‎browser/installer/package-manifest.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@
193193
@RESPATH@/components/dom_network.xpt
194194
@RESPATH@/components/dom_notification.xpt
195195
@RESPATH@/components/dom_html.xpt
196-
@RESPATH@/components/dom_icc.xpt
197196
@RESPATH@/components/dom_offline.xpt
198197
@RESPATH@/components/dom_json.xpt
199198
@RESPATH@/components/dom_power.xpt
@@ -509,8 +508,6 @@
509508

510509
@RESPATH@/components/PermissionSettings.js
511510
@RESPATH@/components/PermissionSettings.manifest
512-
@RESPATH@/components/ContactManager.js
513-
@RESPATH@/components/ContactManager.manifest
514511
@RESPATH@/components/PhoneNumberService.js
515512
@RESPATH@/components/PhoneNumberService.manifest
516513
@RESPATH@/components/NotificationStorage.js

‎dom/apps/PermissionsTable.jsm

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,6 @@ this.PermissionsTable = { geolocation: {
136136
privileged: DENY_ACTION,
137137
certified: ALLOW_ACTION
138138
},
139-
mobileconnection: {
140-
app: DENY_ACTION,
141-
privileged: DENY_ACTION,
142-
certified: ALLOW_ACTION
143-
},
144139
mobilenetwork: {
145140
app: DENY_ACTION,
146141
privileged: ALLOW_ACTION,

‎dom/base/Navigator.cpp

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
#include "mozilla/dom/power/PowerManagerService.h"
4141
#include "mozilla/dom/FlyWebPublishedServer.h"
4242
#include "mozilla/dom/FlyWebService.h"
43-
#include "mozilla/dom/IccManager.h"
4443
#include "mozilla/dom/InputPortManager.h"
4544
#include "mozilla/dom/Permissions.h"
4645
#include "mozilla/dom/Presentation.h"
@@ -57,9 +56,6 @@
5756
#include "Connection.h"
5857
#include "mozilla/dom/Event.h" // for nsIDOMEvent::InternalDOMEvent()
5958
#include "nsGlobalWindow.h"
60-
#ifdef MOZ_B2G_RIL
61-
#include "mozilla/dom/MobileConnectionArray.h"
62-
#endif
6359
#include "nsIIdleObserver.h"
6460
#include "nsIPermissionManager.h"
6561
#include "nsMimeTypes.h"
@@ -211,13 +207,9 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(Navigator)
211207
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mBatteryManager)
212208
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mBatteryPromise)
213209
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPowerManager)
214-
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mIccManager)
215210
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mInputPortManager)
216211
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mConnection)
217212
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mStorageManager)
218-
#ifdef MOZ_B2G_RIL
219-
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mMobileConnections)
220-
#endif
221213
#ifdef MOZ_AUDIO_CHANNEL_MANAGER
222214
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mAudioChannelManager)
223215
#endif
@@ -278,11 +270,6 @@ Navigator::Invalidate()
278270
mPowerManager = nullptr;
279271
}
280272

281-
if (mIccManager) {
282-
mIccManager->Shutdown();
283-
mIccManager = nullptr;
284-
}
285-
286273
if (mInputPortManager) {
287274
mInputPortManager = nullptr;
288275
}
@@ -292,12 +279,6 @@ Navigator::Invalidate()
292279
mConnection = nullptr;
293280
}
294281

295-
#ifdef MOZ_B2G_RIL
296-
if (mMobileConnections) {
297-
mMobileConnections = nullptr;
298-
}
299-
#endif
300-
301282
mMediaDevices = nullptr;
302283

303284
#ifdef MOZ_AUDIO_CHANNEL_MANAGER
@@ -1626,40 +1607,6 @@ Navigator::MozTCPSocket()
16261607
return socket.forget();
16271608
}
16281609

1629-
#ifdef MOZ_B2G_RIL
1630-
1631-
MobileConnectionArray*
1632-
Navigator::GetMozMobileConnections(ErrorResult& aRv)
1633-
{
1634-
if (!mMobileConnections) {
1635-
if (!mWindow) {
1636-
aRv.Throw(NS_ERROR_UNEXPECTED);
1637-
return nullptr;
1638-
}
1639-
mMobileConnections = new MobileConnectionArray(mWindow);
1640-
}
1641-
1642-
return mMobileConnections;
1643-
}
1644-
1645-
#endif // MOZ_B2G_RIL
1646-
1647-
IccManager*
1648-
Navigator::GetMozIccManager(ErrorResult& aRv)
1649-
{
1650-
if (!mIccManager) {
1651-
if (!mWindow) {
1652-
aRv.Throw(NS_ERROR_UNEXPECTED);
1653-
return nullptr;
1654-
}
1655-
NS_ENSURE_TRUE(mWindow->GetDocShell(), nullptr);
1656-
1657-
mIccManager = new IccManager(mWindow);
1658-
}
1659-
1660-
return mIccManager;
1661-
}
1662-
16631610
#ifdef MOZ_GAMEPAD
16641611
void
16651612
Navigator::GetGamepads(nsTArray<RefPtr<Gamepad> >& aGamepads,

‎dom/base/Navigator.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,7 @@ namespace network {
7272
class Connection;
7373
} // namespace network
7474

75-
#ifdef MOZ_B2G_RIL
76-
class MobileConnectionArray;
77-
#endif
78-
7975
class PowerManager;
80-
class IccManager;
8176
class InputPortManager;
8277
class DeviceStorageAreaListener;
8378
class Presentation;
@@ -214,15 +209,11 @@ class Navigator final : public nsIDOMNavigator
214209
ErrorResult& aRv);
215210

216211
DesktopNotificationCenter* GetMozNotification(ErrorResult& aRv);
217-
IccManager* GetMozIccManager(ErrorResult& aRv);
218212
InputPortManager* GetInputPortManager(ErrorResult& aRv);
219213
already_AddRefed<LegacyMozTCPSocket> MozTCPSocket();
220214
network::Connection* GetConnection(ErrorResult& aRv);
221215
MediaDevices* GetMediaDevices(ErrorResult& aRv);
222216

223-
#ifdef MOZ_B2G_RIL
224-
MobileConnectionArray* GetMozMobileConnections(ErrorResult& aRv);
225-
#endif // MOZ_B2G_RIL
226217
#ifdef MOZ_GAMEPAD
227218
void GetGamepads(nsTArray<RefPtr<Gamepad> >& aGamepads, ErrorResult& aRv);
228219
GamepadServiceTest* RequestGamepadServiceTest();
@@ -311,12 +302,8 @@ class Navigator final : public nsIDOMNavigator
311302
RefPtr<battery::BatteryManager> mBatteryManager;
312303
RefPtr<Promise> mBatteryPromise;
313304
RefPtr<PowerManager> mPowerManager;
314-
RefPtr<IccManager> mIccManager;
315305
RefPtr<InputPortManager> mInputPortManager;
316306
RefPtr<network::Connection> mConnection;
317-
#ifdef MOZ_B2G_RIL
318-
RefPtr<MobileConnectionArray> mMobileConnections;
319-
#endif
320307
#ifdef MOZ_AUDIO_CHANNEL_MANAGER
321308
RefPtr<system::AudioChannelManager> mAudioChannelManager;
322309
#endif

‎dom/bindings/Bindings.conf

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -588,48 +588,6 @@ DOMInterfaces = {
588588
'notflattened': True
589589
},
590590

591-
'MozCdmaIccInfo': {
592-
'headerFile': 'mozilla/dom/IccInfo.h',
593-
'nativeType': 'mozilla::dom::CdmaIccInfo',
594-
},
595-
596-
'MozGsmIccInfo': {
597-
'headerFile': 'mozilla/dom/IccInfo.h',
598-
'nativeType': 'mozilla::dom::GsmIccInfo',
599-
},
600-
601-
'MozIcc': {
602-
'nativeType': 'mozilla::dom::Icc',
603-
},
604-
605-
'MozIccInfo': {
606-
'nativeType': 'mozilla::dom::IccInfo',
607-
},
608-
609-
'MozIccManager': {
610-
'nativeType': 'mozilla::dom::IccManager',
611-
},
612-
613-
'MozMobileCellInfo': {
614-
'nativeType': 'mozilla::dom::MobileCellInfo',
615-
},
616-
617-
'MozMobileConnection': {
618-
'nativeType': 'mozilla::dom::MobileConnection',
619-
},
620-
621-
'MozMobileConnectionArray': {
622-
'nativeType': 'mozilla::dom::MobileConnectionArray',
623-
},
624-
625-
'MozMobileConnectionInfo': {
626-
'nativeType': 'mozilla::dom::MobileConnectionInfo',
627-
},
628-
629-
'MozMobileNetworkInfo': {
630-
'nativeType': 'mozilla::dom::MobileNetworkInfo',
631-
},
632-
633591
'MozSpeakerManager': {
634592
'nativeType': 'mozilla::dom::SpeakerManager',
635593
'headerFile': 'SpeakerManager.h'

0 commit comments

Comments
 (0)