import changes from `dev' branch of rmottola/Arctic-Fox:

- let->var (7417185de3)
- Bug 1200194 - Expose nsCaret::GetFrameAndOffset for reuse. r=roc This function can be reused by AccessibleCaret. (4506d97981)
- Bug 1200194 - Fix AccessibleCaret is out of scrollport in cursor mode. r=roc (3c80be5af1)
- Bug 1175171 - Deallocate GTK's KeymapWrapper on shutdown. r=karlt (e5e5468d71)
- Bug 895274 part.6 Rename NS_EVENT_ALL to eAllEvents r=smaug (cc76e8ecc8)
- Bug 895274 part.7 Rename NS_WINDOW_START to eWindowEventFirst r=smaug (c7414fa347)
- Bug 895274 part.8 Rename NS_XUL_CLOSE to eWindowClose r=smaug (30e8142328)
- Bug 895274 part.5 Rename NS_EVENT_NULL to eVoidEvent r=smaug (1950fb6c82)
- Bug 895274 part.4 Clean up the macro names of EventNameList.h r=smaug (46a0c74362)
- Bug 895274 part.9 Rename NS_KEY_PRESS to eKeyPress r=smaug (fb863b578a)
- Bug 895274 part.10 Rename NS_KEY_UP to eKeyUp r=smaug (67a2e3c03a)
- fix (f3a9ad8088)
- Bug 1137557 - Part 1: Allow callee of TIP.keydown() to figure out preventDefault() of keydown and keypress event. r=masayuki, r+sr=smaug (c1d9bca9d0)
- Bug 1119133 Implement TextEventDispatcher::EndInputTransaction() for ensuring TextEventDispatcher forgets the link with TextInputProcessor r=smaug (fffdced45e)

dom/base/nsContentUtils.cpp

@@ -686,15 +686,15 @@ nsContentUtils::InitializeModifierStrings()
 }
 
 // Because of SVG/SMIL we have several atoms mapped to the same
-// id, but we can rely on ID_TO_EVENT to map id to only one atom.
+// id, but we can rely on MESSAGE_TO_EVENT to map id to only one atom.
 static bool
 ShouldAddEventToStringEventTable(const EventNameMapping& aMapping)
 {
   switch(aMapping.mMessage) {
-#define ID_TO_EVENT(name_, message_, type_, struct_) \
+#define MESSAGE_TO_EVENT(name_, message_, type_, struct_) \
   case message_: return nsGkAtoms::on##name_ == aMapping.mAtom;
 #include "mozilla/EventNameList.h"
-#undef ID_TO_EVENT
+#undef MESSAGE_TO_EVENT
   default:
     break;
   }
@@ -7685,16 +7685,16 @@ nsContentUtils::SendKeyEvent(nsCOMPtr<nsIWidget> aWidget,
   if (aType.EqualsLiteral("keydown"))
     msg = NS_KEY_DOWN;
   else if (aType.EqualsLiteral("keyup"))
-    msg = NS_KEY_UP;
+    msg = eKeyUp;
   else if (aType.EqualsLiteral("keypress"))
-    msg = NS_KEY_PRESS;
+    msg = eKeyPress;
   else
     return NS_ERROR_FAILURE;
 
   WidgetKeyboardEvent event(true, msg, aWidget);
   event.modifiers = GetWidgetModifiers(aModifiers);
 
-  if (msg == NS_KEY_PRESS) {
+  if (msg == eKeyPress) {
     event.keyCode = aCharCode ? 0 : aKeyCode;
     event.charCode = aCharCode;
   } else {