From c01910dbae04e4100195759257ed3c883309c45c Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Apr 2020 00:15:56 -0400 Subject: [PATCH 001/100] Issue #80 - De-unify /layout/build --- layout/build/moz.build | 2 +- layout/build/nsLayoutStatics.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/layout/build/moz.build b/layout/build/moz.build index ecf180d78e..360fe3c974 100644 --- a/layout/build/moz.build +++ b/layout/build/moz.build @@ -10,7 +10,7 @@ EXPORTS += [ 'nsLayoutStatics.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'nsContentDLF.cpp', 'nsLayoutModule.cpp', 'nsLayoutStatics.cpp', diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp index 27236e3f4f..daefad038d 100644 --- a/layout/build/nsLayoutStatics.cpp +++ b/layout/build/nsLayoutStatics.cpp @@ -112,11 +112,13 @@ #include "nsApplicationCacheService.h" #include "mozilla/dom/CustomElementRegistry.h" #include "mozilla/dom/time/DateCacheCleaner.h" +#include "mozilla/dom/workers/ServiceWorkerManager.h" #include "mozilla/EventDispatcher.h" #include "mozilla/IMEStateManager.h" #include "mozilla/dom/HTMLVideoElement.h" #include "TouchManager.h" #include "MediaDecoder.h" +#include "MediaManager.h" #include "MediaPrefs.h" #include "mozilla/ServoBindings.h" #include "mozilla/StaticPresData.h" From a229cbf418a73fa5b82aaaba987151f87edbf9b5 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Apr 2020 00:19:33 -0400 Subject: [PATCH 002/100] Issue #80 - De-unify /layout/ipc --- layout/ipc/moz.build | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/layout/ipc/moz.build b/layout/ipc/moz.build index d9cf962ca2..919a9df7a3 100644 --- a/layout/ipc/moz.build +++ b/layout/ipc/moz.build @@ -14,12 +14,9 @@ EXPORTS.mozilla.layout += [ 'VsyncParent.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'RenderFrameChild.cpp', 'RenderFrameParent.cpp', -] - -SOURCES += [ 'VsyncChild.cpp', 'VsyncParent.cpp', ] From ae6ffa021d7f58aeb189cf50d4a94ebb8f7d6b50 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Apr 2020 00:21:30 -0400 Subject: [PATCH 003/100] Issue #80 - De-unify /layout/tools/layout-debug/src --- layout/tools/layout-debug/src/moz.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layout/tools/layout-debug/src/moz.build b/layout/tools/layout-debug/src/moz.build index be7abcab0f..b3f7d5e062 100644 --- a/layout/tools/layout-debug/src/moz.build +++ b/layout/tools/layout-debug/src/moz.build @@ -15,7 +15,7 @@ EXPORTS += [ 'nsLayoutDebugCIID.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'nsDebugFactory.cpp', 'nsLayoutDebugCLH.cpp', 'nsLayoutDebuggingTools.cpp', From 5c75628bdf571a107f6829f25f4fc53e068adb0f Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Apr 2020 00:25:59 -0400 Subject: [PATCH 004/100] Issue #80 - De-unify /layout/inspector --- layout/inspector/moz.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/layout/inspector/moz.build b/layout/inspector/moz.build index 1576b7d148..bbf8082929 100644 --- a/layout/inspector/moz.build +++ b/layout/inspector/moz.build @@ -26,7 +26,7 @@ EXPORTS += [ 'nsFontFaceList.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'inCSSValueSearch.cpp', 'inDeepTreeWalker.cpp', 'inDOMUtils.cpp', @@ -37,7 +37,7 @@ UNIFIED_SOURCES += [ ] if CONFIG['MOZ_XUL']: - UNIFIED_SOURCES += [ + SOURCES += [ 'inDOMView.cpp', ] From 9a7bb89afcda7f30065500788e347da0a126334f Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Apr 2020 00:43:00 -0400 Subject: [PATCH 005/100] Issue #80 - De-unify dom/offline --- dom/offline/moz.build | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dom/offline/moz.build b/dom/offline/moz.build index 1e3c192c50..2baa124962 100644 --- a/dom/offline/moz.build +++ b/dom/offline/moz.build @@ -4,15 +4,10 @@ # 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/. -EXPORTS += [ - 'nsDOMOfflineResourceList.h', -] -UNIFIED_SOURCES += [ - 'nsDOMOfflineResourceList.cpp', -] +EXPORTS += ['nsDOMOfflineResourceList.h'] -LOCAL_INCLUDES += [ - '/dom/base', -] +SOURCES += ['nsDOMOfflineResourceList.cpp'] + +LOCAL_INCLUDES += ['/dom/base'] FINAL_LIBRARY = 'xul' From bd6fbedbf68388d7c42321204ced31d002c56d29 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Apr 2020 00:53:39 -0400 Subject: [PATCH 006/100] Issue #80 - De-unify dom/broadcastchannel --- dom/broadcastchannel/moz.build | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dom/broadcastchannel/moz.build b/dom/broadcastchannel/moz.build index a076331e58..c9d687cbc6 100644 --- a/dom/broadcastchannel/moz.build +++ b/dom/broadcastchannel/moz.build @@ -8,20 +8,16 @@ EXPORTS.mozilla.dom += [ 'BroadcastChannel.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'BroadcastChannel.cpp', 'BroadcastChannelChild.cpp', 'BroadcastChannelParent.cpp', 'BroadcastChannelService.cpp', ] -IPDL_SOURCES += [ - 'PBroadcastChannel.ipdl', -] +IPDL_SOURCES += ['PBroadcastChannel.ipdl'] -LOCAL_INCLUDES += [ - '../workers', -] +LOCAL_INCLUDES += ['../workers'] MOCHITEST_MANIFESTS += ['tests/mochitest.ini'] BROWSER_CHROME_MANIFESTS += ['tests/browser.ini'] From 68fe7a9928c79d0fec3426e6a0713c47eecc217b Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Apr 2020 01:03:17 -0400 Subject: [PATCH 007/100] Issue #80 - De-unify dom/permission --- dom/permission/PermissionUtils.cpp | 1 + dom/permission/Permissions.cpp | 1 + dom/permission/moz.build | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dom/permission/PermissionUtils.cpp b/dom/permission/PermissionUtils.cpp index 1bb1c1c0d1..a1d4fea437 100644 --- a/dom/permission/PermissionUtils.cpp +++ b/dom/permission/PermissionUtils.cpp @@ -4,6 +4,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "nsIPermissionManager.h" #include "PermissionUtils.h" namespace mozilla { diff --git a/dom/permission/Permissions.cpp b/dom/permission/Permissions.cpp index ddbfc5ffe8..99654055a3 100644 --- a/dom/permission/Permissions.cpp +++ b/dom/permission/Permissions.cpp @@ -11,6 +11,7 @@ #include "mozilla/dom/Promise.h" #include "mozilla/Services.h" #include "nsIPermissionManager.h" +#include "PermissionStatus.h" #include "PermissionUtils.h" namespace mozilla { diff --git a/dom/permission/moz.build b/dom/permission/moz.build index 0be8a7535b..ea17c738f1 100644 --- a/dom/permission/moz.build +++ b/dom/permission/moz.build @@ -9,7 +9,7 @@ EXPORTS.mozilla.dom += [ 'PermissionStatus.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'PermissionObserver.cpp', 'Permissions.cpp', 'PermissionStatus.cpp', From eaf9a0cdddb0bb6b905b9c389d52f7a3a0c6c74a Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Apr 2020 01:07:01 -0400 Subject: [PATCH 008/100] Issue #80 - De-unify dom/time --- dom/time/moz.build | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dom/time/moz.build b/dom/time/moz.build index f6ef682c6b..b68f5c0896 100644 --- a/dom/time/moz.build +++ b/dom/time/moz.build @@ -4,9 +4,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -XPIDL_SOURCES += [ - 'nsITimeService.idl', -] +XPIDL_SOURCES += ['nsITimeService.idl'] XPIDL_MODULE = 'dom_time' @@ -17,7 +15,7 @@ EXPORTS.mozilla.dom.time += [ 'TimeService.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'DateCacheCleaner.cpp', 'TimeChangeObserver.cpp', 'TimeManager.cpp', From 1fb177e77a0a22226ecb3c2f3f369c3324c3ea8d Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Apr 2020 01:18:11 -0400 Subject: [PATCH 009/100] Issue #80 - De-unify dom/storage --- dom/storage/DOMStorageDBUpdater.cpp | 4 ++++ dom/storage/DOMStorageManager.cpp | 1 + dom/storage/moz.build | 11 ++++------- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dom/storage/DOMStorageDBUpdater.cpp b/dom/storage/DOMStorageDBUpdater.cpp index 8e3f07d7ce..61d86ca6c7 100644 --- a/dom/storage/DOMStorageDBUpdater.cpp +++ b/dom/storage/DOMStorageDBUpdater.cpp @@ -4,12 +4,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "DOMStorageDBThread.h" #include "DOMStorageManager.h" #include "mozIStorageBindingParamsArray.h" #include "mozIStorageBindingParams.h" #include "mozIStorageValueArray.h" #include "mozIStorageFunction.h" + +#include "mozStorageHelper.h" + #include "mozilla/BasePrincipal.h" #include "nsVariant.h" #include "mozilla/Services.h" diff --git a/dom/storage/DOMStorageManager.cpp b/dom/storage/DOMStorageManager.cpp index 8f50fcfb48..55a360e16d 100644 --- a/dom/storage/DOMStorageManager.cpp +++ b/dom/storage/DOMStorageManager.cpp @@ -14,6 +14,7 @@ #include "nsNetUtil.h" #include "nsNetCID.h" #include "nsIURL.h" +#include "nsPIDOMWindow.h" #include "nsPrintfCString.h" #include "nsXULAppAPI.h" #include "nsThreadUtils.h" diff --git a/dom/storage/moz.build b/dom/storage/moz.build index 47c2fb85f7..7d52d6d7b0 100644 --- a/dom/storage/moz.build +++ b/dom/storage/moz.build @@ -9,7 +9,7 @@ EXPORTS.mozilla.dom += [ 'DOMStorageIPC.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'DOMStorage.cpp', 'DOMStorageCache.cpp', 'DOMStorageDBThread.cpp', @@ -19,16 +19,13 @@ UNIFIED_SOURCES += [ 'DOMStorageObserver.cpp', ] -IPDL_SOURCES += [ - 'PStorage.ipdl', -] +IPDL_SOURCES += ['PStorage.ipdl'] include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' -LOCAL_INCLUDES += [ - '/dom/base', -] + +LOCAL_INCLUDES += ['/dom/base'] if CONFIG['ENABLE_TESTS']: DEFINES['DOM_STORAGE_TESTS'] = True From 5df7f379c42b24e58123ae0c84922bd955af88dd Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Apr 2020 01:21:32 -0400 Subject: [PATCH 010/100] Issue #80 - De-unify dom/media/wave --- dom/media/wave/moz.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom/media/wave/moz.build b/dom/media/wave/moz.build index f91e8eaebe..d62d3bea48 100644 --- a/dom/media/wave/moz.build +++ b/dom/media/wave/moz.build @@ -9,7 +9,7 @@ EXPORTS += [ 'WaveDemuxer.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'WaveDecoder.cpp', 'WaveDemuxer.cpp', ] From 4bef2196750b70d7c76868976d6e89c7d360cf30 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Apr 2020 01:41:24 -0400 Subject: [PATCH 011/100] Issue #80 - De-unify dom/media/mediasink --- dom/media/mediasink/DecodedStream.cpp | 2 ++ dom/media/mediasink/VideoSink.cpp | 2 ++ dom/media/mediasink/moz.build | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dom/media/mediasink/DecodedStream.cpp b/dom/media/mediasink/DecodedStream.cpp index 00bc5ea493..54161be5cf 100644 --- a/dom/media/mediasink/DecodedStream.cpp +++ b/dom/media/mediasink/DecodedStream.cpp @@ -19,6 +19,8 @@ #include "VideoSegment.h" #include "VideoUtils.h" +#include "nsPrintfCString.h" + namespace mozilla { #undef DUMP_LOG diff --git a/dom/media/mediasink/VideoSink.cpp b/dom/media/mediasink/VideoSink.cpp index 18c0b22ad5..a438cf8a4f 100644 --- a/dom/media/mediasink/VideoSink.cpp +++ b/dom/media/mediasink/VideoSink.cpp @@ -4,9 +4,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "MediaStreamGraph.h" #include "MediaQueue.h" #include "VideoSink.h" #include "MediaPrefs.h" +#include "nsPrintfCString.h" namespace mozilla { diff --git a/dom/media/mediasink/moz.build b/dom/media/mediasink/moz.build index c093413744..34c78a7493 100644 --- a/dom/media/mediasink/moz.build +++ b/dom/media/mediasink/moz.build @@ -4,7 +4,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -UNIFIED_SOURCES += [ +SOURCES += [ 'AudioSinkWrapper.cpp', 'DecodedAudioDataSink.cpp', 'DecodedStream.cpp', From de5ee6828bc9295b84a6fce45b2ec3932f5a5ce6 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Apr 2020 01:47:24 -0400 Subject: [PATCH 012/100] Issue #80 - De-unify dom/media/encoder --- dom/media/encoder/OpusTrackEncoder.cpp | 2 ++ dom/media/encoder/moz.build | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dom/media/encoder/OpusTrackEncoder.cpp b/dom/media/encoder/OpusTrackEncoder.cpp index 4b55b3954f..aa732b392e 100644 --- a/dom/media/encoder/OpusTrackEncoder.cpp +++ b/dom/media/encoder/OpusTrackEncoder.cpp @@ -2,7 +2,9 @@ /* 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/. */ + #include "OpusTrackEncoder.h" +#include "VideoUtils.h" #include "nsString.h" #include "GeckoProfiler.h" diff --git a/dom/media/encoder/moz.build b/dom/media/encoder/moz.build index f29430cb03..925c36f90f 100644 --- a/dom/media/encoder/moz.build +++ b/dom/media/encoder/moz.build @@ -16,7 +16,7 @@ EXPORTS += [ 'TrackMetadataBase.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'MediaEncoder.cpp', 'OpusTrackEncoder.cpp', 'TrackEncoder.cpp', @@ -25,8 +25,10 @@ UNIFIED_SOURCES += [ if CONFIG['MOZ_WEBM_ENCODER']: EXPORTS += ['VP8TrackEncoder.h', ] - UNIFIED_SOURCES += ['VP8TrackEncoder.cpp', + + SOURCES += ['VP8TrackEncoder.cpp', ] + LOCAL_INCLUDES += ['/media/libyuv/include'] FINAL_LIBRARY = 'xul' From f09bb5b0c7cd7c0960aa72d9bbe6f00dd47ecafa Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Apr 2020 01:54:43 -0400 Subject: [PATCH 013/100] Issue #80 - De-unify dom/media/ogg --- dom/media/ogg/OggDemuxer.cpp | 1 + dom/media/ogg/moz.build | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dom/media/ogg/OggDemuxer.cpp b/dom/media/ogg/OggDemuxer.cpp index 0cc4846878..f9475700a2 100644 --- a/dom/media/ogg/OggDemuxer.cpp +++ b/dom/media/ogg/OggDemuxer.cpp @@ -21,6 +21,7 @@ #include extern mozilla::LazyLogModule gMediaDemuxerLog; +#define LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg) #define OGG_DEBUG(arg, ...) MOZ_LOG(gMediaDemuxerLog, mozilla::LogLevel::Debug, ("OggDemuxer(%p)::%s: " arg, this, __func__, ##__VA_ARGS__)) // Un-comment to enable logging of seek bisections. diff --git a/dom/media/ogg/moz.build b/dom/media/ogg/moz.build index 07e195b6f7..c47abf690d 100644 --- a/dom/media/ogg/moz.build +++ b/dom/media/ogg/moz.build @@ -13,7 +13,7 @@ EXPORTS += [ 'OpusParser.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'OggCodecState.cpp', 'OggCodecStore.cpp', 'OggDecoder.cpp', From 3b247782e19526083054897553898d047a1f103d Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Apr 2020 01:57:00 -0400 Subject: [PATCH 014/100] Issue #80 - De-unify dom/media/mp3 --- dom/media/mp3/moz.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom/media/mp3/moz.build b/dom/media/mp3/moz.build index 596d061f81..838a5a8540 100644 --- a/dom/media/mp3/moz.build +++ b/dom/media/mp3/moz.build @@ -9,7 +9,7 @@ EXPORTS += [ 'MP3Demuxer.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'MP3Decoder.cpp', 'MP3Demuxer.cpp', ] From 4be245aedef41e228c050e0ce172a234dc060a8e Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Apr 2020 02:08:39 -0400 Subject: [PATCH 015/100] Issue #80 - De-unify dom/media/flac --- dom/media/flac/FlacDemuxer.cpp | 8 -------- dom/media/flac/FlacDemuxer.h | 9 +++++++++ dom/media/flac/FlacFrameParser.cpp | 1 + dom/media/flac/moz.build | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dom/media/flac/FlacDemuxer.cpp b/dom/media/flac/FlacDemuxer.cpp index 7a98edbee6..6df09cc256 100644 --- a/dom/media/flac/FlacDemuxer.cpp +++ b/dom/media/flac/FlacDemuxer.cpp @@ -33,14 +33,6 @@ namespace flac { // flac::FrameHeader - Holds the flac frame header and its parsing // state. -#define FLAC_MAX_CHANNELS 8 -#define FLAC_MIN_BLOCKSIZE 16 -#define FLAC_MAX_BLOCKSIZE 65535 -#define FLAC_MIN_FRAME_SIZE 11 -#define FLAC_MAX_FRAME_HEADER_SIZE 16 -#define FLAC_MAX_FRAME_SIZE (FLAC_MAX_FRAME_HEADER_SIZE \ - +FLAC_MAX_BLOCKSIZE*FLAC_MAX_CHANNELS*3) - class FrameHeader { public: const AudioInfo& Info() const { return mInfo; } diff --git a/dom/media/flac/FlacDemuxer.h b/dom/media/flac/FlacDemuxer.h index fd0e35c94e..248ae861f8 100644 --- a/dom/media/flac/FlacDemuxer.h +++ b/dom/media/flac/FlacDemuxer.h @@ -13,6 +13,15 @@ namespace mozilla { namespace flac { + +#define FLAC_MAX_CHANNELS 8 +#define FLAC_MIN_BLOCKSIZE 16 +#define FLAC_MAX_BLOCKSIZE 65535 +#define FLAC_MIN_FRAME_SIZE 11 +#define FLAC_MAX_FRAME_HEADER_SIZE 16 +#define FLAC_MAX_FRAME_SIZE (FLAC_MAX_FRAME_HEADER_SIZE \ + +FLAC_MAX_BLOCKSIZE*FLAC_MAX_CHANNELS*3) + class Frame; class FrameParser; } diff --git a/dom/media/flac/FlacFrameParser.cpp b/dom/media/flac/FlacFrameParser.cpp index f2d6c1367e..c31161cbc0 100644 --- a/dom/media/flac/FlacFrameParser.cpp +++ b/dom/media/flac/FlacFrameParser.cpp @@ -7,6 +7,7 @@ #include "FlacFrameParser.h" #include "mp4_demuxer/ByteReader.h" #include "nsTArray.h" +#include "FlacDemuxer.h" #include "OggCodecState.h" #include "OpusParser.h" #include "VideoUtils.h" diff --git a/dom/media/flac/moz.build b/dom/media/flac/moz.build index 6933ded1f9..86427e0dd9 100644 --- a/dom/media/flac/moz.build +++ b/dom/media/flac/moz.build @@ -10,7 +10,7 @@ EXPORTS += [ 'FlacFrameParser.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'FlacDecoder.cpp', 'FlacDemuxer.cpp', 'FlacFrameParser.cpp', From 04c723d5688d1c0ec0cd7aed6669cf63960d94de Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Apr 2020 02:11:10 -0400 Subject: [PATCH 016/100] Issue #80 - De-unify dom/media/webm --- dom/media/webm/moz.build | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dom/media/webm/moz.build b/dom/media/webm/moz.build index f2898fafd4..4dacfe0953 100644 --- a/dom/media/webm/moz.build +++ b/dom/media/webm/moz.build @@ -11,7 +11,7 @@ EXPORTS += [ 'WebMDemuxer.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'WebMBufferedParser.cpp', 'WebMDecoder.cpp', 'WebMDemuxer.cpp', @@ -19,8 +19,10 @@ UNIFIED_SOURCES += [ if CONFIG['MOZ_WEBM_ENCODER']: EXPORTS += ['WebMWriter.h'] - UNIFIED_SOURCES += ['EbmlComposer.cpp', - 'WebMWriter.cpp', + + SOURCES += [ + 'EbmlComposer.cpp', + 'WebMWriter.cpp', ] CXXFLAGS += CONFIG['MOZ_LIBVPX_CFLAGS'] From d0495a5a26adcd298553cb78595b8e0851b0e9ad Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Apr 2020 02:25:38 -0400 Subject: [PATCH 017/100] Issue #80 - De-unify dom/console --- dom/console/moz.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom/console/moz.build b/dom/console/moz.build index 79bd1cf099..82623e4429 100644 --- a/dom/console/moz.build +++ b/dom/console/moz.build @@ -22,7 +22,7 @@ EXPORTS.mozilla.dom += [ 'Console.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'Console.cpp', 'ConsoleReportCollector.cpp', ] From 0c2ea70af96e757a6a88bfb8d2093df33a3b2268 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Apr 2020 02:29:40 -0400 Subject: [PATCH 018/100] Issue #80 - De-unify dom/worklet --- dom/worklet/moz.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom/worklet/moz.build b/dom/worklet/moz.build index 80c0bf0c9f..7903dcf888 100644 --- a/dom/worklet/moz.build +++ b/dom/worklet/moz.build @@ -9,7 +9,7 @@ EXPORTS.mozilla.dom += [ 'WorkletGlobalScope.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'Worklet.cpp', 'WorkletGlobalScope.cpp', ] From 3521c15bc8ca54b47e5cf3c464f55bda2534d0f9 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Apr 2020 02:32:06 -0400 Subject: [PATCH 019/100] Issue #80 - De-unify dom/jsurl --- dom/jsurl/moz.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom/jsurl/moz.build b/dom/jsurl/moz.build index f5579b64da..c0c82a141f 100644 --- a/dom/jsurl/moz.build +++ b/dom/jsurl/moz.build @@ -8,7 +8,7 @@ EXPORTS += [ 'nsJSProtocolHandler.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'nsJSProtocolHandler.cpp', ] From e4ce70ac8cb811fa761b7c76a102e8d56b7ecb00 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Apr 2020 02:37:07 -0400 Subject: [PATCH 020/100] Issue #80 - De-unify dom/mathml --- dom/mathml/moz.build | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dom/mathml/moz.build b/dom/mathml/moz.build index 307c1603e7..d483008aaa 100644 --- a/dom/mathml/moz.build +++ b/dom/mathml/moz.build @@ -4,7 +4,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -UNIFIED_SOURCES += [ +SOURCES += [ 'nsMathMLElement.cpp', 'nsMathMLElementFactory.cpp', ] @@ -12,6 +12,5 @@ UNIFIED_SOURCES += [ include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' -LOCAL_INCLUDES += [ - '/dom/base', -] + +LOCAL_INCLUDES += ['/dom/base'] From 2b24fc0af456bca96e2a40cf18c005d8250b0723 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Apr 2020 02:40:11 -0400 Subject: [PATCH 021/100] Issue #80 - De-unify dom/power --- dom/power/moz.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom/power/moz.build b/dom/power/moz.build index cdd99264d7..5474ebadaa 100644 --- a/dom/power/moz.build +++ b/dom/power/moz.build @@ -21,7 +21,7 @@ EXPORTS.mozilla.dom.power += [ 'Types.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'PowerManager.cpp', 'PowerManagerService.cpp', 'WakeLock.cpp', From 2373f28d970f074cc91980caad16ca8d7ad7591f Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Apr 2020 02:49:12 -0400 Subject: [PATCH 022/100] Issue #80 - De-unify dom/u2f --- dom/u2f/moz.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom/u2f/moz.build b/dom/u2f/moz.build index 1c851e1d82..19325205a4 100644 --- a/dom/u2f/moz.build +++ b/dom/u2f/moz.build @@ -10,7 +10,7 @@ EXPORTS.mozilla.dom += [ 'USBToken.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'NSSU2FTokenRemote.cpp', 'U2F.cpp', 'USBToken.cpp', From 64c4dde520d879a67b1ac0d513d819effe53bf86 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Apr 2020 03:00:14 -0400 Subject: [PATCH 023/100] Issue #80 - De-unify dom/json --- dom/json/moz.build | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dom/json/moz.build b/dom/json/moz.build index 635dca2554..28711b19a1 100644 --- a/dom/json/moz.build +++ b/dom/json/moz.build @@ -4,17 +4,11 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -EXPORTS += [ - 'nsJSON.h', -] +EXPORTS += ['nsJSON.h'] -UNIFIED_SOURCES += [ - 'nsJSON.cpp', -] +SOURCES += ['nsJSON.cpp'] -LOCAL_INCLUDES += [ - '/dom/base', -] +LOCAL_INCLUDES += ['/dom/base'] FINAL_LIBRARY = 'xul' From 0ad9b56a31ad4ce7d75aaf550f281e614f8df131 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Apr 2020 03:04:19 -0400 Subject: [PATCH 024/100] Issue #80 - De-unify dom/encoding --- dom/encoding/moz.build | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dom/encoding/moz.build b/dom/encoding/moz.build index 37292d6e51..7dc360aafd 100644 --- a/dom/encoding/moz.build +++ b/dom/encoding/moz.build @@ -11,7 +11,7 @@ EXPORTS.mozilla.dom += [ 'TextEncoder.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'EncodingUtils.cpp', 'FallbackEncoding.cpp', 'TextDecoder.cpp', @@ -19,9 +19,8 @@ UNIFIED_SOURCES += [ ] FINAL_LIBRARY = 'xul' -LOCAL_INCLUDES += [ - '/intl/locale', -] + +LOCAL_INCLUDES += ['/intl/locale'] props2arrays = '/intl/locale/props2arrays.py' prefixes = ( From 0a21348c8c8d9a75ff6dd94a5c62a98bf3befce8 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Apr 2020 03:13:33 -0400 Subject: [PATCH 025/100] Issue #80 - De-unify dom/url --- dom/url/moz.build | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dom/url/moz.build b/dom/url/moz.build index 628b691014..4e88f27233 100644 --- a/dom/url/moz.build +++ b/dom/url/moz.build @@ -9,14 +9,12 @@ EXPORTS.mozilla.dom += [ 'URLSearchParams.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'URL.cpp', 'URLSearchParams.cpp', ] -LOCAL_INCLUDES += [ - '../workers', -] +LOCAL_INCLUDES += ['../workers'] MOCHITEST_MANIFESTS += ['tests/mochitest.ini'] MOCHITEST_CHROME_MANIFESTS += [ 'tests/chrome.ini' ] From c6eb9b907601162f21df728e0068f66bc289522d Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Apr 2020 03:15:52 -0400 Subject: [PATCH 026/100] Issue #80 - De-unify dom/notification --- dom/notification/moz.build | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dom/notification/moz.build b/dom/notification/moz.build index d966b160df..8297daa6b7 100644 --- a/dom/notification/moz.build +++ b/dom/notification/moz.build @@ -9,9 +9,7 @@ EXTRA_COMPONENTS += [ 'NotificationStorage.manifest', ] -EXTRA_JS_MODULES += [ - 'NotificationDB.jsm' -] +EXTRA_JS_MODULES += ['NotificationDB.jsm'] EXPORTS.mozilla.dom += [ 'DesktopNotification.h', @@ -19,7 +17,7 @@ EXPORTS.mozilla.dom += [ 'NotificationEvent.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'DesktopNotification.cpp', 'Notification.cpp', 'NotificationEvent.cpp', @@ -28,6 +26,7 @@ UNIFIED_SOURCES += [ include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' + LOCAL_INCLUDES += [ '/dom/base', '/dom/ipc', From 923386c8f2fff2cc57f287ca2fc95782d85d28d0 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Apr 2020 03:18:46 -0400 Subject: [PATCH 027/100] Issue #80 - De-unify dom/audiochannel --- dom/audiochannel/moz.build | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dom/audiochannel/moz.build b/dom/audiochannel/moz.build index 46923db3c7..547cce24a3 100644 --- a/dom/audiochannel/moz.build +++ b/dom/audiochannel/moz.build @@ -16,14 +16,12 @@ EXPORTS += [ 'AudioChannelService.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'AudioChannelAgent.cpp', 'AudioChannelService.cpp', ] -LOCAL_INCLUDES += [ - '/dom/base/', -] +LOCAL_INCLUDES += ['/dom/base/'] include('/ipc/chromium/chromium-config.mozbuild') From a0d86d02675bc4d060aac3623361a7741668abae Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Apr 2020 03:24:37 -0400 Subject: [PATCH 028/100] Issue #80 - De-unify dom/messagechannel --- dom/messagechannel/moz.build | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dom/messagechannel/moz.build b/dom/messagechannel/moz.build index 679d7eeb83..6ace4d77ff 100644 --- a/dom/messagechannel/moz.build +++ b/dom/messagechannel/moz.build @@ -13,7 +13,7 @@ EXPORTS.mozilla.dom += [ 'MessagePortParent.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'MessageChannel.cpp', 'MessagePort.cpp', 'MessagePortChild.cpp', @@ -22,9 +22,7 @@ UNIFIED_SOURCES += [ 'SharedMessagePortMessage.cpp', ] -IPDL_SOURCES += [ - 'PMessagePort.ipdl', -] +IPDL_SOURCES += ['PMessagePort.ipdl'] LOCAL_INCLUDES += [ '../base', From 11a44c6f376a60320aa00d6f252c0e1ae889932c Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sat, 18 Apr 2020 15:10:34 +0200 Subject: [PATCH 029/100] Issue #80 - De-unify dom/animation KeyFrameEffect and KeyFrameEffectReadOnly are still built unified as buddies because they have some complex interdependency that couldn't easily be resolved without linking failures. --- dom/animation/AnimationComparator.h | 2 ++ dom/animation/AnimationEffectReadOnly.cpp | 1 + dom/animation/AnimationPerformanceWarning.h | 3 +++ dom/animation/CSSPseudoElement.cpp | 1 + dom/animation/KeyframeEffect.cpp | 1 + dom/animation/KeyframeEffectReadOnly.cpp | 2 ++ dom/animation/moz.build | 7 +++++-- 7 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dom/animation/AnimationComparator.h b/dom/animation/AnimationComparator.h index ff665e82aa..730d62f484 100644 --- a/dom/animation/AnimationComparator.h +++ b/dom/animation/AnimationComparator.h @@ -7,6 +7,8 @@ #ifndef mozilla_AnimationComparator_h #define mozilla_AnimationComparator_h +#include "mozilla/dom/Animation.h" + namespace mozilla { // Although this file is called AnimationComparator, we don't actually diff --git a/dom/animation/AnimationEffectReadOnly.cpp b/dom/animation/AnimationEffectReadOnly.cpp index 63d633c2f1..7eb0880c72 100644 --- a/dom/animation/AnimationEffectReadOnly.cpp +++ b/dom/animation/AnimationEffectReadOnly.cpp @@ -6,6 +6,7 @@ #include "mozilla/dom/AnimationEffectReadOnly.h" #include "mozilla/dom/AnimationEffectReadOnlyBinding.h" +#include "mozilla/dom/Animation.h" #include "mozilla/AnimationUtils.h" #include "mozilla/FloatingPoint.h" diff --git a/dom/animation/AnimationPerformanceWarning.h b/dom/animation/AnimationPerformanceWarning.h index 025857e0c0..a1ac35cba0 100644 --- a/dom/animation/AnimationPerformanceWarning.h +++ b/dom/animation/AnimationPerformanceWarning.h @@ -9,6 +9,9 @@ #include +#include "mozilla/Maybe.h" +#include "nsTArray.h" + class nsXPIDLString; namespace mozilla { diff --git a/dom/animation/CSSPseudoElement.cpp b/dom/animation/CSSPseudoElement.cpp index a4dede0b3b..0283eb59e6 100644 --- a/dom/animation/CSSPseudoElement.cpp +++ b/dom/animation/CSSPseudoElement.cpp @@ -7,6 +7,7 @@ #include "mozilla/dom/CSSPseudoElement.h" #include "mozilla/dom/CSSPseudoElementBinding.h" #include "mozilla/dom/Element.h" +#include "mozilla/dom/KeyFrameEffectBinding.h" // for ElementOrCSSPseudoElement class #include "mozilla/AnimationComparator.h" namespace mozilla { diff --git a/dom/animation/KeyframeEffect.cpp b/dom/animation/KeyframeEffect.cpp index decbf63050..32f6bd1a10 100644 --- a/dom/animation/KeyframeEffect.cpp +++ b/dom/animation/KeyframeEffect.cpp @@ -11,6 +11,7 @@ #include "mozilla/dom/AnimationEffectTiming.h" #include "mozilla/dom/KeyframeEffectBinding.h" #include "mozilla/KeyframeUtils.h" +#include "nsContentUtils.h" #include "nsDOMMutationObserver.h" // For nsAutoAnimationMutationBatch #include "nsIScriptError.h" diff --git a/dom/animation/KeyframeEffectReadOnly.cpp b/dom/animation/KeyframeEffectReadOnly.cpp index 164ee02925..5868790bb2 100644 --- a/dom/animation/KeyframeEffectReadOnly.cpp +++ b/dom/animation/KeyframeEffectReadOnly.cpp @@ -6,6 +6,7 @@ #include "mozilla/dom/KeyframeEffectReadOnly.h" +#include "mozilla/dom/Animation.h" #include "mozilla/dom/KeyframeAnimationOptionsBinding.h" // For UnrestrictedDoubleOrKeyframeAnimationOptions; #include "mozilla/dom/CSSPseudoElement.h" @@ -25,6 +26,7 @@ #include "nsCSSPseudoElements.h" // For CSSPseudoElementType #include "nsIPresShell.h" #include "nsIScriptError.h" +#include "nsRefreshDriver.h" namespace mozilla { diff --git a/dom/animation/moz.build b/dom/animation/moz.build index bd8c937072..356980f002 100644 --- a/dom/animation/moz.build +++ b/dom/animation/moz.build @@ -37,6 +37,11 @@ EXPORTS.mozilla += [ ] UNIFIED_SOURCES += [ + 'KeyframeEffect.cpp', + 'KeyframeEffectReadOnly.cpp', +] + +SOURCES += [ 'Animation.cpp', 'AnimationEffectReadOnly.cpp', 'AnimationEffectTiming.cpp', @@ -50,9 +55,7 @@ UNIFIED_SOURCES += [ 'DocumentTimeline.cpp', 'EffectCompositor.cpp', 'EffectSet.cpp', - 'KeyframeEffect.cpp', 'KeyframeEffectParams.cpp', - 'KeyframeEffectReadOnly.cpp', 'KeyframeUtils.cpp', 'PendingAnimationTracker.cpp', 'TimingParams.cpp', From a6fc6896d439e4906db2b64302a7a102a5725a6c Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sat, 18 Apr 2020 17:07:15 +0200 Subject: [PATCH 030/100] Issue #80 - De-unify dom/archivereader --- dom/archivereader/ArchiveRequest.cpp | 2 ++ dom/archivereader/ArchiveZipFile.cpp | 1 + dom/archivereader/moz.build | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dom/archivereader/ArchiveRequest.cpp b/dom/archivereader/ArchiveRequest.cpp index 832dec3fac..a1518449fe 100644 --- a/dom/archivereader/ArchiveRequest.cpp +++ b/dom/archivereader/ArchiveRequest.cpp @@ -8,10 +8,12 @@ #include "mozilla/EventDispatcher.h" #include "mozilla/dom/ArchiveRequestBinding.h" +#include "mozilla/dom/File.h" #include "mozilla/dom/ScriptSettings.h" #include "nsContentUtils.h" using namespace mozilla; +using namespace mozilla::dom; USING_ARCHIVEREADER_NAMESPACE diff --git a/dom/archivereader/ArchiveZipFile.cpp b/dom/archivereader/ArchiveZipFile.cpp index d374fe91f0..e1716f3481 100644 --- a/dom/archivereader/ArchiveZipFile.cpp +++ b/dom/archivereader/ArchiveZipFile.cpp @@ -12,6 +12,7 @@ #include "mozilla/Attributes.h" #include "mozilla/dom/File.h" +using namespace mozilla; using namespace mozilla::dom; USING_ARCHIVEREADER_NAMESPACE diff --git a/dom/archivereader/moz.build b/dom/archivereader/moz.build index 57dbfa1210..a5d853c917 100644 --- a/dom/archivereader/moz.build +++ b/dom/archivereader/moz.build @@ -13,7 +13,7 @@ EXPORTS.mozilla.dom.archivereader += [ 'ArchiveZipFile.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'ArchiveEvent.cpp', 'ArchiveReader.cpp', 'ArchiveRequest.cpp', From f6dce887e1f3dca0ada75aa1fc7c88a091696c31 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sat, 18 Apr 2020 17:39:59 +0200 Subject: [PATCH 031/100] Issue #80 - De-unify dom/cache --- dom/cache/CacheOpParent.cpp | 1 + dom/cache/CacheStorage.cpp | 3 +++ dom/cache/CacheStreamControlChild.cpp | 1 + dom/cache/CacheStreamControlParent.cpp | 2 ++ dom/cache/ReadStream.h | 3 +++ dom/cache/TypeUtils.cpp | 1 + dom/cache/moz.build | 2 +- 7 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dom/cache/CacheOpParent.cpp b/dom/cache/CacheOpParent.cpp index 992ee82a76..37fcbc0f30 100644 --- a/dom/cache/CacheOpParent.cpp +++ b/dom/cache/CacheOpParent.cpp @@ -12,6 +12,7 @@ #include "mozilla/dom/cache/SavedTypes.h" #include "mozilla/ipc/FileDescriptorSetParent.h" #include "mozilla/ipc/InputStreamUtils.h" +#include "mozilla/ipc/IPCStreamUtils.h" #include "mozilla/ipc/SendStream.h" namespace mozilla { diff --git a/dom/cache/CacheStorage.cpp b/dom/cache/CacheStorage.cpp index 937e3826f2..a0f4864452 100644 --- a/dom/cache/CacheStorage.cpp +++ b/dom/cache/CacheStorage.cpp @@ -7,6 +7,7 @@ #include "mozilla/dom/cache/CacheStorage.h" #include "mozilla/Unused.h" +#include "mozilla/dom/CacheBinding.h" #include "mozilla/dom/CacheStorageBinding.h" #include "mozilla/dom/Promise.h" #include "mozilla/dom/Response.h" @@ -29,6 +30,8 @@ #include "nsURLParsers.h" #include "WorkerPrivate.h" +using namespace mozilla::dom; + namespace mozilla { namespace dom { namespace cache { diff --git a/dom/cache/CacheStreamControlChild.cpp b/dom/cache/CacheStreamControlChild.cpp index b7ca3a0e71..978019ab69 100644 --- a/dom/cache/CacheStreamControlChild.cpp +++ b/dom/cache/CacheStreamControlChild.cpp @@ -11,6 +11,7 @@ #include "mozilla/dom/cache/CacheTypes.h" #include "mozilla/dom/cache/ReadStream.h" #include "mozilla/ipc/FileDescriptorSetChild.h" +#include "mozilla/ipc/IPCStreamUtils.h" #include "mozilla/ipc/PBackgroundChild.h" #include "mozilla/ipc/PFileDescriptorSetChild.h" #include "nsISupportsImpl.h" diff --git a/dom/cache/CacheStreamControlParent.cpp b/dom/cache/CacheStreamControlParent.cpp index 54eef01d85..02f2fd2d30 100644 --- a/dom/cache/CacheStreamControlParent.cpp +++ b/dom/cache/CacheStreamControlParent.cpp @@ -11,6 +11,7 @@ #include "mozilla/dom/cache/ReadStream.h" #include "mozilla/dom/cache/StreamList.h" #include "mozilla/ipc/FileDescriptorSetParent.h" +#include "mozilla/ipc/IPCStreamUtils.h" #include "mozilla/ipc/PBackgroundParent.h" #include "mozilla/ipc/PFileDescriptorSetParent.h" #include "nsISupportsImpl.h" @@ -20,6 +21,7 @@ namespace dom { namespace cache { using mozilla::dom::OptionalFileDescriptorSet; +using mozilla::ipc::AutoIPCStream; using mozilla::ipc::FileDescriptor; using mozilla::ipc::FileDescriptorSetParent; using mozilla::ipc::PFileDescriptorSetParent; diff --git a/dom/cache/ReadStream.h b/dom/cache/ReadStream.h index 824cedb029..6744f30c22 100644 --- a/dom/cache/ReadStream.h +++ b/dom/cache/ReadStream.h @@ -12,9 +12,12 @@ #include "nsID.h" #include "nsIInputStream.h" #include "nsISupportsImpl.h" +#include "mozilla/ErrorResult.h" #include "mozilla/RefPtr.h" #include "nsTArrayForwardDeclare.h" +using namespace mozilla; + namespace mozilla { namespace ipc { class AutoIPCStream; diff --git a/dom/cache/TypeUtils.cpp b/dom/cache/TypeUtils.cpp index 2d4cb30eb2..f8c5cd7be8 100644 --- a/dom/cache/TypeUtils.cpp +++ b/dom/cache/TypeUtils.cpp @@ -14,6 +14,7 @@ #include "mozilla/dom/cache/CacheTypes.h" #include "mozilla/dom/cache/ReadStream.h" #include "mozilla/ipc/BackgroundChild.h" +#include "mozilla/ipc/IPCStreamUtils.h" #include "mozilla/ipc/PBackgroundChild.h" #include "mozilla/ipc/PFileDescriptorSetChild.h" #include "mozilla/ipc/InputStreamUtils.h" diff --git a/dom/cache/moz.build b/dom/cache/moz.build index 66f9f30fd0..a536e5d758 100644 --- a/dom/cache/moz.build +++ b/dom/cache/moz.build @@ -38,7 +38,7 @@ EXPORTS.mozilla.dom.cache += [ 'TypeUtils.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'Action.cpp', 'ActorChild.cpp', 'AutoUtils.cpp', From 241c3b3200dc1c659986b736cf65daa2881bb4c5 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Apr 2020 13:10:09 -0400 Subject: [PATCH 032/100] Issue #80 - De-unify layout/forms --- layout/forms/moz.build | 2 +- layout/forms/nsHTMLButtonControlFrame.cpp | 1 + layout/forms/nsLegendFrame.cpp | 2 ++ layout/forms/nsTextControlFrame.cpp | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/layout/forms/moz.build b/layout/forms/moz.build index 4fecbad388..50e364ce2f 100644 --- a/layout/forms/moz.build +++ b/layout/forms/moz.build @@ -18,7 +18,7 @@ EXPORTS += [ 'nsITextControlFrame.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'nsButtonFrameRenderer.cpp', 'nsColorControlFrame.cpp', 'nsComboboxControlFrame.cpp', diff --git a/layout/forms/nsHTMLButtonControlFrame.cpp b/layout/forms/nsHTMLButtonControlFrame.cpp index 2e4fa9f67a..c6d8e1c4f5 100644 --- a/layout/forms/nsHTMLButtonControlFrame.cpp +++ b/layout/forms/nsHTMLButtonControlFrame.cpp @@ -7,6 +7,7 @@ #include "nsContainerFrame.h" #include "nsIFormControlFrame.h" +#include "nsIFrameInlines.h" #include "nsPresContext.h" #include "nsGkAtoms.h" #include "nsButtonFrameRenderer.h" diff --git a/layout/forms/nsLegendFrame.cpp b/layout/forms/nsLegendFrame.cpp index 60056f15d5..95efc2c878 100644 --- a/layout/forms/nsLegendFrame.cpp +++ b/layout/forms/nsLegendFrame.cpp @@ -12,6 +12,8 @@ #include "nsStyleConsts.h" #include "nsFormControlFrame.h" +using namespace mozilla; + nsIFrame* NS_NewLegendFrame(nsIPresShell* aPresShell, nsStyleContext* aContext) { diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp index b34e132e60..465ef0883d 100644 --- a/layout/forms/nsTextControlFrame.cpp +++ b/layout/forms/nsTextControlFrame.cpp @@ -55,6 +55,7 @@ #define DEFAULT_COLUMN_WIDTH 20 using namespace mozilla; +using namespace mozilla::dom; nsIFrame* NS_NewTextControlFrame(nsIPresShell* aPresShell, nsStyleContext* aContext) From 399b79ff714e745bef6c92898cdd0d151eed8971 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Apr 2020 13:31:59 -0400 Subject: [PATCH 033/100] Issue #80 - De-unify layout/mathml --- layout/mathml/moz.build | 2 +- layout/mathml/nsMathMLOperators.cpp | 1 + layout/mathml/nsMathMLmfencedFrame.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/layout/mathml/moz.build b/layout/mathml/moz.build index f40b2c2c65..07dd446a3b 100644 --- a/layout/mathml/moz.build +++ b/layout/mathml/moz.build @@ -16,7 +16,7 @@ if CONFIG['ENABLE_TESTS']: 'tests/chrome.ini', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'nsMathMLChar.cpp', 'nsMathMLContainerFrame.cpp', 'nsMathMLFrame.cpp', diff --git a/layout/mathml/nsMathMLOperators.cpp b/layout/mathml/nsMathMLOperators.cpp index bbb03014b7..9a9f413b4a 100644 --- a/layout/mathml/nsMathMLOperators.cpp +++ b/layout/mathml/nsMathMLOperators.cpp @@ -7,6 +7,7 @@ #include "nsCOMPtr.h" #include "nsDataHashtable.h" #include "nsHashKeys.h" +#include "nsNetUtil.h" #include "nsTArray.h" #include "nsIPersistentProperties2.h" diff --git a/layout/mathml/nsMathMLmfencedFrame.cpp b/layout/mathml/nsMathMLmfencedFrame.cpp index ca780e649b..a5f5ed4d9e 100644 --- a/layout/mathml/nsMathMLmfencedFrame.cpp +++ b/layout/mathml/nsMathMLmfencedFrame.cpp @@ -3,13 +3,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - #include "nsMathMLmfencedFrame.h" #include "nsRenderingContext.h" #include "nsMathMLChar.h" #include using namespace mozilla; +using namespace mozilla::gfx; // // -- surround content with a pair of fences From b3d98cc0787b6578b9cc22d7f5cbd5bfa3bdf18c Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sat, 18 Apr 2020 22:00:45 +0200 Subject: [PATCH 034/100] Issue #80 - De-unify dom/canvas --- dom/canvas/CanvasImageCache.cpp | 1 + dom/canvas/CanvasRenderingContextHelper.cpp | 2 ++ dom/canvas/ImageBitmap.cpp | 12 +++++++++++- dom/canvas/ImageBitmap.h | 2 ++ dom/canvas/ImageBitmapColorUtils.cpp | 3 +++ dom/canvas/ImageBitmapRenderingContext.cpp | 10 ++++++++++ dom/canvas/ImageBitmapUtils.h | 1 + dom/canvas/OffscreenCanvas.cpp | 8 ++++++++ dom/canvas/WebGL2ContextUniforms.cpp | 1 + dom/canvas/WebGLContextBuffers.cpp | 1 + dom/canvas/WebGLContextVertices.cpp | 1 + dom/canvas/WebGLExtensionDebugGet.cpp | 1 + dom/canvas/WebGLObjectModel.h | 1 - dom/canvas/WebGLSampler.h | 1 + dom/canvas/WebGLTransformFeedback.h | 3 +++ dom/canvas/WebGLVertexAttribData.h | 1 + dom/canvas/moz.build | 4 ++-- 17 files changed, 49 insertions(+), 4 deletions(-) diff --git a/dom/canvas/CanvasImageCache.cpp b/dom/canvas/CanvasImageCache.cpp index 82b3f277c7..2e4e90d338 100644 --- a/dom/canvas/CanvasImageCache.cpp +++ b/dom/canvas/CanvasImageCache.cpp @@ -7,6 +7,7 @@ #include "nsAutoPtr.h" #include "nsIImageLoadingContent.h" #include "nsExpirationTracker.h" +#include "imgIContainer.h" #include "imgIRequest.h" #include "mozilla/dom/Element.h" #include "nsTHashtable.h" diff --git a/dom/canvas/CanvasRenderingContextHelper.cpp b/dom/canvas/CanvasRenderingContextHelper.cpp index 61317fb515..229801ffa7 100644 --- a/dom/canvas/CanvasRenderingContextHelper.cpp +++ b/dom/canvas/CanvasRenderingContextHelper.cpp @@ -4,6 +4,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "CanvasRenderingContextHelper.h" + +#include "CanvasUtils.h" #include "ImageBitmapRenderingContext.h" #include "ImageEncoder.h" #include "mozilla/dom/CanvasRenderingContext2D.h" diff --git a/dom/canvas/ImageBitmap.cpp b/dom/canvas/ImageBitmap.cpp index 6efe1b318b..e4b145d461 100644 --- a/dom/canvas/ImageBitmap.cpp +++ b/dom/canvas/ImageBitmap.cpp @@ -5,19 +5,29 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "mozilla/dom/ImageBitmap.h" + #include "mozilla/CheckedInt.h" +#include "mozilla/dom/File.h" // for Blob +#include "mozilla/dom/HTMLImageElement.h" #include "mozilla/dom/ImageBitmapBinding.h" #include "mozilla/dom/Promise.h" #include "mozilla/dom/StructuredCloneTags.h" +#include "mozilla/dom/UnionTypes.h" // for ArrayBufferViewOrArrayBuffer #include "mozilla/dom/WorkerPrivate.h" #include "mozilla/dom/WorkerRunnable.h" -#include "mozilla/gfx/2D.h" +#include "CanvasRenderingContext2D.h" +#include "gfxUtils.h" #include "ImageBitmapColorUtils.h" #include "ImageBitmapUtils.h" +#include "ImageData.h" +#include "ImageLayers.h" #include "ImageUtils.h" #include "imgTools.h" #include "libyuv.h" +#include "nsLayoutUtils.h" +#include "OffscreenCanvas.h" +using namespace mozilla::dom; using namespace mozilla::gfx; using namespace mozilla::layers; diff --git a/dom/canvas/ImageBitmap.h b/dom/canvas/ImageBitmap.h index 25084b6ac5..22953e5419 100644 --- a/dom/canvas/ImageBitmap.h +++ b/dom/canvas/ImageBitmap.h @@ -13,7 +13,9 @@ #include "mozilla/gfx/Rect.h" #include "mozilla/Maybe.h" #include "mozilla/UniquePtr.h" +#include "CanvasRenderingContextHelper.h" #include "nsCycleCollectionParticipant.h" +#include "nsIGlobalObject.h" struct JSContext; struct JSStructuredCloneReader; diff --git a/dom/canvas/ImageBitmapColorUtils.cpp b/dom/canvas/ImageBitmapColorUtils.cpp index 2b65c1f100..4ef4ade868 100644 --- a/dom/canvas/ImageBitmapColorUtils.cpp +++ b/dom/canvas/ImageBitmapColorUtils.cpp @@ -6,6 +6,9 @@ #include "ImageBitmapColorUtils.h" +#include "js/LegacyIntTypes.h" +#include + namespace mozilla { namespace dom { diff --git a/dom/canvas/ImageBitmapRenderingContext.cpp b/dom/canvas/ImageBitmapRenderingContext.cpp index ad313906a3..9c7af25221 100644 --- a/dom/canvas/ImageBitmapRenderingContext.cpp +++ b/dom/canvas/ImageBitmapRenderingContext.cpp @@ -4,9 +4,19 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "ImageBitmapRenderingContext.h" + #include "mozilla/dom/ImageBitmapRenderingContextBinding.h" +#include "mozilla/gfx/2D.h" +#include "mozilla/gfx/DataSurfaceHelpers.h" +#include "ImageBitmap.h" #include "ImageContainer.h" +#include "ImageEncoder.h" #include "ImageLayers.h" +#include "imgIEncoder.h" +#include "Layers.h" + +using namespace mozilla::gfx; +using namespace mozilla::layers; namespace mozilla { namespace dom { diff --git a/dom/canvas/ImageBitmapUtils.h b/dom/canvas/ImageBitmapUtils.h index 39be43d8ae..bc8d6ad153 100644 --- a/dom/canvas/ImageBitmapUtils.h +++ b/dom/canvas/ImageBitmapUtils.h @@ -7,6 +7,7 @@ #ifndef mozilla_dom_ImageBitmapUtils_h #define mozilla_dom_ImageBitmapUtils_h +#include "ImageBitmap.h" #include "mozilla/UniquePtr.h" #include "nsTArrayForwardDeclare.h" diff --git a/dom/canvas/OffscreenCanvas.cpp b/dom/canvas/OffscreenCanvas.cpp index 0d188c24e3..981faf1b16 100644 --- a/dom/canvas/OffscreenCanvas.cpp +++ b/dom/canvas/OffscreenCanvas.cpp @@ -6,6 +6,9 @@ #include "OffscreenCanvas.h" +#include "mozilla/dom/File.h" // for Blob +#include "mozilla/dom/ImageEncoder.h" +#include "mozilla/dom/Promise.h" #include "mozilla/dom/OffscreenCanvasBinding.h" #include "mozilla/dom/WorkerPrivate.h" #include "mozilla/dom/WorkerScope.h" @@ -15,10 +18,15 @@ #include "mozilla/Telemetry.h" #include "CanvasRenderingContext2D.h" #include "CanvasUtils.h" +#include "GLContext.h" #include "GLScreenBuffer.h" +#include "ImageBitmap.h" #include "WebGL1Context.h" #include "WebGL2Context.h" +using namespace mozilla::layers; +using namespace mozilla::dom::workers; + namespace mozilla { namespace dom { diff --git a/dom/canvas/WebGL2ContextUniforms.cpp b/dom/canvas/WebGL2ContextUniforms.cpp index 7f8c07332b..900f845fd0 100644 --- a/dom/canvas/WebGL2ContextUniforms.cpp +++ b/dom/canvas/WebGL2ContextUniforms.cpp @@ -11,6 +11,7 @@ #include "WebGLBuffer.h" #include "WebGLContext.h" #include "WebGLProgram.h" +#include "WebGLTransformFeedback.h" #include "WebGLUniformLocation.h" #include "WebGLVertexArray.h" #include "WebGLVertexAttribData.h" diff --git a/dom/canvas/WebGLContextBuffers.cpp b/dom/canvas/WebGLContextBuffers.cpp index f53f9d7d75..e787b99143 100644 --- a/dom/canvas/WebGLContextBuffers.cpp +++ b/dom/canvas/WebGLContextBuffers.cpp @@ -7,6 +7,7 @@ #include "GLContext.h" #include "WebGLBuffer.h" +#include "WebGLTransformFeedback.h" #include "WebGLVertexArray.h" #include "mozilla/CheckedInt.h" diff --git a/dom/canvas/WebGLContextVertices.cpp b/dom/canvas/WebGLContextVertices.cpp index ba3156693b..5daf1102a8 100644 --- a/dom/canvas/WebGLContextVertices.cpp +++ b/dom/canvas/WebGLContextVertices.cpp @@ -7,6 +7,7 @@ #include "GLContext.h" #include "mozilla/CheckedInt.h" +#include "WebGL2Context.h" #include "WebGLBuffer.h" #include "WebGLFramebuffer.h" #include "WebGLProgram.h" diff --git a/dom/canvas/WebGLExtensionDebugGet.cpp b/dom/canvas/WebGLExtensionDebugGet.cpp index 39bb3c57a2..a849bd17e2 100644 --- a/dom/canvas/WebGLExtensionDebugGet.cpp +++ b/dom/canvas/WebGLExtensionDebugGet.cpp @@ -6,6 +6,7 @@ #include "WebGLExtensions.h" #include "mozilla/dom/WebGLRenderingContextBinding.h" +#include "GLContext.h" #include "WebGLContext.h" #include "WebGLContextUtils.h" diff --git a/dom/canvas/WebGLObjectModel.h b/dom/canvas/WebGLObjectModel.h index 6371c7b038..7c6caf2c4a 100644 --- a/dom/canvas/WebGLObjectModel.h +++ b/dom/canvas/WebGLObjectModel.h @@ -15,7 +15,6 @@ namespace mozilla { template class LinkedList; class WebGLContext; - //// // This class is a mixin for objects that are tied to a specific diff --git a/dom/canvas/WebGLSampler.h b/dom/canvas/WebGLSampler.h index 1cf0399841..73e550dfea 100644 --- a/dom/canvas/WebGLSampler.h +++ b/dom/canvas/WebGLSampler.h @@ -8,6 +8,7 @@ #include "mozilla/LinkedList.h" #include "nsWrapperCache.h" +#include "WebGLContext.h" #include "WebGLObjectModel.h" #include "WebGLStrongTypes.h" diff --git a/dom/canvas/WebGLTransformFeedback.h b/dom/canvas/WebGLTransformFeedback.h index aa57372a59..378794b9fe 100644 --- a/dom/canvas/WebGLTransformFeedback.h +++ b/dom/canvas/WebGLTransformFeedback.h @@ -6,8 +6,11 @@ #ifndef WEBGL_TRANSFORM_FEEDBACK_H_ #define WEBGL_TRANSFORM_FEEDBACK_H_ +#include #include "mozilla/LinkedList.h" #include "nsWrapperCache.h" +#include "WebGLBuffer.h" +#include "WebGLContext.h" #include "WebGLObjectModel.h" namespace mozilla { diff --git a/dom/canvas/WebGLVertexAttribData.h b/dom/canvas/WebGLVertexAttribData.h index 9d79b4f943..6318b06d2d 100644 --- a/dom/canvas/WebGLVertexAttribData.h +++ b/dom/canvas/WebGLVertexAttribData.h @@ -7,6 +7,7 @@ #define WEBGL_VERTEX_ATTRIB_DATA_H_ #include "GLDefs.h" +#include "WebGLBuffer.h" #include "WebGLObjectModel.h" namespace mozilla { diff --git a/dom/canvas/moz.build b/dom/canvas/moz.build index 6d5e2756ff..fe39425ec1 100644 --- a/dom/canvas/moz.build +++ b/dom/canvas/moz.build @@ -42,7 +42,7 @@ EXPORTS.mozilla.dom += [ ] # Canvas 2D and common sources -UNIFIED_SOURCES += [ +SOURCES += [ 'CanvasImageCache.cpp', 'CanvasRenderingContext2D.cpp', 'CanvasRenderingContextHelper.cpp', @@ -60,7 +60,7 @@ SOURCES += [ ] # WebGL Sources -UNIFIED_SOURCES += [ +SOURCES += [ 'TexUnpackBlob.cpp', 'WebGL1Context.cpp', 'WebGL1ContextUniforms.cpp', From f8b2c1fed1a84c7b43878b2240bdc8a3d705acb6 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sun, 19 Apr 2020 12:38:41 -0400 Subject: [PATCH 035/100] Fix typo in dom/animation/CSSPseudoElement.cpp Linux filesystems tend to be case sensitive --- dom/animation/CSSPseudoElement.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom/animation/CSSPseudoElement.cpp b/dom/animation/CSSPseudoElement.cpp index 0283eb59e6..09aad01efe 100644 --- a/dom/animation/CSSPseudoElement.cpp +++ b/dom/animation/CSSPseudoElement.cpp @@ -7,7 +7,7 @@ #include "mozilla/dom/CSSPseudoElement.h" #include "mozilla/dom/CSSPseudoElementBinding.h" #include "mozilla/dom/Element.h" -#include "mozilla/dom/KeyFrameEffectBinding.h" // for ElementOrCSSPseudoElement class +#include "mozilla/dom/KeyframeEffectBinding.h" // for ElementOrCSSPseudoElement class #include "mozilla/AnimationComparator.h" namespace mozilla { From 15fb8e46d1ba99b749d37810c6d857aa9e746922 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sun, 19 Apr 2020 12:52:40 +0200 Subject: [PATCH 036/100] Issue #80 - De-unify dom/crypto --- dom/crypto/WebCryptoThreadPool.cpp | 2 ++ dom/crypto/WebCryptoThreadPool.h | 2 ++ dom/crypto/moz.build | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dom/crypto/WebCryptoThreadPool.cpp b/dom/crypto/WebCryptoThreadPool.cpp index 6a1e786084..000e42d42a 100644 --- a/dom/crypto/WebCryptoThreadPool.cpp +++ b/dom/crypto/WebCryptoThreadPool.cpp @@ -9,6 +9,8 @@ #include "mozilla/Services.h" #include "mozilla/StaticPtr.h" #include "nsComponentManagerUtils.h" +#include "nsNSSComponent.h" +#include "nsString.h" #include "nsXPCOMCIDInternal.h" #include "nsXPCOMPrivate.h" #include "nsIObserverService.h" diff --git a/dom/crypto/WebCryptoThreadPool.h b/dom/crypto/WebCryptoThreadPool.h index 77c4afb24d..76bf747087 100644 --- a/dom/crypto/WebCryptoThreadPool.h +++ b/dom/crypto/WebCryptoThreadPool.h @@ -7,6 +7,8 @@ #ifndef mozilla_dom_WebCryptoThreadPool_h #define mozilla_dom_WebCryptoThreadPool_h +#include "mozilla/Mutex.h" +#include "nsIObserver.h" #include "nsIObserverService.h" #include "nsIThreadPool.h" diff --git a/dom/crypto/moz.build b/dom/crypto/moz.build index ba0b5f2cd8..eb15a55309 100644 --- a/dom/crypto/moz.build +++ b/dom/crypto/moz.build @@ -13,7 +13,7 @@ EXPORTS.mozilla.dom += [ 'WebCryptoThreadPool.h' ] -UNIFIED_SOURCES += [ +SOURCES += [ 'CryptoBuffer.cpp', 'CryptoKey.cpp', 'KeyAlgorithmProxy.cpp', From 06886611133528f9e6af42f67ef7ef757ed69986 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sun, 19 Apr 2020 14:38:07 +0200 Subject: [PATCH 037/100] Issue #80 - De-unify dom/events --- dom/events/DOMEventTargetHelper.cpp | 1 + dom/events/EventTarget.cpp | 1 + dom/events/IMEContentObserver.h | 1 + dom/events/IMEStateManager.cpp | 1 + dom/events/TextClause.h | 1 + dom/events/TouchEvent.cpp | 2 ++ dom/events/moz.build | 10 +++------- 7 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dom/events/DOMEventTargetHelper.cpp b/dom/events/DOMEventTargetHelper.cpp index 90ee610594..f534f119c7 100644 --- a/dom/events/DOMEventTargetHelper.cpp +++ b/dom/events/DOMEventTargetHelper.cpp @@ -13,6 +13,7 @@ #include "mozilla/EventDispatcher.h" #include "mozilla/EventListenerManager.h" #include "mozilla/Likely.h" +#include "mozilla/Unused.h" namespace mozilla { diff --git a/dom/events/EventTarget.cpp b/dom/events/EventTarget.cpp index 6c4cbf2d02..b111b9f9d2 100644 --- a/dom/events/EventTarget.cpp +++ b/dom/events/EventTarget.cpp @@ -5,6 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "mozilla/EventListenerManager.h" +#include "mozilla/dom/Event.h" #include "mozilla/dom/EventTarget.h" #include "mozilla/dom/EventTargetBinding.h" #include "nsThreadUtils.h" diff --git a/dom/events/IMEContentObserver.h b/dom/events/IMEContentObserver.h index d2f65e1860..e459096d99 100644 --- a/dom/events/IMEContentObserver.h +++ b/dom/events/IMEContentObserver.h @@ -7,6 +7,7 @@ #ifndef mozilla_IMEContentObserver_h_ #define mozilla_IMEContentObserver_h_ +#include "ContentEventHandler.h" #include "mozilla/Attributes.h" #include "nsCOMPtr.h" #include "nsCycleCollectionParticipant.h" diff --git a/dom/events/IMEStateManager.cpp b/dom/events/IMEStateManager.cpp index 80abad3cc0..fd628fb6f2 100644 --- a/dom/events/IMEStateManager.cpp +++ b/dom/events/IMEStateManager.cpp @@ -18,6 +18,7 @@ #include "mozilla/TextComposition.h" #include "mozilla/TextEvents.h" #include "mozilla/Unused.h" +#include "mozilla/dom/Event.h" #include "mozilla/dom/HTMLFormElement.h" #include "mozilla/dom/TabParent.h" diff --git a/dom/events/TextClause.h b/dom/events/TextClause.h index 7f85333e81..b9f3c1519f 100644 --- a/dom/events/TextClause.h +++ b/dom/events/TextClause.h @@ -12,6 +12,7 @@ #include "mozilla/ErrorResult.h" #include "mozilla/dom/BindingDeclarations.h" #include "nsCycleCollectionParticipant.h" +#include "nsPIDOMWindow.h" #include "nsWrapperCache.h" namespace mozilla { diff --git a/dom/events/TouchEvent.cpp b/dom/events/TouchEvent.cpp index 9b7a74ac28..0656021a05 100644 --- a/dom/events/TouchEvent.cpp +++ b/dom/events/TouchEvent.cpp @@ -16,6 +16,8 @@ namespace mozilla { +using namespace widget; + namespace dom { /****************************************************************************** diff --git a/dom/events/moz.build b/dom/events/moz.build index ec38132072..661f56c7e9 100644 --- a/dom/events/moz.build +++ b/dom/events/moz.build @@ -76,7 +76,7 @@ EXPORTS.mozilla.dom += [ if CONFIG['MOZ_WEBSPEECH']: EXPORTS.mozilla.dom += ['SpeechRecognitionError.h'] -UNIFIED_SOURCES += [ +SOURCES += [ 'AnimationEvent.cpp', 'AsyncEventDispatcher.cpp', 'BeforeAfterKeyboardEvent.cpp', @@ -97,6 +97,7 @@ UNIFIED_SOURCES += [ 'EventDispatcher.cpp', 'EventListenerManager.cpp', 'EventListenerService.cpp', + 'EventStateManager.cpp', 'EventTarget.cpp', 'FocusEvent.cpp', 'ImageCaptureError.cpp', @@ -126,13 +127,8 @@ UNIFIED_SOURCES += [ 'XULCommandEvent.cpp', ] -# nsEventStateManager.cpp should be built separately because of Mac OS X headers. -SOURCES += [ - 'EventStateManager.cpp', -] - if CONFIG['MOZ_WEBSPEECH']: - UNIFIED_SOURCES += ['SpeechRecognitionError.cpp'] + SOURCES += ['SpeechRecognitionError.cpp'] include('/ipc/chromium/chromium-config.mozbuild') From c7d6ca06da8e04c4a4b6436a530f915ecb697a2d Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sun, 19 Apr 2020 16:45:01 +0200 Subject: [PATCH 038/100] Issue #80 - De-unify dom/fetch Running into the same problem as with dom/canvas: derived template classes not being happy about being non-unified. Kept unified for now to prevent linking errors. --- dom/fetch/FetchConsumer.h | 2 ++ dom/fetch/FetchUtil.cpp | 1 + dom/fetch/InternalRequest.cpp | 1 + dom/fetch/InternalResponse.cpp | 1 + dom/fetch/InternalResponse.h | 1 + dom/fetch/Request.cpp | 13 +++++++++---- dom/fetch/Response.cpp | 1 + dom/fetch/moz.build | 5 ++++- 8 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dom/fetch/FetchConsumer.h b/dom/fetch/FetchConsumer.h index a7509a0ae5..2b57253420 100644 --- a/dom/fetch/FetchConsumer.h +++ b/dom/fetch/FetchConsumer.h @@ -8,11 +8,13 @@ #define mozilla_dom_FetchConsumer_h #include "Fetch.h" +#include "nsIInputStream.h" #include "nsIObserver.h" #include "nsWeakReference.h" #include "mozilla/dom/MutableBlobStorage.h" class nsIThread; +class nsIInputStreamPump; namespace mozilla { namespace dom { diff --git a/dom/fetch/FetchUtil.cpp b/dom/fetch/FetchUtil.cpp index 601d99216e..b384c4f810 100644 --- a/dom/fetch/FetchUtil.cpp +++ b/dom/fetch/FetchUtil.cpp @@ -2,6 +2,7 @@ #include "nsError.h" #include "nsIUnicodeDecoder.h" +#include "nsNetUtil.h" #include "nsString.h" #include "mozilla/dom/EncodingUtils.h" diff --git a/dom/fetch/InternalRequest.cpp b/dom/fetch/InternalRequest.cpp index b2631da6a1..65f8095e28 100644 --- a/dom/fetch/InternalRequest.cpp +++ b/dom/fetch/InternalRequest.cpp @@ -8,6 +8,7 @@ #include "nsIContentPolicy.h" #include "nsIDocument.h" +#include "nsIHttpChannelInternal.h" #include "nsStreamUtils.h" #include "mozilla/ErrorResult.h" diff --git a/dom/fetch/InternalResponse.cpp b/dom/fetch/InternalResponse.cpp index cb7d745972..1b1ae13e3d 100644 --- a/dom/fetch/InternalResponse.cpp +++ b/dom/fetch/InternalResponse.cpp @@ -7,6 +7,7 @@ #include "InternalResponse.h" #include "mozilla/Assertions.h" +#include "mozilla/dom/FetchTypes.h" #include "mozilla/dom/InternalHeaders.h" #include "mozilla/dom/cache/CacheTypes.h" #include "mozilla/ipc/PBackgroundSharedTypes.h" diff --git a/dom/fetch/InternalResponse.h b/dom/fetch/InternalResponse.h index 35467836a0..0801e32506 100644 --- a/dom/fetch/InternalResponse.h +++ b/dom/fetch/InternalResponse.h @@ -12,6 +12,7 @@ #include "mozilla/dom/ResponseBinding.h" #include "mozilla/dom/ChannelInfo.h" +#include "mozilla/dom/InternalHeaders.h" #include "mozilla/UniquePtr.h" namespace mozilla { diff --git a/dom/fetch/Request.cpp b/dom/fetch/Request.cpp index 7ca5b43c4f..6a7885b1aa 100644 --- a/dom/fetch/Request.cpp +++ b/dom/fetch/Request.cpp @@ -7,6 +7,7 @@ #include "Request.h" #include "nsIURI.h" +#include "nsNetUtil.h" #include "nsPIDOMWindow.h" #include "mozilla/ErrorResult.h" @@ -15,14 +16,18 @@ #include "mozilla/dom/FetchUtil.h" #include "mozilla/dom/Promise.h" #include "mozilla/dom/URL.h" -#include "mozilla/dom/WorkerPrivate.h" #include "mozilla/Unused.h" #include "WorkerPrivate.h" +#include "WorkerRunnable.h" +#include "WorkerScope.h" +#include "Workers.h" namespace mozilla { namespace dom { +using namespace workers; + NS_IMPL_CYCLE_COLLECTING_ADDREF(Request) NS_IMPL_CYCLE_COLLECTING_RELEASE(Request) NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(Request, mOwner, mHeaders) @@ -237,14 +242,14 @@ GetRequestURLFromWorker(const GlobalObject& aGlobal, const nsAString& aInput, } } -class ReferrerSameOriginChecker final : public workers::WorkerMainThreadRunnable +class ReferrerSameOriginChecker final : public WorkerMainThreadRunnable { public: ReferrerSameOriginChecker(workers::WorkerPrivate* aWorkerPrivate, const nsAString& aReferrerURL, nsresult& aResult) - : workers::WorkerMainThreadRunnable(aWorkerPrivate, - NS_LITERAL_CSTRING("Fetch :: Referrer same origin check")), + : WorkerMainThreadRunnable(aWorkerPrivate, + NS_LITERAL_CSTRING("Fetch :: Referrer same origin check")), mReferrerURL(aReferrerURL), mResult(aResult) { diff --git a/dom/fetch/Response.cpp b/dom/fetch/Response.cpp index 3b3ada6d31..e35de0e12d 100644 --- a/dom/fetch/Response.cpp +++ b/dom/fetch/Response.cpp @@ -8,6 +8,7 @@ #include "nsISupportsImpl.h" #include "nsIURI.h" +#include "nsNetUtil.h" #include "nsPIDOMWindow.h" #include "mozilla/ErrorResult.h" diff --git a/dom/fetch/moz.build b/dom/fetch/moz.build index fb2279fe7c..f93487e092 100644 --- a/dom/fetch/moz.build +++ b/dom/fetch/moz.build @@ -19,9 +19,12 @@ EXPORTS.mozilla.dom += [ ] UNIFIED_SOURCES += [ - 'ChannelInfo.cpp', 'Fetch.cpp', 'FetchConsumer.cpp', +] + +SOURCES += [ + 'ChannelInfo.cpp', 'FetchDriver.cpp', 'FetchUtil.cpp', 'Headers.cpp', From fc8c7f8f855d5b8f5e5945841fcd277a8e5f18b4 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sun, 19 Apr 2020 12:50:46 -0400 Subject: [PATCH 039/100] Put Request.cpp and Response.cpp back into UNIFIED in dom/fetch due to linux linker errors Reference: 15:03.06 ../../build/unix/gold/ld: error: /home/mattatobin/development/.obj/trunk-master/navigator-x64-gtk3/toolkit/library/../../dom/fetch/Request.o: requires dynamic R_X86_64_PC32 reloc against '_ZN7mozilla3dom9FetchBodyINS0_7RequestEED2Ev' which may overflow at runtime; recompile with -fPIC 15:03.06 ../../build/unix/gold/ld: error: /home/mattatobin/development/.obj/trunk-master/navigator-x64-gtk3/toolkit/library/../../dom/fetch/Response.o: requires dynamic R_X86_64_PC32 reloc against '_ZN7mozilla3dom9FetchBodyINS0_8ResponseEED2Ev' which may overflow at runtime; recompile with -fPIC 15:03.06 ../../build/unix/gold/ld: error: read-only segment has dynamic relocations 15:03.07 /home/mattatobin/development/.obj/trunk-master/navigator-x64-gtk3/toolkit/library/../../dom/fetch/Request.o:Request.cpp:function mozilla::dom::Request::~Request(): error: undefined reference to 'mozilla::dom::FetchBody::~FetchBody()' 15:03.07 /home/mattatobin/development/.obj/trunk-master/navigator-x64-gtk3/toolkit/library/../../dom/fetch/Response.o:Response.cpp:function mozilla::dom::Response::~Response(): error: undefined reference to 'mozilla::dom::FetchBody::~FetchBody()' --- dom/fetch/moz.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dom/fetch/moz.build b/dom/fetch/moz.build index f93487e092..be820ab570 100644 --- a/dom/fetch/moz.build +++ b/dom/fetch/moz.build @@ -21,6 +21,8 @@ EXPORTS.mozilla.dom += [ UNIFIED_SOURCES += [ 'Fetch.cpp', 'FetchConsumer.cpp', + 'Request.cpp', + 'Response.cpp', ] SOURCES += [ @@ -31,8 +33,6 @@ SOURCES += [ 'InternalHeaders.cpp', 'InternalRequest.cpp', 'InternalResponse.cpp', - 'Request.cpp', - 'Response.cpp', ] IPDL_SOURCES += [ From e8e7f40710839924f5fff8fd7ec345d7f23caeab Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sun, 19 Apr 2020 16:29:19 -0400 Subject: [PATCH 040/100] Issue #65 - Remove AppConstants from toolkit/prompts/content/tabprompts.xml This file not only somehow escaped my pass through here but was also mocking me by using AppConstants in a preprocessed file BUT ALSO right AFTER a preprocessor directive. --- .../components/prompts/content/tabprompts.xml | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/toolkit/components/prompts/content/tabprompts.xml b/toolkit/components/prompts/content/tabprompts.xml index 07c6c8efbc..0ce13203c1 100644 --- a/toolkit/components/prompts/content/tabprompts.xml +++ b/toolkit/components/prompts/content/tabprompts.xml @@ -323,21 +323,19 @@ let bnum = this.args.defaultButtonNum || 0; let defaultButton = this.ui["button" + bnum]; - let { AppConstants } = - Components.utils.import("resource://gre/modules/AppConstants.jsm", {}); - if (AppConstants.platform == "macosx") { - // On OS X, the default button always stays marked as such (until - // the entire prompt blurs). - defaultButton.setAttribute("default", true); - } else { - // On other platforms, the default button is only marked as such - // when no other button has focus. XUL buttons on not-OSX will - // react to pressing enter as a command, so you can't trigger the - // default without tabbing to it or something that isn't a button. - let focusedDefault = (event.originalTarget == defaultButton); - let someButtonFocused = event.originalTarget instanceof Ci.nsIDOMXULButtonElement; - defaultButton.setAttribute("default", focusedDefault || !someButtonFocused); - } +#ifdef XP_MACOSX + // On OS X, the default button always stays marked as such (until + // the entire prompt blurs). + defaultButton.setAttribute("default", true); +#else + // On other platforms, the default button is only marked as such + // when no other button has focus. XUL buttons on not-OSX will + // react to pressing enter as a command, so you can't trigger the + // default without tabbing to it or something that isn't a button. + let focusedDefault = (event.originalTarget == defaultButton); + let someButtonFocused = event.originalTarget instanceof Ci.nsIDOMXULButtonElement; + defaultButton.setAttribute("default", focusedDefault || !someButtonFocused); +#endif // If focus shifted to somewhere else in the browser, don't make From baff5cefca93544574c123a3bd2933a2ed8e641d Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Mon, 20 Apr 2020 12:46:11 +0200 Subject: [PATCH 041/100] Issue #80 - De-unify dom/filehandle --- dom/filehandle/moz.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom/filehandle/moz.build b/dom/filehandle/moz.build index b4e3b64c05..37e5c22a71 100644 --- a/dom/filehandle/moz.build +++ b/dom/filehandle/moz.build @@ -18,7 +18,7 @@ EXPORTS.mozilla.dom += [ 'MutableFileBase.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'ActorsChild.cpp', 'ActorsParent.cpp', 'FileHandleBase.cpp', From 8c991b03a58793a83963ab8b75ee63bd3cc607b0 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Mon, 20 Apr 2020 14:17:32 +0200 Subject: [PATCH 042/100] Issue #80 - De-unify dom/filesystem --- dom/filesystem/FileSystemBase.cpp | 1 + dom/filesystem/FileSystemRequestParent.cpp | 3 +++ dom/filesystem/FileSystemSecurity.cpp | 3 +++ dom/filesystem/FileSystemTaskBase.cpp | 2 ++ dom/filesystem/FileSystemUtils.cpp | 3 +++ dom/filesystem/FileSystemUtils.h | 2 ++ dom/filesystem/GetDirectoryListingTask.cpp | 3 +++ dom/filesystem/GetFileOrDirectoryTask.cpp | 3 +++ dom/filesystem/GetFilesHelper.cpp | 8 ++++++++ dom/filesystem/GetFilesHelper.h | 3 +++ dom/filesystem/GetFilesTask.cpp | 3 +++ dom/filesystem/moz.build | 2 +- 12 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dom/filesystem/FileSystemBase.cpp b/dom/filesystem/FileSystemBase.cpp index f44f4fbf1a..b19e12738b 100644 --- a/dom/filesystem/FileSystemBase.cpp +++ b/dom/filesystem/FileSystemBase.cpp @@ -7,6 +7,7 @@ #include "mozilla/dom/FileSystemBase.h" #include "nsCharSeparatedTokenizer.h" +#include "FileSystemUtils.h" #include "OSFileSystem.h" namespace mozilla { diff --git a/dom/filesystem/FileSystemRequestParent.cpp b/dom/filesystem/FileSystemRequestParent.cpp index 0b9d6c18aa..95a316b965 100644 --- a/dom/filesystem/FileSystemRequestParent.cpp +++ b/dom/filesystem/FileSystemRequestParent.cpp @@ -9,12 +9,15 @@ #include "GetDirectoryListingTask.h" #include "GetFileOrDirectoryTask.h" +#include "GetFilesTask.h" +#include "OSFileSystem.h" #include "mozilla/AppProcessChecker.h" #include "mozilla/dom/ContentParent.h" #include "mozilla/dom/FileSystemBase.h" #include "mozilla/dom/FileSystemSecurity.h" #include "mozilla/ipc/BackgroundParent.h" +#include "mozilla/Preferences.h" #include "mozilla/Unused.h" #include "nsProxyRelease.h" diff --git a/dom/filesystem/FileSystemSecurity.cpp b/dom/filesystem/FileSystemSecurity.cpp index b3d4258179..7c70374a00 100644 --- a/dom/filesystem/FileSystemSecurity.cpp +++ b/dom/filesystem/FileSystemSecurity.cpp @@ -8,6 +8,9 @@ #include "FileSystemUtils.h" #include "mozilla/ClearOnShutdown.h" #include "mozilla/StaticPtr.h" +#include "mozilla/ipc/BackgroundParent.h" + +using namespace mozilla::ipc; namespace mozilla { namespace dom { diff --git a/dom/filesystem/FileSystemTaskBase.cpp b/dom/filesystem/FileSystemTaskBase.cpp index 481002b7d0..e9eed90ee2 100644 --- a/dom/filesystem/FileSystemTaskBase.cpp +++ b/dom/filesystem/FileSystemTaskBase.cpp @@ -19,6 +19,8 @@ #include "mozilla/Unused.h" #include "nsProxyRelease.h" +using namespace mozilla::ipc; + namespace mozilla { namespace dom { diff --git a/dom/filesystem/FileSystemUtils.cpp b/dom/filesystem/FileSystemUtils.cpp index 872e049ee1..56293cbda1 100644 --- a/dom/filesystem/FileSystemUtils.cpp +++ b/dom/filesystem/FileSystemUtils.cpp @@ -5,6 +5,9 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "mozilla/dom/FileSystemUtils.h" +#include "nsCharSeparatedTokenizer.h" +#include "nsString.h" +#include "nsTArray.h" namespace mozilla { namespace dom { diff --git a/dom/filesystem/FileSystemUtils.h b/dom/filesystem/FileSystemUtils.h index ae302e07ca..42fc5573c0 100644 --- a/dom/filesystem/FileSystemUtils.h +++ b/dom/filesystem/FileSystemUtils.h @@ -7,6 +7,8 @@ #ifndef mozilla_dom_FileSystemUtils_h #define mozilla_dom_FileSystemUtils_h +#include "nsString.h" + class nsIFile; namespace mozilla { diff --git a/dom/filesystem/GetDirectoryListingTask.cpp b/dom/filesystem/GetDirectoryListingTask.cpp index e3ac2933f9..999366fe89 100644 --- a/dom/filesystem/GetDirectoryListingTask.cpp +++ b/dom/filesystem/GetDirectoryListingTask.cpp @@ -16,10 +16,13 @@ #include "mozilla/dom/UnionTypes.h" #include "mozilla/dom/ipc/BlobChild.h" #include "mozilla/dom/ipc/BlobParent.h" +#include "mozilla/ipc/BackgroundParent.h" #include "nsIFile.h" #include "nsISimpleEnumerator.h" #include "nsStringGlue.h" +using namespace mozilla::ipc; + namespace mozilla { namespace dom { diff --git a/dom/filesystem/GetFileOrDirectoryTask.cpp b/dom/filesystem/GetFileOrDirectoryTask.cpp index f71976503c..446c641f46 100644 --- a/dom/filesystem/GetFileOrDirectoryTask.cpp +++ b/dom/filesystem/GetFileOrDirectoryTask.cpp @@ -14,9 +14,12 @@ #include "mozilla/dom/Promise.h" #include "mozilla/dom/ipc/BlobChild.h" #include "mozilla/dom/ipc/BlobParent.h" +#include "mozilla/ipc/BackgroundParent.h" #include "nsIFile.h" #include "nsStringGlue.h" +using namespace mozilla::ipc; + namespace mozilla { namespace dom { diff --git a/dom/filesystem/GetFilesHelper.cpp b/dom/filesystem/GetFilesHelper.cpp index 21d228a602..c4cbe7f140 100644 --- a/dom/filesystem/GetFilesHelper.cpp +++ b/dom/filesystem/GetFilesHelper.cpp @@ -5,8 +5,16 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "GetFilesHelper.h" +#include "FileSystemUtils.h" #include "mozilla/dom/ContentChild.h" #include "mozilla/dom/ContentParent.h" +#include "mozilla/dom/Directory.h" +#include "mozilla/dom/Promise.h" +#include "mozilla/dom/UnionTypes.h" +#include "mozilla/dom/ipc/BlobParent.h" +#include "nsContentUtils.h" +#include "nsNetCID.h" +#include "nsISimpleEnumerator.h" #include "nsProxyRelease.h" namespace mozilla { diff --git a/dom/filesystem/GetFilesHelper.h b/dom/filesystem/GetFilesHelper.h index a1bb1b27a6..371c73ef24 100644 --- a/dom/filesystem/GetFilesHelper.h +++ b/dom/filesystem/GetFilesHelper.h @@ -9,9 +9,12 @@ #include "mozilla/Mutex.h" #include "mozilla/RefPtr.h" +#include "mozilla/dom/File.h" +#include "nsClassHashtable.h" #include "nsCycleCollectionTraversalCallback.h" #include "nsTArray.h" #include "nsTHashtable.h" +#include "nsThreadUtils.h" class nsIGlobalObject; diff --git a/dom/filesystem/GetFilesTask.cpp b/dom/filesystem/GetFilesTask.cpp index 6682fb7d3e..b283eec54f 100644 --- a/dom/filesystem/GetFilesTask.cpp +++ b/dom/filesystem/GetFilesTask.cpp @@ -15,9 +15,12 @@ #include "mozilla/dom/Promise.h" #include "mozilla/dom/ipc/BlobChild.h" #include "mozilla/dom/ipc/BlobParent.h" +#include "mozilla/ipc/BackgroundParent.h" #include "nsIFile.h" #include "nsStringGlue.h" +using namespace mozilla::ipc; + namespace mozilla { namespace dom { diff --git a/dom/filesystem/moz.build b/dom/filesystem/moz.build index 6e516c3a78..1b6a8d3cae 100644 --- a/dom/filesystem/moz.build +++ b/dom/filesystem/moz.build @@ -19,7 +19,7 @@ EXPORTS.mozilla.dom += [ 'OSFileSystem.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'Directory.cpp', 'FileSystemBase.cpp', 'FileSystemRequestParent.cpp', From 040477a3f33f50bdc0da3dfab17d5e4c4838b9f0 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Mon, 20 Apr 2020 18:08:32 +0200 Subject: [PATCH 043/100] Issue #80 - De-unify dom/gamepad --- dom/gamepad/GamepadManager.cpp | 1 - dom/gamepad/GamepadManager.h | 3 +++ dom/gamepad/GamepadPlatformService.h | 1 + dom/gamepad/GamepadPoseState.h | 2 ++ dom/gamepad/GamepadServiceTest.cpp | 2 ++ dom/gamepad/android/AndroidGamepad.cpp | 1 + dom/gamepad/cocoa/CocoaGamepad.cpp | 1 + dom/gamepad/ipc/GamepadEventChannelParent.cpp | 4 ++++ dom/gamepad/ipc/GamepadTestChannelParent.cpp | 1 + dom/gamepad/linux/LinuxGamepad.cpp | 1 + dom/gamepad/moz.build | 12 ++++++------ dom/gamepad/windows/WindowsGamepad.cpp | 1 + 12 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dom/gamepad/GamepadManager.cpp b/dom/gamepad/GamepadManager.cpp index e178296522..0c05b3ddba 100644 --- a/dom/gamepad/GamepadManager.cpp +++ b/dom/gamepad/GamepadManager.cpp @@ -20,7 +20,6 @@ #include "mozilla/StaticPtr.h" #include "nsAutoPtr.h" -#include "nsGlobalWindow.h" #include "nsIDOMEvent.h" #include "nsIDOMDocument.h" #include "nsIDOMWindow.h" diff --git a/dom/gamepad/GamepadManager.h b/dom/gamepad/GamepadManager.h index a772221cac..38fdfc342a 100644 --- a/dom/gamepad/GamepadManager.h +++ b/dom/gamepad/GamepadManager.h @@ -7,11 +7,14 @@ #ifndef mozilla_dom_GamepadManager_h_ #define mozilla_dom_GamepadManager_h_ +#include "nsGlobalWindow.h" #include "nsIIPCBackgroundChildCreateCallback.h" #include "nsIObserver.h" // Needed for GamepadMappingType #include "mozilla/dom/GamepadBinding.h" +#include "mozilla/dom/GamepadPoseState.h" #include "mozilla/dom/GamepadServiceType.h" +#include "nsRefPtrHashtable.h" class nsGlobalWindow; diff --git a/dom/gamepad/GamepadPlatformService.h b/dom/gamepad/GamepadPlatformService.h index 0a61281e42..77a08ae17d 100644 --- a/dom/gamepad/GamepadPlatformService.h +++ b/dom/gamepad/GamepadPlatformService.h @@ -15,6 +15,7 @@ namespace mozilla { namespace dom { +class GamepadChangeEvent; class GamepadEventChannelParent; // Platform Service for building and transmitting IPDL messages diff --git a/dom/gamepad/GamepadPoseState.h b/dom/gamepad/GamepadPoseState.h index 958b26139f..dc5903aba6 100644 --- a/dom/gamepad/GamepadPoseState.h +++ b/dom/gamepad/GamepadPoseState.h @@ -2,6 +2,8 @@ #ifndef mozilla_dom_gamepad_GamepadPoseState_h_ #define mozilla_dom_gamepad_GamepadPoseState_h_ +#include "mozilla/TypedEnumBits.h" + namespace mozilla{ namespace dom{ diff --git a/dom/gamepad/GamepadServiceTest.cpp b/dom/gamepad/GamepadServiceTest.cpp index 89429b52a2..e8ec46cfe1 100644 --- a/dom/gamepad/GamepadServiceTest.cpp +++ b/dom/gamepad/GamepadServiceTest.cpp @@ -22,6 +22,8 @@ #include "nsIObserver.h" #include "nsIObserverService.h" +using namespace mozilla::ipc; + namespace mozilla { namespace dom { diff --git a/dom/gamepad/android/AndroidGamepad.cpp b/dom/gamepad/android/AndroidGamepad.cpp index 706d02617b..6ed1ef2eec 100644 --- a/dom/gamepad/android/AndroidGamepad.cpp +++ b/dom/gamepad/android/AndroidGamepad.cpp @@ -7,6 +7,7 @@ #include "GeneratedJNIWrappers.h" #include "GeneratedJNINatives.h" #include "nsThreadUtils.h" +#include "mozilla/dom/Gamepad.h" namespace mozilla { namespace dom { diff --git a/dom/gamepad/cocoa/CocoaGamepad.cpp b/dom/gamepad/cocoa/CocoaGamepad.cpp index e7c986e22a..24786f5ef6 100644 --- a/dom/gamepad/cocoa/CocoaGamepad.cpp +++ b/dom/gamepad/cocoa/CocoaGamepad.cpp @@ -7,6 +7,7 @@ // mostly derived from the Allegro source code at: // http://alleg.svn.sourceforge.net/viewvc/alleg/allegro/branches/4.9/src/macosx/hidjoy.m?revision=13760&view=markup +#include "mozilla/dom/Gamepad.h" #include "mozilla/dom/GamepadPlatformService.h" #include "mozilla/ArrayUtils.h" #include "nsThreadUtils.h" diff --git a/dom/gamepad/ipc/GamepadEventChannelParent.cpp b/dom/gamepad/ipc/GamepadEventChannelParent.cpp index c3c8fd2c8b..8060817895 100644 --- a/dom/gamepad/ipc/GamepadEventChannelParent.cpp +++ b/dom/gamepad/ipc/GamepadEventChannelParent.cpp @@ -1,9 +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/. */ + #include "GamepadEventChannelParent.h" + #include "GamepadPlatformService.h" +#include "mozilla/Unused.h" #include "mozilla/dom/GamepadMonitoring.h" +#include "mozilla/ipc/BackgroundParent.h" #include "nsThreadUtils.h" namespace mozilla { diff --git a/dom/gamepad/ipc/GamepadTestChannelParent.cpp b/dom/gamepad/ipc/GamepadTestChannelParent.cpp index 421447fe06..9730f7d167 100644 --- a/dom/gamepad/ipc/GamepadTestChannelParent.cpp +++ b/dom/gamepad/ipc/GamepadTestChannelParent.cpp @@ -5,6 +5,7 @@ #include "GamepadTestChannelParent.h" #include "mozilla/dom/GamepadPlatformService.h" +#include "mozilla/ipc/BackgroundParent.h" #include "mozilla/Unused.h" namespace mozilla { diff --git a/dom/gamepad/linux/LinuxGamepad.cpp b/dom/gamepad/linux/LinuxGamepad.cpp index c45f4174a2..8c6e8ea758 100644 --- a/dom/gamepad/linux/LinuxGamepad.cpp +++ b/dom/gamepad/linux/LinuxGamepad.cpp @@ -19,6 +19,7 @@ #include #include #include "nscore.h" +#include "mozilla/dom/Gamepad.h" #include "mozilla/dom/GamepadPlatformService.h" #include "udev.h" diff --git a/dom/gamepad/moz.build b/dom/gamepad/moz.build index a809d1ebaa..81ff376314 100644 --- a/dom/gamepad/moz.build +++ b/dom/gamepad/moz.build @@ -31,7 +31,7 @@ if CONFIG['MOZ_GAMEPAD']: 'ipc/GamepadTestChannelParent.h' ] - UNIFIED_SOURCES = [ + SOURCES = [ 'Gamepad.cpp', 'GamepadButton.cpp', 'GamepadManager.cpp', @@ -46,23 +46,23 @@ if CONFIG['MOZ_GAMEPAD']: ] if CONFIG['MOZ_GAMEPAD_BACKEND'] == 'stub': - UNIFIED_SOURCES += [ + SOURCES += [ 'fallback/FallbackGamepad.cpp' ] elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'cocoa': - UNIFIED_SOURCES += [ + SOURCES += [ 'cocoa/CocoaGamepad.cpp' ] elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'windows': - UNIFIED_SOURCES += [ + SOURCES += [ 'windows/WindowsGamepad.cpp' ] elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'linux': - UNIFIED_SOURCES += [ + SOURCES += [ 'linux/LinuxGamepad.cpp' ] elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'android': - UNIFIED_SOURCES += [ + SOURCES += [ 'android/AndroidGamepad.cpp' ] diff --git a/dom/gamepad/windows/WindowsGamepad.cpp b/dom/gamepad/windows/WindowsGamepad.cpp index e1965c00c8..ddab2f28cf 100644 --- a/dom/gamepad/windows/WindowsGamepad.cpp +++ b/dom/gamepad/windows/WindowsGamepad.cpp @@ -24,6 +24,7 @@ #include "mozilla/Services.h" #include "mozilla/ipc/BackgroundParent.h" +#include "mozilla/dom/Gamepad.h" #include "mozilla/dom/GamepadPlatformService.h" namespace { From c5c3c68f469f162f1c4af454cf8b31d2b5d16134 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Mon, 20 Apr 2020 19:03:35 +0200 Subject: [PATCH 044/100] Issue #80 - De-unify dom/geolocation --- dom/geolocation/moz.build | 2 +- dom/geolocation/nsGeoPosition.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dom/geolocation/moz.build b/dom/geolocation/moz.build index 4339d5a7f3..8ac79e8b3c 100644 --- a/dom/geolocation/moz.build +++ b/dom/geolocation/moz.build @@ -13,7 +13,7 @@ SOURCES += [ 'nsGeolocation.cpp', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'MLSFallback.cpp', 'nsGeoPosition.cpp', ] diff --git a/dom/geolocation/nsGeoPosition.h b/dom/geolocation/nsGeoPosition.h index 06b406c32d..cefb4ae8d7 100644 --- a/dom/geolocation/nsGeoPosition.h +++ b/dom/geolocation/nsGeoPosition.h @@ -7,6 +7,7 @@ #ifndef nsGeoPosition_h #define nsGeoPosition_h +#include "nsCOMPtr.h" #include "nsIDOMGeoPositionCoords.h" #include "nsIDOMGeoPosition.h" #include "nsString.h" From e4f5cc83b69b598d0ac3d7352170ba163b5acfc5 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Mon, 20 Apr 2020 19:35:13 +0200 Subject: [PATCH 045/100] Issue #80 - De-unify dom/grid --- dom/grid/GridDimension.h | 2 ++ dom/grid/GridLines.cpp | 1 + dom/grid/GridLines.h | 7 ++++++- dom/grid/moz.build | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dom/grid/GridDimension.h b/dom/grid/GridDimension.h index 7a33735216..ec96354441 100644 --- a/dom/grid/GridDimension.h +++ b/dom/grid/GridDimension.h @@ -7,11 +7,13 @@ #ifndef mozilla_dom_GridDimension_h #define mozilla_dom_GridDimension_h +#include "mozilla/dom/GridBinding.h" #include "nsWrapperCache.h" namespace mozilla { struct ComputedGridTrackInfo; +struct ComputedGridLineInfo; namespace dom { diff --git a/dom/grid/GridLines.cpp b/dom/grid/GridLines.cpp index 8988853464..2604eff6cf 100644 --- a/dom/grid/GridLines.cpp +++ b/dom/grid/GridLines.cpp @@ -6,6 +6,7 @@ #include "GridLines.h" +#include "GridArea.h" #include "GridDimension.h" #include "GridLine.h" #include "mozilla/dom/GridBinding.h" diff --git a/dom/grid/GridLines.h b/dom/grid/GridLines.h index 9211682040..784fe2d28a 100644 --- a/dom/grid/GridLines.h +++ b/dom/grid/GridLines.h @@ -7,10 +7,15 @@ #ifndef mozilla_dom_GridLines_h #define mozilla_dom_GridLines_h -#include "nsTArray.h" +#include "mozilla/dom/GridBinding.h" +#include "nsGridContainerFrame.h" #include "nsWrapperCache.h" namespace mozilla { + +struct ComputedGridTrackInfo; +struct ComputedGridLineInfo; + namespace dom { class GridDimension; diff --git a/dom/grid/moz.build b/dom/grid/moz.build index 96d5c31510..62025c98ec 100644 --- a/dom/grid/moz.build +++ b/dom/grid/moz.build @@ -16,7 +16,7 @@ EXPORTS.mozilla.dom += [ 'GridTracks.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'Grid.cpp', 'GridArea.cpp', 'GridDimension.cpp', From 2970ae4c3e2e6007e1943b4689d77c43519abf0a Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Mon, 20 Apr 2020 20:06:44 +0200 Subject: [PATCH 046/100] Issue #80 - De-unify dom/network --- dom/network/TCPServerSocketParent.cpp | 7 +++++-- dom/network/TCPSocket.cpp | 2 ++ dom/network/TCPSocketParent.cpp | 1 + dom/network/UDPSocket.cpp | 2 ++ dom/network/UDPSocketChild.cpp | 2 ++ dom/network/UDPSocketParent.cpp | 5 +++++ dom/network/moz.build | 2 +- 7 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dom/network/TCPServerSocketParent.cpp b/dom/network/TCPServerSocketParent.cpp index 8f98d8b785..aec0ad1984 100644 --- a/dom/network/TCPServerSocketParent.cpp +++ b/dom/network/TCPServerSocketParent.cpp @@ -4,15 +4,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "nsIScriptSecurityManager.h" -#include "TCPServerSocket.h" #include "TCPServerSocketParent.h" + +#include "nsIScriptSecurityManager.h" +#include "TCPSocket.h" +#include "TCPServerSocket.h" #include "nsJSUtils.h" #include "TCPSocketParent.h" #include "mozilla/Unused.h" #include "mozilla/AppProcessChecker.h" #include "mozilla/dom/ContentParent.h" #include "mozilla/dom/TabParent.h" +#include "mozilla/dom/TCPServerSocketEvent.h" namespace mozilla { namespace dom { diff --git a/dom/network/TCPSocket.cpp b/dom/network/TCPSocket.cpp index 38827a9ac4..3f4fb696e5 100644 --- a/dom/network/TCPSocket.cpp +++ b/dom/network/TCPSocket.cpp @@ -6,7 +6,9 @@ #include "mozilla/ErrorResult.h" #include "TCPSocket.h" #include "TCPServerSocket.h" +#include "TCPSocketParent.h" #include "TCPSocketChild.h" +#include "mozilla/Unused.h" #include "mozilla/dom/DOMError.h" #include "mozilla/dom/TCPSocketBinding.h" #include "mozilla/dom/TCPSocketErrorEvent.h" diff --git a/dom/network/TCPSocketParent.cpp b/dom/network/TCPSocketParent.cpp index 54167234e8..5fd53067df 100644 --- a/dom/network/TCPSocketParent.cpp +++ b/dom/network/TCPSocketParent.cpp @@ -5,6 +5,7 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "TCPSocketParent.h" +#include "TCPSocket.h" #include "jsapi.h" #include "jsfriendapi.h" #include "nsJSUtils.h" diff --git a/dom/network/UDPSocket.cpp b/dom/network/UDPSocket.cpp index e275e39029..3e18463ae2 100644 --- a/dom/network/UDPSocket.cpp +++ b/dom/network/UDPSocket.cpp @@ -17,6 +17,8 @@ #include "nsINetAddr.h" #include "nsStringStream.h" +using namespace mozilla::net; + namespace mozilla { namespace dom { diff --git a/dom/network/UDPSocketChild.cpp b/dom/network/UDPSocketChild.cpp index d205e7e8a1..9d6ec09787 100644 --- a/dom/network/UDPSocketChild.cpp +++ b/dom/network/UDPSocketChild.cpp @@ -5,6 +5,8 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "UDPSocketChild.h" + +#include "UDPSocket.h" #include "mozilla/Unused.h" #include "mozilla/ipc/InputStreamUtils.h" #include "mozilla/net/NeckoChild.h" diff --git a/dom/network/UDPSocketParent.cpp b/dom/network/UDPSocketParent.cpp index 904a995ed4..2f258badb2 100644 --- a/dom/network/UDPSocketParent.cpp +++ b/dom/network/UDPSocketParent.cpp @@ -6,9 +6,11 @@ #include "nsIServiceManager.h" #include "UDPSocketParent.h" +#include "UDPSocket.h" #include "nsComponentManagerUtils.h" #include "nsIUDPSocket.h" #include "nsINetAddr.h" +#include "nsNetCID.h" #include "mozilla/AppProcessChecker.h" #include "mozilla/Unused.h" #include "mozilla/ipc/InputStreamUtils.h" @@ -17,9 +19,12 @@ #include "mozilla/net/PNeckoParent.h" #include "nsIPermissionManager.h" #include "nsIScriptSecurityManager.h" +#include "mozilla/dom/ContentParent.h" #include "mozilla/ipc/PBackgroundParent.h" #include "mtransport/runnable_utils.h" +using namespace mozilla::net; + namespace mozilla { namespace dom { diff --git a/dom/network/moz.build b/dom/network/moz.build index ffb90d116c..79f8fe0097 100644 --- a/dom/network/moz.build +++ b/dom/network/moz.build @@ -27,7 +27,7 @@ EXPORTS.mozilla.dom.network += [ 'UDPSocketParent.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'Connection.cpp', 'TCPServerSocket.cpp', 'TCPServerSocketChild.cpp', From eabcbe567262255a0d09fd381f42c62914b841b7 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Tue, 21 Apr 2020 13:07:10 +0200 Subject: [PATCH 047/100] [AM] Clean up addon-signing build leftovers. --- build/mozconfig.common | 5 ----- old-configure.in | 9 --------- python/mozbuild/mozbuild/mozinfo.py | 2 -- toolkit/modules/AppConstants.jsm | 7 ------- 4 files changed, 23 deletions(-) diff --git a/build/mozconfig.common b/build/mozconfig.common index 3d2d0b2895..1bdf69ddc5 100644 --- a/build/mozconfig.common +++ b/build/mozconfig.common @@ -16,11 +16,6 @@ ac_add_options --enable-crashreporter ac_add_options --enable-release -# Disable checking that add-ons are signed by the trusted root -MOZ_ADDON_SIGNING=${MOZ_ADDON_SIGNING-0} -# Disable enforcing that add-ons are signed by the trusted root -MOZ_REQUIRE_SIGNING=${MOZ_REQUIRE_SIGNING-0} - ac_add_options --enable-js-shell . "$topsrcdir/build/mozconfig.automation" diff --git a/old-configure.in b/old-configure.in index 660064bbfc..c2be28f9e5 100644 --- a/old-configure.in +++ b/old-configure.in @@ -5019,15 +5019,6 @@ AC_SUBST(MOZ_FIX_LINK_PATHS) AC_SUBST(MOZ_POST_PROGRAM_COMMAND) AC_SUBST(MOZ_LINKER_EXTRACT) -AC_SUBST(MOZ_ADDON_SIGNING) -if test "$MOZ_ADDON_SIGNING" = 1; then - AC_DEFINE(MOZ_ADDON_SIGNING) -fi -AC_SUBST(MOZ_REQUIRE_SIGNING) -if test "$MOZ_REQUIRE_SIGNING" = 1; then - AC_DEFINE(MOZ_REQUIRE_SIGNING) -fi - AC_SUBST(MOZ_JSDOWNLOADS) if test -n "$MOZ_JSDOWNLOADS"; then AC_DEFINE(MOZ_JSDOWNLOADS) diff --git a/python/mozbuild/mozbuild/mozinfo.py b/python/mozbuild/mozbuild/mozinfo.py index 230ca119ae..3bdde249ce 100644 --- a/python/mozbuild/mozbuild/mozinfo.py +++ b/python/mozbuild/mozbuild/mozinfo.py @@ -88,8 +88,6 @@ def build_dict(config, env=os.environ): d['telemetry'] = substs.get('MOZ_TELEMETRY_REPORTING') == '1' d['tests_enabled'] = substs.get('ENABLE_TESTS') == "1" d['bin_suffix'] = substs.get('BIN_SUFFIX', '') - d['addon_signing'] = substs.get('MOZ_ADDON_SIGNING') == '1' - d['require_signing'] = substs.get('MOZ_REQUIRE_SIGNING') == '1' d['official'] = bool(substs.get('MC_OFFICIAL')) def guess_platform(): diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm index 40aaadbf07..5eea04b0fb 100644 --- a/toolkit/modules/AppConstants.jsm +++ b/toolkit/modules/AppConstants.jsm @@ -194,13 +194,6 @@ MOZ_SAFE_BROWSING: false, #endif - MOZ_REQUIRE_SIGNING: -#ifdef MOZ_REQUIRE_SIGNING - true, -#else - false, -#endif - MENUBAR_CAN_AUTOHIDE: #ifdef MENUBAR_CAN_AUTOHIDE true, From 9b1967f0c391d6d3227a40b06e967cd9607b0454 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Tue, 21 Apr 2020 14:58:19 +0200 Subject: [PATCH 048/100] Issue #80 - De-unify dom/html --- dom/html/HTMLBodyElement.cpp | 1 + dom/html/HTMLFrameSetElement.cpp | 1 + dom/html/HTMLLabelElement.cpp | 1 + dom/html/HTMLMetaElement.cpp | 1 + dom/html/ValidityState.h | 1 + dom/html/moz.build | 8 ++------ dom/html/nsBrowserElement.cpp | 2 ++ dom/html/nsHTMLDocument.cpp | 1 + dom/html/nsIConstraintValidation.cpp | 2 ++ 9 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dom/html/HTMLBodyElement.cpp b/dom/html/HTMLBodyElement.cpp index 112d48dd15..7e5e184801 100644 --- a/dom/html/HTMLBodyElement.cpp +++ b/dom/html/HTMLBodyElement.cpp @@ -7,6 +7,7 @@ #include "HTMLBodyElement.h" #include "mozilla/dom/HTMLBodyElementBinding.h" #include "nsAttrValueInlines.h" +#include "nsContentUtils.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" #include "nsPresContext.h" diff --git a/dom/html/HTMLFrameSetElement.cpp b/dom/html/HTMLFrameSetElement.cpp index 861dbfe9fc..0e9d4fd2e9 100644 --- a/dom/html/HTMLFrameSetElement.cpp +++ b/dom/html/HTMLFrameSetElement.cpp @@ -7,6 +7,7 @@ #include "HTMLFrameSetElement.h" #include "mozilla/dom/HTMLFrameSetElementBinding.h" #include "mozilla/dom/EventHandlerBinding.h" +#include "nsContentUtils.h" #include "nsGlobalWindow.h" #include "mozilla/UniquePtrExtensions.h" #include "nsAttrValueOrString.h" diff --git a/dom/html/HTMLLabelElement.cpp b/dom/html/HTMLLabelElement.cpp index d1c037336e..ec36c8b99d 100644 --- a/dom/html/HTMLLabelElement.cpp +++ b/dom/html/HTMLLabelElement.cpp @@ -8,6 +8,7 @@ * Implementation of HTML