Bug 946065. Part 5: Move content/events to dom/ and flatten away 'src' directory. r=Ms2ger
authorRobert O'Callahan <robert@ocallahan.org>
Fri, 10 Jan 2014 16:03:25 +1300
changeset 179459 35dddd51e275f6a296a79bfaea84db81b3c6ffb2
parent 179458 50be01b3989c5f430f6e78fd986e0c96dae4416a
child 179460 310cc26b4082dc03396d7b25b01b41c4867b7a98
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMs2ger
bugs946065
milestone29.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 946065. Part 5: Move content/events to dom/ and flatten away 'src' directory. r=Ms2ger
accessible/src/windows/msaa/moz.build
content/base/src/moz.build
content/events/crashtests/104310-1.html
content/events/crashtests/116206-1.html
content/events/crashtests/135345-1.html
content/events/crashtests/422009-1.xhtml
content/events/crashtests/457776-1.html
content/events/crashtests/496308-1.html
content/events/crashtests/682637-1.html
content/events/crashtests/crashtests.list
content/events/crashtests/eventctor-nulldictionary.html
content/events/crashtests/eventctor-nullstorage.html
content/events/crashtests/recursive-DOMNodeInserted.html
content/events/crashtests/recursive-onload.html
content/events/moz.build
content/events/public/EventTarget.h
content/events/public/MutationEvent.h
content/events/public/moz.build
content/events/public/nsAsyncDOMEvent.h
content/events/public/nsDOMKeyNameList.h
content/events/public/nsEventDispatcher.h
content/events/public/nsEventNameList.h
content/events/public/nsEventStates.h
content/events/public/nsIEventListenerService.idl
content/events/public/nsIPrivateTextEvent.h
content/events/public/nsIPrivateTextRange.h
content/events/public/nsVKList.h
content/events/src/DOMWheelEvent.cpp
content/events/src/DOMWheelEvent.h
content/events/src/EventTarget.cpp
content/events/src/PointerEvent.cpp
content/events/src/PointerEvent.h
content/events/src/SpeechRecognitionError.cpp
content/events/src/SpeechRecognitionError.h
content/events/src/TextComposition.cpp
content/events/src/TextComposition.h
content/events/src/Touch.cpp
content/events/src/Touch.h
content/events/src/moz.build
content/events/src/nsAsyncDOMEvent.cpp
content/events/src/nsContentEventHandler.cpp
content/events/src/nsContentEventHandler.h
content/events/src/nsDOMAnimationEvent.cpp
content/events/src/nsDOMAnimationEvent.h
content/events/src/nsDOMBeforeUnloadEvent.cpp
content/events/src/nsDOMBeforeUnloadEvent.h
content/events/src/nsDOMClipboardEvent.cpp
content/events/src/nsDOMClipboardEvent.h
content/events/src/nsDOMCommandEvent.cpp
content/events/src/nsDOMCommandEvent.h
content/events/src/nsDOMCompositionEvent.cpp
content/events/src/nsDOMCompositionEvent.h
content/events/src/nsDOMDataContainerEvent.cpp
content/events/src/nsDOMDataContainerEvent.h
content/events/src/nsDOMDataTransfer.cpp
content/events/src/nsDOMDataTransfer.h
content/events/src/nsDOMDeviceMotionEvent.cpp
content/events/src/nsDOMDeviceMotionEvent.h
content/events/src/nsDOMDragEvent.cpp
content/events/src/nsDOMDragEvent.h
content/events/src/nsDOMEvent.cpp
content/events/src/nsDOMEvent.h
content/events/src/nsDOMEventTargetHelper.cpp
content/events/src/nsDOMEventTargetHelper.h
content/events/src/nsDOMFocusEvent.cpp
content/events/src/nsDOMFocusEvent.h
content/events/src/nsDOMKeyboardEvent.cpp
content/events/src/nsDOMKeyboardEvent.h
content/events/src/nsDOMMessageEvent.cpp
content/events/src/nsDOMMessageEvent.h
content/events/src/nsDOMMouseEvent.cpp
content/events/src/nsDOMMouseEvent.h
content/events/src/nsDOMMouseScrollEvent.cpp
content/events/src/nsDOMMouseScrollEvent.h
content/events/src/nsDOMMutationEvent.cpp
content/events/src/nsDOMMutationEvent.h
content/events/src/nsDOMNotifyAudioAvailableEvent.cpp
content/events/src/nsDOMNotifyAudioAvailableEvent.h
content/events/src/nsDOMNotifyPaintEvent.cpp
content/events/src/nsDOMNotifyPaintEvent.h
content/events/src/nsDOMScrollAreaEvent.cpp
content/events/src/nsDOMScrollAreaEvent.h
content/events/src/nsDOMSimpleGestureEvent.cpp
content/events/src/nsDOMSimpleGestureEvent.h
content/events/src/nsDOMTextEvent.cpp
content/events/src/nsDOMTextEvent.h
content/events/src/nsDOMTouchEvent.cpp
content/events/src/nsDOMTouchEvent.h
content/events/src/nsDOMTransitionEvent.cpp
content/events/src/nsDOMTransitionEvent.h
content/events/src/nsDOMUIEvent.cpp
content/events/src/nsDOMUIEvent.h
content/events/src/nsDOMXULCommandEvent.cpp
content/events/src/nsDOMXULCommandEvent.h
content/events/src/nsEventDispatcher.cpp
content/events/src/nsEventListenerManager.cpp
content/events/src/nsEventListenerManager.h
content/events/src/nsEventListenerService.cpp
content/events/src/nsEventListenerService.h
content/events/src/nsEventStateManager.cpp
content/events/src/nsEventStateManager.h
content/events/src/nsIMEStateManager.cpp
content/events/src/nsIMEStateManager.h
content/events/src/nsPaintRequest.cpp
content/events/src/nsPaintRequest.h
content/events/src/nsPrivateTextRange.cpp
content/events/src/nsPrivateTextRange.h
content/events/test/bug226361_iframe.xhtml
content/events/test/bug299673.js
content/events/test/bug322588-popup.html
content/events/test/bug415498-doc1.html
content/events/test/bug415498-doc2.html
content/events/test/bug426082.html
content/events/test/bug457672.html
content/events/test/bug591249_iframe.xul
content/events/test/bug602962.xul
content/events/test/bug656379-1.html
content/events/test/chrome.ini
content/events/test/empty.js
content/events/test/file_bug679494.html
content/events/test/mochitest.ini
content/events/test/test_addEventListenerExtraArg.html
content/events/test/test_all_synthetic_events.html
content/events/test/test_bug226361.xhtml
content/events/test/test_bug238987.html
content/events/test/test_bug288392.html
content/events/test/test_bug299673-1.html
content/events/test/test_bug299673-2.html
content/events/test/test_bug322588.html
content/events/test/test_bug328885.html
content/events/test/test_bug336682.js
content/events/test/test_bug336682_1.html
content/events/test/test_bug336682_2.xul
content/events/test/test_bug367781.html
content/events/test/test_bug368835.html
content/events/test/test_bug379120.html
content/events/test/test_bug391568.xhtml
content/events/test/test_bug402089.html
content/events/test/test_bug405632.html
content/events/test/test_bug409604.html
content/events/test/test_bug412567.html
content/events/test/test_bug415498.xul
content/events/test/test_bug422132.html
content/events/test/test_bug426082.html
content/events/test/test_bug427537.html
content/events/test/test_bug428988.html
content/events/test/test_bug432698.html
content/events/test/test_bug443985.html
content/events/test/test_bug447736.html
content/events/test/test_bug448602.html
content/events/test/test_bug450876.html
content/events/test/test_bug456273.html
content/events/test/test_bug457672.html
content/events/test/test_bug489671.html
content/events/test/test_bug493251.html
content/events/test/test_bug502818.html
content/events/test/test_bug508479.html
content/events/test/test_bug517851.html
content/events/test/test_bug534833.html
content/events/test/test_bug545268.html
content/events/test/test_bug547996-1.html
content/events/test/test_bug547996-2.xhtml
content/events/test/test_bug556493.html
content/events/test/test_bug563329.html
content/events/test/test_bug574663.html
content/events/test/test_bug586961.xul
content/events/test/test_bug591249.xul
content/events/test/test_bug591815.html
content/events/test/test_bug593959.html
content/events/test/test_bug602962.xul
content/events/test/test_bug603008.html
content/events/test/test_bug605242.html
content/events/test/test_bug607464.html
content/events/test/test_bug613634.html
content/events/test/test_bug615597.html
content/events/test/test_bug617528.xul
content/events/test/test_bug624127.html
content/events/test/test_bug635465.html
content/events/test/test_bug641477.html
content/events/test/test_bug648573.html
content/events/test/test_bug650493.html
content/events/test/test_bug656379-1.html
content/events/test/test_bug656379-2.html
content/events/test/test_bug656954.html
content/events/test/test_bug659071.html
content/events/test/test_bug659350.html
content/events/test/test_bug662678.html
content/events/test/test_bug667612.html
content/events/test/test_bug667919-1.html
content/events/test/test_bug679494.xul
content/events/test/test_bug689564.html
content/events/test/test_bug698929.html
content/events/test/test_bug741666.html
content/events/test/test_bug742376.html
content/events/test/test_bug812744.html
content/events/test/test_bug822898.html
content/events/test/test_bug847597.html
content/events/test/test_bug855741.html
content/events/test/test_bug864040.html
content/events/test/test_bug930374-chrome.html
content/events/test/test_bug930374-content.html
content/events/test/test_bug944011.html
content/events/test/test_bug944847.html
content/events/test/test_bug946632.html
content/events/test/test_clickevent_on_input.html
content/events/test/test_continuous_wheel_events.html
content/events/test/test_dblclick_explicit_original_target.html
content/events/test/test_dom_keyboard_event.html
content/events/test/test_dom_mouse_event.html
content/events/test/test_dom_wheel_event.html
content/events/test/test_draggableprop.html
content/events/test/test_dragstart.html
content/events/test/test_eventctors.html
content/events/test/test_eventctors.xul
content/events/test/test_focus_disabled.html
content/events/test/test_messageEvent.html
content/events/test/test_moz_mouse_pixel_scroll_event.html
content/events/test/test_wheel_default_action.html
content/events/test/window_bug493251.html
content/events/test/window_bug617528.xul
content/events/test/window_bug659071.html
content/events/test/window_wheel_default_action.html
content/html/content/src/moz.build
content/html/document/src/moz.build
content/moz.build
content/svg/content/src/moz.build
content/svg/document/src/moz.build
content/xml/document/src/moz.build
content/xul/content/src/moz.build
content/xul/document/src/moz.build
dom/base/moz.build
dom/base/nsIJSEventListener.h
dom/battery/moz.build
dom/bindings/moz.build
dom/devicestorage/moz.build
dom/events/DOMWheelEvent.cpp
dom/events/DOMWheelEvent.h
dom/events/EventTarget.cpp
dom/events/EventTarget.h
dom/events/MutationEvent.h
dom/events/PointerEvent.cpp
dom/events/PointerEvent.h
dom/events/SpeechRecognitionError.cpp
dom/events/SpeechRecognitionError.h
dom/events/TextComposition.cpp
dom/events/TextComposition.h
dom/events/Touch.cpp
dom/events/Touch.h
dom/events/crashtests/104310-1.html
dom/events/crashtests/116206-1.html
dom/events/crashtests/135345-1.html
dom/events/crashtests/422009-1.xhtml
dom/events/crashtests/457776-1.html
dom/events/crashtests/496308-1.html
dom/events/crashtests/682637-1.html
dom/events/crashtests/crashtests.list
dom/events/crashtests/eventctor-nulldictionary.html
dom/events/crashtests/eventctor-nullstorage.html
dom/events/crashtests/recursive-DOMNodeInserted.html
dom/events/crashtests/recursive-onload.html
dom/events/moz.build
dom/events/nsAsyncDOMEvent.cpp
dom/events/nsAsyncDOMEvent.h
dom/events/nsContentEventHandler.cpp
dom/events/nsContentEventHandler.h
dom/events/nsDOMAnimationEvent.cpp
dom/events/nsDOMAnimationEvent.h
dom/events/nsDOMBeforeUnloadEvent.cpp
dom/events/nsDOMBeforeUnloadEvent.h
dom/events/nsDOMClipboardEvent.cpp
dom/events/nsDOMClipboardEvent.h
dom/events/nsDOMCommandEvent.cpp
dom/events/nsDOMCommandEvent.h
dom/events/nsDOMCompositionEvent.cpp
dom/events/nsDOMCompositionEvent.h
dom/events/nsDOMDataContainerEvent.cpp
dom/events/nsDOMDataContainerEvent.h
dom/events/nsDOMDataTransfer.cpp
dom/events/nsDOMDataTransfer.h
dom/events/nsDOMDeviceMotionEvent.cpp
dom/events/nsDOMDeviceMotionEvent.h
dom/events/nsDOMDragEvent.cpp
dom/events/nsDOMDragEvent.h
dom/events/nsDOMEvent.cpp
dom/events/nsDOMEvent.h
dom/events/nsDOMEventTargetHelper.cpp
dom/events/nsDOMEventTargetHelper.h
dom/events/nsDOMFocusEvent.cpp
dom/events/nsDOMFocusEvent.h
dom/events/nsDOMKeyNameList.h
dom/events/nsDOMKeyboardEvent.cpp
dom/events/nsDOMKeyboardEvent.h
dom/events/nsDOMMessageEvent.cpp
dom/events/nsDOMMessageEvent.h
dom/events/nsDOMMouseEvent.cpp
dom/events/nsDOMMouseEvent.h
dom/events/nsDOMMouseScrollEvent.cpp
dom/events/nsDOMMouseScrollEvent.h
dom/events/nsDOMMutationEvent.cpp
dom/events/nsDOMMutationEvent.h
dom/events/nsDOMNotifyAudioAvailableEvent.cpp
dom/events/nsDOMNotifyAudioAvailableEvent.h
dom/events/nsDOMNotifyPaintEvent.cpp
dom/events/nsDOMNotifyPaintEvent.h
dom/events/nsDOMScrollAreaEvent.cpp
dom/events/nsDOMScrollAreaEvent.h
dom/events/nsDOMSimpleGestureEvent.cpp
dom/events/nsDOMSimpleGestureEvent.h
dom/events/nsDOMTextEvent.cpp
dom/events/nsDOMTextEvent.h
dom/events/nsDOMTouchEvent.cpp
dom/events/nsDOMTouchEvent.h
dom/events/nsDOMTransitionEvent.cpp
dom/events/nsDOMTransitionEvent.h
dom/events/nsDOMUIEvent.cpp
dom/events/nsDOMUIEvent.h
dom/events/nsDOMXULCommandEvent.cpp
dom/events/nsDOMXULCommandEvent.h
dom/events/nsEventDispatcher.cpp
dom/events/nsEventDispatcher.h
dom/events/nsEventListenerManager.cpp
dom/events/nsEventListenerManager.h
dom/events/nsEventListenerService.cpp
dom/events/nsEventListenerService.h
dom/events/nsEventNameList.h
dom/events/nsEventStateManager.cpp
dom/events/nsEventStateManager.h
dom/events/nsEventStates.h
dom/events/nsIEventListenerService.idl
dom/events/nsIJSEventListener.h
dom/events/nsIMEStateManager.cpp
dom/events/nsIMEStateManager.h
dom/events/nsIPrivateTextEvent.h
dom/events/nsIPrivateTextRange.h
dom/events/nsJSEventListener.cpp
dom/events/nsJSEventListener.h
dom/events/nsPaintRequest.cpp
dom/events/nsPaintRequest.h
dom/events/nsPrivateTextRange.cpp
dom/events/nsPrivateTextRange.h
dom/events/nsVKList.h
dom/events/test/bug226361_iframe.xhtml
dom/events/test/bug299673.js
dom/events/test/bug322588-popup.html
dom/events/test/bug415498-doc1.html
dom/events/test/bug415498-doc2.html
dom/events/test/bug426082.html
dom/events/test/bug457672.html
dom/events/test/bug591249_iframe.xul
dom/events/test/bug602962.xul
dom/events/test/bug656379-1.html
dom/events/test/chrome.ini
dom/events/test/empty.js
dom/events/test/file_bug679494.html
dom/events/test/mochitest.ini
dom/events/test/test_addEventListenerExtraArg.html
dom/events/test/test_all_synthetic_events.html
dom/events/test/test_bug226361.xhtml
dom/events/test/test_bug238987.html
dom/events/test/test_bug288392.html
dom/events/test/test_bug299673-1.html
dom/events/test/test_bug299673-2.html
dom/events/test/test_bug322588.html
dom/events/test/test_bug328885.html
dom/events/test/test_bug336682.js
dom/events/test/test_bug336682_1.html
dom/events/test/test_bug336682_2.xul
dom/events/test/test_bug367781.html
dom/events/test/test_bug368835.html
dom/events/test/test_bug379120.html
dom/events/test/test_bug391568.xhtml
dom/events/test/test_bug402089.html
dom/events/test/test_bug405632.html
dom/events/test/test_bug409604.html
dom/events/test/test_bug412567.html
dom/events/test/test_bug415498.xul
dom/events/test/test_bug422132.html
dom/events/test/test_bug426082.html
dom/events/test/test_bug427537.html
dom/events/test/test_bug428988.html
dom/events/test/test_bug432698.html
dom/events/test/test_bug443985.html
dom/events/test/test_bug447736.html
dom/events/test/test_bug448602.html
dom/events/test/test_bug450876.html
dom/events/test/test_bug456273.html
dom/events/test/test_bug457672.html
dom/events/test/test_bug489671.html
dom/events/test/test_bug493251.html
dom/events/test/test_bug502818.html
dom/events/test/test_bug508479.html
dom/events/test/test_bug517851.html
dom/events/test/test_bug534833.html
dom/events/test/test_bug545268.html
dom/events/test/test_bug547996-1.html
dom/events/test/test_bug547996-2.xhtml
dom/events/test/test_bug556493.html
dom/events/test/test_bug563329.html
dom/events/test/test_bug574663.html
dom/events/test/test_bug586961.xul
dom/events/test/test_bug591249.xul
dom/events/test/test_bug591815.html
dom/events/test/test_bug593959.html
dom/events/test/test_bug602962.xul
dom/events/test/test_bug603008.html
dom/events/test/test_bug605242.html
dom/events/test/test_bug607464.html
dom/events/test/test_bug613634.html
dom/events/test/test_bug615597.html
dom/events/test/test_bug617528.xul
dom/events/test/test_bug624127.html
dom/events/test/test_bug635465.html
dom/events/test/test_bug641477.html
dom/events/test/test_bug648573.html
dom/events/test/test_bug650493.html
dom/events/test/test_bug656379-1.html
dom/events/test/test_bug656379-2.html
dom/events/test/test_bug656954.html
dom/events/test/test_bug659071.html
dom/events/test/test_bug659350.html
dom/events/test/test_bug662678.html
dom/events/test/test_bug667612.html
dom/events/test/test_bug667919-1.html
dom/events/test/test_bug679494.xul
dom/events/test/test_bug689564.html
dom/events/test/test_bug698929.html
dom/events/test/test_bug741666.html
dom/events/test/test_bug742376.html
dom/events/test/test_bug812744.html
dom/events/test/test_bug822898.html
dom/events/test/test_bug847597.html
dom/events/test/test_bug855741.html
dom/events/test/test_bug864040.html
dom/events/test/test_bug930374-chrome.html
dom/events/test/test_bug930374-content.html
dom/events/test/test_bug944011.html
dom/events/test/test_bug944847.html
dom/events/test/test_bug946632.html
dom/events/test/test_clickevent_on_input.html
dom/events/test/test_continuous_wheel_events.html
dom/events/test/test_dblclick_explicit_original_target.html
dom/events/test/test_dom_keyboard_event.html
dom/events/test/test_dom_mouse_event.html
dom/events/test/test_dom_wheel_event.html
dom/events/test/test_draggableprop.html
dom/events/test/test_dragstart.html
dom/events/test/test_eventctors.html
dom/events/test/test_eventctors.xul
dom/events/test/test_focus_disabled.html
dom/events/test/test_messageEvent.html
dom/events/test/test_moz_mouse_pixel_scroll_event.html
dom/events/test/test_wheel_default_action.html
dom/events/test/window_bug493251.html
dom/events/test/window_bug617528.xul
dom/events/test/window_bug659071.html
dom/events/test/window_wheel_default_action.html
dom/icc/src/moz.build
dom/indexedDB/ipc/moz.build
dom/indexedDB/moz.build
dom/ipc/moz.build
dom/moz.build
dom/network/src/moz.build
dom/smil/moz.build
dom/src/events/moz.build
dom/src/events/nsJSEventListener.cpp
dom/src/events/nsJSEventListener.h
dom/src/geolocation/moz.build
dom/src/moz.build
dom/src/notification/moz.build
dom/src/offline/moz.build
dom/src/storage/moz.build
dom/system/android/moz.build
dom/system/gonk/moz.build
dom/system/moz.build
dom/system/windows/moz.build
dom/workers/moz.build
dom/xbl/moz.build
editor/libeditor/base/moz.build
gfx/layers/moz.build
js/xpconnect/src/moz.build
layout/base/moz.build
layout/build/moz.build
layout/xul/moz.build
layout/xul/tree/moz.build
netwerk/protocol/http/moz.build
netwerk/protocol/rtsp/moz.build
netwerk/protocol/websocket/moz.build
netwerk/sctp/src/moz.build
testing/crashtest/crashtests.list
testing/mochitest/android.json
testing/mochitest/androidx86.json
testing/mochitest/b2g-debug.json
testing/mochitest/b2g-desktop.json
testing/mochitest/b2g.json
uriloader/exthandler/Makefile.in
uriloader/prefetch/Makefile.in
view/src/moz.build
widget/BasicEvents.h
widget/EventClassList.h
widget/android/moz.build
widget/gonk/moz.build
widget/windows/moz.build
--- a/accessible/src/windows/msaa/moz.build
+++ b/accessible/src/windows/msaa/moz.build
@@ -41,17 +41,17 @@ if CONFIG['MOZ_XUL']:
     UNIFIED_SOURCES += [
         'XULListboxAccessibleWrap.cpp',
         'XULMenuAccessibleWrap.cpp',
         'XULTreeGridAccessibleWrap.cpp',
     ]
 
 LOCAL_INCLUDES += [
     '../../../../content/base/src',
-    '../../../../content/events/src',
+    '../../../../dom/events',
     '../../base',
     '../../generic',
     '../../html',
     '../../xpcom',
     '../../xul',
     '../ia2',
     '../sdn',
     '../uia',
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -189,25 +189,25 @@ FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/caps/include',
-    '/content/events/src',
     '/content/html/content/src',
     '/content/html/document/src',
     '/content/xml/content/src',
     '/content/xml/document/src',
     '/content/xul/content/src',
     '/content/xul/document/src',
     '/docshell/base',
     '/dom/base',
+    '/dom/events',
     '/dom/ipc',
     '/dom/workers',
     '/dom/xbl',
     '/dom/xslt/xpath',
     '/image/src',
     '/js/ipc',
     '/js/xpconnect/src',
     '/js/xpconnect/wrappers',
deleted file mode 100644
--- a/content/events/moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-
-PARALLEL_DIRS += ['public', 'src']
-
-MOCHITEST_MANIFESTS += ['test/mochitest.ini']
-MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
deleted file mode 100644
--- a/content/events/public/moz.build
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-
-XPIDL_SOURCES += [
-    'nsIEventListenerService.idl',
-]
-
-XPIDL_MODULE = 'content_events'
-
-EXPORTS += [
-    'nsAsyncDOMEvent.h',
-    'nsDOMKeyNameList.h',
-    'nsEventDispatcher.h',
-    'nsEventNameList.h',
-    'nsEventStates.h',
-    'nsIPrivateTextEvent.h',
-    'nsIPrivateTextRange.h',
-    'nsVKList.h',
-]
-
-EXPORTS.mozilla += [
-    'MutationEvent.h',
-]
-
-EXPORTS.mozilla.dom += [
-    'EventTarget.h',
-]
-
--- a/content/html/content/src/moz.build
+++ b/content/html/content/src/moz.build
@@ -163,21 +163,21 @@ FAIL_ON_WARNINGS = True
 MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/canvas/src',
-    '/content/events/src',
     '/content/html/document/src',
     '/content/media/',
     '/content/xul/content/src',
     '/dom/base',
+    '/dom/events',
     '/dom/xbl',
     '/editor/libeditor/base',
     '/editor/libeditor/text',
     '/editor/txmgr/src',
     '/layout/forms',
     '/layout/generic',
     '/layout/style',
     '/layout/tables',
--- a/content/html/document/src/moz.build
+++ b/content/html/document/src/moz.build
@@ -26,16 +26,16 @@ UNIFIED_SOURCES += [
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '../../content/src',
     '/caps/include',
     '/content/base/src',
-    '/content/events/src',
     '/docshell/base',
     '/dom/base',
+    '/dom/events',
     '/layout/style',
     '/xpcom/ds',
 ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/content/moz.build
+++ b/content/moz.build
@@ -2,17 +2,16 @@
 # vim: set filetype=python:
 # 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/.
 
 PARALLEL_DIRS += [
     'base',
     'canvas',
-    'events',
     'html',
     'mathml/content/src',
     'media',
     'svg',
     'xml',
     'xul',
 ]
 
--- a/content/svg/content/src/moz.build
+++ b/content/svg/content/src/moz.build
@@ -245,20 +245,20 @@ UNIFIED_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
-    '/content/events/src',
     '/content/html/content/src',
     '/content/xml/content/src',
     '/dom',
+    '/dom/events',
     '/dom/smil',
     '/dom/xbl',
     '/layout/generic',
     '/layout/style',
     '/layout/svg',
     '/layout/xul',
 ]
 
--- a/content/svg/document/src/moz.build
+++ b/content/svg/document/src/moz.build
@@ -11,17 +11,17 @@ EXPORTS.mozilla.dom += [
 SOURCES += [
     'SVGDocument.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '/content/base/src',
-    '/content/events/src',
     '/content/html/document/src',
     '/content/svg/content/src',
     '/content/xml/document/src',
+    '/dom/events',
     '/layout/style',
     '/xpcom/ds',
 ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/content/xml/document/src/moz.build
+++ b/content/xml/document/src/moz.build
@@ -17,17 +17,17 @@ UNIFIED_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '/caps/include',
     '/content/base/src',
-    '/content/events/src',
     '/content/html/document/src',
     '/content/xul/content/src',
     '/dom/base',
+    '/dom/events',
     '/layout/style',
     '/xpcom/ds',
     ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/content/xul/content/src/moz.build
+++ b/content/xul/content/src/moz.build
@@ -14,20 +14,20 @@ if CONFIG['MOZ_XUL']:
     ]
 
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '../../document/src',
     '../../templates/src',
     '/content/base/src',
-    '/content/events/src',
     '/content/html/content/src',
     '/content/xml/content/src',
     '/content/xml/document/src',
+    '/dom/events',
     '/dom/xbl',
     '/layout/generic',
     '/layout/style',
     '/layout/xul',
     '/xpcom/ds',
 ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/content/xul/document/src/moz.build
+++ b/content/xul/document/src/moz.build
@@ -18,22 +18,22 @@ if CONFIG['MOZ_XUL']:
     ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '/content/base/src',
-    '/content/events/src',
     '/content/xml/document/src',
     '/content/xul/content/src',
     '/content/xul/templates/src',
     '/docshell/base',
     '/dom/base',
+    '/dom/events',
     '/dom/xbl',
     '/layout/base',
     '/layout/generic',
     '/layout/style',
     '/layout/xul',
     '/xpcom/ds',
 ]
 
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -24,17 +24,16 @@ EXPORTS += [
     'nsDOMClassInfoID.h',
     'nsDOMJSUtils.h',
     'nsDOMNavigationTiming.h',
     'nsDOMString.h',
     'nsFocusManager.h',
     'nsIDOMClassInfo.h',
     'nsIDOMScriptObjectFactory.h',
     'nsIGlobalObject.h',
-    'nsIJSEventListener.h',
     'nsIJSNativeInitializer.h',
     'nsIScriptContext.h',
     'nsIScriptExternalNameSet.h',
     'nsIScriptGlobalObject.h',
     'nsIScriptNameSpaceManager.h',
     'nsIScriptObjectPrincipal.h',
     'nsIScriptTimeoutHandler.h',
     'nsJSEnvironment.h',
@@ -133,24 +132,24 @@ EXTRA_JS_MODULES += [
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '../battery',
     '../bluetooth',
+    '../events',
     '../media',
     '../network/src',
     '../src/geolocation',
     '../src/storage',
     '../time',
     '../xbl',
     '/content/base/src',
-    '/content/events/src',
     '/content/html/document/src',
     '/content/xul/document/src',
     '/layout/generic',
     '/layout/style',
     '/layout/xul',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
--- a/dom/battery/moz.build
+++ b/dom/battery/moz.build
@@ -16,11 +16,11 @@ SOURCES += [
 ]
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
-    '/content/events/src',
+    '/dom/events',
 ]
 
--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@@ -35,29 +35,29 @@ EXPORTS.mozilla.dom += [
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/canvas/src',
-    '/content/events/src',
     '/content/html/content/src',
     '/content/html/document/src',
     '/content/media/webaudio',
     '/content/media/webspeech/recognition',
     '/content/svg/content/src',
     '/content/xml/content/src',
     '/content/xul/content/src',
     '/content/xul/document/src',
     '/dom/base',
     '/dom/battery',
     '/dom/bluetooth',
     '/dom/camera',
+    '/dom/events',
     '/dom/file',
     '/dom/indexedDB',
     '/dom/src/geolocation',
     '/dom/workers',
     '/dom/xbl',
     '/dom/xslt/base',
     '/dom/xslt/xpath',
     '/js/ipc',
--- a/dom/devicestorage/moz.build
+++ b/dom/devicestorage/moz.build
@@ -28,13 +28,13 @@ IPDL_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
-    '/content/events/src',
     '/dom/base',
+    '/dom/events',
     '/dom/ipc',
 ]
 
rename from content/events/src/DOMWheelEvent.cpp
rename to dom/events/DOMWheelEvent.cpp
rename from content/events/src/DOMWheelEvent.h
rename to dom/events/DOMWheelEvent.h
rename from content/events/src/EventTarget.cpp
rename to dom/events/EventTarget.cpp
rename from content/events/public/EventTarget.h
rename to dom/events/EventTarget.h
rename from content/events/public/MutationEvent.h
rename to dom/events/MutationEvent.h
rename from content/events/src/PointerEvent.cpp
rename to dom/events/PointerEvent.cpp
rename from content/events/src/PointerEvent.h
rename to dom/events/PointerEvent.h
rename from content/events/src/SpeechRecognitionError.cpp
rename to dom/events/SpeechRecognitionError.cpp
rename from content/events/src/SpeechRecognitionError.h
rename to dom/events/SpeechRecognitionError.h
rename from content/events/src/TextComposition.cpp
rename to dom/events/TextComposition.cpp
rename from content/events/src/TextComposition.h
rename to dom/events/TextComposition.h
rename from content/events/src/Touch.cpp
rename to dom/events/Touch.cpp
rename from content/events/src/Touch.h
rename to dom/events/Touch.h
rename from content/events/crashtests/104310-1.html
rename to dom/events/crashtests/104310-1.html
rename from content/events/crashtests/116206-1.html
rename to dom/events/crashtests/116206-1.html
rename from content/events/crashtests/135345-1.html
rename to dom/events/crashtests/135345-1.html
rename from content/events/crashtests/422009-1.xhtml
rename to dom/events/crashtests/422009-1.xhtml
rename from content/events/crashtests/457776-1.html
rename to dom/events/crashtests/457776-1.html
rename from content/events/crashtests/496308-1.html
rename to dom/events/crashtests/496308-1.html
rename from content/events/crashtests/682637-1.html
rename to dom/events/crashtests/682637-1.html
rename from content/events/crashtests/crashtests.list
rename to dom/events/crashtests/crashtests.list
rename from content/events/crashtests/eventctor-nulldictionary.html
rename to dom/events/crashtests/eventctor-nulldictionary.html
rename from content/events/crashtests/eventctor-nullstorage.html
rename to dom/events/crashtests/eventctor-nullstorage.html
rename from content/events/crashtests/recursive-DOMNodeInserted.html
rename to dom/events/crashtests/recursive-DOMNodeInserted.html
rename from content/events/crashtests/recursive-onload.html
rename to dom/events/crashtests/recursive-onload.html
rename from content/events/src/moz.build
rename to dom/events/moz.build
--- a/content/events/src/moz.build
+++ b/dom/events/moz.build
@@ -1,24 +1,47 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
+MOCHITEST_MANIFESTS += ['test/mochitest.ini']
+MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
+
+XPIDL_SOURCES += [
+    'nsIEventListenerService.idl',
+]
+
+XPIDL_MODULE = 'content_events'
+
 EXPORTS += [
+    'nsAsyncDOMEvent.h',
     'nsDOMEvent.h',
     'nsDOMEventTargetHelper.h',
+    'nsDOMKeyNameList.h',
     'nsDOMTouchEvent.h',
     'nsDOMUIEvent.h',
+    'nsEventDispatcher.h',
     'nsEventListenerManager.h',
+    'nsEventNameList.h',
     'nsEventStateManager.h',
+    'nsEventStates.h',
+    'nsIJSEventListener.h',
+    'nsIPrivateTextEvent.h',
+    'nsIPrivateTextRange.h',
+    'nsVKList.h',
+]
+
+EXPORTS.mozilla += [
+    'MutationEvent.h',
 ]
 
 EXPORTS.mozilla.dom += [
+    'EventTarget.h',
     'PointerEvent.h',
     'Touch.h',
 ]
 
 if CONFIG['MOZ_WEBSPEECH']:
     EXPORTS.mozilla.dom += ['SpeechRecognitionError.h']
 
 UNIFIED_SOURCES += [
@@ -51,16 +74,17 @@ UNIFIED_SOURCES += [
     'nsDOMTouchEvent.cpp',
     'nsDOMTransitionEvent.cpp',
     'nsDOMUIEvent.cpp',
     'nsDOMXULCommandEvent.cpp',
     'nsEventDispatcher.cpp',
     'nsEventListenerManager.cpp',
     'nsEventListenerService.cpp',
     'nsIMEStateManager.cpp',
+    'nsJSEventListener.cpp',
     'nsPaintRequest.cpp',
     'nsPrivateTextRange.cpp',
     'PointerEvent.cpp',
     'TextComposition.cpp',
     'Touch.cpp',
 ]
 
 # nsEventStateManager.cpp should be built separately because of Mac OS X headers.
rename from content/events/src/nsAsyncDOMEvent.cpp
rename to dom/events/nsAsyncDOMEvent.cpp
rename from content/events/public/nsAsyncDOMEvent.h
rename to dom/events/nsAsyncDOMEvent.h
rename from content/events/src/nsContentEventHandler.cpp
rename to dom/events/nsContentEventHandler.cpp
rename from content/events/src/nsContentEventHandler.h
rename to dom/events/nsContentEventHandler.h
rename from content/events/src/nsDOMAnimationEvent.cpp
rename to dom/events/nsDOMAnimationEvent.cpp
rename from content/events/src/nsDOMAnimationEvent.h
rename to dom/events/nsDOMAnimationEvent.h
rename from content/events/src/nsDOMBeforeUnloadEvent.cpp
rename to dom/events/nsDOMBeforeUnloadEvent.cpp
rename from content/events/src/nsDOMBeforeUnloadEvent.h
rename to dom/events/nsDOMBeforeUnloadEvent.h
rename from content/events/src/nsDOMClipboardEvent.cpp
rename to dom/events/nsDOMClipboardEvent.cpp
rename from content/events/src/nsDOMClipboardEvent.h
rename to dom/events/nsDOMClipboardEvent.h
rename from content/events/src/nsDOMCommandEvent.cpp
rename to dom/events/nsDOMCommandEvent.cpp
rename from content/events/src/nsDOMCommandEvent.h
rename to dom/events/nsDOMCommandEvent.h
rename from content/events/src/nsDOMCompositionEvent.cpp
rename to dom/events/nsDOMCompositionEvent.cpp
rename from content/events/src/nsDOMCompositionEvent.h
rename to dom/events/nsDOMCompositionEvent.h
rename from content/events/src/nsDOMDataContainerEvent.cpp
rename to dom/events/nsDOMDataContainerEvent.cpp
rename from content/events/src/nsDOMDataContainerEvent.h
rename to dom/events/nsDOMDataContainerEvent.h
rename from content/events/src/nsDOMDataTransfer.cpp
rename to dom/events/nsDOMDataTransfer.cpp
rename from content/events/src/nsDOMDataTransfer.h
rename to dom/events/nsDOMDataTransfer.h
rename from content/events/src/nsDOMDeviceMotionEvent.cpp
rename to dom/events/nsDOMDeviceMotionEvent.cpp
rename from content/events/src/nsDOMDeviceMotionEvent.h
rename to dom/events/nsDOMDeviceMotionEvent.h
rename from content/events/src/nsDOMDragEvent.cpp
rename to dom/events/nsDOMDragEvent.cpp
rename from content/events/src/nsDOMDragEvent.h
rename to dom/events/nsDOMDragEvent.h
rename from content/events/src/nsDOMEvent.cpp
rename to dom/events/nsDOMEvent.cpp
rename from content/events/src/nsDOMEvent.h
rename to dom/events/nsDOMEvent.h
rename from content/events/src/nsDOMEventTargetHelper.cpp
rename to dom/events/nsDOMEventTargetHelper.cpp
rename from content/events/src/nsDOMEventTargetHelper.h
rename to dom/events/nsDOMEventTargetHelper.h
rename from content/events/src/nsDOMFocusEvent.cpp
rename to dom/events/nsDOMFocusEvent.cpp
rename from content/events/src/nsDOMFocusEvent.h
rename to dom/events/nsDOMFocusEvent.h
rename from content/events/public/nsDOMKeyNameList.h
rename to dom/events/nsDOMKeyNameList.h
rename from content/events/src/nsDOMKeyboardEvent.cpp
rename to dom/events/nsDOMKeyboardEvent.cpp
rename from content/events/src/nsDOMKeyboardEvent.h
rename to dom/events/nsDOMKeyboardEvent.h
rename from content/events/src/nsDOMMessageEvent.cpp
rename to dom/events/nsDOMMessageEvent.cpp
rename from content/events/src/nsDOMMessageEvent.h
rename to dom/events/nsDOMMessageEvent.h
rename from content/events/src/nsDOMMouseEvent.cpp
rename to dom/events/nsDOMMouseEvent.cpp
rename from content/events/src/nsDOMMouseEvent.h
rename to dom/events/nsDOMMouseEvent.h
rename from content/events/src/nsDOMMouseScrollEvent.cpp
rename to dom/events/nsDOMMouseScrollEvent.cpp
rename from content/events/src/nsDOMMouseScrollEvent.h
rename to dom/events/nsDOMMouseScrollEvent.h
rename from content/events/src/nsDOMMutationEvent.cpp
rename to dom/events/nsDOMMutationEvent.cpp
rename from content/events/src/nsDOMMutationEvent.h
rename to dom/events/nsDOMMutationEvent.h
rename from content/events/src/nsDOMNotifyAudioAvailableEvent.cpp
rename to dom/events/nsDOMNotifyAudioAvailableEvent.cpp
rename from content/events/src/nsDOMNotifyAudioAvailableEvent.h
rename to dom/events/nsDOMNotifyAudioAvailableEvent.h
rename from content/events/src/nsDOMNotifyPaintEvent.cpp
rename to dom/events/nsDOMNotifyPaintEvent.cpp
rename from content/events/src/nsDOMNotifyPaintEvent.h
rename to dom/events/nsDOMNotifyPaintEvent.h
rename from content/events/src/nsDOMScrollAreaEvent.cpp
rename to dom/events/nsDOMScrollAreaEvent.cpp
rename from content/events/src/nsDOMScrollAreaEvent.h
rename to dom/events/nsDOMScrollAreaEvent.h
rename from content/events/src/nsDOMSimpleGestureEvent.cpp
rename to dom/events/nsDOMSimpleGestureEvent.cpp
rename from content/events/src/nsDOMSimpleGestureEvent.h
rename to dom/events/nsDOMSimpleGestureEvent.h
rename from content/events/src/nsDOMTextEvent.cpp
rename to dom/events/nsDOMTextEvent.cpp
rename from content/events/src/nsDOMTextEvent.h
rename to dom/events/nsDOMTextEvent.h
rename from content/events/src/nsDOMTouchEvent.cpp
rename to dom/events/nsDOMTouchEvent.cpp
rename from content/events/src/nsDOMTouchEvent.h
rename to dom/events/nsDOMTouchEvent.h
rename from content/events/src/nsDOMTransitionEvent.cpp
rename to dom/events/nsDOMTransitionEvent.cpp
rename from content/events/src/nsDOMTransitionEvent.h
rename to dom/events/nsDOMTransitionEvent.h
rename from content/events/src/nsDOMUIEvent.cpp
rename to dom/events/nsDOMUIEvent.cpp
rename from content/events/src/nsDOMUIEvent.h
rename to dom/events/nsDOMUIEvent.h
rename from content/events/src/nsDOMXULCommandEvent.cpp
rename to dom/events/nsDOMXULCommandEvent.cpp
rename from content/events/src/nsDOMXULCommandEvent.h
rename to dom/events/nsDOMXULCommandEvent.h
rename from content/events/src/nsEventDispatcher.cpp
rename to dom/events/nsEventDispatcher.cpp
rename from content/events/public/nsEventDispatcher.h
rename to dom/events/nsEventDispatcher.h
rename from content/events/src/nsEventListenerManager.cpp
rename to dom/events/nsEventListenerManager.cpp
rename from content/events/src/nsEventListenerManager.h
rename to dom/events/nsEventListenerManager.h
rename from content/events/src/nsEventListenerService.cpp
rename to dom/events/nsEventListenerService.cpp
rename from content/events/src/nsEventListenerService.h
rename to dom/events/nsEventListenerService.h
rename from content/events/public/nsEventNameList.h
rename to dom/events/nsEventNameList.h
rename from content/events/src/nsEventStateManager.cpp
rename to dom/events/nsEventStateManager.cpp
rename from content/events/src/nsEventStateManager.h
rename to dom/events/nsEventStateManager.h
rename from content/events/public/nsEventStates.h
rename to dom/events/nsEventStates.h
rename from content/events/public/nsIEventListenerService.idl
rename to dom/events/nsIEventListenerService.idl
rename from dom/base/nsIJSEventListener.h
rename to dom/events/nsIJSEventListener.h
rename from content/events/src/nsIMEStateManager.cpp
rename to dom/events/nsIMEStateManager.cpp
rename from content/events/src/nsIMEStateManager.h
rename to dom/events/nsIMEStateManager.h
rename from content/events/public/nsIPrivateTextEvent.h
rename to dom/events/nsIPrivateTextEvent.h
rename from content/events/public/nsIPrivateTextRange.h
rename to dom/events/nsIPrivateTextRange.h
rename from dom/src/events/nsJSEventListener.cpp
rename to dom/events/nsJSEventListener.cpp
rename from dom/src/events/nsJSEventListener.h
rename to dom/events/nsJSEventListener.h
rename from content/events/src/nsPaintRequest.cpp
rename to dom/events/nsPaintRequest.cpp
rename from content/events/src/nsPaintRequest.h
rename to dom/events/nsPaintRequest.h
rename from content/events/src/nsPrivateTextRange.cpp
rename to dom/events/nsPrivateTextRange.cpp
rename from content/events/src/nsPrivateTextRange.h
rename to dom/events/nsPrivateTextRange.h
rename from content/events/public/nsVKList.h
rename to dom/events/nsVKList.h
rename from content/events/test/bug226361_iframe.xhtml
rename to dom/events/test/bug226361_iframe.xhtml
rename from content/events/test/bug299673.js
rename to dom/events/test/bug299673.js
rename from content/events/test/bug322588-popup.html
rename to dom/events/test/bug322588-popup.html
rename from content/events/test/bug415498-doc1.html
rename to dom/events/test/bug415498-doc1.html
rename from content/events/test/bug415498-doc2.html
rename to dom/events/test/bug415498-doc2.html
rename from content/events/test/bug426082.html
rename to dom/events/test/bug426082.html
rename from content/events/test/bug457672.html
rename to dom/events/test/bug457672.html
rename from content/events/test/bug591249_iframe.xul
rename to dom/events/test/bug591249_iframe.xul
rename from content/events/test/bug602962.xul
rename to dom/events/test/bug602962.xul
rename from content/events/test/bug656379-1.html
rename to dom/events/test/bug656379-1.html
rename from content/events/test/chrome.ini
rename to dom/events/test/chrome.ini
rename from content/events/test/empty.js
rename to dom/events/test/empty.js
rename from content/events/test/file_bug679494.html
rename to dom/events/test/file_bug679494.html
rename from content/events/test/mochitest.ini
rename to dom/events/test/mochitest.ini
rename from content/events/test/test_addEventListenerExtraArg.html
rename to dom/events/test/test_addEventListenerExtraArg.html
rename from content/events/test/test_all_synthetic_events.html
rename to dom/events/test/test_all_synthetic_events.html
rename from content/events/test/test_bug226361.xhtml
rename to dom/events/test/test_bug226361.xhtml
rename from content/events/test/test_bug238987.html
rename to dom/events/test/test_bug238987.html
rename from content/events/test/test_bug288392.html
rename to dom/events/test/test_bug288392.html
rename from content/events/test/test_bug299673-1.html
rename to dom/events/test/test_bug299673-1.html
rename from content/events/test/test_bug299673-2.html
rename to dom/events/test/test_bug299673-2.html
rename from content/events/test/test_bug322588.html
rename to dom/events/test/test_bug322588.html
rename from content/events/test/test_bug328885.html
rename to dom/events/test/test_bug328885.html
rename from content/events/test/test_bug336682.js
rename to dom/events/test/test_bug336682.js
rename from content/events/test/test_bug336682_1.html
rename to dom/events/test/test_bug336682_1.html
rename from content/events/test/test_bug336682_2.xul
rename to dom/events/test/test_bug336682_2.xul
rename from content/events/test/test_bug367781.html
rename to dom/events/test/test_bug367781.html
rename from content/events/test/test_bug368835.html
rename to dom/events/test/test_bug368835.html
rename from content/events/test/test_bug379120.html
rename to dom/events/test/test_bug379120.html
rename from content/events/test/test_bug391568.xhtml
rename to dom/events/test/test_bug391568.xhtml
rename from content/events/test/test_bug402089.html
rename to dom/events/test/test_bug402089.html
rename from content/events/test/test_bug405632.html
rename to dom/events/test/test_bug405632.html
rename from content/events/test/test_bug409604.html
rename to dom/events/test/test_bug409604.html
rename from content/events/test/test_bug412567.html
rename to dom/events/test/test_bug412567.html
rename from content/events/test/test_bug415498.xul
rename to dom/events/test/test_bug415498.xul
rename from content/events/test/test_bug422132.html
rename to dom/events/test/test_bug422132.html
rename from content/events/test/test_bug426082.html
rename to dom/events/test/test_bug426082.html
rename from content/events/test/test_bug427537.html
rename to dom/events/test/test_bug427537.html
rename from content/events/test/test_bug428988.html
rename to dom/events/test/test_bug428988.html
rename from content/events/test/test_bug432698.html
rename to dom/events/test/test_bug432698.html
rename from content/events/test/test_bug443985.html
rename to dom/events/test/test_bug443985.html
rename from content/events/test/test_bug447736.html
rename to dom/events/test/test_bug447736.html
rename from content/events/test/test_bug448602.html
rename to dom/events/test/test_bug448602.html
rename from content/events/test/test_bug450876.html
rename to dom/events/test/test_bug450876.html
rename from content/events/test/test_bug456273.html
rename to dom/events/test/test_bug456273.html
rename from content/events/test/test_bug457672.html
rename to dom/events/test/test_bug457672.html
rename from content/events/test/test_bug489671.html
rename to dom/events/test/test_bug489671.html
rename from content/events/test/test_bug493251.html
rename to dom/events/test/test_bug493251.html
rename from content/events/test/test_bug502818.html
rename to dom/events/test/test_bug502818.html
rename from content/events/test/test_bug508479.html
rename to dom/events/test/test_bug508479.html
rename from content/events/test/test_bug517851.html
rename to dom/events/test/test_bug517851.html
rename from content/events/test/test_bug534833.html
rename to dom/events/test/test_bug534833.html
rename from content/events/test/test_bug545268.html
rename to dom/events/test/test_bug545268.html
rename from content/events/test/test_bug547996-1.html
rename to dom/events/test/test_bug547996-1.html
rename from content/events/test/test_bug547996-2.xhtml
rename to dom/events/test/test_bug547996-2.xhtml
rename from content/events/test/test_bug556493.html
rename to dom/events/test/test_bug556493.html
rename from content/events/test/test_bug563329.html
rename to dom/events/test/test_bug563329.html
rename from content/events/test/test_bug574663.html
rename to dom/events/test/test_bug574663.html
rename from content/events/test/test_bug586961.xul
rename to dom/events/test/test_bug586961.xul
rename from content/events/test/test_bug591249.xul
rename to dom/events/test/test_bug591249.xul
--- a/content/events/test/test_bug591249.xul
+++ b/dom/events/test/test_bug591249.xul
@@ -10,17 +10,17 @@ https://bugzilla.mozilla.org/show_bug.cg
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
   <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>
 
 <body xmlns="http://www.w3.org/1999/xhtml">
   <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=591249">Mozilla Bug 591249</a>
   <img id="image"
        src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAIAAAAC64paAAAAG0lEQVR42mP8z0A%2BYKJA76jmUc2jmkc1U0EzACKcASfOgGoMAAAAAElFTkSuQmCC"
        ondragstart="event.preventDefault();"/>
-  <iframe id="iframe" src="chrome://mochitests/content/chrome/content/events/test/bug591249_iframe.xul" style="height: 300px; width: 100%;"></iframe>
+  <iframe id="iframe" src="chrome://mochitests/content/chrome/dom/events/test/bug591249_iframe.xul" style="height: 300px; width: 100%;"></iframe>
 </body>
 
 <script class="testbody" type="application/javascript;version=1.8"><![CDATA[
 /** Test for Bug 591249 **/
 
 SimpleTest.waitForExplicitFinish();
 
 function completeTest(aBox) {
rename from content/events/test/test_bug591815.html
rename to dom/events/test/test_bug591815.html
rename from content/events/test/test_bug593959.html
rename to dom/events/test/test_bug593959.html
rename from content/events/test/test_bug602962.xul
rename to dom/events/test/test_bug602962.xul
--- a/content/events/test/test_bug602962.xul
+++ b/dom/events/test/test_bug602962.xul
@@ -21,17 +21,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 /** Test for Bug 602962 **/
 var scrollbox, sbo, content;
 var scrollX = 0, scrollY = 0;
 
 var oldWidth = 0, oldHeight = 0;
 var win = null;
 
 function openWindow() {
-  win = window.open("chrome://mochitests/content/chrome/content/events/test/bug602962.xul", "_blank", "width=600,height=600");
+  win = window.open("chrome://mochitests/content/chrome/dom/events/test/bug602962.xul", "_blank", "width=600,height=600");
 }
 
 function doTest() {
   scrollbox = win.document.getElementById("page-scrollbox");
   sbo = scrollbox.boxObject.QueryInterface(Components.interfaces.nsIScrollBoxObject);
   content = win.document.getElementById("page-box");
   content.style.width = 400 + "px";
   
rename from content/events/test/test_bug603008.html
rename to dom/events/test/test_bug603008.html
rename from content/events/test/test_bug605242.html
rename to dom/events/test/test_bug605242.html
rename from content/events/test/test_bug607464.html
rename to dom/events/test/test_bug607464.html
rename from content/events/test/test_bug613634.html
rename to dom/events/test/test_bug613634.html
rename from content/events/test/test_bug615597.html
rename to dom/events/test/test_bug615597.html
rename from content/events/test/test_bug617528.xul
rename to dom/events/test/test_bug617528.xul
rename from content/events/test/test_bug624127.html
rename to dom/events/test/test_bug624127.html
rename from content/events/test/test_bug635465.html
rename to dom/events/test/test_bug635465.html
rename from content/events/test/test_bug641477.html
rename to dom/events/test/test_bug641477.html
rename from content/events/test/test_bug648573.html
rename to dom/events/test/test_bug648573.html
rename from content/events/test/test_bug650493.html
rename to dom/events/test/test_bug650493.html
rename from content/events/test/test_bug656379-1.html
rename to dom/events/test/test_bug656379-1.html
rename from content/events/test/test_bug656379-2.html
rename to dom/events/test/test_bug656379-2.html
rename from content/events/test/test_bug656954.html
rename to dom/events/test/test_bug656954.html
rename from content/events/test/test_bug659071.html
rename to dom/events/test/test_bug659071.html
rename from content/events/test/test_bug659350.html
rename to dom/events/test/test_bug659350.html
rename from content/events/test/test_bug662678.html
rename to dom/events/test/test_bug662678.html
rename from content/events/test/test_bug667612.html
rename to dom/events/test/test_bug667612.html
rename from content/events/test/test_bug667919-1.html
rename to dom/events/test/test_bug667919-1.html
rename from content/events/test/test_bug679494.xul
rename to dom/events/test/test_bug679494.xul
rename from content/events/test/test_bug689564.html
rename to dom/events/test/test_bug689564.html
rename from content/events/test/test_bug698929.html
rename to dom/events/test/test_bug698929.html
rename from content/events/test/test_bug741666.html
rename to dom/events/test/test_bug741666.html
rename from content/events/test/test_bug742376.html
rename to dom/events/test/test_bug742376.html
rename from content/events/test/test_bug812744.html
rename to dom/events/test/test_bug812744.html
rename from content/events/test/test_bug822898.html
rename to dom/events/test/test_bug822898.html
rename from content/events/test/test_bug847597.html
rename to dom/events/test/test_bug847597.html
rename from content/events/test/test_bug855741.html
rename to dom/events/test/test_bug855741.html
rename from content/events/test/test_bug864040.html
rename to dom/events/test/test_bug864040.html
--- a/content/events/test/test_bug864040.html
+++ b/dom/events/test/test_bug864040.html
@@ -6,17 +6,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 <head>
   <meta charset="utf-8">
   <title>Test for Bug 864040</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
   <script type="application/javascript" src="/tests/SimpleTest/WindowSnapshot.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 </head>
-<body onload="setTimeout(runTests, 0);">
+<body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=864040">Mozilla Bug 864040</a>
 <div id="display">
   <textarea id="ta" rows="5" cols="20"></textarea>
   <div id="ce" contentEditable="true" style="height: 5em;"></div>
 </div>
 <div id="content" style="display: none">
 </div>
 <pre id="test">
@@ -74,12 +74,14 @@ https://bugzilla.mozilla.org/show_bug.cg
       // test textarea
       testSelectEndOfText(document.getElementById('ta'));
       // test contentEditable
       testSelectEndOfText(document.getElementById('ce'));
       SimpleTest.finish();
     }
 
     SimpleTest.waitForExplicitFinish();
+
+    SimpleTest.waitForFocus(runTests);
   </script>
 </pre>
 </body>
 </html>
rename from content/events/test/test_bug930374-chrome.html
rename to dom/events/test/test_bug930374-chrome.html
rename from content/events/test/test_bug930374-content.html
rename to dom/events/test/test_bug930374-content.html
rename from content/events/test/test_bug944011.html
rename to dom/events/test/test_bug944011.html
rename from content/events/test/test_bug944847.html
rename to dom/events/test/test_bug944847.html
rename from content/events/test/test_bug946632.html
rename to dom/events/test/test_bug946632.html
rename from content/events/test/test_clickevent_on_input.html
rename to dom/events/test/test_clickevent_on_input.html
rename from content/events/test/test_continuous_wheel_events.html
rename to dom/events/test/test_continuous_wheel_events.html
rename from content/events/test/test_dblclick_explicit_original_target.html
rename to dom/events/test/test_dblclick_explicit_original_target.html
rename from content/events/test/test_dom_keyboard_event.html
rename to dom/events/test/test_dom_keyboard_event.html
rename from content/events/test/test_dom_mouse_event.html
rename to dom/events/test/test_dom_mouse_event.html
rename from content/events/test/test_dom_wheel_event.html
rename to dom/events/test/test_dom_wheel_event.html
rename from content/events/test/test_draggableprop.html
rename to dom/events/test/test_draggableprop.html
rename from content/events/test/test_dragstart.html
rename to dom/events/test/test_dragstart.html
rename from content/events/test/test_eventctors.html
rename to dom/events/test/test_eventctors.html
rename from content/events/test/test_eventctors.xul
rename to dom/events/test/test_eventctors.xul
rename from content/events/test/test_focus_disabled.html
rename to dom/events/test/test_focus_disabled.html
rename from content/events/test/test_messageEvent.html
rename to dom/events/test/test_messageEvent.html
rename from content/events/test/test_moz_mouse_pixel_scroll_event.html
rename to dom/events/test/test_moz_mouse_pixel_scroll_event.html
rename from content/events/test/test_wheel_default_action.html
rename to dom/events/test/test_wheel_default_action.html
rename from content/events/test/window_bug493251.html
rename to dom/events/test/window_bug493251.html
rename from content/events/test/window_bug617528.xul
rename to dom/events/test/window_bug617528.xul
rename from content/events/test/window_bug659071.html
rename to dom/events/test/window_bug659071.html
rename from content/events/test/window_wheel_default_action.html
rename to dom/events/test/window_wheel_default_action.html
--- a/dom/icc/src/moz.build
+++ b/dom/icc/src/moz.build
@@ -18,11 +18,11 @@ SOURCES += [
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 
 LOCAL_INCLUDES += [
     '../../system/gonk',
-    '/content/events/src',
+    '/dom/events',
 ]
 
--- a/dom/indexedDB/ipc/moz.build
+++ b/dom/indexedDB/ipc/moz.build
@@ -31,12 +31,12 @@ IPDL_SOURCES += [
 FAIL_ON_WARNINGS = True
 
 MOCHITEST_MANIFESTS += ['mochitest.ini']
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
-    '/content/events/src',
+    '/dom/events',
     '/dom/indexedDB',
 ]
 
--- a/dom/indexedDB/moz.build
+++ b/dom/indexedDB/moz.build
@@ -67,16 +67,16 @@ SOURCES += [
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/caps/include',
     '/content/base/src',
-    '/content/events/src',
     '/db/sqlite3/src',
     '/dom/base',
+    '/dom/events',
     '/dom/quota',
     '/dom/src/storage',
     '/xpcom/build',
 ]
 
--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -81,23 +81,23 @@ include('/ipc/chromium/chromium-config.m
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../src/base',
     '../src/geolocation',
     '../src/storage',
     '/chrome/src',
     '/content/base/src',
-    '/content/events/src',
     '/content/media/webspeech/synth/ipc',
     '/docshell/base',
     '/dom/base',
     '/dom/bluetooth',
     '/dom/bluetooth/ipc',
     '/dom/devicestorage',
+    '/dom/events',
     '/dom/fmradio/ipc',
     '/dom/indexedDB',
     '/dom/indexedDB/ipc',
     '/dom/mobilemessage/src/ipc',
     '/extensions/cookie',
     '/hal/sandbox',
     '/js/ipc',
     '/layout/base',
@@ -112,9 +112,9 @@ DEFINES['BIN_SUFFIX'] = '"%s"' % CONFIG[
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gonk', 'qt'):
     DEFINES['MOZ_ENABLE_FREETYPE'] = True
 
 for var in ('MOZ_PERMISSIONS', 'MOZ_CHILD_PERMISSIONS'):
     if CONFIG[var]:
         DEFINES[var] = True
 
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
+JAR_MANIFESTS += ['jar.mn']
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -43,16 +43,17 @@ PARALLEL_DIRS += [
     'bluetooth',
     'browser-element',
     'contacts',
     'phonenumberutils',
     'alarm',
     'datastore',
     'devicestorage',
     'encoding',
+    'events',
     'file',
     'fmradio',
     'asmjscache',
     'media',
     'messages',
     'power',
     'push',
     'quota',
--- a/dom/network/src/moz.build
+++ b/dom/network/src/moz.build
@@ -66,11 +66,11 @@ IPDL_SOURCES += [
 ]
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
-    '/content/events/src',
+    '/dom/events',
 ]
 
--- a/dom/smil/moz.build
+++ b/dom/smil/moz.build
@@ -58,14 +58,14 @@ UNIFIED_SOURCES += [
     'SMILIntegerType.cpp',
     'SMILStringType.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '/content/base/src',
-    '/content/events/src',
     '/content/svg/content/src',
+    '/dom/events',
     '/layout/style',
 ]
 
 FINAL_LIBRARY = 'gklayout'
deleted file mode 100644
--- a/dom/src/events/moz.build
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-
-UNIFIED_SOURCES += [
-    'nsJSEventListener.cpp',
-]
-
-FAIL_ON_WARNINGS = True
-
-MSVC_ENABLE_PGO = True
-
-LOCAL_INCLUDES += [
-    "/content/base/src",
-    "/dom/base",
-]
-
-FINAL_LIBRARY = 'gklayout'
--- a/dom/src/geolocation/moz.build
+++ b/dom/src/geolocation/moz.build
@@ -16,18 +16,18 @@ UNIFIED_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
-    '/content/events/src',
     '/dom/base',
+    '/dom/events',
     '/dom/ipc',
 ]
 
 if CONFIG['MOZ_ENABLE_QTMOBILITY']:
     LOCAL_INCLUDES += [
         '/dom/system/unix',
     ]
 
--- a/dom/src/moz.build
+++ b/dom/src/moz.build
@@ -1,17 +1,16 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
 DIRS += [
     'jsurl',
-    'events',
     'storage',
     'offline',
     'json',
     'geolocation',
     'notification',
 ]
 
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
+JAR_MANIFESTS += ['jar.mn']
--- a/dom/src/notification/moz.build
+++ b/dom/src/notification/moz.build
@@ -25,13 +25,13 @@ UNIFIED_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
-    '/content/events/src',
     '/dom/base',
+    '/dom/events',
     '/dom/ipc',
 ]
 
--- a/dom/src/offline/moz.build
+++ b/dom/src/offline/moz.build
@@ -10,13 +10,13 @@ EXPORTS += [
 UNIFIED_SOURCES += [
     'nsDOMOfflineResourceList.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     "/content/base/src",
-    "/content/events/src",
     "/dom/base",
+    "/dom/events",
 ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/dom/src/storage/moz.build
+++ b/dom/src/storage/moz.build
@@ -24,14 +24,14 @@ IPDL_SOURCES += [
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
-    '/content/events/src',
     '/dom/base',
+    '/dom/events',
 ]
 
 if CONFIG['ENABLE_TESTS']:
     DEFINES['DOM_STORAGE_TESTS'] = True
--- a/dom/system/android/moz.build
+++ b/dom/system/android/moz.build
@@ -10,12 +10,12 @@ SOURCES += [
 ]
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
-    '/content/events/src',
+    '/dom/events',
     '/dom/src/geolocation',
 ]
 
--- a/dom/system/gonk/moz.build
+++ b/dom/system/gonk/moz.build
@@ -100,17 +100,17 @@ if CONFIG['MOZ_NFC']:
     'nfc_worker.js',
     ]
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 LOCAL_INCLUDES += [
-    '/content/events/src',
     '/dom/base',
     '/dom/bluetooth',
+    '/dom/events',
     '/dom/nfc',
     '/dom/src/geolocation',
     '/dom/wifi',
 ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/dom/system/moz.build
+++ b/dom/system/moz.build
@@ -48,16 +48,16 @@ if CONFIG['OS_TARGET'] != 'Android' or C
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 # We fire the nsDOMDeviceAcceleration
 LOCAL_INCLUDES += [
-    '/content/events/src',
     '/dom/base',
     '/dom/bindings',
+    '/dom/events',
     '/js/xpconnect/loader',
 ]
 
 DEFINES['DLL_PREFIX'] = '"%s"' % CONFIG['DLL_PREFIX']
 DEFINES['DLL_SUFFIX'] = '"%s"' % CONFIG['DLL_SUFFIX']
--- a/dom/system/windows/moz.build
+++ b/dom/system/windows/moz.build
@@ -5,14 +5,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += [
     'nsHapticFeedback.cpp',
 ]
 
 # We fire the nsDOMDeviceAcceleration
 LOCAL_INCLUDES += [
-    '/content/events/src',
+    '/dom/events',
 ]
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'gklayout'
--- a/dom/workers/moz.build
+++ b/dom/workers/moz.build
@@ -53,16 +53,16 @@ SOURCES += [
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '../base',
     '../system',
     '/content/base/src',
-    '/content/events/src',
+    '/dom/events',
     '/xpcom/build',
     '/xpcom/threads',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
--- a/dom/xbl/moz.build
+++ b/dom/xbl/moz.build
@@ -38,19 +38,19 @@ UNIFIED_SOURCES += [
 ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '/content/base/src',
-    '/content/events/src',
     '/content/html/document/src',
     '/content/xml/document/src',
     '/content/xul/content/src',
     '/content/xul/document/src',
     '/dom/base',
+    '/dom/events',
     '/layout/style',
     '/xpcom/ds',
 ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/editor/libeditor/base/moz.build
+++ b/editor/libeditor/base/moz.build
@@ -31,15 +31,15 @@ UNIFIED_SOURCES += [
     'SplitElementTxn.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '../text',
     '/content/base/src',
-    '/content/events/src',
+    '/dom/events',
     '/editor/txmgr/src',
     '/extensions/spellcheck/src',
     '/layout/style',
 ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/gfx/layers/moz.build
+++ b/gfx/layers/moz.build
@@ -307,16 +307,16 @@ FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'thebes'
 
 LOCAL_INCLUDES += [
-    '/content/events/src',
+    '/dom/events',
 ]
 
 if CONFIG['MOZ_DEBUG']:
     DEFINES['D3D_DEBUG_INFO'] = True
 
 if CONFIG['MOZ_ENABLE_D3D10_LAYER']:
     DEFINES['MOZ_ENABLE_D3D10_LAYER'] = True
--- a/js/xpconnect/src/moz.build
+++ b/js/xpconnect/src/moz.build
@@ -81,21 +81,21 @@ if CONFIG['MOZ_JSDEBUGGER']:
     DEFINES['MOZ_JSDEBUGGER'] = True
 
 LOCAL_INCLUDES += [
     '../loader',
     '../wrappers',
     '/caps/include',
     '/content/base/public',
     '/content/base/src',
-    '/content/events/src',
     '/content/html/content/src',
     '/content/html/document/src',
     '/content/svg/content/src',
     '/dom/base',
+    '/dom/events',
     '/js/ipc',
     '/layout/base',
     '/layout/style',
     '/xpcom/ds',
 ]
 
 if CONFIG['MOZ_B2G_BT']:
     LOCAL_INCLUDES += [
--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@@ -108,31 +108,31 @@ SOURCES += [
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 LOCAL_INCLUDES += [
     '../../content/base/src',
-    '../../content/events/src',
     '../../content/html/content/src',
     '../../content/svg/content/src',
     '../../view/src',
     '../forms',
     '../generic',
     '../mathml',
     '../printing',
     '../style',
     '../svg',
     '../tables',
     '../xul',
     '../xul/tree/',
     '/docshell/base',
     '/dom/base',
+    '/dom/events',
     '/dom/xbl',
     '/xpcom/ds',
 ]
 
 FINAL_LIBRARY = 'gklayout'
 
 MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
 MOCHITEST_CHROME_MANIFESTS += ['tests/chrome/chrome.ini']
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -36,27 +36,27 @@ LOCAL_INCLUDES += [
     '../inspector',
     '../mathml',
     '../style',
     '../tables',
     '../xul',
     '/caps/include',
     '/content/base/src',
     '/content/canvas/src',
-    '/content/events/src',
     '/content/html/content/src',
     '/content/html/document/src',
     '/content/svg/content/src',
     '/content/xul/content/src',
     '/content/xul/document/src',
     '/content/xul/templates/src',
     '/docshell/base',
     '/dom/audiochannel',
     '/dom/base',
     '/dom/camera',
+    '/dom/events',
     '/dom/file',
     '/dom/media',
     '/dom/speakermanager',
     '/dom/src/geolocation',
     '/dom/src/json',
     '/dom/src/jsurl',
     '/dom/src/offline',
     '/dom/src/storage',
--- a/layout/xul/moz.build
+++ b/layout/xul/moz.build
@@ -82,15 +82,15 @@ if CONFIG['MOZ_XUL']:
     PARALLEL_DIRS += ['tree', 'grid']
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
-    '../../content/base/src',
-    '../../content/events/src',
     '../base',
     '../generic',
     '../style',
+    '/content/base/src',
+    '/dom/events',
 ]
 
--- a/layout/xul/tree/moz.build
+++ b/layout/xul/tree/moz.build
@@ -36,11 +36,11 @@ FAIL_ON_WARNINGS = True
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '..',
     '../../base',
     '../../forms',
     '../../generic',
     '../../style',
     '/content/base/src',
-    '/content/events/src',
+    '/dom/events',
 ]
 
--- a/netwerk/protocol/http/moz.build
+++ b/netwerk/protocol/http/moz.build
@@ -105,11 +105,11 @@ MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'necko'
 
 LOCAL_INCLUDES += [
     '../../base/src',
     '/content/base/src',
-    '/content/events/src',
+    '/dom/events',
     '/xpcom/ds',
 ]
--- a/netwerk/protocol/rtsp/moz.build
+++ b/netwerk/protocol/rtsp/moz.build
@@ -50,16 +50,16 @@ include('/ipc/chromium/chromium-config.m
 FINAL_LIBRARY = 'necko'
 
 DEFINES['IMPL_NS_NET'] = True
 DEFINES['FORCE_PR_LOG'] = True
 
 LOCAL_INCLUDES += [
     '../../base/src',
     '/content/base/src',
-    '/content/events/src',
+    '/dom/events',
     '/xpcom/ds',
     'controller',
     'rtsp',
 ]
 
 for var in ('IMPL_NS_NET', 'FORCE_PR_LOG'):
     DEFINES[var] = True
--- a/netwerk/protocol/websocket/moz.build
+++ b/netwerk/protocol/websocket/moz.build
@@ -37,11 +37,11 @@ MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'necko'
 
 LOCAL_INCLUDES += [
     '../../base/src',
     '/content/base/src',
-    '/content/events/src',
+    '/dom/events',
     '/xpcom/ds',
 ]
--- a/netwerk/sctp/src/moz.build
+++ b/netwerk/sctp/src/moz.build
@@ -45,17 +45,17 @@ LIBRARY_NAME = 'nksctp_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'necko'
 
 LOCAL_INCLUDES += [
     '../../base/src',
     '/content/base/src',
-    '/content/events/src',
+    '/dom/events',
     '/xpcom/ds',
 ]
 
 for var in ('SCTP_SIMPLE_ALLOCATOR', 'USE_SCTP_SHA1',
             'SCTP_PROCESS_LEVEL_LOCKS', '__Userspace__', 'INET',
             'CALLBACK_API', 'SCTP_DEBUG'):
     DEFINES[var] = 1
 
--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -2,17 +2,16 @@
 # DO NOT ADD CRASHTESTS INDIVIDUALLY HERE!
 
 include ../../testing/crashtest/sanity/crashtests.list
 
 include ../../accessible/tests/crashtests/crashtests.list
 
 include ../../content/base/crashtests/crashtests.list
 include ../../content/canvas/crashtests/crashtests.list
-include ../../content/events/crashtests/crashtests.list
 include ../../content/html/document/crashtests/crashtests.list
 include ../../content/html/content/crashtests/crashtests.list
 include ../../content/svg/content/src/crashtests/crashtests.list
 include ../../content/xml/content/crashtest/crashtests.list
 include ../../content/xml/document/crashtests/crashtests.list
 include ../../content/xul/content/crashtests/crashtests.list
 include ../../content/xul/document/crashtests/crashtests.list
 include ../../content/xul/templates/src/crashtests/crashtests.list
@@ -20,16 +19,17 @@ include ../../content/mathml/content/cra
 
 # Bug 868152 - webaudio crash on tegra platform
 skip-if(Android) include ../../content/media/test/crashtests/crashtests.list
 
 include ../../docshell/base/crashtests/crashtests.list
 
 include ../../dom/base/crashtests/crashtests.list
 include ../../dom/bindings/crashtests/crashtests.list
+include ../../dom/events/crashtests/crashtests.list
 include ../../dom/indexedDB/crashtests/crashtests.list
 include ../../dom/smil/crashtests/crashtests.list
 include ../../dom/xbl/crashtests/crashtests.list
 include ../../dom/xslt/crashtests/crashtests.list
 
 # Bug 811873 - mozRTCPeerConnection doesn't support remote browser yet
 skip-if(B2G||browserIsRemote) include ../../dom/media/tests/crashtests/crashtests.list
 
--- a/testing/mochitest/android.json
+++ b/testing/mochitest/android.json
@@ -38,55 +38,16 @@
  "content/base/test/test_x-frame-options.html": "",
  "content/base/test/test_xhr_abort_after_load.html": "",
  "content/base/test/test_xhr_progressevents.html": "",
  "content/base/test/websocket_hybi/test_receive-arraybuffer.html": "",
  "content/base/test/websocket_hybi/test_receive-blob.html": "",
  "content/base/test/websocket_hybi/test_send-arraybuffer.html": "",
  "content/base/test/websocket_hybi/test_send-blob.html": "",
  "content/canvas/test/webgl": "bug 865443- seperate suite",
- "content/events/test/test_bug409604.html": "TIMED_OUT",
- "content/events/test/test_bug426082.html": "",
- "content/events/test/test_bug457672.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug502818.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug508479.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug508906.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug517851.htm": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug534833.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug545268.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug547996-1.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug547996-2.xhtml": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug556493.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug574663.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug603008.html": "",
- "content/events/test/test_bug605242.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug607464.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug613634.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug624127.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug635465.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug648573.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug650493.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug656379-1.html": "TIMED_OUT",
- "content/events/test/test_bug656379-2.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug656954.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug659350.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug662678.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug667612.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug667919-1.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug667919-2.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug689564.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug698929.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug741666.html": "",
- "content/events/test/test_clickevent_on_input.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_dom_keyboard_event.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_dom_mouse_event.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_draggableprop.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_dragstart.html": "TIMED_OUT",
- "content/events/test/test_eventctors.html": "CRASH_DUMP, RANDOM",
- "content/events/test": "CRASH_DUMP, RANDOM",
  "content/html/content/test/test_bug209275.xhtml": "TIMED_OUT",
  "content/html/content/test/test_bug481335.xhtml": "TIMED_OUT",
  "content/html/content/test/test_bug514856.html": "",
  "content/html/content/test/test_bug557087-2.html": "TIMED_OUT",
  "content/html/content/test/test_bug612730.html": "",
  "content/html/content/test/test_bug615833.html": "TIMED_OUT",
  "content/html/content/test/test_formSubmission.html": "TIMED_OUT",
  "content/html/content/test/test_formSubmission2.html": "",
@@ -119,16 +80,55 @@
  "docshell/test/test_bug668513.html": "RANDOM",
  "docshell/test/test_framedhistoryframes.html": "bug 784321",
  "dom/browser-element/mochitest/test_browserElement_oop_SecurityChange.html": "TIMED_OUT, bug 766586",
  "dom/browser-element/mochitest/test_browserElement_inproc_AppFramePermission.html": "",
  "dom/browser-element/mochitest/test_browserElement_inproc_AppWindowNamespace.html": "TIMED_OUT, bug 783509",
  "dom/browser-element/mochitest/test_browserElement_inproc_SecurityChange.html": "TIMED_OUT, bug 766586",
  "dom/browser-element/mochitest/test_browserElement_inproc_CloseApp.html": "FAILS, bug 796982",
  "dom/devicestorage": "bug 781789 & bug 782275",
+ "dom/events/test/test_bug409604.html": "TIMED_OUT",
+ "dom/events/test/test_bug426082.html": "",
+ "dom/events/test/test_bug457672.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug502818.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug508479.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug508906.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug517851.htm": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug534833.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug545268.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug547996-1.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug547996-2.xhtml": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug556493.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug574663.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug603008.html": "",
+ "dom/events/test/test_bug605242.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug607464.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug613634.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug624127.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug635465.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug648573.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug650493.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug656379-1.html": "TIMED_OUT",
+ "dom/events/test/test_bug656379-2.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug656954.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug659350.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug662678.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug667612.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug667919-1.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug667919-2.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug689564.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug698929.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug741666.html": "",
+ "dom/events/test/test_clickevent_on_input.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_dom_keyboard_event.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_dom_mouse_event.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_draggableprop.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_dragstart.html": "TIMED_OUT",
+ "dom/events/test/test_eventctors.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test": "CRASH_DUMP, RANDOM",
  "dom/imptests/editing/conformancetest/test_runtest.html": "",
  "dom/imptests/editing/selecttest/test_addRange.html": "bug 775227",
  "dom/imptests/html/webgl": "WebGL",
  "dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_key.html": "bug 775227",
  "dom/indexedDB/ipc/test_ipc.html": "bug 783513",
  "dom/indexedDB/test/test_third_party.html": "TIMED_OUT",
  "dom/indexedDB/test/test_event_propagation.html": "TIMED_OUT, bug 780855",
  "dom/indexedDB/test/test_app_isolation_inproc.html": "TIMED_OUT",
--- a/testing/mochitest/androidx86.json
+++ b/testing/mochitest/androidx86.json
@@ -68,55 +68,16 @@
  "content/canvas/test/test_2d.composite.image.source-in.html": "x86 only bug 913662",
  "content/canvas/test/test_2d.composite.image.source-out.html": "x86 only bug 913662",
  "content/canvas/test/test_2d.composite.uncovered.image.destination-atop.html": "x86 only bug 913662",
  "content/canvas/test/test_2d.composite.uncovered.image.destination-in.html": "x86 only bug 913662",
  "content/canvas/test/test_2d.composite.uncovered.image.source-in.html": "x86 only bug 913662",
  "content/canvas/test/test_2d.composite.uncovered.image.source-out.html": "x86 only bug 913662",
  "content/canvas/test/test_canvas.html": "x86 only bug 913662",
  "content/canvas/test/webgl": "bug 865443- seperate suite",
- "content/events/test/test_bug409604.html": "TIMED_OUT",
- "content/events/test/test_bug426082.html": "",
- "content/events/test/test_bug457672.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug502818.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug508479.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug508906.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug517851.htm": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug534833.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug545268.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug547996-1.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug547996-2.xhtml": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug556493.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug574663.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug603008.html": "",
- "content/events/test/test_bug605242.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug607464.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug613634.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug624127.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug635465.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug648573.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug650493.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug656379-1.html": "TIMED_OUT",
- "content/events/test/test_bug656379-2.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug656954.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug659350.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug662678.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug667612.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug667919-1.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug667919-2.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug689564.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug698929.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_bug741666.html": "",
- "content/events/test/test_clickevent_on_input.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_dom_keyboard_event.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_dom_mouse_event.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_draggableprop.html": "CRASH_DUMP, RANDOM",
- "content/events/test/test_dragstart.html": "TIMED_OUT",
- "content/events/test/test_eventctors.html": "CRASH_DUMP, RANDOM",
- "content/events/test": "CRASH_DUMP, RANDOM",
  "content/html/content/test/forms/test_input_textarea_set_value_no_scroll.html": "x86 only",
  "content/html/content/test/test_bug209275.xhtml": "TIMED_OUT",
  "content/html/content/test/test_bug481335.xhtml": "TIMED_OUT",
  "content/html/content/test/test_bug514856.html": "",
  "content/html/content/test/test_bug557087-2.html": "TIMED_OUT",
  "content/html/content/test/test_bug612730.html": "",
  "content/html/content/test/test_bug615833.html": "TIMED_OUT",
  "content/html/content/test/test_formSubmission.html": "TIMED_OUT",
@@ -196,16 +157,55 @@
  "dom/browser-element/mochitest/test_browserElement_inproc_CloseApp.html": "FAILS, bug 796982",
  "dom/browser-element/mochitest/test_browserElement_NoWhitelist.html": "x86 only bug 936226",
  "dom/browser-element/mochitest/test_browserElement_oop_NextPaint.html": "x86 only bug 936226",
  "dom/contacts/tests/test_contacts_getall.html": "x86 only",
  "dom/datastore/tests/test_oop.html": "x86 only bug 936226",
  "dom/datastore/tests/test_readonly.html": "x86 only bug 936226",
  "dom/datastore/tests/test_sync.html": "x86 only bug 936226",
  "dom/devicestorage": "bug 781789 & bug 782275",
+ "dom/events/test/test_bug409604.html": "TIMED_OUT",
+ "dom/events/test/test_bug426082.html": "",
+ "dom/events/test/test_bug457672.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug502818.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug508479.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug508906.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug517851.htm": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug534833.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug545268.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug547996-1.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug547996-2.xhtml": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug556493.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug574663.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug603008.html": "",
+ "dom/events/test/test_bug605242.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug607464.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug613634.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug624127.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug635465.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug648573.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug650493.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug656379-1.html": "TIMED_OUT",
+ "dom/events/test/test_bug656379-2.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug656954.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug659350.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug662678.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug667612.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug667919-1.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug667919-2.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug689564.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug698929.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_bug741666.html": "",
+ "dom/events/test/test_clickevent_on_input.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_dom_keyboard_event.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_dom_mouse_event.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_draggableprop.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test/test_dragstart.html": "TIMED_OUT",
+ "dom/events/test/test_eventctors.html": "CRASH_DUMP, RANDOM",
+ "dom/events/test": "CRASH_DUMP, RANDOM",
  "dom/imptests/editing/conformancetest/test_runtest.html": "",
  "dom/imptests/editing/selecttest/test_addRange.html": "bug 775227",
  "dom/imptests/html/webgl": "WebGL",
  "dom/imptests/webapps/WebStorage/tests/submissions/Infraware/test_storage_local_key.html": "bug 775227",
  "dom/indexedDB/ipc/test_ipc.html": "bug 783513",
  "dom/indexedDB/test/test_third_party.html": "TIMED_OUT",
  "dom/indexedDB/test/test_event_propagation.html": "TIMED_OUT, bug 780855",
  "dom/indexedDB/test/test_app_isolation_inproc.html": "TIMED_OUT",
--- a/testing/mochitest/b2g-debug.json
+++ b/testing/mochitest/b2g-debug.json
@@ -73,19 +73,19 @@
     "dom/imptests/html/dom/ranges/test_Range-compareBoundaryPoints.html":"times out, bug 862196",
     "dom/imptests/html/dom/ranges/test_Range-deleteContents.html":"",
     "dom/imptests/html/dom/ranges/test_Range-extractContents.html":"",
     "dom/imptests/html/dom/ranges/test_Range-set.html":"",
     "dom/imptests/html/dom/ranges/test_Range-surroundContents.html":"",
     "dom/imptests/html/dom/ranges/test_Range-mutations.html":"Test timed out.",
     "dom/encoding/test/test_stringencoding.html":"Test timed out on b2g board",
 
-    "content/events/test/test_bug615597.html":"bug 900969, 5 tests",
-    "content/events/test/test_bug667919-1.html":"bug 900969, 5 tests",
-    "content/events/test/test_bug667919-2.html":"bug 900969, 5 tests",
+    "dom/events/test/test_bug615597.html":"bug 900969, 5 tests",
+    "dom/events/test/test_bug667919-1.html":"bug 900969, 5 tests",
+    "dom/events/test/test_bug667919-2.html":"bug 900969, 5 tests",
 
     "content/html/content/test/test_bug561636.html":"observerservice not working",
     "content/base/test/test_bug548193.html":"observerservice issue",
     "content/base/test/test_x-frame-options.html":"observerservice issue",
 
     "content/base/test/test_XHRSendData.html":"seems to stall",
     "content/base/test/test_XHR_parameters.html":"86 total, 4 failing - testing mozAnon - got false, expected true",
     "content/base/test/test_XHR_system.html":"12 total, 2 failing - .mozSystem == true - got false, expected true + ",
@@ -149,29 +149,29 @@
     "content/html/document/test/test_bug391777.html":"showmodaldialog",
     "content/media/webspeech/recognition/test/test_nested_eventloop.html": "showmodaldialog",
     "dom/tests/mochitest/bugs/test_bug291653.html":"showmodaldialog",
     "dom/tests/mochitest/bugs/test_bug414291.html":"showmodaldialog",
     "dom/tests/mochitest/bugs/test_bug479143.html":"showmodaldialog",
     "dom/tests/mochitest/bugs/test_bug504862.html":"showmodaldialog",
     "dom/tests/mochitest/bugs/test_bug61098.html":"showmodaldialog",
 
-    "content/events/test/test_continuous_wheel_events.html":"5535 passed, 108 failed - more tests running than desktop",
-    "content/events/test/test_bug422132.html":"2 failures out of 8, mousewheel test",
-    "content/events/test/test_bug659071.html":"1 failure out of 2, mousewheel zoom test",
-    "content/events/test/test_dom_wheel_event.html":"456 failed out of 19873, mousewheel test",
+    "dom/events/test/test_continuous_wheel_events.html":"5535 passed, 108 failed - more tests running than desktop",
+    "dom/events/test/test_bug422132.html":"2 failures out of 8, mousewheel test",
+    "dom/events/test/test_bug659071.html":"1 failure out of 2, mousewheel zoom test",
+    "dom/events/test/test_dom_wheel_event.html":"456 failed out of 19873, mousewheel test",
 
-    "content/events/test/test_bug426082.html":"1 failure out of 6, Moving the mouse down from the label should have unpressed the button",
-    "content/events/test/test_bug534833.html":"4 failures out of 6, bug 901564,click not fired, also disabled on Android",
-    "content/events/test/test_bug603008.html":"1 failure out of 615, bug 901533, Six move events fired - got 7, expected 6, also disabled on Android, touchmove",
+    "dom/events/test/test_bug426082.html":"1 failure out of 6, Moving the mouse down from the label should have unpressed the button",
+    "dom/events/test/test_bug534833.html":"4 failures out of 6, bug 901564,click not fired, also disabled on Android",
+    "dom/events/test/test_bug603008.html":"1 failure out of 615, bug 901533, Six move events fired - got 7, expected 6, also disabled on Android, touchmove",
 
-    "content/events/test/test_bug508479.html":"drag event, also fails on Android",
-    "content/events/test/test_dragstart.html":"drag event, also fails on Android",
+    "dom/events/test/test_bug508479.html":"drag event, also fails on Android",
+    "dom/events/test/test_dragstart.html":"drag event, also fails on Android",
 
-    "content/events/test/test_bug864040.html":"failing when the test gets moved around, and on debug",
+    "dom/events/test/test_bug864040.html":"failing when the test gets moved around, and on debug",
 
     "content/html/content/test/forms/test_input_file_picker.html":"5 failures out of 139 and timing out, bug 901581",
     "content/html/content/test/forms/test_validation.html":"374 total, bug 901848, no keygen support",
 
     "content/html/content/test/test_bug430351.html":"13 failing out of 700, not focusable iframes? bug 902207",
 
     "content/html/content/test/test_bug523771.html":"onload of iframe not firing, because submit not working?",
 
@@ -235,23 +235,16 @@
     "content/base/test/test_websocket.html":"",
     "content/base/test/test_websocket_basic.html":"",
     "content/base/test/test_websocket_hello.html":"",
     "content/base/test/websocket_hybi/test_receive-arraybuffer.html":"",
     "content/base/test/websocket_hybi/test_receive-blob.html":"",
     "content/base/test/websocket_hybi/test_send-arraybuffer.html":"",
     "content/base/test/websocket_hybi/test_send-blob.html":"",
     "content/canvas/test/webgl/test_webgl_conformance_test_suite.html":"",
-    "content/events/test/test_bug226361.xhtml":"",
-    "content/events/test/test_bug238987.html":"",
-    "content/events/test/test_bug409604.html":"",
-    "content/events/test/test_bug457672.html":"",
-    "content/events/test/test_bug574663.html":"",
-    "content/events/test/test_bug607464.html":"",
-    "content/events/test/test_wheel_default_action.html":"",
     "content/base/test/test_bug682592.html":"",	
     "content/html/document/test/test_bug369370.html":"",
     "content/svg/content/test/test_text_selection.html":"Mouse selection not workin on b2g",
     "content/svg/content/test/test_SVGAnimatedImageSMILDisabled.html":"",
     "content/xml/document/test/test_bug392338.html":"",
     "content/base/test/csp/test_bothCSPheaders.html":"",
     "content/base/test/test_bug383430.html":"",
     "content/base/test/test_bug422403-2.xhtml":"",
@@ -275,16 +268,24 @@
     "dom/browser-element/mochitest/test_browserElement_inproc_AppFramePermission.html":"",
     "dom/browser-element/mochitest/test_browserElement_inproc_AppWindowNamespace.html":"",
     "dom/browser-element/mochitest/test_browserElement_inproc_Auth.html":"",
     "dom/browser-element/mochitest/test_browserElement_inproc_BrowserWindowNamespace.html":"",
     "dom/browser-element/mochitest/test_browserElement_inproc_CloseApp.html":"",
     "dom/browser-element/mochitest/test_browserElement_inproc_CloseFromOpener.html":"",
     "dom/browser-element/":"",
 
+    "dom/events/test/test_bug226361.xhtml":"",
+    "dom/events/test/test_bug238987.html":"",
+    "dom/events/test/test_bug409604.html":"",
+    "dom/events/test/test_bug457672.html":"",
+    "dom/events/test/test_bug574663.html":"",
+    "dom/events/test/test_bug607464.html":"",
+    "dom/events/test/test_wheel_default_action.html":"",
+
     "dom/file/test/test_progress_events.html":"All of these fail fairly regularly with: UnknownError: The operation failed for reasons unrelated to the database itself and not covered by any other error code. at http://mochi.test:8888/tests/dom/file/test/helpers.js:126",
     "dom/file/test/test_request_readyState.html":"",
     "dom/file/test/test_stream_tracking.html":"",
     "dom/file/test/test_append_read_data.html":"",
     "dom/file/test/test_archivereader.html":"",
     "dom/file/test/test_archivereader_nonUnicode.html":"",
     "dom/file/test/test_archivereader_zip_in_zip.html":"",
     "dom/file/test/test_location.html":"",
--- a/testing/mochitest/b2g-desktop.json
+++ b/testing/mochitest/b2g-desktop.json
@@ -73,19 +73,19 @@
     "dom/imptests/html/dom/ranges/test_Range-compareBoundaryPoints.html":"times out, bug 862196",
     "dom/imptests/html/dom/ranges/test_Range-deleteContents.html":"",
     "dom/imptests/html/dom/ranges/test_Range-extractContents.html":"",
     "dom/imptests/html/dom/ranges/test_Range-set.html":"",
     "dom/imptests/html/dom/ranges/test_Range-surroundContents.html":"",
     "dom/imptests/html/dom/ranges/test_Range-mutations.html":"Test timed out.",
     "dom/encoding/test/test_stringencoding.html":"Test timed out on b2g board",
 
-    "content/events/test/test_bug615597.html":"bug 900969, 5 tests",
-    "content/events/test/test_bug667919-1.html":"bug 900969, 5 tests",
-    "content/events/test/test_bug667919-2.html":"bug 900969, 5 tests",
+    "dom/events/test/test_bug615597.html":"bug 900969, 5 tests",
+    "dom/events/test/test_bug667919-1.html":"bug 900969, 5 tests",
+    "dom/events/test/test_bug667919-2.html":"bug 900969, 5 tests",
 
     "content/html/content/test/test_bug561636.html":"observerservice not working",
     "content/base/test/test_bug548193.html":"observerservice issue",
     "content/base/test/test_x-frame-options.html":"observerservice issue",
 
     "content/base/test/test_XHRSendData.html":"seems to stall",
     "content/base/test/test_XHR_parameters.html":"86 total, 4 failing - testing mozAnon - got false, expected true",
     "content/base/test/test_XHR_system.html":"12 total, 2 failing - .mozSystem == true - got false, expected true + ",
@@ -150,29 +150,29 @@
     "content/html/document/test/test_bug391777.html":"showmodaldialog",
     "content/media/webspeech/recognition/test/test_nested_eventloop.html": "showmodaldialog",
     "dom/tests/mochitest/bugs/test_bug291653.html":"showmodaldialog",
     "dom/tests/mochitest/bugs/test_bug414291.html":"showmodaldialog",
     "dom/tests/mochitest/bugs/test_bug479143.html":"showmodaldialog",
     "dom/tests/mochitest/bugs/test_bug504862.html":"showmodaldialog",
     "dom/tests/mochitest/bugs/test_bug61098.html":"showmodaldialog",
 
-    "content/events/test/test_continuous_wheel_events.html":"5535 passed, 108 failed - more tests running than desktop",
-    "content/events/test/test_bug422132.html":"2 failures out of 8, mousewheel test",
-    "content/events/test/test_bug659071.html":"1 failure out of 2, mousewheel zoom test",
-    "content/events/test/test_dom_wheel_event.html":"456 failed out of 19873, mousewheel test",
+    "dom/events/test/test_continuous_wheel_events.html":"5535 passed, 108 failed - more tests running than desktop",
+    "dom/events/test/test_bug422132.html":"2 failures out of 8, mousewheel test",
+    "dom/events/test/test_bug659071.html":"1 failure out of 2, mousewheel zoom test",
+    "dom/events/test/test_dom_wheel_event.html":"456 failed out of 19873, mousewheel test",
 
-    "content/events/test/test_bug426082.html":"1 failure out of 6, Moving the mouse down from the label should have unpressed the button",
-    "content/events/test/test_bug534833.html":"4 failures out of 6, bug 901564,click not fired, also disabled on Android",
-    "content/events/test/test_bug603008.html":"1 failure out of 615, bug 901533, Six move events fired - got 7, expected 6, also disabled on Android, touchmove",
+    "dom/events/test/test_bug426082.html":"1 failure out of 6, Moving the mouse down from the label should have unpressed the button",
+    "dom/events/test/test_bug534833.html":"4 failures out of 6, bug 901564,click not fired, also disabled on Android",
+    "dom/events/test/test_bug603008.html":"1 failure out of 615, bug 901533, Six move events fired - got 7, expected 6, also disabled on Android, touchmove",
 
-    "content/events/test/test_bug508479.html":"drag event, also fails on Android",
-    "content/events/test/test_dragstart.html":"drag event, also fails on Android",
+    "dom/events/test/test_bug508479.html":"drag event, also fails on Android",
+    "dom/events/test/test_dragstart.html":"drag event, also fails on Android",
 
-    "content/events/test/test_bug864040.html":"failing when the test gets moved around, and on debug",
+    "dom/events/test/test_bug864040.html":"failing when the test gets moved around, and on debug",
 
     "content/html/content/test/forms/test_input_file_picker.html":"5 failures out of 139 and timing out, bug 901581",
     "content/html/content/test/forms/test_validation.html":"374 total, bug 901848, no keygen support",
 
     "content/html/content/test/test_bug430351.html":"13 failing out of 700, not focusable iframes? bug 902207",
 
     "content/html/content/test/test_bug523771.html":"onload of iframe not firing, because submit not working?",
 
@@ -231,23 +231,16 @@
     "content/base/test/test_websocket.html":"",
     "content/base/test/test_websocket_basic.html":"",
     "content/base/test/test_websocket_hello.html":"",
     "content/base/test/websocket_hybi/test_receive-arraybuffer.html":"",
     "content/base/test/websocket_hybi/test_receive-blob.html":"",
     "content/base/test/websocket_hybi/test_send-arraybuffer.html":"",
     "content/base/test/websocket_hybi/test_send-blob.html":"",
     "content/canvas/test/webgl/test_webgl_conformance_test_suite.html":"",
-    "content/events/test/test_bug226361.xhtml":"",
-    "content/events/test/test_bug238987.html":"",
-    "content/events/test/test_bug409604.html":"",
-    "content/events/test/test_bug457672.html":"",
-    "content/events/test/test_bug574663.html":"",
-    "content/events/test/test_bug607464.html":"",
-    "content/events/test/test_wheel_default_action.html":"",
     "content/base/test/test_bug682592.html":"",
     "content/html/document/test/test_bug369370.html":"",
     "content/svg/content/test/test_text_selection.html":"Mouse selection not workin on b2g",
     "content/svg/content/test/test_SVGAnimatedImageSMILDisabled.html":"",
     "content/xml/document/test/test_bug392338.html":"",
     "content/base/test/csp/test_bothCSPheaders.html":"",
     "content/base/test/test_bug383430.html":"",
     "content/base/test/test_bug422403-2.xhtml":"",
@@ -272,16 +265,24 @@
     "dom/browser-element/mochitest/test_browserElement_inproc_AppFramePermission.html":"",
     "dom/browser-element/mochitest/test_browserElement_inproc_AppWindowNamespace.html":"",
     "dom/browser-element/mochitest/test_browserElement_inproc_Auth.html":"",
     "dom/browser-element/mochitest/test_browserElement_inproc_BrowserWindowNamespace.html":"",
     "dom/browser-element/mochitest/test_browserElement_inproc_CloseApp.html":"",
     "dom/browser-element/mochitest/test_browserElement_inproc_CloseFromOpener.html":"",
     "dom/browser-element/":"",
 
+    "dom/events/test/test_bug226361.xhtml":"",
+    "dom/events/test/test_bug238987.html":"",
+    "dom/events/test/test_bug409604.html":"",
+    "dom/events/test/test_bug457672.html":"",
+    "dom/events/test/test_bug574663.html":"",
+    "dom/events/test/test_bug607464.html":"",
+    "dom/events/test/test_wheel_default_action.html":"",
+
     "dom/file/test/test_progress_events.html":"All of these fail fairly regularly with: UnknownError: The operation failed for reasons unrelated to the database itself and not covered by any other error code. at http://mochi.test:8888/tests/dom/file/test/helpers.js:126",
     "dom/file/test/test_request_readyState.html":"",
     "dom/file/test/test_stream_tracking.html":"",
     "dom/file/test/test_append_read_data.html":"",
     "dom/file/test/test_archivereader.html":"",
     "dom/file/test/test_archivereader_nonUnicode.html":"",
     "dom/file/test/test_archivereader_zip_in_zip.html":"",
     "dom/file/test/test_location.html":"",
@@ -409,20 +410,16 @@
 
     "caps/tests/mochitest/test_bug292789.html": "Bug 931116, b2g desktop specific, initial triage",
     "content/base/test/csp/test_policyuri_regression_from_multipolicy.html": "Bug 931116, b2g desktop specific, initial triage",
     "content/base/test/test_bug326337.html": "Bug 931116, b2g desktop specific, initial triage",
     "content/base/test/test_bug426646.html": "Bug 931116, b2g desktop specific, initial triage",
     "content/base/test/test_bug557892.html": "Bug 931116, b2g desktop specific, initial triage",
     "content/base/test/test_bug578096.html": "Bug 931116, b2g desktop specific, initial triage",
     "content/base/test/test_copyimage.html": "Bug 931116, b2g desktop specific, initial triage",
-    "content/events/test/test_bug322588.html": "Bug 931116, b2g desktop specific, initial triage",
-    "content/events/test/test_bug493251.html": "Bug 931116, b2g desktop specific, initial triage",
-    "content/events/test/test_bug545268.html": "Bug 931116, b2g desktop specific, initial triage",
-    "content/events/test/test_bug656379-1.html": "Bug 931116, b2g desktop specific, initial triage",
     "content/html/content/test/forms/test_change_event.html": "Bug 931116, b2g desktop specific, initial triage",
     "content/html/content/test/forms/test_input_event.html": "Bug 931116, b2g desktop specific, initial triage",
     "content/html/content/test/forms/test_input_range_key_events.html": "Bug 931116, b2g desktop specific, initial triage",
     "content/html/content/test/forms/test_input_range_rounding.html": "Bug 931116, b2g desktop specific, initial triage",
     "content/html/content/test/test_bug633058.html": "Bug 931116, b2g desktop specific, initial triage",
     "content/html/content/test/test_bug643051.html": "Bug 931116, b2g desktop specific, initial triage",
     "content/html/content/test/test_bug651956.html": "Bug 931116, b2g desktop specific, initial triage",
     "content/html/content/test/test_bug659743.xml": "Bug 931116, b2g desktop specific, initial triage",
@@ -465,16 +462,20 @@
     "dom/alarm/test/test_alarm_add_date.html": "Bug 931116, b2g desktop specific, initial triage",
     "dom/alarm/test/test_alarm_add_respectTimezone.html": "Bug 931116, b2g desktop specific, initial triage",
     "dom/alarm/test/test_alarm_remove.html": "Bug 931116, b2g desktop specific, initial triage",
     "dom/base/test/test_setting_opener.html": "Bug 931116, b2g desktop specific, initial triage",
     "dom/datastore/tests/test_oop.html": "Bug 931116, b2g desktop specific, initial triage",
     "dom/datastore/tests/test_readonly.html": "Bug 931116, b2g desktop specific, initial triage",
     "dom/datastore/tests/test_revision.html": "Bug 931116, b2g desktop specific, initial triage",
     "dom/datastore/tests/test_sync.html": "Bug 931116, b2g desktop specific, initial triage",
+    "dom/events/test/test_bug322588.html": "Bug 931116, b2g desktop specific, initial triage",
+    "dom/events/test/test_bug493251.html": "Bug 931116, b2g desktop specific, initial triage",
+    "dom/events/test/test_bug545268.html": "Bug 931116, b2g desktop specific, initial triage",
+    "dom/events/test/test_bug656379-1.html": "Bug 931116, b2g desktop specific, initial triage",
     "dom/indexedDB/test/test_add_put.html": "Bug 931116, b2g desktop specific, initial triage",
     "dom/indexedDB/test/test_add_twice_failure.html": "Bug 931116, b2g desktop specific, initial triage",
     "dom/indexedDB/test/test_advance.html": "Bug 931116, b2g desktop specific, initial triage",
     "dom/indexedDB/test/test_app_isolation_inproc.html": "Bug 931116, b2g desktop specific, initial triage",
     "dom/indexedDB/test/test_app_isolation_oop.html": "Bug 931116, b2g desktop specific, initial triage",
     "dom/indexedDB/test/test_autoIncrement.html": "Bug 931116, b2g desktop specific, initial triage",
     "dom/indexedDB/test/test_autoIncrement_indexes.html": "Bug 931116, b2g desktop specific, initial triage",
     "dom/indexedDB/test/test_bfcache.html": "Bug 931116, b2g desktop specific, initial triage",
--- a/testing/mochitest/b2g.json
+++ b/testing/mochitest/b2g.json
@@ -72,20 +72,29 @@
     "dom/imptests/html/dom/ranges/test_Range-cloneContents.html":"",
     "dom/imptests/html/dom/ranges/test_Range-compareBoundaryPoints.html":"times out, bug 862196",
     "dom/imptests/html/dom/ranges/test_Range-deleteContents.html":"",
     "dom/imptests/html/dom/ranges/test_Range-extractContents.html":"",
     "dom/imptests/html/dom/ranges/test_Range-set.html":"",
     "dom/imptests/html/dom/ranges/test_Range-surroundContents.html":"",
     "dom/imptests/html/dom/ranges/test_Range-mutations.html":"Test timed out.",
     "dom/encoding/test/test_stringencoding.html":"Test timed out on b2g board",
-
-    "content/events/test/test_bug615597.html":"bug 900969, 5 tests",
-    "content/events/test/test_bug667919-1.html":"bug 900969, 5 tests",
-    "content/events/test/test_bug667919-2.html":"bug 900969, 5 tests",
+    "dom/events/test/test_bug615597.html":"bug 900969, 5 tests",
+    "dom/events/test/test_bug667919-1.html":"bug 900969, 5 tests",
+    "dom/events/test/test_bug667919-2.html":"bug 900969, 5 tests",
+    "dom/events/test/test_continuous_wheel_events.html":"5535 passed, 108 failed - more tests running than desktop",
+    "dom/events/test/test_bug422132.html":"2 failures out of 8, mousewheel test",
+    "dom/events/test/test_bug659071.html":"1 failure out of 2, mousewheel zoom test",
+    "dom/events/test/test_dom_wheel_event.html":"456 failed out of 19873, mousewheel test",
+    "dom/events/test/test_bug426082.html":"1 failure out of 6, Moving the mouse down from the label should have unpressed the button",
+    "dom/events/test/test_bug534833.html":"4 failures out of 6, bug 901564,click not fired, also disabled on Android",
+    "dom/events/test/test_bug603008.html":"1 failure out of 615, bug 901533, Six move events fired - got 7, expected 6, also disabled on Android, touchmove",
+    "dom/events/test/test_bug508479.html":"drag event, also fails on Android",
+    "dom/events/test/test_dragstart.html":"drag event, also fails on Android",
+    "dom/events/test/test_bug864040.html":"failing when the test gets moved around, and on debug",
 
     "content/html/content/test/test_bug561636.html":"observerservice not working",
     "content/base/test/test_bug548193.html":"observerservice issue",
     "content/base/test/test_x-frame-options.html":"observerservice issue",
 
     "content/base/test/test_XHRSendData.html":"seems to stall",
     "content/base/test/test_XHR_parameters.html":"86 total, 4 failing - testing mozAnon - got false, expected true",
     "content/base/test/test_XHR_system.html":"12 total, 2 failing - .mozSystem == true - got false, expected true + ",
@@ -150,30 +159,16 @@
     "content/html/document/test/test_bug391777.html":"showmodaldialog",
     "content/media/webspeech/recognition/test/test_nested_eventloop.html": "showmodaldialog",
     "dom/tests/mochitest/bugs/test_bug291653.html":"showmodaldialog",
     "dom/tests/mochitest/bugs/test_bug414291.html":"showmodaldialog",
     "dom/tests/mochitest/bugs/test_bug479143.html":"showmodaldialog",
     "dom/tests/mochitest/bugs/test_bug504862.html":"showmodaldialog",
     "dom/tests/mochitest/bugs/test_bug61098.html":"showmodaldialog",
 
-    "content/events/test/test_continuous_wheel_events.html":"5535 passed, 108 failed - more tests running than desktop",
-    "content/events/test/test_bug422132.html":"2 failures out of 8, mousewheel test",
-    "content/events/test/test_bug659071.html":"1 failure out of 2, mousewheel zoom test",
-    "content/events/test/test_dom_wheel_event.html":"456 failed out of 19873, mousewheel test",
-
-    "content/events/test/test_bug426082.html":"1 failure out of 6, Moving the mouse down from the label should have unpressed the button",
-    "content/events/test/test_bug534833.html":"4 failures out of 6, bug 901564,click not fired, also disabled on Android",
-    "content/events/test/test_bug603008.html":"1 failure out of 615, bug 901533, Six move events fired - got 7, expected 6, also disabled on Android, touchmove",
-
-    "content/events/test/test_bug508479.html":"drag event, also fails on Android",
-    "content/events/test/test_dragstart.html":"drag event, also fails on Android",
-
-    "content/events/test/test_bug864040.html":"failing when the test gets moved around, and on debug",
-
     "content/html/content/test/forms/test_input_file_picker.html":"5 failures out of 139 and timing out, bug 901581",
     "content/html/content/test/forms/test_validation.html":"374 total, bug 901848, no keygen support",
 
     "content/html/content/test/test_bug430351.html":"13 failing out of 700, not focusable iframes? bug 902207",
 
     "content/html/content/test/test_bug523771.html":"onload of iframe not firing, because submit not working?",
 
     "content/html/content/test/test_bug612730.html":"form control not selected/checked with synthesizeMouse, also fails on Android",
@@ -227,24 +222,17 @@
     "content/base/test/test_websocket.html":"",
     "content/base/test/test_websocket_basic.html":"",
     "content/base/test/test_websocket_hello.html":"",
     "content/base/test/websocket_hybi/test_receive-arraybuffer.html":"",
     "content/base/test/websocket_hybi/test_receive-blob.html":"",
     "content/base/test/websocket_hybi/test_send-arraybuffer.html":"",
     "content/base/test/websocket_hybi/test_send-blob.html":"",
     "content/canvas/test/webgl/test_webgl_conformance_test_suite.html":"",
-    "content/events/test/test_bug226361.xhtml":"",
-    "content/events/test/test_bug238987.html":"",
-    "content/events/test/test_bug409604.html":"",
-    "content/events/test/test_bug457672.html":"",
-    "content/events/test/test_bug574663.html":"",
-    "content/events/test/test_bug607464.html":"",
-    "content/events/test/test_wheel_default_action.html":"",
-    "content/base/test/test_bug682592.html":"",
+    "content/base/test/test_bug682592.html":"",	
     "content/html/document/test/test_bug369370.html":"",
     "content/svg/content/test/test_text_selection.html":"Mouse selection not workin on b2g",
     "content/svg/content/test/test_SVGAnimatedImageSMILDisabled.html":"",
     "content/xml/document/test/test_bug392338.html":"",
     "content/base/test/test_bug383430.html":"",
     "content/base/test/test_bug422403-2.xhtml":"",
     "content/base/test/test_bug424359-1.html":"",
     "content/base/test/test_bug424359-2.html":"",
@@ -291,16 +279,23 @@
     "dom/browser-element/mochitest/test_browserElement_oop_OpenMixedProcess.html":"",
     "dom/browser-element/mochitest/test_browserElement_oop_OpenNamed.html":"",
     "dom/browser-element/mochitest/test_browserElement_oop_OpenWindow.html":"",
     "dom/browser-element/mochitest/test_browserElement_oop_OpenWindowDifferentOrigin.html":"",
     "dom/browser-element/mochitest/test_browserElement_oop_OpenWindowInFrame.html":"",
     "dom/browser-element/mochitest/test_browserElement_oop_OpenWindowRejected.html":"",
     "dom/browser-element/mochitest/test_browserElement_oop_SecurityChange.html":"",
     "dom/browser-element/mochitest/test_browserElement_oop_TargetBlank.html":"",
+    "dom/events/test/test_bug226361.xhtml":"",
+    "dom/events/test/test_bug238987.html":"",
+    "dom/events/test/test_bug409604.html":"",
+    "dom/events/test/test_bug457672.html":"",
+    "dom/events/test/test_bug574663.html":"",
+    "dom/events/test/test_bug607464.html":"",
+    "dom/events/test/test_wheel_default_action.html":"",
 
     "dom/file/test/test_progress_events.html":"All of these fail fairly regularly with: UnknownError: The operation failed for reasons unrelated to the database itself and not covered by any other error code. at http://mochi.test:8888/tests/dom/file/test/helpers.js:126",
     "dom/file/test/test_request_readyState.html":"",
     "dom/file/test/test_stream_tracking.html":"",
     "dom/file/test/test_append_read_data.html":"",
     "dom/file/test/test_archivereader.html":"",
     "dom/file/test/test_archivereader_nonUnicode.html":"",
     "dom/file/test/test_archivereader_zip_in_zip.html":"",
--- a/uriloader/exthandler/Makefile.in
+++ b/uriloader/exthandler/Makefile.in
@@ -1,19 +1,19 @@
 #
 # 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/.
 
 LOCAL_INCLUDES = -I$(srcdir)
 
 LOCAL_INCLUDES += -I$(topsrcdir)/dom/base \
+            -I$(topsrcdir)/dom/events \
             -I$(topsrcdir)/dom/ipc \
             -I$(topsrcdir)/content/base/src \
-            -I$(topsrcdir)/content/events/src \
             -I$(topsrcdir)/netwerk/base/src \
             -I$(topsrcdir)/netwerk/protocol/http
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 LOCAL_INCLUDES += -I$(srcdir)/win
 endif
 
 ifdef MOZ_ENABLE_DBUS
--- a/uriloader/prefetch/Makefile.in
+++ b/uriloader/prefetch/Makefile.in
@@ -1,13 +1,13 @@
 #
 # 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/.
 
 LOCAL_INCLUDES = \
 		-I$(topsrcdir)/content/base/src \
-		-I$(topsrcdir)/content/events/src \
+		-I$(topsrcdir)/dom/events \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 # vim: ts=4 sw=4 noexpandtab
--- a/view/src/moz.build
+++ b/view/src/moz.build
@@ -12,10 +12,10 @@ SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'gklayout'
 
 LOCAL_INCLUDES += [
-    '../../content/events/src/',
+    '/dom/events/',
 ]
--- a/widget/BasicEvents.h
+++ b/widget/BasicEvents.h
@@ -58,17 +58,17 @@ enum nsEventStructType
   NS_TRANSITION_EVENT,               // InternalTransitionEvent
   NS_ANIMATION_EVENT,                // InternalAnimationEvent
 
   // MiscEvents.h
   NS_COMMAND_EVENT,                  // WidgetCommandEvent
   NS_CONTENT_COMMAND_EVENT,          // WidgetContentCommandEvent
   NS_PLUGIN_EVENT,                   // WidgetPluginEvent
 
-  // MutationEvent.h (content/events/public)
+  // MutationEvent.h (dom/events)
   NS_MUTATION_EVENT,                 // InternalMutationEvent
 
   // Follwoing struct type values are ugly.  They indicate other struct type
   // actually.  However, they are used for distinguishing which DOM event
   // should be created for the event.
   NS_SVGZOOM_EVENT,                  // WidgetGUIEvent
   NS_SMIL_TIME_EVENT                 // InternalUIEvent
 };
--- a/widget/EventClassList.h
+++ b/widget/EventClassList.h
@@ -50,10 +50,10 @@ NS_EVENT_CLASS(Internal, FocusEvent)
 NS_EVENT_CLASS(Internal, TransitionEvent)
 NS_EVENT_CLASS(Internal, AnimationEvent)
 
 // MiscEvents.h
 NS_EVENT_CLASS(Widget, CommandEvent)
 NS_EVENT_CLASS(Widget, ContentCommandEvent)
 NS_EVENT_CLASS(Widget, PluginEvent)
 
-// MutationEvent.h (content/events/public)
+// MutationEvent.h (dom/events)
 NS_EVENT_CLASS(Internal, MutationEvent)
--- a/widget/android/moz.build
+++ b/widget/android/moz.build
@@ -42,18 +42,18 @@ FAIL_ON_WARNINGS = True
 
 LIBRARY_NAME = 'widget_android'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '/content/events/src',
     '/docshell/base',
+    '/dom/events',
     '/dom/system/android',
     '/netwerk/cache',
     '/widget/android/android',
     '/widget/shared',
     '/widget/xpwidgets',
 ]
 
 #DEFINES['DEBUG_WIDGETS'] = True
--- a/widget/gonk/moz.build
+++ b/widget/gonk/moz.build
@@ -62,18 +62,18 @@ SOURCES += [
 
 LIBRARY_NAME = 'widget_gonk'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '/content/events/src',
     '/content/media/omx/mediaresourcemanager',
+    '/dom/events',
     '/dom/system/android',
     '/gfx/skia/include/config',
     '/gfx/skia/include/core',
     '/widget/shared',
     '/widget/xpwidgets',
 ]
 
 DEFINES['HAVE_OFF64_T'] = True
--- a/widget/windows/moz.build
+++ b/widget/windows/moz.build
@@ -95,17 +95,17 @@ LIBRARY_NAME = 'widget_windows'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '../shared',
     '../xpwidgets',
-    '/content/events/src',
+    '/dom/events',
     '/layout/generic',
     '/layout/xul',
     '/toolkit/xre',
     '/xpcom/base',
 ]
 
 DEFINES['MOZ_UNICODE'] = True