Bug 895274 part.208 Rename NS_NETWORK_UPLOAD_EVENT to eNetworkUpload r=smaug

This commit is contained in:
Masayuki Nakano 2015-09-12 01:19:26 +09:00
parent a7aae5c117
commit 585a5b420d
4 changed files with 7 additions and 7 deletions

View File

@ -1449,7 +1449,7 @@ nsGlobalWindow::CleanUp()
}
#ifdef MOZ_B2G
DisableNetworkEvent(NS_NETWORK_UPLOAD_EVENT);
DisableNetworkEvent(eNetworkUpload);
DisableNetworkEvent(eNetworkDownload);
#endif // MOZ_B2G
@ -14601,7 +14601,7 @@ nsGlobalWindow::EnableNetworkEvent(EventMessage aEventMessage)
}
switch (aEventMessage) {
case NS_NETWORK_UPLOAD_EVENT:
case eNetworkUpload:
if (!mNetworkUploadObserverEnabled) {
mNetworkUploadObserverEnabled = true;
os->AddObserver(mObserver, NS_NETWORK_ACTIVITY_BLIP_UPLOAD_TOPIC, false);
@ -14629,7 +14629,7 @@ nsGlobalWindow::DisableNetworkEvent(EventMessage aEventMessage)
}
switch (aEventMessage) {
case NS_NETWORK_UPLOAD_EVENT:
case eNetworkUpload:
if (mNetworkUploadObserverEnabled) {
mNetworkUploadObserverEnabled = false;
os->RemoveObserver(mObserver, NS_NETWORK_ACTIVITY_BLIP_UPLOAD_TOPIC);

View File

@ -334,7 +334,7 @@ EventListenerManager::AddEventListenerInternal(
} else if (aTypeAtom == nsGkAtoms::onmoznetworkupload) {
nsCOMPtr<nsPIDOMWindow> window = GetTargetAsInnerWindow();
if (window) {
window->EnableNetworkEvent(NS_NETWORK_UPLOAD_EVENT);
window->EnableNetworkEvent(eNetworkUpload);
}
} else if (aTypeAtom == nsGkAtoms::onmoznetworkdownload) {
nsCOMPtr<nsPIDOMWindow> window = GetTargetAsInnerWindow();
@ -511,7 +511,7 @@ EventListenerManager::RemoveEventListenerInternal(
bool deviceType = IsDeviceType(aEventMessage);
#ifdef MOZ_B2G
bool timeChangeEvent = (aEventMessage == eTimeChange);
bool networkEvent = (aEventMessage == NS_NETWORK_UPLOAD_EVENT ||
bool networkEvent = (aEventMessage == eNetworkUpload ||
aEventMessage == eNetworkDownload);
#endif // MOZ_B2G

View File

@ -554,7 +554,7 @@ WINDOW_ONLY_EVENT(moztimechange,
EventNameType_None,
eBasicEventClass)
WINDOW_ONLY_EVENT(moznetworkupload,
NS_NETWORK_UPLOAD_EVENT,
eNetworkUpload,
EventNameType_None,
eBasicEventClass)
WINDOW_ONLY_EVENT(moznetworkdownload,

View File

@ -399,7 +399,7 @@ NS_EVENT_MESSAGE(eTimeChange, 5500)
// Network packet events.
NS_EVENT_MESSAGE(NS_NETWORK_EVENT_START, 5600)
NS_EVENT_MESSAGE(NS_NETWORK_UPLOAD_EVENT, NS_NETWORK_EVENT_START + 1)
NS_EVENT_MESSAGE(eNetworkUpload, NS_NETWORK_EVENT_START + 1)
NS_EVENT_MESSAGE(eNetworkDownload, NS_NETWORK_EVENT_START + 2)
// MediaRecorder events.