Skip to content

Commit 16522e6

Browse files
philorphilor
committed
Backed out changeset 27695ca9f8cd (bug 1310864) for failures in test_navigator_resolve_identity.html, test_bug707564.html, and test_dom_xrays.html
1 parent 62aec9f commit 16522e6

File tree

234 files changed

+37371
-1
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

+37371
-1
lines changed

‎b2g/app/b2g.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ 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);
203204
pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
204205

205206
// base url for the stumbler

‎b2g/chrome/content/shell.js

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

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

9+
Cu.import('resource://gre/modules/ContactService.jsm');
910
Cu.import('resource://gre/modules/NotificationDB.jsm');
1011
Cu.import("resource://gre/modules/AppsUtils.jsm");
1112
Cu.import('resource://gre/modules/UserAgentOverrides.jsm');

‎b2g/installer/package-manifest.in

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,11 @@
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
160163
@RESPATH@/components/dom_canvas.xpt
164+
@RESPATH@/components/dom_contacts.xpt
161165
@RESPATH@/components/dom_core.xpt
162166
@RESPATH@/components/dom_css.xpt
163167
@RESPATH@/components/dom_events.xpt
@@ -333,6 +337,8 @@
333337
@RESPATH@/components/BrowserElementParent.js
334338
@RESPATH@/components/BrowserElementProxy.manifest
335339
@RESPATH@/components/BrowserElementProxy.js
340+
@RESPATH@/components/ContactManager.js
341+
@RESPATH@/components/ContactManager.manifest
336342
@RESPATH@/components/PhoneNumberService.js
337343
@RESPATH@/components/PhoneNumberService.manifest
338344
@RESPATH@/components/NotificationStorage.js
@@ -444,6 +450,8 @@
444450
#ifndef DISABLE_MOZ_RIL_GEOLOC
445451
@RESPATH@/components/DataCallInterfaceService.js
446452
@RESPATH@/components/DataCallInterfaceService.manifest
453+
@RESPATH@/components/MobileConnectionService.js
454+
@RESPATH@/components/MobileConnectionService.manifest
447455
@RESPATH@/components/RadioInterfaceLayer.js
448456
@RESPATH@/components/RadioInterfaceLayer.manifest
449457
@RESPATH@/components/SmsService.js

‎browser/installer/package-manifest.in

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

509510
@RESPATH@/components/PermissionSettings.js
510511
@RESPATH@/components/PermissionSettings.manifest
512+
@RESPATH@/components/ContactManager.js
513+
@RESPATH@/components/ContactManager.manifest
511514
@RESPATH@/components/PhoneNumberService.js
512515
@RESPATH@/components/PhoneNumberService.manifest
513516
@RESPATH@/components/NotificationStorage.js

‎dom/apps/PermissionsTable.jsm

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,11 @@ 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+
},
139144
mobilenetwork: {
140145
app: DENY_ACTION,
141146
privileged: ALLOW_ACTION,

‎dom/base/Navigator.cpp

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
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"
4344
#include "mozilla/dom/InputPortManager.h"
4445
#include "mozilla/dom/Permissions.h"
4546
#include "mozilla/dom/Presentation.h"
@@ -56,6 +57,9 @@
5657
#include "Connection.h"
5758
#include "mozilla/dom/Event.h" // for nsIDOMEvent::InternalDOMEvent()
5859
#include "nsGlobalWindow.h"
60+
#ifdef MOZ_B2G_RIL
61+
#include "mozilla/dom/MobileConnectionArray.h"
62+
#endif
5963
#include "nsIIdleObserver.h"
6064
#include "nsIPermissionManager.h"
6165
#include "nsMimeTypes.h"
@@ -207,9 +211,13 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(Navigator)
207211
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mBatteryManager)
208212
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mBatteryPromise)
209213
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPowerManager)
214+
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mIccManager)
210215
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mInputPortManager)
211216
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mConnection)
212217
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mStorageManager)
218+
#ifdef MOZ_B2G_RIL
219+
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mMobileConnections)
220+
#endif
213221
#ifdef MOZ_AUDIO_CHANNEL_MANAGER
214222
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mAudioChannelManager)
215223
#endif
@@ -270,6 +278,11 @@ Navigator::Invalidate()
270278
mPowerManager = nullptr;
271279
}
272280

281+
if (mIccManager) {
282+
mIccManager->Shutdown();
283+
mIccManager = nullptr;
284+
}
285+
273286
if (mInputPortManager) {
274287
mInputPortManager = nullptr;
275288
}
@@ -279,6 +292,12 @@ Navigator::Invalidate()
279292
mConnection = nullptr;
280293
}
281294

295+
#ifdef MOZ_B2G_RIL
296+
if (mMobileConnections) {
297+
mMobileConnections = nullptr;
298+
}
299+
#endif
300+
282301
mMediaDevices = nullptr;
283302

284303
#ifdef MOZ_AUDIO_CHANNEL_MANAGER
@@ -1607,6 +1626,40 @@ Navigator::MozTCPSocket()
16071626
return socket.forget();
16081627
}
16091628

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+
16101663
#ifdef MOZ_GAMEPAD
16111664
void
16121665
Navigator::GetGamepads(nsTArray<RefPtr<Gamepad> >& aGamepads,

‎dom/base/Navigator.h

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

75+
#ifdef MOZ_B2G_RIL
76+
class MobileConnectionArray;
77+
#endif
78+
7579
class PowerManager;
80+
class IccManager;
7681
class InputPortManager;
7782
class DeviceStorageAreaListener;
7883
class Presentation;
@@ -209,11 +214,15 @@ class Navigator final : public nsIDOMNavigator
209214
ErrorResult& aRv);
210215

211216
DesktopNotificationCenter* GetMozNotification(ErrorResult& aRv);
217+
IccManager* GetMozIccManager(ErrorResult& aRv);
212218
InputPortManager* GetInputPortManager(ErrorResult& aRv);
213219
already_AddRefed<LegacyMozTCPSocket> MozTCPSocket();
214220
network::Connection* GetConnection(ErrorResult& aRv);
215221
MediaDevices* GetMediaDevices(ErrorResult& aRv);
216222

223+
#ifdef MOZ_B2G_RIL
224+
MobileConnectionArray* GetMozMobileConnections(ErrorResult& aRv);
225+
#endif // MOZ_B2G_RIL
217226
#ifdef MOZ_GAMEPAD
218227
void GetGamepads(nsTArray<RefPtr<Gamepad> >& aGamepads, ErrorResult& aRv);
219228
GamepadServiceTest* RequestGamepadServiceTest();
@@ -302,8 +311,12 @@ class Navigator final : public nsIDOMNavigator
302311
RefPtr<battery::BatteryManager> mBatteryManager;
303312
RefPtr<Promise> mBatteryPromise;
304313
RefPtr<PowerManager> mPowerManager;
314+
RefPtr<IccManager> mIccManager;
305315
RefPtr<InputPortManager> mInputPortManager;
306316
RefPtr<network::Connection> mConnection;
317+
#ifdef MOZ_B2G_RIL
318+
RefPtr<MobileConnectionArray> mMobileConnections;
319+
#endif
307320
#ifdef MOZ_AUDIO_CHANNEL_MANAGER
308321
RefPtr<system::AudioChannelManager> mAudioChannelManager;
309322
#endif

‎dom/bindings/Bindings.conf

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -588,6 +588,48 @@ 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+
591633
'MozSpeakerManager': {
592634
'nativeType': 'mozilla::dom::SpeakerManager',
593635
'headerFile': 'SpeakerManager.h'

0 commit comments

Comments
 (0)