From 63875c9e0475a119093078f06cfa6124415e6853 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Wed, 7 Sep 2022 12:47:24 +0000 Subject: Re-unify most of DOM --- dom/base/moz.build | 7 ++++--- dom/canvas/ImageBitmapColorUtils.cpp | 3 --- dom/canvas/moz.build | 4 ++-- dom/fetch/moz.build | 9 +++------ dom/gamepad/moz.build | 10 +++++----- dom/media/eme/moz.build | 2 +- dom/media/encoder/moz.build | 4 ++-- dom/media/gmp/moz.build | 4 ++-- dom/media/platforms/agnostic/eme/moz.build | 2 +- dom/media/platforms/agnostic/gmp/moz.build | 2 +- dom/media/platforms/ffmpeg/moz.build | 2 +- dom/media/webaudio/moz.build | 2 +- dom/media/webspeech/synth/moz.build | 2 +- dom/plugins/ipc/hangui/moz.build | 2 +- dom/plugins/ipc/interpose/moz.build | 2 +- dom/xul/moz.build | 2 +- 16 files changed, 27 insertions(+), 32 deletions(-) diff --git a/dom/base/moz.build b/dom/base/moz.build index 98235c0622..a3b0d85f7f 100755 --- a/dom/base/moz.build +++ b/dom/base/moz.build @@ -222,7 +222,7 @@ EXPORTS.mozilla.dom += [ 'WindowOrientationObserver.h', ] -SOURCES += [ +UNIFIED_SOURCES += [ 'AnonymousContent.cpp', 'Attr.cpp', 'BarProps.cpp', @@ -238,7 +238,6 @@ SOURCES += [ 'DirectionalityUtils.cpp', 'DocGroup.cpp', 'DocumentFragment.cpp', - 'DocumentOrShadowRoot.cpp', 'DocumentType.cpp', 'DOMCursor.cpp', 'DOMError.cpp', @@ -373,12 +372,14 @@ SOURCES += [ ] if CONFIG['MOZ_WEBRTC']: - SOURCES += [ + UNIFIED_SOURCES += [ 'nsDOMDataChannel.cpp', ] # these files couldn't be in UNIFIED_SOURCES for now for reasons given below: SOURCES += [ + # DocumentOrShadowRoot conflicts with mozilla::dom::ShadowRoot + 'DocumentOrShadowRoot.cpp', # Several conflicts with other bindings. 'DOMIntersectionObserver.cpp', # Because of OS X headers. diff --git a/dom/canvas/ImageBitmapColorUtils.cpp b/dom/canvas/ImageBitmapColorUtils.cpp index 4ef4ade868..2b65c1f100 100644 --- a/dom/canvas/ImageBitmapColorUtils.cpp +++ b/dom/canvas/ImageBitmapColorUtils.cpp @@ -6,9 +6,6 @@ #include "ImageBitmapColorUtils.h" -#include "js/LegacyIntTypes.h" -#include - namespace mozilla { namespace dom { diff --git a/dom/canvas/moz.build b/dom/canvas/moz.build index d70f1ad1f1..20b5112cb3 100644 --- a/dom/canvas/moz.build +++ b/dom/canvas/moz.build @@ -41,7 +41,7 @@ EXPORTS.mozilla.dom += [ ] # Canvas 2D and common sources -SOURCES += [ +UNIFIED_SOURCES += [ 'CanvasImageCache.cpp', 'CanvasRenderingContext2D.cpp', 'CanvasRenderingContextHelper.cpp', @@ -59,7 +59,7 @@ SOURCES += [ ] # WebGL Sources -SOURCES += [ +UNIFIED_SOURCES += [ 'TexUnpackBlob.cpp', 'WebGL1Context.cpp', 'WebGL1ContextUniforms.cpp', diff --git a/dom/fetch/moz.build b/dom/fetch/moz.build index 2efcd3fb2a..d1a8a49323 100644 --- a/dom/fetch/moz.build +++ b/dom/fetch/moz.build @@ -19,14 +19,9 @@ EXPORTS.mozilla.dom += [ ] UNIFIED_SOURCES += [ + 'ChannelInfo.cpp', 'Fetch.cpp', 'FetchConsumer.cpp', - 'Request.cpp', - 'Response.cpp', -] - -SOURCES += [ - 'ChannelInfo.cpp', 'FetchDriver.cpp', 'FetchObserver.cpp', 'FetchUtil.cpp', @@ -34,6 +29,8 @@ SOURCES += [ 'InternalHeaders.cpp', 'InternalRequest.cpp', 'InternalResponse.cpp', + 'Request.cpp', + 'Response.cpp', ] IPDL_SOURCES += [ diff --git a/dom/gamepad/moz.build b/dom/gamepad/moz.build index 1ed5830567..16e9093a45 100644 --- a/dom/gamepad/moz.build +++ b/dom/gamepad/moz.build @@ -30,7 +30,7 @@ if CONFIG['MOZ_GAMEPAD']: 'ipc/GamepadTestChannelParent.h' ] - SOURCES = [ + UNIFIED_SOURCES = [ 'Gamepad.cpp', 'GamepadButton.cpp', 'GamepadManager.cpp', @@ -45,19 +45,19 @@ if CONFIG['MOZ_GAMEPAD']: ] if CONFIG['MOZ_GAMEPAD_BACKEND'] == 'stub': - SOURCES += [ + UNIFIED_SOURCES += [ 'fallback/FallbackGamepad.cpp' ] elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'cocoa': - SOURCES += [ + UNIFIED_SOURCES += [ 'cocoa/CocoaGamepad.cpp' ] elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'windows': - SOURCES += [ + UNIFIED_SOURCES += [ 'windows/WindowsGamepad.cpp' ] elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'linux': - SOURCES += [ + UNIFIED_SOURCES += [ 'linux/LinuxGamepad.cpp' ] diff --git a/dom/media/eme/moz.build b/dom/media/eme/moz.build index 7b1ad9d843..31ab9ffd87 100644 --- a/dom/media/eme/moz.build +++ b/dom/media/eme/moz.build @@ -22,7 +22,7 @@ EXPORTS.mozilla += [ 'EMEUtils.h', ] -SOURCES += [ +UNIFIED_SOURCES += [ 'CDMCaps.cpp', 'DetailedPromise.cpp', 'EMEUtils.cpp', diff --git a/dom/media/encoder/moz.build b/dom/media/encoder/moz.build index cabe1624c3..247773c72e 100644 --- a/dom/media/encoder/moz.build +++ b/dom/media/encoder/moz.build @@ -15,7 +15,7 @@ EXPORTS += [ 'TrackMetadataBase.h', ] -SOURCES += [ +UNIFIED_SOURCES += [ 'MediaEncoder.cpp', 'OpusTrackEncoder.cpp', 'TrackEncoder.cpp', @@ -25,7 +25,7 @@ if CONFIG['MOZ_WEBM_ENCODER']: EXPORTS += ['VP8TrackEncoder.h', ] - SOURCES += ['VP8TrackEncoder.cpp', + UNIFIED_SOURCES += ['VP8TrackEncoder.cpp', ] LOCAL_INCLUDES += ['/media/libyuv/include'] diff --git a/dom/media/gmp/moz.build b/dom/media/gmp/moz.build index fb8e6532fc..c4da2573fb 100644 --- a/dom/media/gmp/moz.build +++ b/dom/media/gmp/moz.build @@ -76,7 +76,7 @@ if CONFIG['MOZ_EME']: 'GMPCDMProxy.h', ] -SOURCES += [ +UNIFIED_SOURCES += [ 'GMPAudioDecoderChild.cpp', 'GMPAudioDecoderParent.cpp', 'GMPAudioHost.cpp', @@ -112,7 +112,7 @@ SOURCES += [ ] if CONFIG['MOZ_EME']: - SOURCES += [ + UNIFIED_SOURCES += [ 'GMPCDMCallbackProxy.cpp', 'GMPCDMProxy.cpp', ] diff --git a/dom/media/platforms/agnostic/eme/moz.build b/dom/media/platforms/agnostic/eme/moz.build index 97156f33a8..74260b3ba2 100644 --- a/dom/media/platforms/agnostic/eme/moz.build +++ b/dom/media/platforms/agnostic/eme/moz.build @@ -10,7 +10,7 @@ EXPORTS += [ 'SamplesWaitingForKey.h', ] -SOURCES += [ +UNIFIED_SOURCES += [ 'EMEAudioDecoder.cpp', 'EMEDecoderModule.cpp', 'EMEVideoDecoder.cpp', diff --git a/dom/media/platforms/agnostic/gmp/moz.build b/dom/media/platforms/agnostic/gmp/moz.build index 64e2586204..ce5ec0692a 100644 --- a/dom/media/platforms/agnostic/gmp/moz.build +++ b/dom/media/platforms/agnostic/gmp/moz.build @@ -10,7 +10,7 @@ EXPORTS += [ 'MediaDataDecoderProxy.h', ] -SOURCES += [ +UNIFIED_SOURCES += [ 'GMPAudioDecoder.cpp', 'GMPDecoderModule.cpp', 'GMPVideoDecoder.cpp', diff --git a/dom/media/platforms/ffmpeg/moz.build b/dom/media/platforms/ffmpeg/moz.build index f42711a44e..3dae0fc1d0 100644 --- a/dom/media/platforms/ffmpeg/moz.build +++ b/dom/media/platforms/ffmpeg/moz.build @@ -16,7 +16,7 @@ DIRS += [ 'ffmpeg59', ] -SOURCES += [ +UNIFIED_SOURCES += [ 'FFmpegRuntimeLinker.cpp', ] diff --git a/dom/media/webaudio/moz.build b/dom/media/webaudio/moz.build index fa97fd20f9..2cec1e5271 100644 --- a/dom/media/webaudio/moz.build +++ b/dom/media/webaudio/moz.build @@ -74,7 +74,7 @@ EXPORTS.mozilla.dom += [ 'WaveShaperNode.h', ] -SOURCES += [ +UNIFIED_SOURCES += [ 'AnalyserNode.cpp', 'AudioBlock.cpp', 'AudioBuffer.cpp', diff --git a/dom/media/webspeech/synth/moz.build b/dom/media/webspeech/synth/moz.build index 6603689261..f4afa2e430 100644 --- a/dom/media/webspeech/synth/moz.build +++ b/dom/media/webspeech/synth/moz.build @@ -19,7 +19,7 @@ EXPORTS.mozilla.dom += [ 'SpeechSynthesisVoice.h', ] -SOURCES += [ +UNIFIED_SOURCES += [ 'ipc/SpeechSynthesisChild.cpp', 'ipc/SpeechSynthesisParent.cpp', 'nsSpeechTask.cpp', diff --git a/dom/plugins/ipc/hangui/moz.build b/dom/plugins/ipc/hangui/moz.build index 8e24249d31..5a081cf6d3 100644 --- a/dom/plugins/ipc/hangui/moz.build +++ b/dom/plugins/ipc/hangui/moz.build @@ -5,7 +5,7 @@ Program('plugin-hang-ui') -SOURCES += [ +UNIFIED_SOURCES += [ 'MiniShmChild.cpp', 'PluginHangUIChild.cpp', ] diff --git a/dom/plugins/ipc/interpose/moz.build b/dom/plugins/ipc/interpose/moz.build index 319c325a70..cbd84c8efc 100644 --- a/dom/plugins/ipc/interpose/moz.build +++ b/dom/plugins/ipc/interpose/moz.build @@ -5,7 +5,7 @@ SharedLibrary('plugin_child_interpose') -SOURCES += [ "%s.mm" % (LIBRARY_NAME) ] +UNIFIED_SOURCES += [ "%s.mm" % (LIBRARY_NAME) ] OS_LIBS += ['-framework Carbon'] diff --git a/dom/xul/moz.build b/dom/xul/moz.build index c2e0fc8262..9e523fc12d 100644 --- a/dom/xul/moz.build +++ b/dom/xul/moz.build @@ -17,7 +17,7 @@ EXPORTS += [ 'nsIXULDocument.h', ] -SOURCES += [ +UNIFIED_SOURCES += [ 'nsXULCommandDispatcher.cpp', 'nsXULContentSink.cpp', 'nsXULElement.cpp', -- cgit v1.2.3