From d1b8dc1081fbdd7352bb7af5f5e72cc7b4e92bc0 Mon Sep 17 00:00:00 2001 From: Fedor Date: Thu, 7 May 2020 14:45:49 +0300 Subject: [PATCH] De-unify dom/. --- 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 +- dom/archivereader/ArchiveRequest.cpp | 2 + dom/archivereader/ArchiveZipFile.cpp | 1 + dom/archivereader/moz.build | 2 +- dom/audiochannel/moz.build | 6 +- dom/base/BlobSet.h | 3 + dom/base/CORSMode.h | 2 + dom/base/ChromeUtils.cpp | 1 + dom/base/ChromeUtils.h | 1 + dom/base/CustomElementRegistry.cpp | 3 + dom/base/DocGroup.cpp | 1 + dom/base/DocGroup.h | 1 + dom/base/GroupedSHistory.h | 2 + dom/base/ImageTracker.cpp | 2 + dom/base/ImageTracker.h | 1 + dom/base/MutableBlobStorage.h | 3 + dom/base/MutableBlobStreamListener.cpp | 1 + dom/base/NodeInfo.cpp | 1 + dom/base/Pose.h | 1 + dom/base/TabGroup.h | 2 + dom/base/ThirdPartyUtil.cpp | 1 + dom/base/TimeoutHandler.cpp | 1 + dom/base/TimeoutHandler.h | 2 + dom/base/TimerClamping.h | 2 + dom/base/moz.build | 4 +- dom/base/nsDOMMutationObserver.cpp | 4 + dom/base/nsJSEnvironment.cpp | 1 + dom/base/nsJSUtils.cpp | 1 + dom/broadcastchannel/moz.build | 10 +- 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 +- 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/WebGLExtensions.h | 2 +- dom/canvas/WebGLFramebuffer.h | 2 +- dom/canvas/WebGLObjectModel.h | 1 - dom/canvas/WebGLSampler.h | 1 + dom/canvas/WebGLTransformFeedback.h | 3 + dom/canvas/WebGLVertexAttribData.cpp | 1 + dom/canvas/WebGLVertexAttribData.h | 1 + dom/canvas/moz.build | 4 +- dom/console/moz.build | 2 +- dom/crypto/WebCryptoThreadPool.cpp | 3 + dom/crypto/WebCryptoThreadPool.h | 2 + dom/crypto/moz.build | 2 +- dom/encoding/moz.build | 7 +- 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 +- 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 | 9 +- dom/filehandle/moz.build | 2 +- 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 +- 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 | 2 + 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 + dom/geolocation/moz.build | 2 +- dom/geolocation/nsGeoPosition.h | 1 + dom/grid/GridDimension.h | 2 + dom/grid/GridLines.cpp | 1 + dom/grid/GridLines.h | 7 +- dom/grid/moz.build | 2 +- 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 + dom/indexedDB/IDBDatabase.cpp | 7 +- dom/indexedDB/IDBFactory.cpp | 2 + dom/indexedDB/IDBFileHandle.cpp | 2 + dom/indexedDB/IDBIndex.cpp | 3 + dom/indexedDB/IDBObjectStore.cpp | 2 + dom/indexedDB/IDBTransaction.cpp | 1 + dom/indexedDB/KeyPath.cpp | 2 + dom/indexedDB/ScriptErrorHelper.h | 2 + dom/indexedDB/moz.build | 2 +- dom/ipc/ContentParent.cpp | 2 + dom/ipc/StructuredCloneData.cpp | 1 + dom/ipc/TabChild.cpp | 1 + dom/ipc/moz.build | 13 +-- dom/ipc/nsIContentParent.cpp | 1 + dom/json/moz.build | 12 +-- dom/jsurl/moz.build | 2 +- dom/mathml/moz.build | 7 +- dom/media/Benchmark.cpp | 1 + dom/media/CanvasCaptureMediaStream.cpp | 1 + dom/media/CubebUtils.cpp | 2 + dom/media/DOMMediaStream.cpp | 2 + dom/media/MediaDecoder.cpp | 7 ++ dom/media/MediaDecoderReader.cpp | 1 + dom/media/MediaStreamListener.h | 2 + dom/media/MediaStreamTrack.cpp | 4 + dom/media/eme/MediaKeySystemAccess.cpp | 2 + dom/media/eme/mediadrm/moz.build | 2 +- dom/media/eme/moz.build | 2 +- dom/media/encoder/OpusTrackEncoder.cpp | 2 + dom/media/encoder/moz.build | 6 +- dom/media/flac/FlacDemuxer.cpp | 8 -- dom/media/flac/FlacDemuxer.h | 9 ++ dom/media/flac/FlacFrameParser.cpp | 1 + dom/media/flac/moz.build | 2 +- dom/media/fmp4/moz.build | 7 +- dom/media/gmp/GMPDecryptorParent.cpp | 2 + dom/media/gmp/GMPUtils.cpp | 2 + dom/media/gmp/moz.build | 4 +- dom/media/imagecapture/CaptureTask.cpp | 18 ---- dom/media/imagecapture/CaptureTask.h | 18 ++++ dom/media/imagecapture/moz.build | 2 +- dom/media/mediasink/DecodedStream.cpp | 2 + dom/media/mediasink/VideoSink.cpp | 2 + dom/media/mediasink/moz.build | 2 +- dom/media/mediasource/TrackBuffersManager.cpp | 1 + dom/media/mediasource/moz.build | 2 +- dom/media/moz.build | 8 +- dom/media/mp3/moz.build | 2 +- dom/media/ogg/OggDemuxer.cpp | 1 + dom/media/ogg/moz.build | 2 +- dom/media/platforms/PlatformDecoderModule.h | 2 + .../platforms/agnostic/TheoraDecoder.cpp | 1 + dom/media/platforms/agnostic/eme/moz.build | 2 +- .../agnostic/gmp/GMPVideoDecoder.cpp | 1 + dom/media/platforms/agnostic/gmp/moz.build | 2 +- dom/media/platforms/apple/AppleCMLinker.cpp | 2 + dom/media/platforms/apple/AppleVTDecoder.cpp | 5 +- dom/media/platforms/apple/AppleVTLinker.cpp | 2 + .../platforms/ffmpeg/FFmpegVideoDecoder.cpp | 1 + dom/media/platforms/ffmpeg/ffmpeg57/moz.build | 2 +- dom/media/platforms/ffmpeg/ffmpeg58/moz.build | 2 +- dom/media/platforms/ffmpeg/ffvpx/moz.build | 2 +- dom/media/platforms/ffmpeg/libav53/moz.build | 2 +- dom/media/platforms/ffmpeg/libav54/moz.build | 2 +- dom/media/platforms/ffmpeg/libav55/moz.build | 2 +- dom/media/platforms/ffmpeg/moz.build | 2 +- dom/media/platforms/moz.build | 10 +- dom/media/platforms/omx/OmxPlatformLayer.cpp | 2 + dom/media/platforms/omx/OmxPlatformLayer.h | 1 + dom/media/platforms/omx/moz.build | 2 +- dom/media/platforms/wmf/moz.build | 1 + .../platforms/wrappers/FuzzingWrapper.cpp | 2 + .../platforms/wrappers/H264Converter.cpp | 2 + dom/media/standalone/moz.build | 2 +- dom/media/systemservices/MediaParent.cpp | 1 + .../MediaSystemResourceManager.cpp | 1 + dom/media/systemservices/moz.build | 12 ++- dom/media/wave/moz.build | 2 +- dom/media/webaudio/AudioContext.cpp | 1 + dom/media/webaudio/AudioDestinationNode.cpp | 1 + dom/media/webaudio/AudioEventTimeline.h | 1 + dom/media/webaudio/AudioNodeEngine.cpp | 1 + dom/media/webaudio/AudioNodeStream.cpp | 1 + dom/media/webaudio/ConstantSourceNode.cpp | 2 + dom/media/webaudio/DelayBuffer.h | 1 + dom/media/webaudio/IIRFilterNode.cpp | 6 ++ dom/media/webaudio/MediaBufferDecoder.cpp | 1 + .../webaudio/MediaStreamAudioSourceNode.cpp | 2 + dom/media/webaudio/WebAudioUtils.cpp | 1 + dom/media/webaudio/moz.build | 2 +- dom/media/webm/moz.build | 8 +- .../webrtc/MediaEngineRemoteVideoSource.cpp | 3 + .../webrtc/MediaEngineTabVideoSource.cpp | 1 + dom/media/webrtc/MediaEngineWebRTCAudio.cpp | 1 + dom/media/webrtc/MediaTrackConstraints.cpp | 1 + dom/media/webrtc/PeerIdentity.h | 2 + dom/media/webrtc/moz.build | 11 ++- .../recognition/SpeechGrammarList.cpp | 1 + .../webspeech/recognition/SpeechGrammarList.h | 1 + .../recognition/SpeechRecognition.cpp | 1 + dom/media/webspeech/recognition/moz.build | 6 +- dom/media/webspeech/synth/moz.build | 4 +- dom/media/webspeech/synth/pico/moz.build | 2 +- dom/media/webspeech/synth/speechd/moz.build | 2 +- dom/media/webspeech/synth/windows/moz.build | 2 +- dom/messagechannel/moz.build | 6 +- 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 +- dom/notification/moz.build | 7 +- dom/offline/moz.build | 13 +-- dom/performance/PerformanceMainThread.cpp | 5 + dom/performance/PerformanceService.cpp | 1 + dom/performance/PerformanceTiming.cpp | 1 + dom/performance/moz.build | 2 +- dom/permission/PermissionUtils.cpp | 1 + dom/permission/Permissions.cpp | 1 + dom/permission/moz.build | 2 +- dom/plugins/base/moz.build | 17 ++-- dom/plugins/base/nsNPAPIPluginInstance.cpp | 1 + .../base/nsNPAPIPluginStreamListener.cpp | 2 + .../base/nsNPAPIPluginStreamListener.h | 1 + dom/plugins/base/nsPluginInstanceOwner.cpp | 2 + dom/plugins/base/nsPluginNativeWindowWin.cpp | 1 + .../base/nsPluginStreamListenerPeer.cpp | 1 + dom/plugins/base/nsPluginTags.cpp | 2 + dom/plugins/ipc/D3D11SurfaceHolder.h | 1 + dom/plugins/ipc/PluginAsyncSurrogate.h | 1 + dom/plugins/ipc/PluginInstanceParent.cpp | 4 + dom/plugins/ipc/PluginModuleParent.cpp | 5 + dom/plugins/ipc/PluginQuirks.h | 2 + dom/plugins/ipc/PluginUtilsWin.h | 1 + dom/plugins/ipc/hangui/moz.build | 2 +- dom/plugins/ipc/interpose/moz.build | 2 +- dom/plugins/ipc/moz.build | 19 ++-- dom/power/moz.build | 2 +- dom/push/PushSubscriptionOptions.cpp | 1 + dom/push/PushUtil.cpp | 1 + dom/push/PushUtil.h | 1 + dom/push/moz.build | 2 +- dom/quota/QuotaManagerService.cpp | 1 + dom/quota/QuotaRequests.cpp | 1 + dom/quota/QuotaResults.h | 1 + dom/quota/StorageManager.cpp | 3 + dom/quota/StorageManager.h | 2 + dom/quota/moz.build | 2 +- dom/security/SRICheck.h | 1 + dom/security/moz.build | 7 +- dom/security/nsCSPParser.h | 1 + dom/security/nsCSPUtils.cpp | 27 ++++++ dom/security/nsContentSecurityManager.cpp | 10 ++ dom/security/nsMixedContentBlocker.cpp | 4 +- dom/smil/moz.build | 2 +- dom/smil/nsSMILAnimationFunction.cpp | 1 + dom/smil/nsSMILCSSProperty.cpp | 1 + dom/smil/nsSMILCSSValueType.cpp | 1 + dom/smil/nsSMILCompositor.cpp | 3 + dom/smil/nsSMILInstanceTime.h | 1 + dom/smil/nsSMILTimeContainer.cpp | 2 + dom/storage/DOMStorageDBUpdater.cpp | 4 + dom/storage/DOMStorageManager.cpp | 1 + dom/storage/moz.build | 11 +-- dom/svg/SVGDocument.cpp | 2 + dom/svg/SVGElementFactory.cpp | 2 - dom/svg/SVGElementFactory.h | 5 + dom/svg/SVGGraphicsElement.cpp | 2 + dom/svg/SVGSymbolElement.cpp | 2 + dom/svg/SVGTests.cpp | 1 + dom/svg/moz.build | 2 +- dom/system/moz.build | 2 +- dom/time/moz.build | 6 +- dom/u2f/moz.build | 2 +- dom/url/moz.build | 6 +- dom/workers/ServiceWorkerCommon.h | 2 + dom/workers/ServiceWorkerEvents.cpp | 2 + dom/workers/ServiceWorkerInfo.cpp | 2 + dom/workers/ServiceWorkerInfo.h | 1 + dom/workers/ServiceWorkerJob.cpp | 1 + dom/workers/ServiceWorkerRegisterJob.cpp | 1 + dom/workers/ServiceWorkerRegistrationInfo.cpp | 4 + dom/workers/ServiceWorkerRegistrationInfo.h | 1 + dom/workers/ServiceWorkerUnregisterJob.cpp | 4 + dom/workers/ServiceWorkerUpdateJob.cpp | 4 + dom/workers/ServiceWorkerUpdateJob.h | 2 + dom/workers/ServiceWorkerWindowClient.cpp | 3 + dom/workers/SharedWorker.cpp | 1 + dom/workers/WorkerRunnable.cpp | 2 + dom/workers/WorkerRunnable.h | 1 + dom/workers/moz.build | 3 +- dom/worklet/moz.build | 2 +- dom/xbl/moz.build | 2 +- dom/xhr/XMLHttpRequestString.cpp | 91 ------------------ dom/xhr/XMLHttpRequestString.h | 95 +++++++++++++++++++ dom/xhr/XMLHttpRequestWorker.cpp | 2 + dom/xhr/moz.build | 2 +- dom/xml/moz.build | 2 +- dom/xml/nsXMLPrettyPrinter.cpp | 1 + dom/xslt/base/moz.build | 2 +- dom/xslt/xml/moz.build | 2 +- dom/xslt/xpath/moz.build | 2 +- dom/xslt/xslt/moz.build | 2 +- dom/xslt/xslt/txExecutionState.cpp | 3 + dom/xslt/xslt/txMozillaXSLTProcessor.cpp | 2 + dom/xul/moz.build | 4 +- dom/xul/nsXULContentSink.cpp | 2 + dom/xul/templates/moz.build | 2 +- dom/xul/templates/nsInstantiationNode.cpp | 3 + dom/xul/templates/nsTemplateMap.h | 2 + .../nsXULTemplateQueryProcessorRDF.cpp | 4 + .../nsXULTemplateQueryProcessorStorage.cpp | 2 + dom/xul/templates/nsXULTreeBuilder.cpp | 3 + 337 files changed, 806 insertions(+), 351 deletions(-) diff --git a/dom/animation/AnimationComparator.h b/dom/animation/AnimationComparator.h index ff665e82a..730d62f48 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 63d633c2f..7eb0880c7 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 025857e0c..a1ac35cba 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 a4dede0b3..09aad01ef 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 decbf6305..32f6bd1a1 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 639e0b2b0..95f657449 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 bd8c93707..356980f00 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', diff --git a/dom/archivereader/ArchiveRequest.cpp b/dom/archivereader/ArchiveRequest.cpp index ec1686804..8505f0e1f 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 d374fe91f..e1716f348 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 57dbfa121..a5d853c91 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', diff --git a/dom/audiochannel/moz.build b/dom/audiochannel/moz.build index 46923db3c..547cce24a 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') diff --git a/dom/base/BlobSet.h b/dom/base/BlobSet.h index 3e22955dd..bf98cb023 100644 --- a/dom/base/BlobSet.h +++ b/dom/base/BlobSet.h @@ -8,6 +8,9 @@ #define mozilla_dom_BlobSet_h #include "mozilla/RefPtr.h" +#include "jsfriendapi.h" +#include "nsString.h" +#include "nsTArray.h" namespace mozilla { namespace dom { diff --git a/dom/base/CORSMode.h b/dom/base/CORSMode.h index 82f2f570d..577e78725 100644 --- a/dom/base/CORSMode.h +++ b/dom/base/CORSMode.h @@ -7,6 +7,8 @@ #ifndef CORSMode_h_ #define CORSMode_h_ +#include + namespace mozilla { enum CORSMode : uint8_t { diff --git a/dom/base/ChromeUtils.cpp b/dom/base/ChromeUtils.cpp index 3cde261f0..b25f0b76b 100644 --- a/dom/base/ChromeUtils.cpp +++ b/dom/base/ChromeUtils.cpp @@ -7,6 +7,7 @@ #include "mozilla/Base64.h" #include "mozilla/BasePrincipal.h" +#include "jsfriendapi.h" namespace mozilla { namespace dom { diff --git a/dom/base/ChromeUtils.h b/dom/base/ChromeUtils.h index 051217c84..58a67b4f2 100644 --- a/dom/base/ChromeUtils.h +++ b/dom/base/ChromeUtils.h @@ -10,6 +10,7 @@ #include "mozilla/dom/BindingDeclarations.h" #include "mozilla/dom/ChromeUtilsBinding.h" #include "mozilla/dom/ThreadSafeChromeUtilsBinding.h" +#include "mozilla/dom/UnionTypes.h" #include "mozilla/ErrorResult.h" namespace mozilla { diff --git a/dom/base/CustomElementRegistry.cpp b/dom/base/CustomElementRegistry.cpp index 99452df65..87d92a6ce 100644 --- a/dom/base/CustomElementRegistry.cpp +++ b/dom/base/CustomElementRegistry.cpp @@ -8,8 +8,11 @@ #include "mozilla/CycleCollectedJSContext.h" #include "mozilla/dom/CustomElementRegistryBinding.h" +#include "mozilla/dom/Element.h" #include "mozilla/dom/HTMLElementBinding.h" #include "mozilla/dom/WebComponentsBinding.h" +#include "mozilla/dom/Promise.h" +#include "nsContentUtils.h" #include "mozilla/dom/DocGroup.h" #include "nsIParserService.h" #include "jsapi.h" diff --git a/dom/base/DocGroup.cpp b/dom/base/DocGroup.cpp index 30c058f0c..c15bec233 100644 --- a/dom/base/DocGroup.cpp +++ b/dom/base/DocGroup.cpp @@ -6,6 +6,7 @@ #include "mozilla/StaticPtr.h" #include "mozilla/ClearOnShutdown.h" #include "nsIDocShell.h" +#include "nsNetCID.h" namespace mozilla { namespace dom { diff --git a/dom/base/DocGroup.h b/dom/base/DocGroup.h index 5b8f627cc..f48f32b8b 100644 --- a/dom/base/DocGroup.h +++ b/dom/base/DocGroup.h @@ -7,6 +7,7 @@ #ifndef DocGroup_h #define DocGroup_h +#include "nsIDocument.h" #include "nsISupports.h" #include "nsISupportsImpl.h" #include "nsIPrincipal.h" diff --git a/dom/base/GroupedSHistory.h b/dom/base/GroupedSHistory.h index 8c88a0aaf..c5e75d639 100644 --- a/dom/base/GroupedSHistory.h +++ b/dom/base/GroupedSHistory.h @@ -7,6 +7,8 @@ #ifndef GroupedSHistory_h #define GroupedSHistory_h +#include "nsCOMArray.h" +#include "nsCycleCollectionParticipant.h" // NS_DECL_CYCLE_* #include "nsIFrameLoader.h" #include "nsIGroupedSHistory.h" #include "nsIPartialSHistory.h" diff --git a/dom/base/ImageTracker.cpp b/dom/base/ImageTracker.cpp index 9fef059bc..d0c231981 100644 --- a/dom/base/ImageTracker.cpp +++ b/dom/base/ImageTracker.cpp @@ -8,6 +8,8 @@ * animating */ #include "ImageTracker.h" +#include "mozilla/Preferences.h" +#include "nsAppRunner.h" // for XRE_IsContentProcess namespace mozilla { namespace dom { diff --git a/dom/base/ImageTracker.h b/dom/base/ImageTracker.h index d33dc55f8..f16461192 100644 --- a/dom/base/ImageTracker.h +++ b/dom/base/ImageTracker.h @@ -10,6 +10,7 @@ #ifndef mozilla_dom_ImageTracker #define mozilla_dom_ImageTracker +#include "imgIRequest.h" #include "nsDataHashtable.h" #include "nsHashKeys.h" diff --git a/dom/base/MutableBlobStorage.h b/dom/base/MutableBlobStorage.h index fad391b16..ed368e5e6 100644 --- a/dom/base/MutableBlobStorage.h +++ b/dom/base/MutableBlobStorage.h @@ -7,6 +7,9 @@ #ifndef mozilla_dom_MutableBlobStorage_h #define mozilla_dom_MutableBlobStorage_h +#include "nsCycleCollectionParticipant.h" +#include "nsThreadUtils.h" +#include "nsProxyRelease.h" #include "mozilla/RefPtr.h" #include "prio.h" diff --git a/dom/base/MutableBlobStreamListener.cpp b/dom/base/MutableBlobStreamListener.cpp index 6769ad3e6..afcc04d9f 100644 --- a/dom/base/MutableBlobStreamListener.cpp +++ b/dom/base/MutableBlobStreamListener.cpp @@ -5,6 +5,7 @@ #include "MutableBlobStreamListener.h" #include "MutableBlobStorage.h" +#include "nsIInputStream.h" namespace mozilla { namespace dom { diff --git a/dom/base/NodeInfo.cpp b/dom/base/NodeInfo.cpp index d32a00fd3..f055dfc75 100644 --- a/dom/base/NodeInfo.cpp +++ b/dom/base/NodeInfo.cpp @@ -15,6 +15,7 @@ #include "mozilla/ArrayUtils.h" #include "mozilla/Likely.h" +#include "mozilla/Unused.h" #include "nsNodeInfoManager.h" #include "nsCOMPtr.h" diff --git a/dom/base/Pose.h b/dom/base/Pose.h index c7ef1b381..0817c8c96 100644 --- a/dom/base/Pose.h +++ b/dom/base/Pose.h @@ -8,6 +8,7 @@ #define mozilla_dom_Pose_h #include "nsWrapperCache.h" +#include "mozilla/ErrorResult.h" namespace mozilla { namespace dom { diff --git a/dom/base/TabGroup.h b/dom/base/TabGroup.h index f9fa9eec5..c436ce98d 100644 --- a/dom/base/TabGroup.h +++ b/dom/base/TabGroup.h @@ -7,10 +7,12 @@ #ifndef TabGroup_h #define TabGroup_h +#include "nsIDocument.h" #include "nsISupports.h" #include "nsISupportsImpl.h" #include "nsIPrincipal.h" #include "nsTHashtable.h" +#include "nsHashKeys.h" #include "nsString.h" #include "mozilla/RefPtr.h" diff --git a/dom/base/ThirdPartyUtil.cpp b/dom/base/ThirdPartyUtil.cpp index 61d97f634..37d326dbc 100644 --- a/dom/base/ThirdPartyUtil.cpp +++ b/dom/base/ThirdPartyUtil.cpp @@ -10,6 +10,7 @@ #include "nsIChannel.h" #include "nsIServiceManager.h" #include "nsIHttpChannelInternal.h" +#include "nsPIDOMWindow.h" #include "nsIDOMWindow.h" #include "nsILoadContext.h" #include "nsIPrincipal.h" diff --git a/dom/base/TimeoutHandler.cpp b/dom/base/TimeoutHandler.cpp index 78c3f16dd..f34275840 100644 --- a/dom/base/TimeoutHandler.cpp +++ b/dom/base/TimeoutHandler.cpp @@ -5,6 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "TimeoutHandler.h" +#include "nsJSUtils.h" namespace mozilla { namespace dom { diff --git a/dom/base/TimeoutHandler.h b/dom/base/TimeoutHandler.h index cb0a0ce94..a80dc2995 100644 --- a/dom/base/TimeoutHandler.h +++ b/dom/base/TimeoutHandler.h @@ -7,9 +7,11 @@ #ifndef mozilla_dom_timeout_handler_h #define mozilla_dom_timeout_handler_h +#include "nsCycleCollectionParticipant.h" // NS_DECL_CYCLE_* #include "nsCOMPtr.h" #include "nsISupports.h" #include "nsITimeoutHandler.h" +#include "nsString.h" namespace mozilla { namespace dom { diff --git a/dom/base/TimerClamping.h b/dom/base/TimerClamping.h index 2ffd6add5..2bd1f019c 100644 --- a/dom/base/TimerClamping.h +++ b/dom/base/TimerClamping.h @@ -7,6 +7,8 @@ #ifndef TimerClamping_h___ #define TimerClamping_h___ +#include + namespace mozilla { class TimerClamping diff --git a/dom/base/moz.build b/dom/base/moz.build index 8de4fa14c..6c2c73166 100644 --- a/dom/base/moz.build +++ b/dom/base/moz.build @@ -225,7 +225,7 @@ EXPORTS.mozilla.dom += [ 'WindowOrientationObserver.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'AnonymousContent.cpp', 'Attr.cpp', 'BarProps.cpp', @@ -375,7 +375,7 @@ UNIFIED_SOURCES += [ ] if CONFIG['MOZ_WEBRTC']: - UNIFIED_SOURCES += [ + SOURCES += [ 'nsDOMDataChannel.cpp', ] diff --git a/dom/base/nsDOMMutationObserver.cpp b/dom/base/nsDOMMutationObserver.cpp index 4c4731c11..03de5a01f 100644 --- a/dom/base/nsDOMMutationObserver.cpp +++ b/dom/base/nsDOMMutationObserver.cpp @@ -7,6 +7,7 @@ #include "nsDOMMutationObserver.h" #include "mozilla/AnimationTarget.h" +#include "mozilla/CycleCollectedJSContext.h" #include "mozilla/Maybe.h" #include "mozilla/OwningNonNull.h" @@ -29,6 +30,9 @@ using mozilla::dom::TreeOrderComparator; using mozilla::dom::Animation; using mozilla::dom::Element; +using namespace mozilla; +using namespace mozilla::dom; + AutoTArray, 4>* nsDOMMutationObserver::sScheduledMutationObservers = nullptr; diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp index dfd380fc2..efea3ee40 100644 --- a/dom/base/nsJSEnvironment.cpp +++ b/dom/base/nsJSEnvironment.cpp @@ -57,6 +57,7 @@ #include "mozilla/dom/ErrorEvent.h" #include "nsAXPCNativeCallContext.h" #include "mozilla/CycleCollectedJSContext.h" +#include "mozilla/Telemetry.h" #include "nsJSPrincipals.h" diff --git a/dom/base/nsJSUtils.cpp b/dom/base/nsJSUtils.cpp index b6c843065..c24adc739 100644 --- a/dom/base/nsJSUtils.cpp +++ b/dom/base/nsJSUtils.cpp @@ -31,6 +31,7 @@ #include "mozilla/dom/Element.h" #include "mozilla/dom/ScriptSettings.h" +using namespace mozilla; using namespace mozilla::dom; bool diff --git a/dom/broadcastchannel/moz.build b/dom/broadcastchannel/moz.build index a076331e5..c9d687cbc 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'] diff --git a/dom/cache/CacheOpParent.cpp b/dom/cache/CacheOpParent.cpp index 992ee82a7..37fcbc0f3 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 937e3826f..a0f486445 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 b7ca3a0e7..978019ab6 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 54eef01d8..02f2fd2d3 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 824cedb02..6744f30c2 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 2d4cb30eb..f8c5cd7be 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 66f9f30fd..a536e5d75 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', diff --git a/dom/canvas/CanvasImageCache.cpp b/dom/canvas/CanvasImageCache.cpp index 82b3f277c..2e4e90d33 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 61317fb51..229801ffa 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 6efe1b318..e4b145d46 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 25084b6ac..22953e541 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 2b65c1f10..4ef4ade86 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 ad313906a..9c7af2522 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 39be43d8a..bc8d6ad15 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 0d188c24e..981faf1b1 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 7f8c07332..900f845fd 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 f53f9d7d7..e787b9914 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 ba3156693..5daf1102a 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 39bb3c57a..a849bd17e 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/WebGLExtensions.h b/dom/canvas/WebGLExtensions.h index 7b6b6b54b..595d1c948 100644 --- a/dom/canvas/WebGLExtensions.h +++ b/dom/canvas/WebGLExtensions.h @@ -8,7 +8,7 @@ #include "mozilla/AlreadyAddRefed.h" #include "nsWrapperCache.h" -#include "WebGLObjectModel.h" +#include "WebGLContext.h" #include "WebGLTypes.h" namespace mozilla { diff --git a/dom/canvas/WebGLFramebuffer.h b/dom/canvas/WebGLFramebuffer.h index ac457c098..53e01dfe7 100644 --- a/dom/canvas/WebGLFramebuffer.h +++ b/dom/canvas/WebGLFramebuffer.h @@ -12,7 +12,7 @@ #include "mozilla/WeakPtr.h" #include "nsWrapperCache.h" -#include "WebGLObjectModel.h" +#include "WebGLContext.h" #include "WebGLRenderbuffer.h" #include "WebGLStrongTypes.h" #include "WebGLTexture.h" diff --git a/dom/canvas/WebGLObjectModel.h b/dom/canvas/WebGLObjectModel.h index 6371c7b03..7c6caf2c4 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 1cf039984..73e550dfe 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 aa57372a5..378794b9f 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.cpp b/dom/canvas/WebGLVertexAttribData.cpp index b5aee18e5..cea78eb14 100644 --- a/dom/canvas/WebGLVertexAttribData.cpp +++ b/dom/canvas/WebGLVertexAttribData.cpp @@ -7,6 +7,7 @@ #include "GLContext.h" #include "WebGLBuffer.h" +#include "WebGLContext.h" namespace mozilla { diff --git a/dom/canvas/WebGLVertexAttribData.h b/dom/canvas/WebGLVertexAttribData.h index 9d79b4f94..6318b06d2 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 6d5e2756f..fe39425ec 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', diff --git a/dom/console/moz.build b/dom/console/moz.build index 79bd1cf09..82623e442 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', ] diff --git a/dom/crypto/WebCryptoThreadPool.cpp b/dom/crypto/WebCryptoThreadPool.cpp index 6a1e78608..a2b8e6239 100644 --- a/dom/crypto/WebCryptoThreadPool.cpp +++ b/dom/crypto/WebCryptoThreadPool.cpp @@ -9,6 +9,9 @@ #include "mozilla/Services.h" #include "mozilla/StaticPtr.h" #include "nsComponentManagerUtils.h" +#include "nsContentUtils.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 77c4afb24..76bf74708 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 ba0b5f2cd..eb15a5530 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', diff --git a/dom/encoding/moz.build b/dom/encoding/moz.build index 37292d6e5..7dc360aaf 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 = ( diff --git a/dom/events/DOMEventTargetHelper.cpp b/dom/events/DOMEventTargetHelper.cpp index dd9a01d8d..7daf7f7a7 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 6c4cbf2d0..b111b9f9d 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 d2f65e186..e459096d9 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 1c8ed63f0..56385d927 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 7f85333e8..b9f3c1519 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 9b7a74ac2..0656021a0 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 ec3813207..661f56c7e 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') diff --git a/dom/fetch/FetchConsumer.h b/dom/fetch/FetchConsumer.h index a7509a0ae..2b5725342 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 601d99216..b384c4f81 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 b2631da6a..65f8095e2 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 cb7d74597..1b1ae13e3 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 35467836a..0801e3250 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 7ca5b43c4..6a7885b1a 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 3b3ada6d3..e35de0e12 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 fb2279fe7..be820ab57 100644 --- a/dom/fetch/moz.build +++ b/dom/fetch/moz.build @@ -19,17 +19,20 @@ EXPORTS.mozilla.dom += [ ] UNIFIED_SOURCES += [ - 'ChannelInfo.cpp', 'Fetch.cpp', 'FetchConsumer.cpp', + 'Request.cpp', + 'Response.cpp', +] + +SOURCES += [ + 'ChannelInfo.cpp', 'FetchDriver.cpp', 'FetchUtil.cpp', 'Headers.cpp', 'InternalHeaders.cpp', 'InternalRequest.cpp', 'InternalResponse.cpp', - 'Request.cpp', - 'Response.cpp', ] IPDL_SOURCES += [ diff --git a/dom/filehandle/moz.build b/dom/filehandle/moz.build index b4e3b64c0..37e5c22a7 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', diff --git a/dom/filesystem/FileSystemBase.cpp b/dom/filesystem/FileSystemBase.cpp index f44f4fbf1..b19e12738 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 0b9d6c18a..95a316b96 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 b3d425817..7c70374a0 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 481002b7d..e9eed90ee 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 872e049ee..56293cbda 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 ae302e07c..42fc5573c 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 e3ac2933f..999366fe8 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 f71976503..446c641f4 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 21d228a60..c4cbe7f14 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 a1bb1b27a..371c73ef2 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 6682fb7d3..b283eec54 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 6e516c3a7..1b6a8d3ca 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', diff --git a/dom/gamepad/GamepadManager.cpp b/dom/gamepad/GamepadManager.cpp index e17829652..0c05b3ddb 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 a772221ca..38fdfc342 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 0a61281e4..77a08ae17 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 958b26139..dc5903aba 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 89429b52a..e8ec46cfe 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 706d02617..6ed1ef2ee 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 e7c986e22..7fcf48532 100644 --- a/dom/gamepad/cocoa/CocoaGamepad.cpp +++ b/dom/gamepad/cocoa/CocoaGamepad.cpp @@ -7,8 +7,10 @@ // 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 "mozilla/Unused.h" #include "nsThreadUtils.h" #include #include diff --git a/dom/gamepad/ipc/GamepadEventChannelParent.cpp b/dom/gamepad/ipc/GamepadEventChannelParent.cpp index c3c8fd2c8..806081789 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 421447fe0..9730f7d16 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 c45f4174a..8c6e8ea75 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 a809d1eba..81ff37631 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 e1965c00c..ddab2f28c 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 { diff --git a/dom/geolocation/moz.build b/dom/geolocation/moz.build index 4339d5a7f..8ac79e8b3 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 06b406c32..cefb4ae8d 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" diff --git a/dom/grid/GridDimension.h b/dom/grid/GridDimension.h index 7a3373521..ec9635444 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 898885346..2604eff6c 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 921168204..784fe2d28 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 96d5c3151..62025c98e 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', diff --git a/dom/html/HTMLBodyElement.cpp b/dom/html/HTMLBodyElement.cpp index 6230cb6ca..ee1bced02 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 6d39caa19..5d49cd78e 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" diff --git a/dom/html/HTMLLabelElement.cpp b/dom/html/HTMLLabelElement.cpp index d1c037336..ec36c8b99 100644 --- a/dom/html/HTMLLabelElement.cpp +++ b/dom/html/HTMLLabelElement.cpp @@ -8,6 +8,7 @@ * Implementation of HTML