corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1167132 - Part 13: [NetworkManager] Move network information into a separate interface (Necko/NetStats). r=ethan

Browse Source
This commit is contained in:
Jessica Jong
2015-07-29 02:14:00 -04:00
parent 6e4ceaecc9
commit 0fdefc07fa
10 changed files with 51 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
netwerk/protocol/websocket/WebSocketChannel.cpp
View File

@@ -1376,10 +1376,10 @@ WebSocketChannel::BeginOpenInternal()
#ifdef MOZ_WIDGET_GONK
if (mAppId != NECKO_NO_APP_ID) {
nsCOMPtr<nsINetworkInterface> activeNetwork;
GetActiveNetworkInterface(activeNetwork);
mActiveNetwork =
new nsMainThreadPtrHolder<nsINetworkInterface>(activeNetwork);
nsCOMPtr<nsINetworkInfo> activeNetworkInfo;
GetActiveNetworkInfo(activeNetworkInfo);
mActiveNetworkInfo =
new nsMainThreadPtrHolder<nsINetworkInfo>(activeNetworkInfo);
}
#endif
@@ -3709,7 +3709,7 @@ WebSocketChannel::SaveNetworkStats(bool enforce)
{
#ifdef MOZ_WIDGET_GONK
// Check if the active network and app id are valid.
if(!mActiveNetwork || mAppId == NECKO_NO_APP_ID) {
if(!mActiveNetworkInfo || mAppId == NECKO_NO_APP_ID) {
return NS_OK;
}
@@ -3735,7 +3735,7 @@ WebSocketChannel::SaveNetworkStats(bool enforce)
// Create the event to save the network statistics.
// the event is then dispathed to the main thread.
nsRefPtr<nsRunnable> event =
new SaveNetworkStatsEvent(mAppId, mIsInBrowser, mActiveNetwork,
new SaveNetworkStatsEvent(mAppId, mIsInBrowser, mActiveNetworkInfo,
countRecv, countSent, false);
NS_DispatchToMainThread(event);