Bug 895274 part.227 Rename NS_USER_PROXIMITY to eUserProximity r=smaug
authorMasayuki Nakano <masayuki@d-toybox.com>
Sat, 12 Sep 2015 01:19:28 +0900
changeset 294668 0b13a7d48bc33a13ce6ae48085786715366a6b8a
parent 294667 ef4b9a26ef4368da0d2b0fdfc56fb3169fbb7efe
child 294669 28fe9b60f5d5dbd1b91b5e30effa8a8cb7e9148c
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs895274
milestone43.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
Bug 895274 part.227 Rename NS_USER_PROXIMITY to eUserProximity r=smaug
dom/events/EventListenerManager.cpp
dom/events/EventNameList.h
widget/EventMessageList.h
--- a/dom/events/EventListenerManager.cpp
+++ b/dom/events/EventListenerManager.cpp
@@ -418,17 +418,17 @@ EventListenerManager::AddEventListenerIn
 bool
 EventListenerManager::IsDeviceType(EventMessage aEventMessage)
 {
   switch (aEventMessage) {
     case eDeviceOrientation:
     case eDeviceMotion:
     case NS_DEVICE_LIGHT:
     case eDeviceProximity:
-    case NS_USER_PROXIMITY:
+    case eUserProximity:
       return true;
     default:
       break;
   }
   return false;
 }
 
 void
@@ -439,17 +439,17 @@ EventListenerManager::EnableDevice(Event
     return;
   }
 
   switch (aEventMessage) {
     case eDeviceOrientation:
       window->EnableDeviceSensor(SENSOR_ORIENTATION);
       break;
     case eDeviceProximity:
-    case NS_USER_PROXIMITY:
+    case eUserProximity:
       window->EnableDeviceSensor(SENSOR_PROXIMITY);
       break;
     case NS_DEVICE_LIGHT:
       window->EnableDeviceSensor(SENSOR_LIGHT);
       break;
     case eDeviceMotion:
       window->EnableDeviceSensor(SENSOR_ACCELERATION);
       window->EnableDeviceSensor(SENSOR_LINEAR_ACCELERATION);
@@ -474,17 +474,17 @@ EventListenerManager::DisableDevice(Even
       window->DisableDeviceSensor(SENSOR_ORIENTATION);
       break;
     case eDeviceMotion:
       window->DisableDeviceSensor(SENSOR_ACCELERATION);
       window->DisableDeviceSensor(SENSOR_LINEAR_ACCELERATION);
       window->DisableDeviceSensor(SENSOR_GYROSCOPE);
       break;
     case eDeviceProximity:
-    case NS_USER_PROXIMITY:
+    case eUserProximity:
       window->DisableDeviceSensor(SENSOR_PROXIMITY);
       break;
     case NS_DEVICE_LIGHT:
       window->DisableDeviceSensor(SENSOR_LIGHT);
       break;
     default:
       NS_WARNING("Disabling an unknown device sensor.");
       break;
--- a/dom/events/EventNameList.h
+++ b/dom/events/EventNameList.h
@@ -535,17 +535,17 @@ WINDOW_ONLY_EVENT(deviceorientation,
                   eDeviceOrientation,
                   EventNameType_None,
                   eBasicEventClass)
 WINDOW_ONLY_EVENT(deviceproximity,
                   eDeviceProximity,
                   EventNameType_None,
                   eBasicEventClass)
 WINDOW_ONLY_EVENT(userproximity,
-                  NS_USER_PROXIMITY,
+                  eUserProximity,
                   EventNameType_None,
                   eBasicEventClass)
 WINDOW_ONLY_EVENT(devicelight,
                   NS_DEVICE_LIGHT,
                   EventNameType_None,
                   eBasicEventClass)
 
 #ifdef MOZ_B2G
--- a/widget/EventMessageList.h
+++ b/widget/EventMessageList.h
@@ -354,17 +354,17 @@ NS_EVENT_MESSAGE(NS_MESSAGE,            
 NS_EVENT_MESSAGE(eOpenCloseEventFirst,  4800)
 NS_EVENT_MESSAGE(eOpen,                 eOpenCloseEventFirst)
 
 // Device motion and orientation
 NS_EVENT_MESSAGE(eDeviceEventFirst,      4900)
 NS_EVENT_MESSAGE(eDeviceOrientation,     eDeviceEventFirst)
 NS_EVENT_MESSAGE(eDeviceMotion,          eDeviceEventFirst + 1)
 NS_EVENT_MESSAGE(eDeviceProximity,       eDeviceEventFirst + 2)
-NS_EVENT_MESSAGE(NS_USER_PROXIMITY,      eDeviceEventFirst + 3)
+NS_EVENT_MESSAGE(eUserProximity,         eDeviceEventFirst + 3)
 NS_EVENT_MESSAGE(NS_DEVICE_LIGHT,        eDeviceEventFirst + 4)
 
 NS_EVENT_MESSAGE(NS_SHOW_EVENT,          5000)
 
 // Fullscreen DOM API
 NS_EVENT_MESSAGE(eFullscreenEventFirst,  5100)
 NS_EVENT_MESSAGE(eFullscreenChange,      eFullscreenEventFirst)
 NS_EVENT_MESSAGE(eFullscreenError,       eFullscreenEventFirst + 1)