Bug 1535353 - update Core :: DOM: * bugzilla product and component meta data in moz.build files after reorganization in bug 1533440 r=hsinyi
authorSebastian Hengst <archaeopteryx@coole-files.de>
Sun, 17 Mar 2019 23:13:22 +0000
changeset 464716 f74e07af9897218f5af09cc0188e753e74ecb58d
parent 464715 ded91213a778fd33682159dbc42b7191fd290fa7
child 464717 7f712118be5d87b60579a6d26f887891bac92e60
push id112470
push useropoprus@mozilla.com
push dateMon, 18 Mar 2019 10:13:23 +0000
treeherdermozilla-inbound@9421b477d67c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewershsinyi
bugs1535353, 1533440
milestone67.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 1535353 - update Core :: DOM: * bugzilla product and component meta data in moz.build files after reorganization in bug 1533440 r=hsinyi Differential Revision: https://phabricator.services.mozilla.com/D23546
docshell/test/moz.build
dom/abort/moz.build
dom/audiochannel/moz.build
dom/base/moz.build
dom/bindings/moz.build
dom/broadcastchannel/moz.build
dom/browser-element/moz.build
dom/cache/moz.build
dom/chrome-webidl/moz.build
dom/console/moz.build
dom/fetch/moz.build
dom/filehandle/moz.build
dom/html/moz.build
dom/imptests/moz.build
dom/interfaces/base/moz.build
dom/interfaces/html/moz.build
dom/interfaces/notification/moz.build
dom/interfaces/sidebar/moz.build
dom/interfaces/storage/moz.build
dom/locales/moz.build
dom/manifest/moz.build
dom/messagechannel/moz.build
dom/moz.build
dom/performance/moz.build
dom/permission/moz.build
dom/power/moz.build
dom/presentation/moz.build
dom/prio/moz.build
dom/promise/moz.build
dom/script/moz.build
dom/system/moz.build
dom/tests/moz.build
dom/url/moz.build
dom/webbrowserpersist/moz.build
dom/webidl/moz.build
dom/websocket/moz.build
dom/worklet/moz.build
dom/xhr/moz.build
extensions/permissions/moz.build
layout/reftests/moz.build
testing/talos/moz.build
testing/web-platform/moz.build
toolkit/content/moz.build
widget/tests/moz.build
--- a/docshell/test/moz.build
+++ b/docshell/test/moz.build
@@ -1,19 +1,19 @@
 with Files('**'):
     BUG_COMPONENT = ('Core', 'Document Navigation')
 
 with Files('browser/*_bug234628*'):
     BUG_COMPONENT = ('Core', 'Internationalization')
 
 with Files('browser/*_bug349769*'):
-    BUG_COMPONENT = ('Core', 'DOM')
+    BUG_COMPONENT = ('Core', 'DOM: Core & HTML')
 
 with Files('browser/*_bug388121*'):
-    BUG_COMPONENT = ('Core', 'DOM')
+    BUG_COMPONENT = ('Core', 'DOM: Core & HTML')
 
 with Files('browser/*_bug655270*'):
     BUG_COMPONENT = ('Toolkit', 'Places')
 
 with Files('browser/*_bug655273*'):
     BUG_COMPONENT = ('Firefox', 'Menus')
 
 with Files('browser/*_bug852909*'):
@@ -42,70 +42,70 @@ with Files('chrome/*303267*'):
 
 with Files('chrome/*453650*'):
     BUG_COMPONENT = ('Core', 'Layout')
 
 with Files('chrome/*565388*'):
     BUG_COMPONENT = ('Core', 'Widget')
 
 with Files('chrome/*582176*'):
-    BUG_COMPONENT = ('Core', 'DOM')
+    BUG_COMPONENT = ('Core', 'DOM: Core & HTML')
 
 with Files('chrome/*608669*'):
-    BUG_COMPONENT = ('Core', 'DOM')
+    BUG_COMPONENT = ('Core', 'DOM: Core & HTML')
 
 with Files('chrome/*690056*'):
-    BUG_COMPONENT = ('Core', 'DOM')
+    BUG_COMPONENT = ('Core', 'DOM: Core & HTML')
 
 with Files('chrome/*92598*'):
     BUG_COMPONENT = ('Core', 'Networking: HTTP')
 
 with Files('chrome/*private_hidden_window*'):
     BUG_COMPONENT = ('Firefox', 'Private Browsing')
 
 
 with Files('iframesandbox/**'):
     BUG_COMPONENT = ('Core', 'Security')
 
 with Files('iframesandbox/*marquee_event_handlers*'):
     BUG_COMPONENT = ('Core', 'DOM: Security')
 
 
 with Files('mochitest/*1045096*'):
-    BUG_COMPONENT = ('Core', 'DOM')
+    BUG_COMPONENT = ('Core', 'DOM: Core & HTML')
 
 with Files('mochitest/*1151421*'):
     BUG_COMPONENT = ('Core', 'DOM: Core & HTML')
 
 with Files('mochitest/*402210*'):
     BUG_COMPONENT = ('Core', 'DOM: Security')
 
 with Files('mochitest/*509055*'):
     BUG_COMPONENT = ('Core', 'History: Global')
 
 with Files('mochitest/*511449*'):
     BUG_COMPONENT = ('Core', 'Widget: Cocoa')
 
 with Files('mochitest/*551225*'):
-    BUG_COMPONENT = ('Core', 'DOM')
+    BUG_COMPONENT = ('Core', 'DOM: Core & HTML')
 
 with Files('mochitest/*570341*'):
-    BUG_COMPONENT = ('Core', 'DOM')
+    BUG_COMPONENT = ('Core', 'DOM: Core & HTML')
 
 with Files('mochitest/*580069*'):
-    BUG_COMPONENT = ('Core', 'DOM')
+    BUG_COMPONENT = ('Core', 'DOM: Core & HTML')
 
 with Files('mochitest/*637644*'):
     BUG_COMPONENT = ('Core', 'DOM: Core & HTML')
 
 with Files('mochitest/*640387*'):
     BUG_COMPONENT = ('Core', 'DOM: Events')
 
 with Files('mochitest/*668513*'):
-    BUG_COMPONENT = ('Core', 'DOM')
+    BUG_COMPONENT = ('Core', 'DOM: Core & HTML')
 
 with Files('mochitest/*797909*'):
     BUG_COMPONENT = ('Core', 'DOM: Core & HTML')
 
 with Files('mochitest/*forceinheritprincipal*'):
     BUG_COMPONENT = ('Core', 'DOM: Security')
 
 
--- a/dom/abort/moz.build
+++ b/dom/abort/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 TEST_DIRS += ['tests']
 
 EXPORTS.mozilla.dom += [
     'AbortController.h',
     'AbortSignal.h',
 ]
 
--- a/dom/audiochannel/moz.build
+++ b/dom/audiochannel/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 XPIDL_SOURCES += [
     'nsIAudioChannelAgent.idl',
 ]
 
 XPIDL_MODULE = 'dom_audiochannel'
 
 EXPORTS += [
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -3,17 +3,17 @@
 # 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/.
 
 with Files('*Selection*'):
     BUG_COMPONENT = ('Core', 'Selection')
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 TEST_DIRS += ['test']
 
 XPIDL_SOURCES += [
     'mozIDOMWindow.idl',
     'nsIContentPolicy.idl',
     'nsIDocumentEncoder.idl',
     'nsIDOMRequestService.idl',
--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 TEST_DIRS += ['test']
 
 XPIDL_SOURCES += [
     'nsIScriptError.idl'
 ]
 
 XPIDL_MODULE = 'dom_bindings'
--- a/dom/broadcastchannel/moz.build
+++ b/dom/broadcastchannel/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 EXPORTS.mozilla.dom += [
     'BroadcastChannel.h',
 ]
 
 UNIFIED_SOURCES += [
     'BroadcastChannel.cpp',
     'BroadcastChannelChild.cpp',
--- a/dom/browser-element/moz.build
+++ b/dom/browser-element/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 EXPORTS.mozilla += [
     'BrowserElementParent.h',
 ]
 
 SOURCES += [
     'BrowserElementParent.cpp',
 ]
--- a/dom/cache/moz.build
+++ b/dom/cache/moz.build
@@ -1,17 +1,17 @@
 # -*- Mode: python; 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/.
 
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 EXPORTS.mozilla.dom.cache += [
     'Action.h',
     'ActorChild.h',
     'ActorUtils.h',
     'AutoUtils.h',
     'Cache.h',
     'CacheChild.h',
--- a/dom/chrome-webidl/moz.build
+++ b/dom/chrome-webidl/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("ChannelWrapper.webidl"):
     BUG_COMPONENT = ("WebExtensions", "Request Handling")
 
 with Files("Flex.webidl"):
     BUG_COMPONENT = ("Core", "CSS Parsing and Computation")
 
 with Files("HeapSnapshot.webidl"):
--- a/dom/console/moz.build
+++ b/dom/console/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 XPIDL_SOURCES += [
     'nsIConsoleAPIStorage.idl',
 ]
 
 XPIDL_MODULE = 'dom'
 
 EXPORTS += [
--- a/dom/fetch/moz.build
+++ b/dom/fetch/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 EXPORTS.mozilla.dom += [
     'BodyExtractor.h',
     'ChannelInfo.h',
     'Fetch.h',
     'FetchDriver.h',
     'FetchIPCTypes.h',
     'FetchObserver.h',
--- a/dom/filehandle/moz.build
+++ b/dom/filehandle/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 EXPORTS.mozilla.dom.filehandle += [
     'ActorsParent.h',
     'SerializationHelpers.h',
 ]
 
 EXPORTS.mozilla.dom += [
     'FileHandleStorage.h',
--- a/dom/html/moz.build
+++ b/dom/html/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 DIRS += ['input']
 
 MOCHITEST_MANIFESTS += [
     'test/forms/mochitest.ini',
     'test/mochitest.ini',
 ]
 
--- a/dom/imptests/moz.build
+++ b/dom/imptests/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("html/webgl/**"):
     BUG_COMPONENT = ("Core", "Canvas: 2D")
 
 with Files("html/typedarrays/**"):
     BUG_COMPONENT = ("Core", "JavaScript: Standard Library")
 
 with Files("html/js/**"):
--- a/dom/interfaces/base/moz.build
+++ b/dom/interfaces/base/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 XPIDL_SOURCES += [
     'domstubs.idl',
     'nsIBrowser.idl',
     'nsIBrowserDOMWindow.idl',
     'nsIContentPermissionPrompt.idl',
     'nsIContentPrefService2.idl',
     'nsIContentProcess.idl',
--- a/dom/interfaces/html/moz.build
+++ b/dom/interfaces/html/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 XPIDL_SOURCES += [
     'nsIDOMMozBrowserFrame.idl',
     'nsIMozBrowserFrame.idl',
 ]
 
 XPIDL_MODULE = 'dom_html'
 
--- a/dom/interfaces/notification/moz.build
+++ b/dom/interfaces/notification/moz.build
@@ -1,15 +1,15 @@
 # -*- Mode: python; 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 XPIDL_SOURCES += [
     'nsINotificationStorage.idl',
 ]
 
 XPIDL_MODULE = 'dom_notification'
 
--- a/dom/interfaces/sidebar/moz.build
+++ b/dom/interfaces/sidebar/moz.build
@@ -1,15 +1,15 @@
 # -*- Mode: python; 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 XPIDL_SOURCES += [
     'nsIWebProtocolHandlerRegistrar.idl',
 ]
 
 XPIDL_MODULE = 'dom_sidebar'
 
--- a/dom/interfaces/storage/moz.build
+++ b/dom/interfaces/storage/moz.build
@@ -1,15 +1,15 @@
 # -*- Mode: python; 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 XPIDL_SOURCES += [
     'nsIDOMStorageManager.idl',
     'nsIStorageActivityService.idl',
 ]
 
 XPIDL_MODULE = 'dom_storage'
--- a/dom/locales/moz.build
+++ b/dom/locales/moz.build
@@ -1,25 +1,25 @@
 # -*- Mode: python; 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("en-US/chrome/accessibility/**"):
     BUG_COMPONENT = ("Core", "Disability Access APIs")
 
 with Files("en-US/chrome/dom/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("en-US/chrome/layout/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("en-US/chrome/layout/css.properties"):
     BUG_COMPONENT = ("Core", "CSS Parsing and Computation")
 
 with Files("en-US/chrome/layout/htmlparser.properties"):
     BUG_COMPONENT = ("Core", "HTML: Parser")
 
 with Files("en-US/chrome/layout/layout_errors.properties"):
--- a/dom/manifest/moz.build
+++ b/dom/manifest/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 EXTRA_JS_MODULES += [
     'ImageObjectProcessor.jsm',
     'Manifest.jsm',
     'ManifestFinder.jsm',
     'ManifestIcons.jsm',
     'ManifestObtainer.jsm',
     'ManifestProcessor.jsm',
--- a/dom/messagechannel/moz.build
+++ b/dom/messagechannel/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 TEST_DIRS += ['tests']
 
 EXPORTS.mozilla.dom += [
     'MessageChannel.h',
     'MessagePort.h',
     'MessagePortChild.h',
     'MessagePortParent.h',
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -1,17 +1,17 @@
 # -*- Mode: python; 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/.
 
 # interfaces/*/ are annotated per directory, this is for new files
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("plugins/**"):
     BUG_COMPONENT = ("Core", "Plug-ins")
 
 JAR_MANIFESTS += ['jar.mn']
 
 interfaces = [
     'base',
--- a/dom/performance/moz.build
+++ b/dom/performance/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 EXPORTS.mozilla.dom += [
     'Performance.h',
     'PerformanceEntry.h',
     'PerformanceMark.h',
     'PerformanceMeasure.h',
     'PerformanceNavigation.h',
     'PerformanceNavigationTiming.h',
--- a/dom/permission/moz.build
+++ b/dom/permission/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 EXPORTS.mozilla.dom += [
     'Permissions.h',
     'PermissionStatus.h',
 ]
 
 UNIFIED_SOURCES += [
     'PermissionObserver.cpp',
--- a/dom/power/moz.build
+++ b/dom/power/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 XPIDL_SOURCES += [
     'nsIDOMWakeLockListener.idl',
     'nsIPowerManagerService.idl',
     'nsIWakeLock.idl',
 ]
 
 XPIDL_MODULE = 'dom_power'
--- a/dom/presentation/moz.build
+++ b/dom/presentation/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 DIRS += ['interfaces', 'provider']
 
 XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell/xpcshell.ini']
 MOCHITEST_MANIFESTS += ['tests/mochitest/mochitest.ini']
 MOCHITEST_CHROME_MANIFESTS += ['tests/mochitest/chrome.ini']
 
 EXPORTS.mozilla.dom += [
--- a/dom/prio/moz.build
+++ b/dom/prio/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 LOCAL_INCLUDES += [
     '/third_party/msgpack/include'
 ]
 
 EXPORTS.mozilla.dom += [
     'PrioEncoder.h',
 ]
--- a/dom/promise/moz.build
+++ b/dom/promise/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 EXPORTS.mozilla.dom += [
     'Promise-inl.h',
     'Promise.h',
     'PromiseDebugging.h',
     'PromiseNativeHandler.h',
     'PromiseWorkerProxy.h',
 ]
--- a/dom/script/moz.build
+++ b/dom/script/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 XPIDL_SOURCES += [
     'nsIScriptLoaderObserver.idl',
 ]
 
 XPIDL_MODULE = 'dom'
 
 EXPORTS += [
--- a/dom/system/moz.build
+++ b/dom/system/moz.build
@@ -1,17 +1,17 @@
 # -*- Mode: python; 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/.
 
 # This picks up *hapticfeedback* which is graveyard
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("*OSFile*"):
     BUG_COMPONENT = ("Toolkit", "OS.File")
 
 with Files("*ocationProvider*"):
     BUG_COMPONENT = ("Core", "Geolocation")
 
 with Files("windows/*LocationProvider*"):
--- a/dom/tests/moz.build
+++ b/dom/tests/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files("browser/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("browser/*onsole*"):
     BUG_COMPONENT = ("DevTools", "General")
 
 with Files("browser/*autofocus*"):
     BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("browser/*unload*"):
@@ -21,125 +21,125 @@ with Files("browser/*1238427*"):
 
 with Files("browser/*Geolocation*"):
     BUG_COMPONENT = ("Core", "Geolocation")
 
 with Files("browser/*geo_*"):
     BUG_COMPONENT = ("Core", "Geolocation")
 
 with Files("browser/browser_cancel_keydown_keypress_event.js"):
-    BUG_COMPONENT = ("Core", "Event Handling")
+    BUG_COMPONENT = ("Core", "User events and focus handling")
 
 with Files("browser/*local*"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("browser/browser_test_focus_after_modal_state.js"):
-    BUG_COMPONENT = ("Core", "Event Handling")
+    BUG_COMPONENT = ("Core", "User events and focus handling")
 
 with Files("mochitest/ajax/**"):
     BUG_COMPONENT = ("Testing", "Mochitest")
 
 with Files("mochitest/ajax/offline/**"):
     BUG_COMPONENT = ("Core", "Networking: Cache")
 
 with Files("mochitest/beacon/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 # big mix of components here
 with Files("mochitest/bugs/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 # TODO: big mix of components here
 with Files("mochitest/chrome/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("mochitest/crypto/**"):
     BUG_COMPONENT = ("Core", "DOM: Security")
 
 with Files("mochitest/dom-level0/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("mochitest/dom-level1-core/**"):
     BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("mochitest/dom-level2-core/**"):
     BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("mochitest/dom-level2-html/**"):
     BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("mochitest/fetch/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("mochitest/gamepad/**"):
     BUG_COMPONENT = ("Core", "DOM: Device Interfaces")
 
 # TODO: big mix of components here
 with Files("mochitest/general/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("mochitest/geolocation/**"):
     BUG_COMPONENT = ("Core", "Geolocation")
 
 with Files("mochitest/localstorage/**"):
     BUG_COMPONENT = ("Core", "DOM: Web Storage")
 
 with Files("mochitest/orientation/**"):
     BUG_COMPONENT = ("Core", "DOM: Device Interfaces")
 
 with Files("mochitest/orientation/*507902*"):
     BUG_COMPONENT = ("Core", "Layout: Images, Video, and HTML Frames")
 
 with Files("mochitest/pointerlock/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("mochitest/script/**"):
     BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("mochitest/sessionstorage/**"):
     BUG_COMPONENT = ("Core", "DOM: Web Storage")
 
 with Files("mochitest/storageevent/**"):
     BUG_COMPONENT = ("Core", "DOM: Web Storage")
 
 with Files("mochitest/webcomponents/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("mochitest/whatwg/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("reftest/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("reftest/*456008*"):
     BUG_COMPONENT = ("Core", "XML")
 
 with Files("reftest/*439965*"):
     BUG_COMPONENT = ("Core", "Editor")
 
 with Files("reftest/*427779*"):
     BUG_COMPONENT = ("Core", "XML")
 
 with Files("reftest/*559996*"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("reftest/*591981*"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("reftest/*592366*"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("reftest/*798068*"):
     BUG_COMPONENT = ("Core", "Layout")
 
 with Files("reftest/xml-stylesheet/**"):
     BUG_COMPONENT = ("Core", "XSLT")
 
 with Files("unit/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("unit/*geolocation*"):
     BUG_COMPONENT = ("Core", "Geolocation")
 
 with Files("unit/test_bug465752.js"):
     BUG_COMPONENT = ("Core", "CSS Parsing and Computation")
 
 with Files("unit/test_PromiseDebugging.js"):
--- a/dom/url/moz.build
+++ b/dom/url/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 EXPORTS.mozilla.dom += [
     'URL.h',
     'URLSearchParams.h',
 ]
 
 UNIFIED_SOURCES += [
     'URL.cpp',
--- a/dom/webbrowserpersist/moz.build
+++ b/dom/webbrowserpersist/moz.build
@@ -1,17 +1,17 @@
 # -*- Mode: python; 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/.
 
 # moved from embedding/components/webbrowserpersist Jan 13, 2017
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 XPIDL_SOURCES += [
     'nsIWebBrowserPersist.idl',
     'nsIWebBrowserPersistDocument.idl',
 ]
 
 XPIDL_MODULE = 'webbrowserpersist'
 
--- a/dom/webidl/moz.build
+++ b/dom/webidl/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("APZTestData.webidl"):
     BUG_COMPONENT = ("Core", "Panning and Zooming")
 
 with Files("AccessibleNode.webidl"):
     BUG_COMPONENT = ("Core", "Disability Access APIs")
 
 with Files("Addon*"):
@@ -33,17 +33,17 @@ with Files("BaseKeyframeTypes.webidl"):
 
 with Files("BatteryManager.webidl"):
     BUG_COMPONENT = ("Core", "DOM: Device Interfaces")
 
 with Files("BiquadFilterNode.webidl"):
     BUG_COMPONENT = ("Core", "Web Audio")
 
 with Files("BrowserElement*"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("CSP*"):
     BUG_COMPONENT = ("Core", "DOM: Security")
 
 with Files("CSS*"):
     BUG_COMPONENT = ("Core", "CSS Parsing and Computation")
 
 with Files("Canvas*"):
@@ -141,17 +141,17 @@ with Files("HiddenPluginEvent.webidl"):
 
 with Files("IDB*"):
     BUG_COMPONENT = ("Core", "DOM: IndexedDB")
 
 with Files("IIRFilterNode.webidl"):
     BUG_COMPONENT = ("Core", "Web Audio")
 
 with Files("Image*"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("ImageCapture*"):
     BUG_COMPONENT = ("Core", "Audio/Video")
 
 with Files("InputEvent.webidl"):
     BUG_COMPONENT = ("Core", "DOM: Events")
 
 with Files("InstallTrigger.webidl"):
--- a/dom/websocket/moz.build
+++ b/dom/websocket/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 EXPORTS.mozilla.dom += [
     'WebSocket.h',
 ]
 
 UNIFIED_SOURCES += [
     'WebSocket.cpp',
 ]
--- a/dom/worklet/moz.build
+++ b/dom/worklet/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 EXPORTS.mozilla.dom += [
     'Worklet.h',
     'WorkletGlobalScope.h',
     'WorkletImpl.h',
     'WorkletPrincipal.h',
     'WorkletThread.h',
 ]
--- a/dom/xhr/moz.build
+++ b/dom/xhr/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 EXPORTS.mozilla.dom += [
     'XMLHttpRequest.h',
     'XMLHttpRequestEventTarget.h',
     'XMLHttpRequestMainThread.h',
     'XMLHttpRequestString.h',
     'XMLHttpRequestUpload.h',
 ]
--- a/extensions/permissions/moz.build
+++ b/extensions/permissions/moz.build
@@ -10,9 +10,9 @@ UNIFIED_SOURCES += [
 
 XPCOM_MANIFESTS += [
     'components.conf',
 ]
 
 FINAL_LIBRARY = 'xul'
 
 with Files('**'):
-    BUG_COMPONENT = ('Core', 'DOM')
+    BUG_COMPONENT = ('Core', 'DOM: Core & HTML')
--- a/layout/reftests/moz.build
+++ b/layout/reftests/moz.build
@@ -203,17 +203,17 @@ with Files('margin-collapsing/**'):
     BUG_COMPONENT = ('Core', 'Layout: Block and Inline')
 with Files('marquee/**'):
     BUG_COMPONENT = ('Core', 'CSS Parsing and Computation')
 with Files('mathml/**'):
     BUG_COMPONENT = ('Core', 'MathML')
 with Files('native-theme/**'):
     BUG_COMPONENT = ('Core', 'Layout')
 with Files('object/**'):
-    BUG_COMPONENT = ('Core', 'DOM')
+    BUG_COMPONENT = ('Core', 'DOM: Core & HTML')
 with Files('ogg-video/**'):
     BUG_COMPONENT = ('Core', 'Audio/Video')
 with Files('outline/**'):
     BUG_COMPONENT = ('Core', 'Layout')
 with Files('pagination/**'):
     BUG_COMPONENT = ('Core', 'Layout')
 with Files('percent-overflow-sizing/**'):
     BUG_COMPONENT = ('Core', 'Layout')
@@ -303,17 +303,17 @@ with Files('w3c-css/submitted/text-decor
     BUG_COMPONENT = ('Core', 'Layout: Block and Inline')
 with Files('w3c-css/submitted/ui3/**'):
     BUG_COMPONENT = ('Core', 'Layout')
 with Files('w3c-css/submitted/values3/**'):
     BUG_COMPONENT = ('Core', 'CSS Parsing and Computation')
 with Files('w3c-css/submitted/variables/**'):
     BUG_COMPONENT = ('Core', 'CSS Parsing and Computation')
 with Files('webcomponents/**'):
-    BUG_COMPONENT = ('Core', 'DOM')
+    BUG_COMPONENT = ('Core', 'DOM: Core & HTML')
 with Files('webm-video/**'):
     BUG_COMPONENT = ('Core', 'Audio/Video')
 with Files('writing-mode/**'):
     BUG_COMPONENT = ('Core', 'Layout: Block and Inline')
 with Files('xul/**'):
     BUG_COMPONENT = ('Core', 'XUL')
 with Files('xul-document-load/**'):
     BUG_COMPONENT = ('Core', 'XUL')
--- a/testing/talos/moz.build
+++ b/testing/talos/moz.build
@@ -16,17 +16,17 @@ with Files("talos/tests/tresize/**"):
 
 with Files("talos/tests/a11y/**"):
     BUG_COMPONENT = ("Core", "Disability Access APIs")
 
 with Files("talos/tests/cpstartup/**"):
     BUG_COMPONENT = ("Firefox", "Tabbed Browser")
 
 with Files("talos/tests/dromaeo/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("talos/tests/kraken/**"):
     BUG_COMPONENT = ("Core", "JavaScript Engine")
 
 with Files("talos/tests/scroll/**"):
     BUG_COMPONENT = ("Core", "Graphics")
 
 with Files("talos/tests/svg*"):
--- a/testing/web-platform/moz.build
+++ b/testing/web-platform/moz.build
@@ -49,35 +49,35 @@ with Files("outbound/tests/placeholder")
 
 with Files("mozilla/README"):
     BUG_COMPONENT = ("Testing", "web-platform-tests")
 
 with Files("mozilla/meta/**"):
     BUG_COMPONENT = ("Testing", "web-platform-tests")
 
 with Files("mozilla/tests/dom/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("mozilla/tests/editor/**"):
     BUG_COMPONENT = ("Core", "Editor")
 
 with Files("mozilla/tests/fetch/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("mozilla/tests/focus/**"):
     BUG_COMPONENT = ("Core", "Editor")
 
 with Files("mozilla/tests/html/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("mozilla/tests/html/semantics/forms/**"):
     BUG_COMPONENT = ("Core", "Layout: Form Controls")
 
 with Files("mozilla/tests/html/semantics/scripting-1/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("mozilla/tests/placeholder"):
     BUG_COMPONENT = ("Testing", "web-platform-tests")
 
 with Files("mozilla/tests/wasm/**"):
     BUG_COMPONENT = ("Core", "Javascript: Web Assembly")
 
 with Files("update/**"):
@@ -120,29 +120,29 @@ with Files("tests/wpt"):
 with Files("tests/wpt.py"):
     BUG_COMPONENT = ("Testing", "web-platform-tests")
 
 
 with Files("tests/2dcontext/**"):
     BUG_COMPONENT = ("Core", "Canvas: 2D")
 
 with Files("tests/FileAPI/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/IndexedDB/**"):
     BUG_COMPONENT = ("Core", "DOM: IndexedDB")
 
 with Files("tests/WebCryptoAPI/**"):
     BUG_COMPONENT = ("Core", "DOM: Security")
 
 with Files("tests/WebIDL/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/xhr/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/accelerometer/**"):
     BUG_COMPONENT = ("Core", "DOM: Device Interfaces")
 
 with Files("tests/ambient-light/**"):
     BUG_COMPONENT = ("Core", "DOM: Device Interfaces")
 
 with Files("tests/annotation-model/**"):
@@ -162,26 +162,26 @@ with Files("tests/audio-output/**"):
 
 with Files("tests/background-fetch/**"):
     BUG_COMPONENT = ("Core", "DOM: Service Workers")
 
 with Files("tests/battery-status/**"):
     BUG_COMPONENT = ("Core", "DOM: Device Interfaces")
 
 with Files("tests/beacon/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/bluetooth/**"):
     BUG_COMPONENT = ("Core", "DOM: Device Interfaces")
 
 with Files("tests/clear-site-data/**"):
     BUG_COMPONENT = ("Core", "DOM: Security")
 
 with Files("tests/clipboard-apis/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/common/**"):
     BUG_COMPONENT = ("Testing", "web-platform-tests")
 
 # Appears to be testing -webkit specific css properties
 with Files("tests/compat/**"):
     BUG_COMPONENT = ("Core", "Layout")
 
@@ -244,26 +244,26 @@ with Files("tests/css/cssom/**"):
 
 with Files("tests/css/cssom-view/**"):
     BUG_COMPONENT = ("Core", "DOM: CSS Object Model")
 
 with Files("tests/css/selectors/**"):
     BUG_COMPONENT = ("Core", "CSS Parsing and Computation")
 
 with Files("tests/custom-elements/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/docs/**"):
     BUG_COMPONENT = ("Testing", "web-platform-tests")
 
 with Files("tests/dom/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/domparsing/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/domxpath/**"):
     BUG_COMPONENT = ("Core", "XSLT")
 
 with Files("tests/dpub-aam/**"):
     BUG_COMPONENT = ("Core", "Disability Access APIs")
 
 with Files("tests/dpub-aria/**"):
@@ -275,51 +275,51 @@ with Files("tests/editing/**"):
 # as per Bug 746911
 with Files("tests/encoding/**"):
     BUG_COMPONENT = ("Core", "Internationalization")
 
 with Files("tests/encrypted-media/**"):
     BUG_COMPONENT = ("Core", "Audio/Video: Playback")
 
 with Files("tests/entries-api/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/eventsource/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/feature-policy/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/fetch/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/fonts/**"):
     BUG_COMPONENT = ("Testing", "web-platform-tests")
 
 with Files("tests/fonts/math/**"):
     BUG_COMPONENT = ("Core", "MathML")
 
 with Files("tests/fullscreen/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/gamepad/**"):
     BUG_COMPONENT = ("Core", "DOM: Device Interfaces")
 
 # Bug 1359076 - Deleting this feature due to security
 with Files("tests/geolocation-API/**"):
     BUG_COMPONENT = ("Core", "Geolocation")
 
 with Files("tests/gyroscope/**"):
     BUG_COMPONENT = ("Core", "DOM: Device Interfaces")
 
 with Files("tests/hr-time/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/html/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/html-longdesc/**"):
     BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 # Not implemented yet, see Bug 741393
 with Files("tests/html-media-capture/**"):
     BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
@@ -331,47 +331,47 @@ with Files("tests/images/**"):
 
 with Files("tests/infrastructure/**"):
     BUG_COMPONENT = ("Testing", "web-platform-tests")
 
 with Files("tests/input-events/**"):
     BUG_COMPONENT = ("Core", "General")
 
 with Files("tests/interfaces/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/intersection-observer/**"):
     BUG_COMPONENT = ("Core", "Layout")
 
 with Files("tests/js/**"):
     BUG_COMPONENT = ("Core", "JavaScript Engine")
 
 # To be implemented in bug 1348405
 with Files("tests/keyboard-lock/**"):
     BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 # No reference to longtask in bugzilla or codebase
 with Files("tests/longtask-timing/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 # depends on generic-sensor, check bug 1359076
 with Files("tests/magnetometer/**"):
     BUG_COMPONENT = ("Core", "DOM: Device Interfaces")
 
 with Files("tests/mathml/**"):
     BUG_COMPONENT = ("Core", "MathML")
 
 with Files("tests/media/**"):
     BUG_COMPONENT = ("Core", "Audio/Video: Playback")
 
 with Files("tests/media-capabilities/**"):
     BUG_COMPONENT = ("Core", "WebRTC: Audio/Video")
 
 with Files("tests/mediasession/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/media-source/**"):
     BUG_COMPONENT = ("Core", "Audio/Video: Playback")
 
 with Files("tests/mediacapture-fromelement/**"):
     BUG_COMPONENT = ("Core", "Audio/Video: Recording")
 
 with Files("tests/mediacapture-image/**"):
@@ -382,17 +382,17 @@ with Files("tests/mediacapture-record/**
 
 with Files("tests/mediacapture-streams/**"):
     BUG_COMPONENT = ("Core", "Audio/Video: MediaStreamGraph")
 
 with Files("tests/mixed-content/**"):
     BUG_COMPONENT = ("Core", "DOM: Security")
 
 with Files("tests/navigation-timing/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/netinfo/**"):
     BUG_COMPONENT = ("Core", "DOM: Device Interfaces")
 
 with Files("tests/notifications/**"):
     BUG_COMPONENT = ("Toolkit", "Notifications and Alerts")
 
 with Files("tests/offscreen-canvas/**"):
@@ -410,20 +410,20 @@ with Files("tests/old-tests/submission/M
 
 with Files("tests/orientation-event/**"):
     BUG_COMPONENT = ("Core", "DOM: Device Interfaces")
 
 with Files("tests/orientation-sensor/**"):
     BUG_COMPONENT = ("Core", "DOM: Device Interfaces")
 
 with Files("tests/page-visibility/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/paint-timing/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 # No tests in here
 with Files("tests/payment-handler/**"):
     BUG_COMPONENT = ("Core", "DOM: Web Payments")
 
 # No tests in here
 with Files("tests/payment-method-basic-card/**"):
     BUG_COMPONENT = ("Core", "DOM: Web Payments")
@@ -431,114 +431,114 @@ with Files("tests/payment-method-basic-c
 # No tests in here
 with Files("tests/payment-method-id/**"):
     BUG_COMPONENT = ("Core", "DOM: Web Payments")
 
 with Files("tests/payment-request/**"):
     BUG_COMPONENT = ("Core", "DOM: Web Payments")
 
 with Files("tests/performance-timeline/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/pointerevents/**"):
     BUG_COMPONENT = ("Core", "DOM: Events")
 
 with Files("tests/pointerlock/**"):
     BUG_COMPONENT = ("Core", "DOM: Events")
 
 with Files("tests/preload/**"):
     BUG_COMPONENT = ("Core", "DOM: Core & Html")
 
 with Files("tests/presentation-api/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/proximity/**"):
     BUG_COMPONENT = ("Core", "DOM: Device Interfaces")
 
 with Files("tests/quirks/**"):
     BUG_COMPONENT = ("Core", "Layout")
 
 with Files("tests/remote-playback/**"):
     BUG_COMPONENT = ("Core", "Audio/Video: Playback")
 
 with Files("tests/referrer-policy/**"):
     BUG_COMPONENT = ("Core", "DOM: Security")
 
 with Files("tests/requestidlecallback/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 # To be implemented in bug 1272409
 with Files("tests/resize-observer/**"):
     BUG_COMPONENT = ("Core", "Layout")
 
 with Files("tests/resource-timing/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/resources/**"):
     BUG_COMPONENT = ("Testing", "web-platform-tests")
 
 with Files("tests/screen-orientation/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/secure-contexts/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/selection/**"):
     BUG_COMPONENT = ("Core", "Selection")
 
 with Files("tests/server-timing/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/service-workers/**"):
     BUG_COMPONENT = ("Core", "DOM: Service Workers")
 
 with Files("tests/shadow-dom/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/speech-api/**"):
     BUG_COMPONENT = ("Core", "Web Speech")
 
 with Files("tests/storage/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/streams/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/subresource-integrity/**"):
     BUG_COMPONENT = ("Core", "DOM: Security")
 
 with Files("tests/svg/**"):
     BUG_COMPONENT = ("Core", "SVG")
 
 with Files("tests/svg-aam/**"):
     BUG_COMPONENT = ("Core", "SVG")
 
 with Files("tests/touch-events/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/tools/**"):
     BUG_COMPONENT = ("Testing", "web-platform-tests")
 
 with Files("tests/trusted-types/**"):
     BUG_COMPONENT = ("Core", "DOM: Security")
 
 with Files("tests/uievents/**"):
     BUG_COMPONENT = ("Core", "DOM: Events")
 
 with Files("tests/upgrade-insecure-requests/**"):
     BUG_COMPONENT = ("Core", "DOM: Security")
 
 with Files("tests/url/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/user-timing/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/vibration/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/visual-viewport/**"):
     BUG_COMPONENT = ("Core", "Layout")
 
 with Files("tests/wai-aria/**"):
     BUG_COMPONENT = ("Core", "Disability Access APIs")
 
 with Files("tests/wasm/**"):
@@ -555,43 +555,43 @@ with Files("tests/webauthn/**"):
 
 with Files("tests/webdriver/**"):
     BUG_COMPONENT = ("Testing", "geckodriver")
 
 with Files("tests/webgl/**"):
     BUG_COMPONENT = ("Core", "Canvas: WebGL")
 
 with Files("tests/webmessaging/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/web-nfc/**"):
     BUG_COMPONENT = ("Core", "DOM: Device Interfaces")
 
 with Files("tests/webrtc/**"):
     BUG_COMPONENT = ("Core", "WebRTC")
 
 with Files("tests/web-share/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/websockets/**"):
     BUG_COMPONENT = ("Core", "Networking: WebSockets")
 
 with Files("tests/webstorage/**"):
     BUG_COMPONENT = ("Core", "DOM: Web Storage")
 
 with Files("tests/webusb/**"):
     BUG_COMPONENT = ("Core", "DOM: Device Interfaces")
 
 with Files("tests/webvr/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/webvtt/**"):
     BUG_COMPONENT = ("Core", "Audio/Video: Playback")
 
 with Files("tests/workers/**"):
     BUG_COMPONENT = ("Core", "DOM: Workers")
 
 # to be implemented in bug 1315239
 with Files("tests/worklets/**"):
-    BUG_COMPONENT = ("Core", "DOM")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/x-frame-options/**"):
     BUG_COMPONENT = ("Core", "DOM: Security")
--- a/toolkit/content/moz.build
+++ b/toolkit/content/moz.build
@@ -171,17 +171,17 @@ with Files('tests/chrome/*findbar*'):
 
 with Files('tests/chrome/test_preferences*'):
     BUG_COMPONENT = ('Toolkit', 'Preferences')
 
 with Files('tests/mochitest/*autocomplete*'):
     BUG_COMPONENT = ('Toolkit', 'Autocomplete')
 
 with Files('tests/mochitest/*mousecapture*'):
-    BUG_COMPONENT = ('Core', 'Event Handling')
+    BUG_COMPONENT = ('Core', 'User events and focus handling')
 
 with Files('tests/reftests/*multiline*'):
     BUG_COMPONENT = ('Core', 'XBL')
 
 with Files('tests/reftests/*videocontrols*'):
     BUG_COMPONENT = ('Toolkit', 'Video/Audio Controls')
 
 with Files('tests/unit/**'):
@@ -198,17 +198,17 @@ with Files('tests/widgets/*contextmenu*'
 
 with Files('tests/widgets/*editor*'):
     BUG_COMPONENT = ('Core', 'XUL')
 
 with Files('tests/widgets/*menubar*'):
     BUG_COMPONENT = ('Core', 'XUL')
 
 with Files('tests/widgets/*capture*'):
-    BUG_COMPONENT = ('Core', 'Event Handling')
+    BUG_COMPONENT = ('Core', 'User events and focus handling')
 
 with Files('tests/widgets/*popup*'):
     BUG_COMPONENT = ('Toolkit', 'XUL Widgets')
 with Files('tests/widgets/*tree*'):
     BUG_COMPONENT = ('Toolkit', 'XUL Widgets')
 
 with Files('tests/widgets/*videocontrols*'):
     BUG_COMPONENT = ('Toolkit', 'Video/Audio Controls')
--- a/widget/tests/moz.build
+++ b/widget/tests/moz.build
@@ -15,17 +15,17 @@ with Files("unit/*taskbar_jumplistitems*
 
 with Files("TestAppShellSteadyState.cpp"):
     BUG_COMPONENT = ("Core", "DOM: IndexedDB")
 
 with Files("TestChromeMargin.cpp"):
     BUG_COMPONENT = ("Core", "Widget: Win32")
 
 with Files("*1151186*"):
-    BUG_COMPONENT = ("Core", "Event Handling")
+    BUG_COMPONENT = ("Core", "User events and focus handling")
 
 with Files("*413277*"):
     BUG_COMPONENT = ("Core", "Widget: Cocoa")
 
 with Files("*428405*"):
     BUG_COMPONENT = ("Core", "Widget: Cocoa")
 
 with Files("*429954*"):
@@ -33,17 +33,17 @@ with Files("*429954*"):
 
 with Files("*444800*"):
     BUG_COMPONENT = ("Core", "Widget: Win32")
 
 with Files("*466599*"):
     BUG_COMPONENT = ("Core", "Widget: Cocoa")
 
 with Files("*478536*"):
-    BUG_COMPONENT = ("Core", "Event Handling")
+    BUG_COMPONENT = ("Core", "User events and focus handling")
 
 with Files("*485118*"):
     BUG_COMPONENT = ("Toolkit", "XUL Widgets")
 
 with Files("*517396*"):
     BUG_COMPONENT = ("Toolkit", "XUL Widgets")
 
 with Files("*522217*"):
@@ -57,26 +57,26 @@ with Files("*565392*"):
 
 with Files("*586713*"):
     BUG_COMPONENT = ("Core", "Widget: Cocoa")
 
 with Files("*593307*"):
     BUG_COMPONENT = ("Core", "Widget: Win32")
 
 with Files("*596600*"):
-    BUG_COMPONENT = ("Core", "Event Handling")
+    BUG_COMPONENT = ("Core", "User events and focus handling")
 
 with Files("*673301*"):
     BUG_COMPONENT = ("Firefox", "Bookmarks & History")
 
 with Files("test_assign_event_data.html"):
-    BUG_COMPONENT = ("Core", "Event Handling")
+    BUG_COMPONENT = ("Core", "User events and focus handling")
 
 with Files("test_input_events_on_deactive_window.xul"):
-    BUG_COMPONENT = ("Core", "Event Handling")
+    BUG_COMPONENT = ("Core", "User events and focus handling")
 
 with Files("*chrome_context_menus_win*"):
     BUG_COMPONENT = ("Core", "General")
 
 with Files("*composition_text_querycontent*"):
     BUG_COMPONENT = ("Core", "Internationalization")
 
 with Files("*key_event_counts*"):
@@ -111,17 +111,17 @@ with Files("test_sizemode_events.xul"):
 
 with Files("*system_status_bar*"):
     BUG_COMPONENT = ("Core", "Widget: Cocoa")
 
 with Files("*taskbar_progress*"):
     BUG_COMPONENT = ("Core", "Widget: Win32")
 
 with Files("*wheeltransaction*"):
-    BUG_COMPONENT = ("Core", "Event Handling")
+    BUG_COMPONENT = ("Core", "User events and focus handling")
 
 
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 MOCHITEST_MANIFESTS += ['mochitest.ini']
 MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
 BROWSER_CHROME_MANIFESTS += ['browser/browser.ini']
 
 # if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':