Merge m-c to fx-team.

CLOBBER

@@ -18,4 +18,4 @@
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
-Bug 785884 - Implement support for temporary storage (aka shared pool) 
+Bug 913260 needed a clobber to not break tons of tests 

accessible/src/base/nsCoreUtils.cpp

@@ -24,7 +24,8 @@
 #include "nsEventStateManager.h"
 #include "nsISelectionPrivate.h"
 #include "nsISelectionController.h"
-#include "nsGUIEvent.h"
+#include "mozilla/MouseEvents.h"
+#include "mozilla/TouchEvents.h"
 #include "nsView.h"
 #include "nsGkAtoms.h"
 #include "nsDOMTouchEvent.h"

accessible/src/base/nsCoreUtils.h

@@ -49,7 +49,7 @@ public:
   /**
    * Send mouse event to the given element.
    *
-   * @param aEventType   [in] an event type (see nsGUIEvent.h for constants)
+   * @param aEventType   [in] an event type (see BasicEvents.h for constants)
    * @param aX           [in] x coordinate in dev pixels
    * @param aY           [in] y coordinate in dev pixels
    * @param aContent     [in] the element
@@ -64,7 +64,7 @@ public:
   /**
    * Send a touch event with a single touch point to the given element.
    *
-   * @param aEventType   [in] an event type (see nsGUIEvent.h for constants)
+   * @param aEventType   [in] an event type (see BasicEvents.h for constants)
    * @param aX           [in] x coordinate in dev pixels
    * @param aY           [in] y coordinate in dev pixels
    * @param aContent     [in] the element

accessible/src/generic/Accessible.cpp

@@ -75,6 +75,7 @@
 #endif
 
 #include "mozilla/Assertions.h"
+#include "mozilla/MouseEvents.h"
 #include "mozilla/unused.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/dom/Element.h"

accessible/src/generic/BaseAccessibles.cpp

@@ -12,8 +12,6 @@
 #include "nsCoreUtils.h"
 #include "Role.h"
 #include "States.h"
-
-#include "nsGUIEvent.h"
 #include "nsINameSpaceManager.h"
 #include "nsIURI.h"
 

accessible/src/generic/HyperTextAccessible.cpp

@@ -775,7 +775,7 @@ HyperTextAccessible::FindOffset(int32_t aOffset, nsDirection aDirection,
       return -1;
 
     // We're on the last continuation since we're on the last character.
-    frameAtOffset = frameAtOffset->GetLastContinuation();
+    frameAtOffset = frameAtOffset->LastContinuation();
   }
 
   // Return hypertext offset of the boundary of the found word.

accessible/src/jsat/TraversalRules.jsm

@@ -108,6 +108,8 @@ var gSimpleTraversalRoles =
    ROLE_KEY,
    ROLE_HEADER,
    ROLE_HEADING,
+   ROLE_SLIDER,
+   ROLE_SPINBUTTON,
    // Used for traversing in to child OOP frames.
    ROLE_INTERNAL_FRAME];
 

accessible/src/jsat/Utils.jsm

@@ -557,7 +557,7 @@ PivotContext.prototype = {
         include = true;
       } else {
         let [state,] = Utils.getStates(child);
-        include = !(state.value & Ci.nsIAccessibleStates.STATE_INVISIBLE);
+        include = !(state & Ci.nsIAccessibleStates.STATE_INVISIBLE);
       }
       if (include) {
         if (aPreorder) {

accessible/src/xul/XULMenuAccessible.cpp

@@ -23,7 +23,6 @@
 #include "nsIServiceManager.h"
 #include "nsIPresShell.h"
 #include "nsIContent.h"
-#include "nsGUIEvent.h"
 #include "nsMenuBarFrame.h"
 #include "nsMenuPopupFrame.h"
 

b2g/app/b2g.js

@@ -431,8 +431,6 @@ pref("services.push.pingInterval", 1800000); // 30 minutes
 pref("services.push.requestTimeout", 10000);
 // enable udp wakeup support
 pref("services.push.udp.wakeupEnabled", true);
-// port on which UDP server socket is bound
-pref("services.push.udp.port", 2442);
 
 // NetworkStats
 #ifdef MOZ_B2G_RIL
@@ -612,6 +610,10 @@ pref("dom.ipc.processPriorityManager.temporaryPriorityLockMS", 5000);
 // /still/ have the same niceness; we'd effectively have erased NSPR's thread
 // priorities.
 
+// The kernel can only accept 6 (OomScoreAdjust, KillUnderMB) pairs. But it is
+// okay, kernel will still kill processes with larger OomScoreAdjust first even
+// its OomScoreAdjust don't have a corresponding KillUnderMB.
+
 pref("hal.processPriorityManager.gonk.MASTER.OomScoreAdjust", 0);
 pref("hal.processPriorityManager.gonk.MASTER.KillUnderMB", 4);
 pref("hal.processPriorityManager.gonk.MASTER.Nice", 0);
@@ -624,6 +626,9 @@ pref("hal.processPriorityManager.gonk.FOREGROUND.OomScoreAdjust", 134);
 pref("hal.processPriorityManager.gonk.FOREGROUND.KillUnderMB", 6);
 pref("hal.processPriorityManager.gonk.FOREGROUND.Nice", 1);
 
+pref("hal.processPriorityManager.gonk.FOREGROUND_KEYBOARD.OomScoreAdjust", 200);
+pref("hal.processPriorityManager.gonk.FOREGROUND_KEYBOARD.Nice", 1);
+
 pref("hal.processPriorityManager.gonk.BACKGROUND_PERCEIVABLE.OomScoreAdjust", 400);
 pref("hal.processPriorityManager.gonk.BACKGROUND_PERCEIVABLE.KillUnderMB", 7);
 pref("hal.processPriorityManager.gonk.BACKGROUND_PERCEIVABLE.Nice", 7);

b2g/config/gaia.json

@@ -1,4 +1,4 @@
 {
-    "revision": "44efe8a2b5ce1abc18fb4da92fe774d08290bd31", 
+    "revision": "df1654f408ae9ff3bdb276ad2e243bfecfd47087", 
     "repo_path": "/integration/gaia-central"
 }

build/win64/mozconfig.vs2010

@@ -21,7 +21,12 @@ export PATH="/c/Program Files (x86)/Windows Kits/8.0/bin/x64:${_VSPATH}/Common7/
 
 # Use 32bit linker for PGO crash bug.
 # https://connect.microsoft.com/VisualStudio/feedback/details/686117/
-export LD="${_VSPATH}/VC/BIN/x86_amd64/link.exe"
+if [ -f /c/PROGRA~2/MICROS~2.0/VC/BIN/x86_amd64/link.exe ]; then
+  # /c/Program Files (x86)/Microsoft Visual Studio 10.0
+  export LD=c:/PROGRA~2/MICROS~2.0/VC/BIN/x86_amd64/link.exe
+else
+  export LD=c:/tools/msvs10/VC/BIN/x86_amd64/link.exe
+fi
 
 . $topsrcdir/build/mozconfig.vs2010-common
 

content/base/src/DOMImplementation.cpp

@@ -4,6 +4,7 @@
 
 #include "mozilla/dom/DOMImplementation.h"
 
+#include "mozilla/ContentEvents.h"
 #include "mozilla/dom/DOMImplementationBinding.h"
 #include "nsContentCreatorFunctions.h"
 #include "nsContentUtils.h"

content/base/src/Element.cpp

@@ -48,7 +48,10 @@
 #include "nsDOMString.h"
 #include "nsIScriptSecurityManager.h"
 #include "nsIDOMMutationEvent.h"
+#include "mozilla/ContentEvents.h"
+#include "mozilla/MouseEvents.h"
 #include "mozilla/MutationEvent.h"
+#include "mozilla/TextEvents.h"
 #include "nsNodeUtils.h"
 #include "mozilla/dom/DirectionalityUtils.h"
 #include "nsDocument.h"

content/base/src/FragmentOrElement.cpp

@@ -51,6 +51,7 @@
 #include "nsDOMString.h"
 #include "nsIScriptSecurityManager.h"
 #include "nsIDOMMutationEvent.h"
+#include "mozilla/MouseEvents.h"
 #include "mozilla/MutationEvent.h"
 #include "nsNodeUtils.h"
 #include "nsDocument.h"

content/base/src/nsContentList.cpp

@@ -44,7 +44,17 @@ nsBaseContentList::~nsBaseContentList()
 {
 }
 
-NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(nsBaseContentList, mElements)
+NS_IMPL_CYCLE_COLLECTION_CLASS(nsBaseContentList)
+NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsBaseContentList)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK(mElements)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER
+  tmp->RemoveFromCaches();
+NS_IMPL_CYCLE_COLLECTION_UNLINK_END
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsBaseContentList)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mElements)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
+NS_IMPL_CYCLE_COLLECTION_TRACE_WRAPPERCACHE(nsBaseContentList)
 
 NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_BEGIN(nsBaseContentList)
   if (nsCCUncollectableMarker::sGeneration && tmp->IsBlack()) {

content/base/src/nsContentList.h

@@ -96,6 +96,14 @@ public:
     MOZ_OVERRIDE = 0;
 
 protected:
+  /**
+   * To be called from non-destructor locations (e.g. unlink) that want to
+   * remove from caches.  Cacheable subclasses should override.
+   */
+  virtual void RemoveFromCaches()
+  {
+  }
+
   nsTArray< nsCOMPtr<nsIContent> > mElements;
 };
 
@@ -365,7 +373,8 @@ protected:
    * Needed because if subclasses want to have cache behavior they can't just
    * override RemoveFromHashtable(), since we call that in our destructor.
    */
-  virtual void RemoveFromCaches() {
+  virtual void RemoveFromCaches() MOZ_OVERRIDE
+  {
     RemoveFromHashtable();
   }
 

content/base/src/nsContentUtils.cpp

@@ -38,9 +38,11 @@
 #include "mozilla/dom/HTMLTemplateElement.h"
 #include "mozilla/dom/TextDecoder.h"
 #include "mozilla/Likely.h"
+#include "mozilla/MouseEvents.h"
 #include "mozilla/MutationEvent.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Selection.h"
+#include "mozilla/TextEvents.h"
 #include "mozilla/Util.h"
 #include "nsAString.h"
 #include "nsAttrName.h"

content/base/src/nsCopySupport.cpp

@@ -36,7 +36,6 @@
 #include "nsIDOMDocument.h"
 #include "nsIHTMLDocument.h"
 #include "nsGkAtoms.h"
-#include "nsGUIEvent.h"
 #include "nsIFrame.h"
 #include "nsIURI.h"
 #include "nsISimpleEnumerator.h"
@@ -47,6 +46,7 @@
 #include "nsContentUtils.h"
 #include "nsContentCID.h"
 
+#include "mozilla/ContentEvents.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/Selection.h"
 

content/base/src/nsDocument.cpp

@@ -39,7 +39,7 @@
 #include "nsDOMClassInfo.h"
 #include "nsCxPusher.h"
 
-#include "nsGUIEvent.h"
+#include "mozilla/BasicEvents.h"
 #include "nsAsyncDOMEvent.h"
 #include "nsIDOMNodeFilter.h"
 

content/base/src/nsFrameLoader.cpp

@@ -45,7 +45,6 @@
 #include "nsIScrollableFrame.h"
 #include "nsSubDocumentFrame.h"
 #include "nsError.h"
-#include "nsGUIEvent.h"
 #include "nsEventDispatcher.h"
 #include "nsISHistory.h"
 #include "nsISHistoryInternal.h"

content/base/src/nsGenConImageContent.cpp

@@ -16,7 +16,7 @@
 #include "imgIRequest.h"
 #include "nsEventStates.h"
 #include "nsEventDispatcher.h"
-#include "nsGUIEvent.h"
+#include "mozilla/BasicEvents.h"
 
 class nsGenConImageContent MOZ_FINAL : public nsXMLElement,
                                        public nsImageLoadingContent

content/base/src/nsImageLoadingContent.cpp

@@ -31,7 +31,6 @@
 
 #include "nsIPresShell.h"
 #include "nsEventStates.h"
-#include "nsGUIEvent.h"
 
 #include "nsIChannel.h"
 #include "nsIStreamListener.h"

content/base/src/nsObjectLoadingContent.cpp

@@ -58,7 +58,6 @@
 #include "nsNetUtil.h"
 #include "nsMimeTypes.h"
 #include "nsStyleUtil.h"
-#include "nsGUIEvent.h"
 #include "nsUnicharUtils.h"
 #include "mozilla/Preferences.h"
 #include "nsSandboxFlags.h"

content/base/src/nsScriptElement.cpp

@@ -4,9 +4,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsScriptElement.h"
+#include "mozilla/BasicEvents.h"
 #include "mozilla/dom/Element.h"
 #include "nsContentUtils.h"
-#include "nsGUIEvent.h"
 #include "nsEventDispatcher.h"
 #include "nsPresContext.h"
 #include "nsScriptLoader.h"

content/base/src/nsXMLHttpRequest.cpp

@@ -26,7 +26,6 @@
 #include "nsIUploadChannel2.h"
 #include "nsIDOMSerializer.h"
 #include "nsXPCOM.h"
-#include "nsGUIEvent.h"
 #include "nsIDOMEventListener.h"
 #include "nsIScriptSecurityManager.h"
 #include "nsIDOMWindow.h"

content/events/public/nsEventNameList.h

@@ -10,7 +10,7 @@
  *
  * Each entry consists of 4 pieces of information:
  * 1) The name of the event
- * 2) The event ID (see nsGUIEvent.h)
+ * 2) The event ID (see BasicEvents.h)
  * 3) The event type (see the EventNameType enum in nsContentUtils.h)
  * 4) The event struct type for this event.
  * Items 2-4 might be empty strings for events for which they don't make sense.

content/events/public/nsVKList.h

@@ -3,7 +3,7 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
-// IWYU pragma: private, include "nsGUIEvent.h"
+// IWYU pragma: private, include "mozilla/KeyTextEvents.h"
 
 /**
  * This header file defines all DOM keys which are defined in nsIDOMKeyEvent.

content/events/src/DOMWheelEvent.cpp

@@ -5,7 +5,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "DOMWheelEvent.h"
-#include "nsGUIEvent.h"
+#include "mozilla/MouseEvents.h"
 #include "prtime.h"
 
 namespace mozilla {

content/events/src/DOMWheelEvent.h

@@ -9,6 +9,7 @@
 
 #include "nsIDOMWheelEvent.h"
 #include "nsDOMMouseEvent.h"
+#include "mozilla/MouseEvents.h"
 #include "mozilla/dom/WheelEventBinding.h"
 
 namespace mozilla {

content/events/src/TextComposition.cpp

@@ -8,11 +8,12 @@
 #include "nsContentEventHandler.h"
 #include "nsContentUtils.h"
 #include "nsEventDispatcher.h"
-#include "nsGUIEvent.h"
 #include "nsIContent.h"
 #include "nsIMEStateManager.h"
 #include "nsIPresShell.h"
 #include "nsPresContext.h"
+#include "mozilla/MiscEvents.h"
+#include "mozilla/TextEvents.h"
 
 namespace mozilla {
 

content/events/src/nsAsyncDOMEvent.cpp

@@ -7,8 +7,8 @@
 #include "nsIDOMEvent.h"
 #include "nsContentUtils.h"
 #include "nsEventDispatcher.h"
-#include "nsGUIEvent.h"
 #include "nsDOMEvent.h"
+#include "mozilla/BasicEvents.h"
 #include "mozilla/dom/EventTarget.h"
 
 using namespace mozilla::dom;

content/events/src/nsContentEventHandler.cpp

@@ -11,7 +11,6 @@
 #include "nsISelection.h"
 #include "nsIDOMRange.h"
 #include "nsRange.h"
-#include "nsGUIEvent.h"
 #include "nsCaret.h"
 #include "nsCopySupport.h"
 #include "nsFrameSelection.h"

content/events/src/nsDOMAnimationEvent.cpp

@@ -4,8 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsDOMAnimationEvent.h"
-#include "nsGUIEvent.h"
 #include "prtime.h"
+#include "mozilla/ContentEvents.h"
 
 nsDOMAnimationEvent::nsDOMAnimationEvent(mozilla::dom::EventTarget* aOwner,
                                          nsPresContext *aPresContext,

content/events/src/nsDOMAnimationEvent.h

@@ -7,6 +7,7 @@
 
 #include "nsDOMEvent.h"
 #include "nsIDOMAnimationEvent.h"
+#include "mozilla/ContentEvents.h"
 #include "mozilla/dom/AnimationEventBinding.h"
 
 class nsAString;

content/events/src/nsDOMClipboardEvent.cpp

@@ -6,6 +6,7 @@
 #include "nsDOMClipboardEvent.h"
 #include "nsDOMDataTransfer.h"
 #include "nsIClipboard.h"
+#include "mozilla/ContentEvents.h"
 
 nsDOMClipboardEvent::nsDOMClipboardEvent(mozilla::dom::EventTarget* aOwner,
                                          nsPresContext* aPresContext,

content/events/src/nsDOMClipboardEvent.h

@@ -8,6 +8,7 @@
 
 #include "nsIDOMClipboardEvent.h"
 #include "nsDOMEvent.h"
+#include "mozilla/EventForwards.h"
 #include "mozilla/dom/ClipboardEventBinding.h"
 
 class nsDOMClipboardEvent : public nsDOMEvent,

content/events/src/nsDOMCommandEvent.cpp

@@ -5,6 +5,7 @@
 
 #include "nsDOMCommandEvent.h"
 #include "prtime.h"
+#include "mozilla/MiscEvents.h"
 
 nsDOMCommandEvent::nsDOMCommandEvent(mozilla::dom::EventTarget* aOwner,
                                      nsPresContext* aPresContext,

content/events/src/nsDOMCommandEvent.h

@@ -9,6 +9,7 @@
 #include "nsIDOMCommandEvent.h"
 #include "nsDOMEvent.h"
 #include "mozilla/dom/CommandEventBinding.h"
+#include "mozilla/EventForwards.h"
 
 class nsDOMCommandEvent : public nsDOMEvent,
                           public nsIDOMCommandEvent

content/events/src/nsDOMCompositionEvent.cpp

@@ -6,6 +6,7 @@
 
 #include "nsDOMCompositionEvent.h"
 #include "prtime.h"
+#include "mozilla/TextEvents.h"
 
 nsDOMCompositionEvent::nsDOMCompositionEvent(mozilla::dom::EventTarget* aOwner,
                                              nsPresContext* aPresContext,

content/events/src/nsDOMCompositionEvent.h

@@ -10,6 +10,7 @@
 #include "nsDOMUIEvent.h"
 #include "nsIDOMCompositionEvent.h"
 #include "mozilla/dom/CompositionEventBinding.h"
+#include "mozilla/TextEvents.h"
 
 class nsDOMCompositionEvent : public nsDOMUIEvent,
                               public nsIDOMCompositionEvent

content/events/src/nsDOMDataTransfer.cpp

@@ -3,6 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "mozilla/BasicEvents.h"
 #include "mozilla/Util.h"
 
 #include "nsDOMDataTransfer.h"
@@ -13,7 +14,6 @@
 #include "nsDOMClassInfoID.h"
 #include "nsIScriptSecurityManager.h"
 #include "nsDOMLists.h"
-#include "nsGUIEvent.h"
 #include "nsError.h"
 #include "nsIDragService.h"
 #include "nsIClipboard.h"

content/events/src/nsDOMDragEvent.cpp

@@ -4,10 +4,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsDOMDragEvent.h"
-#include "nsGUIEvent.h"
 #include "nsContentUtils.h"
 #include "nsIDOMDataTransfer.h"
 #include "prtime.h"
+#include "mozilla/MouseEvents.h"
 
 nsDOMDragEvent::nsDOMDragEvent(mozilla::dom::EventTarget* aOwner,
                                nsPresContext* aPresContext,

content/events/src/nsDOMDragEvent.h

@@ -9,6 +9,7 @@
 #include "nsIDOMDragEvent.h"
 #include "nsDOMMouseEvent.h"
 #include "mozilla/dom/DragEventBinding.h"
+#include "mozilla/EventForwards.h"
 
 class nsDOMDragEvent : public nsDOMMouseEvent,
                        public nsIDOMDragEvent

content/events/src/nsDOMEvent.cpp

@@ -14,7 +14,12 @@
 #include "nsIContent.h"
 #include "nsIPresShell.h"
 #include "nsIDocument.h"
+#include "mozilla/ContentEvents.h"
+#include "mozilla/MiscEvents.h"
+#include "mozilla/MouseEvents.h"
 #include "mozilla/MutationEvent.h"
+#include "mozilla/TextEvents.h"
+#include "mozilla/TouchEvents.h"
 #include "nsContentUtils.h"
 #include "nsJSEnvironment.h"
 #include "mozilla/Preferences.h"

content/events/src/nsDOMEvent.h

@@ -7,12 +7,12 @@
 #define nsDOMEvent_h__
 
 #include "mozilla/Attributes.h"
+#include "mozilla/BasicEvents.h"
 #include "nsIDOMEvent.h"
 #include "nsISupports.h"
 #include "nsCOMPtr.h"
 #include "nsPIDOMWindow.h"
 #include "nsPoint.h"
-#include "nsGUIEvent.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsAutoPtr.h"
 #include "mozilla/dom/EventBinding.h"

content/events/src/nsDOMFocusEvent.cpp

@@ -5,6 +5,7 @@
 
 #include "nsDOMFocusEvent.h"
 #include "prtime.h"
+#include "mozilla/ContentEvents.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;

content/events/src/nsDOMFocusEvent.h

@@ -7,6 +7,7 @@
 
 #include "nsDOMUIEvent.h"
 #include "nsIDOMFocusEvent.h"
+#include "mozilla/EventForwards.h"
 #include "mozilla/dom/FocusEventBinding.h"
 
 class nsDOMFocusEvent : public nsDOMUIEvent,

content/events/src/nsDOMKeyboardEvent.cpp

@@ -5,6 +5,7 @@
 
 #include "nsDOMKeyboardEvent.h"
 #include "prtime.h"
+#include "mozilla/TextEvents.h"
 
 nsDOMKeyboardEvent::nsDOMKeyboardEvent(mozilla::dom::EventTarget* aOwner,
                                        nsPresContext* aPresContext,

content/events/src/nsDOMKeyboardEvent.h

@@ -8,7 +8,9 @@
 
 #include "nsIDOMKeyEvent.h"
 #include "nsDOMUIEvent.h"
+#include "mozilla/EventForwards.h"
 #include "mozilla/dom/KeyboardEventBinding.h"
+#include "mozilla/TextEvents.h"
 
 class nsDOMKeyboardEvent : public nsDOMUIEvent,
                            public nsIDOMKeyEvent

content/events/src/nsDOMMouseEvent.cpp

@@ -4,10 +4,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsDOMMouseEvent.h"
-#include "nsGUIEvent.h"
 #include "nsIContent.h"
 #include "nsContentUtils.h"
 #include "prtime.h"
+#include "mozilla/MouseEvents.h"
 
 using namespace mozilla;
 

content/events/src/nsDOMMouseEvent.h

@@ -9,6 +9,7 @@
 #include "nsIDOMMouseEvent.h"
 #include "nsDOMUIEvent.h"
 #include "mozilla/dom/MouseEventBinding.h"
+#include "mozilla/MouseEvents.h"
 
 class nsDOMMouseEvent : public nsDOMUIEvent,
                         public nsIDOMMouseEvent

content/events/src/nsDOMMouseScrollEvent.cpp

@@ -5,6 +5,7 @@
 
 #include "nsDOMMouseScrollEvent.h"
 #include "prtime.h"
+#include "mozilla/MouseEvents.h"
 
 nsDOMMouseScrollEvent::nsDOMMouseScrollEvent(mozilla::dom::EventTarget* aOwner,
                                              nsPresContext* aPresContext,

content/events/src/nsDOMScrollAreaEvent.cpp

@@ -5,9 +5,9 @@
 
 #include "base/basictypes.h"
 #include "ipc/IPCMessageUtils.h"
+#include "mozilla/ContentEvents.h"
 
 #include "nsDOMScrollAreaEvent.h"
-#include "nsGUIEvent.h"
 #include "nsClientRect.h"
 
 nsDOMScrollAreaEvent::nsDOMScrollAreaEvent(mozilla::dom::EventTarget* aOwner,

content/events/src/nsDOMScrollAreaEvent.h

@@ -7,6 +7,7 @@
 #define nsDOMScrollAreaEvent_h__
 
 #include "mozilla/Attributes.h"
+#include "mozilla/EventForwards.h"
 #include "nsIDOMScrollAreaEvent.h"
 #include "nsDOMUIEvent.h"
 

content/events/src/nsDOMSimpleGestureEvent.cpp

@@ -5,6 +5,7 @@
 
 #include "nsDOMSimpleGestureEvent.h"
 #include "prtime.h"
+#include "mozilla/TouchEvents.h"
 
 nsDOMSimpleGestureEvent::nsDOMSimpleGestureEvent(mozilla::dom::EventTarget* aOwner,
                                                  nsPresContext* aPresContext,

content/events/src/nsDOMSimpleGestureEvent.h

@@ -7,6 +7,7 @@
 
 #include "nsIDOMSimpleGestureEvent.h"
 #include "nsDOMMouseEvent.h"
+#include "mozilla/TouchEvents.h"
 #include "mozilla/dom/SimpleGestureEventBinding.h"
 
 class nsPresContext;

content/events/src/nsDOMTextEvent.cpp

@@ -7,6 +7,7 @@
 #include "nsDOMTextEvent.h"
 #include "nsPrivateTextRange.h"
 #include "prtime.h"
+#include "mozilla/TextEvents.h"
 
 nsDOMTextEvent::nsDOMTextEvent(mozilla::dom::EventTarget* aOwner,
                                nsPresContext* aPresContext,

content/events/src/nsDOMTextEvent.h

@@ -7,6 +7,7 @@
 #define nsDOMTextEvent_h__
 
 #include "mozilla/Attributes.h"
+#include "mozilla/EventForwards.h"
 #include "nsDOMUIEvent.h"
 #include "nsIPrivateTextEvent.h"
 #include "nsPrivateTextRange.h"

content/events/src/nsDOMTouchEvent.cpp

@@ -5,11 +5,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsDOMTouchEvent.h"
-#include "nsGUIEvent.h"
 #include "nsContentUtils.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/dom/Touch.h"
 #include "mozilla/dom/TouchListBinding.h"
+#include "mozilla/TouchEvents.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;

content/events/src/nsDOMTouchEvent.h

@@ -8,10 +8,12 @@
 #include "nsDOMUIEvent.h"
 #include "nsTArray.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/TouchEvents.h"
 #include "nsJSEnvironment.h"
 #include "mozilla/dom/TouchEventBinding.h"
 #include "nsWrapperCache.h"
 
+
 class nsAString;
 
 class nsDOMTouchList MOZ_FINAL : public nsISupports

content/events/src/nsDOMTransitionEvent.cpp

@@ -4,8 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsDOMTransitionEvent.h"
-#include "nsGUIEvent.h"
 #include "prtime.h"
+#include "mozilla/ContentEvents.h"
 
 nsDOMTransitionEvent::nsDOMTransitionEvent(mozilla::dom::EventTarget* aOwner,
                                            nsPresContext *aPresContext,

content/events/src/nsDOMTransitionEvent.h

@@ -7,6 +7,7 @@
 
 #include "nsDOMEvent.h"
 #include "nsIDOMTransitionEvent.h"
+#include "mozilla/ContentEvents.h"
 #include "mozilla/dom/TransitionEventBinding.h"
 
 class nsAString;

content/events/src/nsDOMUIEvent.cpp

@@ -16,6 +16,8 @@
 #include "nsIFrame.h"
 #include "mozilla/Util.h"
 #include "mozilla/Assertions.h"
+#include "mozilla/ContentEvents.h"
+#include "mozilla/TextEvents.h"
 #include "prtime.h"
 
 using namespace mozilla;

content/events/src/nsEventDispatcher.cpp

@@ -16,8 +16,13 @@
 #include "nsDOMTouchEvent.h"
 #include "GeckoProfiler.h"
 #include "GeneratedEvents.h"
+#include "mozilla/ContentEvents.h"
 #include "mozilla/dom/EventTarget.h"
+#include "mozilla/MiscEvents.h"
+#include "mozilla/MouseEvents.h"
 #include "mozilla/MutationEvent.h"
+#include "mozilla/TextEvents.h"
+#include "mozilla/TouchEvents.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;

content/events/src/nsEventListenerManager.cpp

@@ -3,6 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "mozilla/BasicEvents.h"
 #ifdef MOZ_B2G
 #include "mozilla/Hal.h"
 #endif
@@ -12,7 +13,6 @@
 #undef CreateEvent
 
 #include "nsISupports.h"
-#include "nsGUIEvent.h"
 #include "nsDOMEvent.h"
 #include "nsEventListenerManager.h"
 #include "nsIDOMEventListener.h"

content/events/src/nsEventListenerManager.h

@@ -6,12 +6,12 @@
 #ifndef nsEventListenerManager_h__
 #define nsEventListenerManager_h__
 
+#include "mozilla/BasicEvents.h"
 #include "mozilla/dom/EventListenerBinding.h"
 #include "mozilla/MemoryReporting.h"
 #include "nsCOMPtr.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsGkAtoms.h"
-#include "nsGUIEvent.h"
 #include "nsIDOMEventListener.h"
 #include "nsIJSEventListener.h"
 #include "nsTObserverArray.h"

content/events/src/nsEventListenerService.cpp

@@ -9,13 +9,13 @@
 #include "nsCxPusher.h"
 #include "nsIXPConnect.h"
 #include "nsJSUtils.h"
-#include "nsGUIEvent.h"
 #include "nsEventDispatcher.h"
 #include "nsIJSEventListener.h"
 #ifdef MOZ_JSDEBUGGER
 #include "jsdIDebuggerService.h"
 #endif
 #include "nsDOMClassInfoID.h"
+#include "mozilla/BasicEvents.h"
 #include "mozilla/Maybe.h"
 #include "nsServiceManagerUtils.h"
 

content/events/src/nsEventStateManager.cpp

@@ -5,7 +5,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/Attributes.h"
+#include "mozilla/MiscEvents.h"
 #include "mozilla/MathAlgorithms.h"
+#include "mozilla/MouseEvents.h"
+#include "mozilla/TextEvents.h"
+#include "mozilla/TouchEvents.h"
 #include "mozilla/dom/TabParent.h"
 
 #include "nsCOMPtr.h"

content/events/src/nsEventStateManager.h

@@ -6,9 +6,10 @@
 #ifndef nsEventStateManager_h__
 #define nsEventStateManager_h__
 
+#include "mozilla/BasicEvents.h"
+#include "mozilla/EventForwards.h"
 #include "mozilla/TypedEnum.h"
 
-#include "nsGUIEvent.h"
 #include "nsIObserver.h"
 #include "nsWeakReference.h"
 #include "nsCOMPtr.h"

content/events/src/nsIMEStateManager.cpp

@@ -29,10 +29,10 @@
 #include "nsIForm.h"
 #include "mozilla/dom/HTMLFormElement.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/TextEvents.h"
 #include "TextComposition.h"
 #include "mozilla/Preferences.h"
 #include "nsAsyncDOMEvent.h"
-#include "nsGUIEvent.h"
 
 using namespace mozilla;
 using namespace mozilla::widget;

content/events/src/nsPrivateTextRange.cpp

@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsPrivateTextRange.h"
-
+#include "mozilla/TextEvents.h"
 
 nsPrivateTextRange::nsPrivateTextRange(const nsTextRange &aTextRange)
   : mRangeStart(uint16_t(aTextRange.mStartOffset)),

content/html/content/src/HTMLButtonElement.cpp

@@ -22,7 +22,9 @@
 #include "nsIFormControlFrame.h"
 #include "nsIDOMEvent.h"
 #include "nsIDocument.h"
-#include "nsGUIEvent.h"
+#include "mozilla/ContentEvents.h"
+#include "mozilla/MouseEvents.h"
+#include "mozilla/TextEvents.h"
 #include "nsUnicharUtils.h"
 #include "nsLayoutUtils.h"
 #include "nsEventDispatcher.h"

content/html/content/src/HTMLFieldSetElement.cpp

@@ -3,11 +3,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "mozilla/BasicEvents.h"
 #include "mozilla/dom/HTMLFieldSetElement.h"
 #include "mozilla/dom/HTMLFieldSetElementBinding.h"
 #include "nsContentList.h"
 #include "nsEventDispatcher.h"
-#include "nsGUIEvent.h"
 
 NS_IMPL_NS_NEW_HTML_ELEMENT(FieldSet)
 

content/html/content/src/HTMLFormElement.cpp

@@ -3,6 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "mozilla/ContentEvents.h"
 #include "mozilla/dom/HTMLFormElement.h"
 #include "mozilla/dom/HTMLFormElementBinding.h"
 #include "nsIHTMLDocument.h"
@@ -17,7 +18,6 @@
 #include "nsContentUtils.h"
 #include "nsInterfaceHashtable.h"
 #include "nsContentList.h"
-#include "nsGUIEvent.h"
 #include "nsCOMArray.h"
 #include "nsAutoPtr.h"
 #include "nsTArray.h"

content/html/content/src/HTMLImageElement.cpp

@@ -22,7 +22,7 @@
 #include "nsContentUtils.h"
 #include "nsIFrame.h"
 #include "nsNodeInfoManager.h"
-#include "nsGUIEvent.h"
+#include "mozilla/MouseEvents.h"
 #include "nsContentPolicyUtils.h"
 #include "nsIDOMWindow.h"
 #include "nsFocusManager.h"

content/html/content/src/HTMLInputElement.cpp

@@ -42,7 +42,6 @@
 #include "nsIServiceManager.h"
 #include "nsError.h"
 #include "nsIEditor.h"
-#include "nsGUIEvent.h"
 #include "nsIIOService.h"
 #include "nsDocument.h"
 #include "nsAttrValueOrString.h"
@@ -58,7 +57,10 @@
 #include "nsLayoutUtils.h"
 
 #include "nsIDOMMutationEvent.h"
+#include "mozilla/ContentEvents.h"
 #include "mozilla/MutationEvent.h"
+#include "mozilla/TextEvents.h"
+#include "mozilla/TouchEvents.h"
 #include "nsEventListenerManager.h"
 
 #include "nsRuleData.h"

content/html/content/src/HTMLLabelElement.cpp

@@ -10,7 +10,7 @@
 #include "mozilla/dom/HTMLLabelElementBinding.h"
 #include "nsEventDispatcher.h"
 #include "nsFocusManager.h"
-#include "nsGUIEvent.h"
+#include "mozilla/MouseEvents.h"
 #include "nsIDOMMouseEvent.h"
 
 // construction, destruction

content/html/content/src/HTMLMenuElement.cpp

@@ -5,12 +5,12 @@
 
 #include "mozilla/dom/HTMLMenuElement.h"
 
+#include "mozilla/BasicEvents.h"
 #include "mozilla/dom/HTMLMenuElementBinding.h"
 #include "mozilla/dom/HTMLMenuItemElement.h"
 #include "nsAttrValueInlines.h"
 #include "nsContentUtils.h"
 #include "nsEventDispatcher.h"
-#include "nsGUIEvent.h"
 #include "nsXULContextMenuBuilder.h"
 #include "nsIURI.h"
 

content/html/content/src/HTMLMenuItemElement.cpp

@@ -5,11 +5,11 @@
 
 #include "mozilla/dom/HTMLMenuItemElement.h"
 
+#include "mozilla/BasicEvents.h"
 #include "mozilla/dom/HTMLMenuItemElementBinding.h"
 #include "nsAttrValueInlines.h"
 #include "nsContentUtils.h"
 #include "nsEventDispatcher.h"
-#include "nsGUIEvent.h"
 
 
 NS_IMPL_NS_NEW_HTML_ELEMENT_CHECK_PARSER(MenuItem)

content/html/content/src/HTMLOptionsCollection.cpp

@@ -19,7 +19,6 @@
 #include "nsEventStates.h"
 #include "nsFormSubmission.h"
 #include "nsGkAtoms.h"
-#include "nsGUIEvent.h"
 #include "nsIComboboxControlFrame.h"
 #include "nsIDocument.h"
 #include "nsIDOMHTMLOptGroupElement.h"

content/html/content/src/HTMLSelectElement.cpp

@@ -19,7 +19,6 @@
 #include "nsEventStates.h"
 #include "nsFormSubmission.h"
 #include "nsGkAtoms.h"
-#include "nsGUIEvent.h"
 #include "nsIComboboxControlFrame.h"
 #include "nsIDocument.h"
 #include "nsIFormControlFrame.h"

content/html/content/src/HTMLTextAreaElement.cpp

@@ -9,6 +9,7 @@
 #include "mozAutoDocUpdate.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/dom/HTMLTextAreaElementBinding.h"
+#include "mozilla/MouseEvents.h"
 #include "mozilla/Util.h"
 #include "nsAttrValueInlines.h"
 #include "nsContentCID.h"
@@ -17,7 +18,6 @@
 #include "nsEventDispatcher.h"
 #include "nsFocusManager.h"
 #include "nsFormSubmission.h"
-#include "nsGUIEvent.h"
 #include "nsIComponentManager.h"
 #include "nsIConstraintValidation.h"
 #include "nsIControllers.h"

content/html/content/src/nsGenericHTMLElement.cpp

@@ -4,6 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "mozilla/MouseEvents.h"
 #include "mozilla/Util.h"
 #include "mozilla/Likely.h"
 

content/html/content/src/nsTextEditorState.cpp

@@ -42,6 +42,7 @@
 #include "mozilla/Preferences.h"
 #include "nsTextNode.h"
 #include "nsIController.h"
+#include "mozilla/TextEvents.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;

content/media/AudioStream.cpp

@@ -905,8 +905,8 @@ BufferedAudioStream::DataCallback(void* aBuffer, long aFrames)
     if (cubeb_stream_get_latency(mCubebStream, &latency)) {
       NS_WARNING("Could not get latency from cubeb.");
     }
-    LogLatency(AsyncLatencyLogger::AudioStream, 0, (mBuffer.Length() * 1000) / mOutRate);
-    LogLatency(AsyncLatencyLogger::Cubeb, 0, (latency * 1000) / mOutRate);
+    mLatencyLog->Log(AsyncLatencyLogger::AudioStream, 0, (mBuffer.Length() * 1000) / mOutRate);
+    mLatencyLog->Log(AsyncLatencyLogger::Cubeb, 0, (latency * 1000) / mOutRate);
   }
 
   mAudioClock.UpdateWritePosition(servicedFrames);

content/media/AudioStream.h

@@ -9,6 +9,8 @@
 #include "AudioSampleFormat.h"
 #include "AudioChannelCommon.h"
 #include "nsAutoPtr.h"
+#include "nsCOMPtr.h"
+#include "Latency.h"
 
 namespace soundtouch {
 class SoundTouch;
@@ -185,6 +187,7 @@ protected:
   int64_t mWritten;
   AudioClock mAudioClock;
   nsAutoPtr<soundtouch::SoundTouch> mTimeStretcher;
+  nsRefPtr<AsyncLatencyLogger> mLatencyLog;
 };
 
 } // namespace mozilla

content/media/Latency.cpp

@@ -13,7 +13,9 @@
 #include <cmath>
 #include <algorithm>
 
+#include <mozilla/Services.h>
 #include <mozilla/StaticPtr.h>
+#include "nsContentUtils.h"
 
 using namespace mozilla;
 
@@ -59,12 +61,12 @@ protected:
   int64_t mValue;
 };
 
-// This is the only function that clients should use.
 void LogLatency(AsyncLatencyLogger::LatencyLogIndex aIndex, uint64_t aID, int64_t aValue)
 {
   AsyncLatencyLogger::Get()->Log(aIndex, aID, aValue);
 }
 
+/* static */
 void AsyncLatencyLogger::InitializeStatics()
 {
   NS_ASSERTION(NS_IsMainThread(), "Main thread only");
@@ -72,7 +74,8 @@ void AsyncLatencyLogger::InitializeStatics()
   gAsyncLogger = new AsyncLatencyLogger();
 }
 
-void AsyncLatencyLogger::Shutdown()
+/* static */
+void AsyncLatencyLogger::ShutdownLogger()
 {
   gAsyncLogger = nullptr;
 }
@@ -80,36 +83,62 @@ void AsyncLatencyLogger::Shutdown()
 /* static */
 AsyncLatencyLogger* AsyncLatencyLogger::Get(bool aStartTimer)
 {
+  // Users don't generally null-check the result since we should live longer than they
+  MOZ_ASSERT(gAsyncLogger);
+
   if (aStartTimer) {
     gAsyncLogger->Init();
   }
   return gAsyncLogger;
 }
 
+NS_IMPL_ISUPPORTS1(AsyncLatencyLogger, nsIObserver)
+
 AsyncLatencyLogger::AsyncLatencyLogger()
   : mThread(nullptr),
     mMutex("AsyncLatencyLogger")
-{ }
+{
+  NS_ASSERTION(NS_IsMainThread(), "Main thread only");
+  nsContentUtils::RegisterShutdownObserver(this);
+}
 
 AsyncLatencyLogger::~AsyncLatencyLogger()
 {
+  AsyncLatencyLogger::Shutdown();
+}
+
+void AsyncLatencyLogger::Shutdown()
+{
+  nsContentUtils::UnregisterShutdownObserver(this);
+
   MutexAutoLock lock(mMutex);
   if (mThread) {
     mThread->Shutdown();
   }
-  mStart = TimeStamp();
+  mStart = TimeStamp(); // make sure we don't try to restart it for any reason
 }
 
 void AsyncLatencyLogger::Init()
 {
   MutexAutoLock lock(mMutex);
   if (mStart.IsNull()) {
-    mStart = TimeStamp::Now();
     nsresult rv = NS_NewNamedThread("Latency Logger", getter_AddRefs(mThread));
     NS_ENSURE_SUCCESS_VOID(rv);
+    mStart = TimeStamp::Now();
   }
 }
 
+nsresult
+AsyncLatencyLogger::Observe(nsISupports* aSubject, const char* aTopic,
+                            const PRUnichar* aData)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  if (strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID) == 0) {
+    Shutdown();
+  }
+  return NS_OK;
+}
+
 // aID is a sub-identifier (in particular a specific MediaStramTrack)
 void AsyncLatencyLogger::WriteLog(LatencyLogIndex aIndex, uint64_t aID, int64_t aValue)
 {
@@ -133,4 +162,3 @@ void AsyncLatencyLogger::Log(LatencyLogIndex aIndex, uint64_t aID, int64_t aValu
     }
   }
 }
-

content/media/Latency.h

@@ -13,6 +13,7 @@
 #include "nsIThread.h"
 #include "mozilla/Monitor.h"
 #include "nsISupportsImpl.h"
+#include "nsObserverService.h"
 
 class AsyncLatencyLogger;
 class LogEvent;
@@ -20,10 +21,13 @@ class LogEvent;
 PRLogModuleInfo* GetLatencyLog();
 
 // This class is a singleton. It is refcounted.
-class AsyncLatencyLogger
+class AsyncLatencyLogger : public nsIObserver
 {
-  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(AsyncLatencyLogger);
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_NSIOBSERVER
+
 public:
+
   enum LatencyLogIndex {
     AudioMediaStreamTrack,
     VideoMediaStreamTrack,
@@ -37,12 +41,16 @@ public:
 
   static AsyncLatencyLogger* Get(bool aStartTimer = false);
   static void InitializeStatics();
-  static void Shutdown();
+  // After this is called, the global log object may go away
+  static void ShutdownLogger();
 private:
   AsyncLatencyLogger();
-  ~AsyncLatencyLogger();
+  virtual ~AsyncLatencyLogger();
   int64_t GetTimeStamp();
   void Init();
+  // Shut down the thread associated with this, and make sure it doesn't
+  // start up again.
+  void Shutdown();
   // The thread on which the IO happens
   nsCOMPtr<nsIThread> mThread;
   // This can be initialized on multiple threads, but is protected by a

content/media/MediaStreamGraph.cpp

@@ -2325,6 +2325,7 @@ MediaStreamGraphImpl::MediaStreamGraphImpl(bool aRealtime)
   , mRealtime(aRealtime)
   , mNonRealtimeProcessing(false)
   , mStreamOrderDirty(false)
+  , mLatencyLog(AsyncLatencyLogger::Get())
 {
 #ifdef PR_LOGGING
   if (!gMediaStreamGraphLog) {

content/media/MediaStreamGraphImpl.h

@@ -12,6 +12,7 @@
 #include "mozilla/TimeStamp.h"
 #include "nsIThread.h"
 #include "nsIRunnable.h"
+#include "Latency.h"
 
 namespace mozilla {
 
@@ -566,6 +567,10 @@ public:
    * blocking order.
    */
   bool mStreamOrderDirty;
+  /**
+   * Hold a ref to the Latency logger
+   */
+  nsRefPtr<AsyncLatencyLogger> mLatencyLog;
 };
 
 }

content/media/test/crashtests/crashtests.list

@@ -56,5 +56,5 @@ load 907986-2.html
 load 907986-3.html
 load 907986-4.html
 load 910171-1.html
-load oscillator-ended-1.html
-load oscillator-ended-2.html
+skip-if(B2G) load oscillator-ended-1.html # intermittent B2G timeouts, bug 920338
+skip-if(B2G) load oscillator-ended-2.html # intermittent B2G timeouts, bug 920338

content/media/webrtc/MediaEngineWebRTC.cpp

@@ -94,15 +94,10 @@ MediaEngineWebRTC::EnumerateVideoDevices(nsTArray<nsRefPtr<MediaEngineVideoSourc
   // get the JVM
   JavaVM *jvm = mozilla::AndroidBridge::Bridge()->GetVM();
 
-  JNIEnv *env;
-  jint res = jvm->AttachCurrentThread(&env, NULL);
-
   if (webrtc::VideoEngine::SetAndroidObjects(jvm, (void*)context) != 0) {
     LOG(("VieCapture:SetAndroidObjects Failed"));
     return;
   }
-
-  env->DeleteGlobalRef(context);
 #endif
 
   if (!mVideoEngine) {

content/media/webspeech/synth/pico/PicoModule.cpp

@@ -34,7 +34,7 @@ static const mozilla::Module::ContractIDEntry kContracts[] = {
 };
 
 static const mozilla::Module::CategoryEntry kCategories[] = {
-  { "app-startup", "Pico Speech Synth", "service," PICOSERVICE_CONTRACTID },
+  { "profile-after-change", "Pico Speech Synth", PICOSERVICE_CONTRACTID },
   { NULL }
 };
 

content/media/webspeech/synth/pico/nsPicoService.cpp

@@ -699,6 +699,10 @@ nsPicoService*
 nsPicoService::GetInstance()
 {
   MOZ_ASSERT(NS_IsMainThread());
+  if (XRE_GetProcessType() != GeckoProcessType_Default) {
+    MOZ_ASSERT(false, "nsPicoService can only be started on main gecko process");
+    return nullptr;
+  }
 
   if (!sSingleton) {
     sSingleton = new nsPicoService();

content/smil/nsDOMTimeEvent.cpp

@@ -4,9 +4,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsDOMTimeEvent.h"
-#include "nsGUIEvent.h"
 #include "nsPresContext.h"
 #include "nsIInterfaceRequestorUtils.h"
+#include "mozilla/BasicEvents.h"
 
 nsDOMTimeEvent::nsDOMTimeEvent(mozilla::dom::EventTarget* aOwner,
                                nsPresContext* aPresContext, nsEvent* aEvent)

content/smil/nsSMILTimeValueSpec.cpp

@@ -12,7 +12,7 @@
 #include "nsSMILInstanceTime.h"
 #include "nsSMILParserUtils.h"
 #include "nsEventListenerManager.h"
-#include "nsGUIEvent.h"
+#include "nsIDOMKeyEvent.h"
 #include "nsIDOMTimeEvent.h"
 #include "nsString.h"
 #include <limits>

content/smil/nsSMILTimedElement.cpp

@@ -5,6 +5,7 @@
 
 #include "mozilla/DebugOnly.h"
 
+#include "mozilla/BasicEvents.h"
 #include "mozilla/dom/SVGAnimationElement.h"
 #include "nsSMILTimedElement.h"
 #include "nsAttrValueInlines.h"
@@ -15,7 +16,6 @@
 #include "nsSMILParserUtils.h"
 #include "nsSMILTimeContainer.h"
 #include "nsGkAtoms.h"
-#include "nsGUIEvent.h"
 #include "nsEventDispatcher.h"
 #include "nsReadableUtils.h"
 #include "nsMathUtils.h"

content/svg/content/src/SVGSVGElement.cpp

@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include <stdint.h>
+#include "mozilla/BasicEvents.h"
 #include "mozilla/Util.h"
 #include "mozilla/Likely.h"
 
@@ -24,7 +25,6 @@
 #include "mozilla/dom/SVGRect.h"
 #include "nsError.h"
 #include "nsISVGChildFrame.h"
-#include "nsGUIEvent.h"
 #include "mozilla/dom/SVGSVGElement.h"
 #include "mozilla/dom/SVGSVGElementBinding.h"
 #include "nsSVGUtils.h"

content/xbl/src/nsXBLBinding.cpp

@@ -47,7 +47,6 @@
 #include "nsXBLBinding.h"
 #include "nsIPrincipal.h"
 #include "nsIScriptSecurityManager.h"
-#include "nsGUIEvent.h"
 #include "mozilla/dom/XBLChildrenElement.h"
 
 #include "prprf.h"