author | Sebastian Hengst <archaeopteryx@coole-files.de> |
Thu, 29 Sep 2016 19:53:44 +0200 | |
changeset 316389 | 2fae37a9ffe6e5e4f63dbb3f91f30c9ef8b88d45 |
parent 316388 | 70a79f04def4c008fd2168e0f929c76570e155f4 |
child 316390 | 42f0050c38d1697d006c182ccf50c8d9a568f55c |
push id | 30770 |
push user | kwierso@gmail.com |
push date | Wed, 05 Oct 2016 00:00:48 +0000 |
treeherder | mozilla-central@3470e326025c [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mayhemer |
bugs | 1306397 |
milestone | 52.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/netwerk/base/nsIOService.cpp +++ b/netwerk/base/nsIOService.cpp @@ -160,17 +160,16 @@ int16_t gBadPortList[] = { 6668, // Alternate IRC [Apple addition] 6669, // Alternate IRC [Apple addition] 0, // This MUST be zero so that we can populating the array }; static const char kProfileChangeNetTeardownTopic[] = "profile-change-net-teardown"; static const char kProfileChangeNetRestoreTopic[] = "profile-change-net-restore"; static const char kProfileDoChange[] = "profile-do-change"; -static const char kNetworkActiveChanged[] = "network-active-changed"; // Necko buffer defaults uint32_t nsIOService::gDefaultSegmentSize = 4096; uint32_t nsIOService::gDefaultSegmentCount = 24; bool nsIOService::sTelemetryEnabled = false; NS_IMPL_ISUPPORTS(nsAppOfflineInfo, nsIAppOfflineInfo) @@ -244,17 +243,16 @@ nsIOService::Init() nsCOMPtr<nsIObserverService> observerService = services::GetObserverService(); if (observerService) { observerService->AddObserver(this, kProfileChangeNetTeardownTopic, true); observerService->AddObserver(this, kProfileChangeNetRestoreTopic, true); observerService->AddObserver(this, kProfileDoChange, true); observerService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, true); observerService->AddObserver(this, NS_NETWORK_LINK_TOPIC, true); observerService->AddObserver(this, NS_WIDGET_WAKE_OBSERVER_TOPIC, true); - observerService->AddObserver(this, kNetworkActiveChanged, true); } else NS_WARNING("failed to get observer service"); Preferences::AddBoolVarCache(&sTelemetryEnabled, "toolkit.telemetry.enabled", false); Preferences::AddBoolVarCache(&mOfflineMirrorsConnectivity, OFFLINE_MIRRORS_CONNECTIVITY, true); gIOService = this; @@ -1493,48 +1491,16 @@ nsIOService::Observe(nsISupports *subjec } else if (!strcmp(topic, NS_NETWORK_LINK_TOPIC)) { OnNetworkLinkEvent(NS_ConvertUTF16toUTF8(data).get()); } else if (!strcmp(topic, NS_WIDGET_WAKE_OBSERVER_TOPIC)) { // coming back alive from sleep // this indirection brought to you by: // https://bugzilla.mozilla.org/show_bug.cgi?id=1152048#c19 nsCOMPtr<nsIRunnable> wakeupNotifier = new nsWakeupNotifier(this); NS_DispatchToMainThread(wakeupNotifier); - } else if (!strcmp(topic, kNetworkActiveChanged)) { -#ifdef MOZ_WIDGET_GONK - if (IsNeckoChild()) { - return NS_OK; - } - nsCOMPtr<nsINetworkInfo> interface = do_QueryInterface(subject); - if (!interface) { - return NS_ERROR_FAILURE; - } - int32_t state; - if (NS_FAILED(interface->GetState(&state))) { - return NS_ERROR_FAILURE; - } - - bool wifiActive = IsWifiActive(); - int32_t newWifiState = wifiActive ? - nsINetworkInfo::NETWORK_TYPE_WIFI : - nsINetworkInfo::NETWORK_TYPE_MOBILE; - if (mPreviousWifiState != newWifiState) { - // Notify wifi-only apps of their new status - int32_t status = wifiActive ? - nsIAppOfflineInfo::ONLINE : nsIAppOfflineInfo::OFFLINE; - - for (auto it = mAppsOfflineStatus.Iter(); !it.Done(); it.Next()) { - if (it.UserData() == nsIAppOfflineInfo::WIFI_ONLY) { - NotifyAppOfflineStatus(it.Key(), status); - } - } - } - - mPreviousWifiState = newWifiState; -#endif } return NS_OK; } // nsINetUtil interface NS_IMETHODIMP nsIOService::ParseRequestContentType(const nsACString &aTypeHeader,