wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-25 18:07:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/tracking' into custom

Browse source
This commit is contained in:
roytam1 2022-09-07 11:03:19 +08:00
commit 866ded0b0a
138 changed files with 825 additions and 1086 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/check_spidermonkey_style.py
View file

@ -89,7 +89,7 @@ included_inclnames_to_ignore = set([
'unicode/udisplaycontext.h',# ICU 'unicode/udisplaycontext.h',# ICU
'unicode/uenum.h', # ICU 'unicode/uenum.h', # ICU
'unicode/uniset.h', # ICU 'unicode/uniset.h', # ICU
'unicode/unorm.h', # ICU 'unicode/unorm2.h', # ICU
'unicode/unum.h', # ICU 'unicode/unum.h', # ICU
'unicode/unumsys.h', # ICU 'unicode/unumsys.h', # ICU
'unicode/upluralrules.h', # ICU 'unicode/upluralrules.h', # ICU

7
dom/animation/moz.build
View file

@ -36,11 +36,6 @@ EXPORTS.mozilla += [
] ]
UNIFIED_SOURCES += [ UNIFIED_SOURCES += [
'KeyframeEffect.cpp',
'KeyframeEffectReadOnly.cpp',
]
SOURCES += [
'Animation.cpp', 'Animation.cpp',
'AnimationEffectReadOnly.cpp', 'AnimationEffectReadOnly.cpp',
'AnimationEffectTiming.cpp', 'AnimationEffectTiming.cpp',
@ -54,7 +49,9 @@ SOURCES += [
'DocumentTimeline.cpp', 'DocumentTimeline.cpp',
'EffectCompositor.cpp', 'EffectCompositor.cpp',
'EffectSet.cpp', 'EffectSet.cpp',
'KeyframeEffect.cpp',
'KeyframeEffectParams.cpp', 'KeyframeEffectParams.cpp',
'KeyframeEffectReadOnly.cpp',
'KeyframeUtils.cpp', 'KeyframeUtils.cpp',
'PendingAnimationTracker.cpp', 'PendingAnimationTracker.cpp',
'TimingParams.cpp', 'TimingParams.cpp',

2
dom/audiochannel/moz.build
View file

@ -15,7 +15,7 @@ EXPORTS += [
'AudioChannelService.h', 'AudioChannelService.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'AudioChannelAgent.cpp', 'AudioChannelAgent.cpp',
'AudioChannelService.cpp', 'AudioChannelService.cpp',
] ]

2
dom/bindings/moz.build
View file

@ -84,7 +84,7 @@ LOCAL_INCLUDES += [
'/media/webrtc/signaling/src/peerconnection', '/media/webrtc/signaling/src/peerconnection',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'BindingUtils.cpp', 'BindingUtils.cpp',
'CallbackInterface.cpp', 'CallbackInterface.cpp',
'CallbackObject.cpp', 'CallbackObject.cpp',

2
dom/broadcastchannel/moz.build
View file

@ -7,7 +7,7 @@ EXPORTS.mozilla.dom += [
'BroadcastChannel.h', 'BroadcastChannel.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'BroadcastChannel.cpp', 'BroadcastChannel.cpp',
'BroadcastChannelChild.cpp', 'BroadcastChannelChild.cpp',
'BroadcastChannelParent.cpp', 'BroadcastChannelParent.cpp',

2
dom/cache/moz.build vendored
View file

@ -37,7 +37,7 @@ EXPORTS.mozilla.dom.cache += [
'TypeUtils.h', 'TypeUtils.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'Action.cpp', 'Action.cpp',
'ActorChild.cpp', 'ActorChild.cpp',
'AutoUtils.cpp', 'AutoUtils.cpp',

2
dom/console/moz.build
View file

@ -21,7 +21,7 @@ EXPORTS.mozilla.dom += [
'Console.h', 'Console.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'Console.cpp', 'Console.cpp',
'ConsoleReportCollector.cpp', 'ConsoleReportCollector.cpp',
] ]

2
dom/crypto/moz.build
View file

@ -12,7 +12,7 @@ EXPORTS.mozilla.dom += [
'WebCryptoThreadPool.h' 'WebCryptoThreadPool.h'
] ]
SOURCES += [ UNIFIED_SOURCES += [
'CryptoBuffer.cpp', 'CryptoBuffer.cpp',
'CryptoKey.cpp', 'CryptoKey.cpp',
'KeyAlgorithmProxy.cpp', 'KeyAlgorithmProxy.cpp',

2
dom/encoding/moz.build
View file

@ -10,7 +10,7 @@ EXPORTS.mozilla.dom += [
'TextEncoder.h', 'TextEncoder.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'EncodingUtils.cpp', 'EncodingUtils.cpp',
'FallbackEncoding.cpp', 'FallbackEncoding.cpp',
'TextDecoder.cpp', 'TextDecoder.cpp',

8
dom/events/moz.build
View file

@ -73,7 +73,7 @@ EXPORTS.mozilla.dom += [
'XULCommandEvent.h', 'XULCommandEvent.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'AnimationEvent.cpp', 'AnimationEvent.cpp',
'AsyncEventDispatcher.cpp', 'AsyncEventDispatcher.cpp',
'BeforeAfterKeyboardEvent.cpp', 'BeforeAfterKeyboardEvent.cpp',
@ -95,7 +95,6 @@ SOURCES += [
'EventDispatcher.cpp', 'EventDispatcher.cpp',
'EventListenerManager.cpp', 'EventListenerManager.cpp',
'EventListenerService.cpp', 'EventListenerService.cpp',
'EventStateManager.cpp',
'EventTarget.cpp', 'EventTarget.cpp',
'FocusEvent.cpp', 'FocusEvent.cpp',
'ImageCaptureError.cpp', 'ImageCaptureError.cpp',
@ -125,6 +124,11 @@ SOURCES += [
'XULCommandEvent.cpp', 'XULCommandEvent.cpp',
] ]
# nsEventStateManager.cpp should be built separately because of Mac OS X headers.
SOURCES += [
'EventStateManager.cpp',
]
include('/ipc/chromium/chromium-config.mozbuild') include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul' FINAL_LIBRARY = 'xul'

2
dom/filehandle/moz.build
View file

@ -17,7 +17,7 @@ EXPORTS.mozilla.dom += [
'MutableFileBase.h', 'MutableFileBase.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'ActorsChild.cpp', 'ActorsChild.cpp',
'ActorsParent.cpp', 'ActorsParent.cpp',
'FileHandleBase.cpp', 'FileHandleBase.cpp',

2
dom/filesystem/moz.build
View file

@ -18,7 +18,7 @@ EXPORTS.mozilla.dom += [
'OSFileSystem.h', 'OSFileSystem.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'Directory.cpp', 'Directory.cpp',
'FileSystemBase.cpp', 'FileSystemBase.cpp',
'FileSystemRequestParent.cpp', 'FileSystemRequestParent.cpp',

2
dom/geolocation/moz.build
View file

@ -12,7 +12,7 @@ SOURCES += [
'nsGeolocation.cpp', 'nsGeolocation.cpp',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'MLSFallback.cpp', 'MLSFallback.cpp',
'nsGeoPosition.cpp', 'nsGeoPosition.cpp',
] ]

2
dom/grid/moz.build
View file

@ -15,7 +15,7 @@ EXPORTS.mozilla.dom += [
'GridTracks.h', 'GridTracks.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'Grid.cpp', 'Grid.cpp',
'GridArea.cpp', 'GridArea.cpp',
'GridDimension.cpp', 'GridDimension.cpp',

4
dom/html/HTMLOptGroupElement.cpp
View file

@ -13,6 +13,10 @@
#include "nsIFrame.h" #include "nsIFrame.h"
#include "nsIFormControlFrame.h" #include "nsIFormControlFrame.h"
#if defined(MOZ_X11)
#include "X11UndefineNone.h"
#endif
NS_IMPL_NS_NEW_HTML_ELEMENT(OptGroup) NS_IMPL_NS_NEW_HTML_ELEMENT(OptGroup)
namespace mozilla { namespace mozilla {

8
dom/html/moz.build
View file

@ -120,7 +120,7 @@ EXPORTS.mozilla.dom += [
'ValidityState.h', 'ValidityState.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'HTMLAllCollection.cpp', 'HTMLAllCollection.cpp',
'HTMLAnchorElement.cpp', 'HTMLAnchorElement.cpp',
'HTMLAreaElement.cpp', 'HTMLAreaElement.cpp',
@ -203,7 +203,6 @@ SOURCES += [
'nsIConstraintValidation.cpp', 'nsIConstraintValidation.cpp',
'nsRadioVisitor.cpp', 'nsRadioVisitor.cpp',
'nsTextEditorState.cpp', 'nsTextEditorState.cpp',
'PluginDocument.cpp',
'RadioNodeList.cpp', 'RadioNodeList.cpp',
'TextTrackManager.cpp', 'TextTrackManager.cpp',
'TimeRanges.cpp', 'TimeRanges.cpp',
@ -211,6 +210,11 @@ SOURCES += [
'VideoDocument.cpp', 'VideoDocument.cpp',
] ]
SOURCES += [
# Includes npapi.h.
'PluginDocument.cpp',
]
EXTRA_COMPONENTS += [ EXTRA_COMPONENTS += [
'htmlMenuBuilder.js', 'htmlMenuBuilder.js',
'htmlMenuBuilder.manifest' 'htmlMenuBuilder.manifest'

2
dom/indexedDB/moz.build
View file

@ -44,7 +44,7 @@ EXPORTS.mozilla.dom.indexedDB += [
'SerializationHelpers.h', 'SerializationHelpers.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'ActorsChild.cpp', 'ActorsChild.cpp',
'FileInfo.cpp', 'FileInfo.cpp',
'FileSnapshot.cpp', 'FileSnapshot.cpp',

13
dom/ipc/moz.build
View file

@ -43,13 +43,11 @@ EXPORTS.mozilla += [
'ProcessPriorityManager.h', 'ProcessPriorityManager.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'AppProcessChecker.cpp', 'AppProcessChecker.cpp',
'Blob.cpp',
'ColorPickerParent.cpp', 'ColorPickerParent.cpp',
'ContentBridgeChild.cpp', 'ContentBridgeChild.cpp',
'ContentBridgeParent.cpp', 'ContentBridgeParent.cpp',
'ContentChild.cpp',
'ContentParent.cpp', 'ContentParent.cpp',
'ContentProcess.cpp', 'ContentProcess.cpp',
'ContentProcessManager.cpp', 'ContentProcessManager.cpp',
@ -58,7 +56,6 @@ SOURCES += [
'nsIContentParent.cpp', 'nsIContentParent.cpp',
'PermissionMessageUtils.cpp', 'PermissionMessageUtils.cpp',
'PreallocatedProcessManager.cpp', 'PreallocatedProcessManager.cpp',
'ProcessHangMonitor.cpp',
'ProcessPriorityManager.cpp', 'ProcessPriorityManager.cpp',
'ScreenManagerParent.cpp', 'ScreenManagerParent.cpp',
'StructuredCloneData.cpp', 'StructuredCloneData.cpp',
@ -68,6 +65,14 @@ SOURCES += [
'TabParent.cpp', 'TabParent.cpp',
] ]
# Blob.cpp cannot be compiled in unified mode because it triggers a fatal gcc warning.
# ContentChild.cpp cannot be compiled in unified mode on linux due to Time conflict
SOURCES += [
'Blob.cpp',
'ContentChild.cpp',
'ProcessHangMonitor.cpp',
]
IPDL_SOURCES += [ IPDL_SOURCES += [
'BlobTypes.ipdlh', 'BlobTypes.ipdlh',
'DOMTypes.ipdlh', 'DOMTypes.ipdlh',

4
dom/json/moz.build
View file

@ -5,7 +5,9 @@
EXPORTS += ['nsJSON.h'] EXPORTS += ['nsJSON.h']
SOURCES += ['nsJSON.cpp'] UNIFIED_SOURCES += [
'nsJSON.cpp',
]
LOCAL_INCLUDES += ['/dom/base'] LOCAL_INCLUDES += ['/dom/base']

2
dom/jsurl/moz.build
View file

@ -7,7 +7,7 @@ EXPORTS += [
'nsJSProtocolHandler.h', 'nsJSProtocolHandler.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'nsJSProtocolHandler.cpp', 'nsJSProtocolHandler.cpp',
] ]

2
dom/mathml/moz.build
View file

@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # 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/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
SOURCES += [ UNIFIED_SOURCES += [
'nsMathMLElement.cpp', 'nsMathMLElement.cpp',
'nsMathMLElementFactory.cpp', 'nsMathMLElementFactory.cpp',
] ]

2
dom/media/flac/moz.build
View file

@ -9,7 +9,7 @@ EXPORTS += [
'FlacFrameParser.h', 'FlacFrameParser.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'FlacDecoder.cpp', 'FlacDecoder.cpp',
'FlacDemuxer.cpp', 'FlacDemuxer.cpp',
'FlacFrameParser.cpp', 'FlacFrameParser.cpp',

7
dom/media/fmp4/moz.build
View file

@ -9,10 +9,13 @@ EXPORTS += [
'MP4Stream.h', 'MP4Stream.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'MP4Decoder.cpp', 'MP4Decoder.cpp',
'MP4Demuxer.cpp',
'MP4Stream.cpp', 'MP4Stream.cpp',
] ]
SOURCES += [
'MP4Demuxer.cpp',
]
FINAL_LIBRARY = 'xul' FINAL_LIBRARY = 'xul'

2
dom/media/imagecapture/moz.build
View file

@ -7,7 +7,7 @@ EXPORTS.mozilla.dom += [
'ImageCapture.h' 'ImageCapture.h'
] ]
SOURCES += [ UNIFIED_SOURCES += [
'CaptureTask.cpp', 'CaptureTask.cpp',
'ImageCapture.cpp', 'ImageCapture.cpp',
] ]

2
dom/media/mediasink/moz.build
View file

@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # 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/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
SOURCES += [ UNIFIED_SOURCES += [
'AudioSinkWrapper.cpp', 'AudioSinkWrapper.cpp',
'DecodedAudioDataSink.cpp', 'DecodedAudioDataSink.cpp',
'DecodedStream.cpp', 'DecodedStream.cpp',

2
dom/media/mediasource/moz.build
View file

@ -20,7 +20,7 @@ EXPORTS.mozilla.dom += [
'SourceBufferList.h', 'SourceBufferList.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'ContainerParser.cpp', 'ContainerParser.cpp',
'MediaSource.cpp', 'MediaSource.cpp',
'MediaSourceDecoder.cpp', 'MediaSourceDecoder.cpp',

8
dom/media/moz.build
View file

@ -181,7 +181,7 @@ EXPORTS.mozilla.dom += [
'VideoTrackList.h', 'VideoTrackList.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'AccurateSeekTask.cpp', 'AccurateSeekTask.cpp',
'ADTSDecoder.cpp', 'ADTSDecoder.cpp',
'ADTSDemuxer.cpp', 'ADTSDemuxer.cpp',
@ -198,7 +198,6 @@ SOURCES += [
'CanvasCaptureMediaStream.cpp', 'CanvasCaptureMediaStream.cpp',
'CubebUtils.cpp', 'CubebUtils.cpp',
'DecoderDoctorDiagnostics.cpp', 'DecoderDoctorDiagnostics.cpp',
'DecoderTraits.cpp',
'DOMMediaStream.cpp', 'DOMMediaStream.cpp',
'EncodedBufferCache.cpp', 'EncodedBufferCache.cpp',
'FileBlockCache.cpp', 'FileBlockCache.cpp',
@ -254,6 +253,11 @@ SOURCES += [
if CONFIG['OS_TARGET'] == 'WINNT': if CONFIG['OS_TARGET'] == 'WINNT':
SOURCES += [ 'ThreadPoolCOMListener.cpp' ] SOURCES += [ 'ThreadPoolCOMListener.cpp' ]
# DecoderTraits.cpp needs to be built separately because of Mac OS X headers.
SOURCES += [
'DecoderTraits.cpp',
]
# Some codec-related code uses multi-character constants, which GCC and clang # Some codec-related code uses multi-character constants, which GCC and clang
# warn about. Suppress turning this warning into an error. # warn about. Suppress turning this warning into an error.
if CONFIG['GNU_CC'] or CONFIG['CLANG_CL']: if CONFIG['GNU_CC'] or CONFIG['CLANG_CL']:

2
dom/media/mp3/moz.build
View file

@ -8,7 +8,7 @@ EXPORTS += [
'MP3Demuxer.h', 'MP3Demuxer.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'MP3Decoder.cpp', 'MP3Decoder.cpp',
'MP3Demuxer.cpp', 'MP3Demuxer.cpp',
] ]

2
dom/media/ogg/moz.build
View file

@ -12,7 +12,7 @@ EXPORTS += [
'OpusParser.h', 'OpusParser.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'OggCodecState.cpp', 'OggCodecState.cpp',
'OggCodecStore.cpp', 'OggCodecStore.cpp',
'OggDecoder.cpp', 'OggDecoder.cpp',

2
dom/media/platforms/ffmpeg/ffmpeg57/moz.build
View file

@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # 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/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
SOURCES += [ UNIFIED_SOURCES += [
'../FFmpegAudioDecoder.cpp', '../FFmpegAudioDecoder.cpp',
'../FFmpegDataDecoder.cpp', '../FFmpegDataDecoder.cpp',
'../FFmpegDecoderModule.cpp', '../FFmpegDecoderModule.cpp',

2
dom/media/platforms/ffmpeg/ffmpeg58/moz.build
View file

@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # 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/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
SOURCES += [ UNIFIED_SOURCES += [
'../FFmpegAudioDecoder.cpp', '../FFmpegAudioDecoder.cpp',
'../FFmpegDataDecoder.cpp', '../FFmpegDataDecoder.cpp',
'../FFmpegDecoderModule.cpp', '../FFmpegDecoderModule.cpp',

2
dom/media/platforms/ffmpeg/ffvpx/moz.build
View file

@ -8,7 +8,7 @@ EXPORTS += [
'FFVPXRuntimeLinker.h', 'FFVPXRuntimeLinker.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'../FFmpegAudioDecoder.cpp', '../FFmpegAudioDecoder.cpp',
'../FFmpegDataDecoder.cpp', '../FFmpegDataDecoder.cpp',
'../FFmpegDecoderModule.cpp', '../FFmpegDecoderModule.cpp',

2
dom/media/platforms/ffmpeg/libav53/moz.build
View file

@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # 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/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
SOURCES += [ UNIFIED_SOURCES += [
'../FFmpegAudioDecoder.cpp', '../FFmpegAudioDecoder.cpp',
'../FFmpegDataDecoder.cpp', '../FFmpegDataDecoder.cpp',
'../FFmpegDecoderModule.cpp', '../FFmpegDecoderModule.cpp',

2
dom/media/platforms/ffmpeg/libav54/moz.build
View file

@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # 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/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
SOURCES += [ UNIFIED_SOURCES += [
'../FFmpegAudioDecoder.cpp', '../FFmpegAudioDecoder.cpp',
'../FFmpegDataDecoder.cpp', '../FFmpegDataDecoder.cpp',
'../FFmpegDecoderModule.cpp', '../FFmpegDecoderModule.cpp',

2
dom/media/platforms/ffmpeg/libav55/moz.build
View file

@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # 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/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
SOURCES += [ UNIFIED_SOURCES += [
'../FFmpegAudioDecoder.cpp', '../FFmpegAudioDecoder.cpp',
'../FFmpegDataDecoder.cpp', '../FFmpegDataDecoder.cpp',
'../FFmpegDecoderModule.cpp', '../FFmpegDecoderModule.cpp',

8
dom/media/platforms/moz.build
View file

@ -15,7 +15,7 @@ EXPORTS += [
'wrappers/H264Converter.h' 'wrappers/H264Converter.h'
] ]
SOURCES += [ UNIFIED_SOURCES += [
'agnostic/AgnosticDecoderModule.cpp', 'agnostic/AgnosticDecoderModule.cpp',
'agnostic/BlankDecoderModule.cpp', 'agnostic/BlankDecoderModule.cpp',
'agnostic/OpusDecoder.cpp', 'agnostic/OpusDecoder.cpp',
@ -39,7 +39,7 @@ if CONFIG['MOZ_WMF']:
if CONFIG['MOZ_FFVPX'] or CONFIG['MOZ_FFMPEG']: if CONFIG['MOZ_FFVPX'] or CONFIG['MOZ_FFMPEG']:
# common code to either FFmpeg or FFVPX # common code to either FFmpeg or FFVPX
SOURCES += [ UNIFIED_SOURCES += [
'ffmpeg/FFmpegLibWrapper.cpp', 'ffmpeg/FFmpegLibWrapper.cpp',
] ]
@ -57,7 +57,7 @@ if CONFIG['MOZ_AV1']:
EXPORTS += [ EXPORTS += [
'agnostic/AOMDecoder.h', 'agnostic/AOMDecoder.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'agnostic/AOMDecoder.cpp', 'agnostic/AOMDecoder.cpp',
] ]
@ -65,7 +65,7 @@ if CONFIG['MOZ_APPLEMEDIA']:
EXPORTS += [ EXPORTS += [
'apple/AppleDecoderModule.h', 'apple/AppleDecoderModule.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'apple/AppleATDecoder.cpp', 'apple/AppleATDecoder.cpp',
'apple/AppleCMLinker.cpp', 'apple/AppleCMLinker.cpp',
'apple/AppleDecoderModule.cpp', 'apple/AppleDecoderModule.cpp',

2
dom/media/platforms/omx/moz.build
View file

@ -7,7 +7,7 @@ EXPORTS += [
'OmxDecoderModule.h', 'OmxDecoderModule.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'OmxDataDecoder.cpp', 'OmxDataDecoder.cpp',
'OmxDecoderModule.cpp', 'OmxDecoderModule.cpp',
'OmxPlatformLayer.cpp', 'OmxPlatformLayer.cpp',

2
dom/media/standalone/moz.build
View file

@ -6,7 +6,7 @@
if CONFIG['OS_TARGET'] != 'WINNT': if CONFIG['OS_TARGET'] != 'WINNT':
Library('media_standalone') Library('media_standalone')
SOURCES += [ UNIFIED_SOURCES += [
'../AudioChannelFormat.cpp', '../AudioChannelFormat.cpp',
'../AudioSegment.cpp', '../AudioSegment.cpp',
'../SimpleImageBuffer.cpp', '../SimpleImageBuffer.cpp',

5
dom/media/systemservices/moz.build
View file

@ -13,7 +13,7 @@ if CONFIG['MOZ_WEBRTC']:
'VideoEngine.h', 'VideoEngine.h',
'VideoFrameUtils.h' 'VideoFrameUtils.h'
] ]
SOURCES += [ UNIFIED_SOURCES += [
'CamerasChild.cpp', 'CamerasChild.cpp',
'CamerasParent.cpp', 'CamerasParent.cpp',
'LoadManager.cpp', 'LoadManager.cpp',
@ -77,8 +77,7 @@ EXPORTS.mozilla.media += ['CamerasTypes.h',
'MediaTaskUtils.h', 'MediaTaskUtils.h',
'MediaUtils.h', 'MediaUtils.h',
] ]
UNIFIED_SOURCES += [
SOURCES += [
'MediaChild.cpp', 'MediaChild.cpp',
'MediaParent.cpp', 'MediaParent.cpp',
'MediaSystemResourceClient.cpp', 'MediaSystemResourceClient.cpp',

2
dom/media/wave/moz.build
View file

@ -8,7 +8,7 @@ EXPORTS += [
'WaveDemuxer.h', 'WaveDemuxer.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'WaveDecoder.cpp', 'WaveDecoder.cpp',
'WaveDemuxer.cpp', 'WaveDemuxer.cpp',
] ]

2
dom/media/webm/moz.build
View file

@ -10,7 +10,7 @@ EXPORTS += [
'WebMDemuxer.h', 'WebMDemuxer.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'WebMBufferedParser.cpp', 'WebMBufferedParser.cpp',
'WebMDecoder.cpp', 'WebMDecoder.cpp',
'WebMDemuxer.cpp', 'WebMDemuxer.cpp',

11
dom/media/webrtc/moz.build
View file

@ -30,14 +30,15 @@ if CONFIG['MOZ_WEBRTC']:
UNIFIED_SOURCES += [ UNIFIED_SOURCES += [
'MediaEngineCameraVideoSource.cpp', 'MediaEngineCameraVideoSource.cpp',
'MediaEngineRemoteVideoSource.cpp', 'MediaEngineRemoteVideoSource.cpp',
]
SOURCES += [
'MediaEngineTabVideoSource.cpp', 'MediaEngineTabVideoSource.cpp',
'MediaEngineWebRTC.cpp',
'MediaEngineWebRTCAudio.cpp', 'MediaEngineWebRTCAudio.cpp',
'RTCCertificate.cpp', 'RTCCertificate.cpp',
'RTCIdentityProviderRegistrar.cpp', 'RTCIdentityProviderRegistrar.cpp',
] ]
# MediaEngineWebRTC.cpp needs to be built separately.
SOURCES += [
'MediaEngineWebRTC.cpp',
]
LOCAL_INCLUDES += [ LOCAL_INCLUDES += [
'/dom/base', '/dom/base',
'/media/libyuv/include', '/media/libyuv/include',
@ -51,10 +52,8 @@ XPIDL_SOURCES += [
] ]
UNIFIED_SOURCES += [ UNIFIED_SOURCES += [
'MediaTrackConstraints.cpp',
]
SOURCES += [
'MediaEngineDefault.cpp', 'MediaEngineDefault.cpp',
'MediaTrackConstraints.cpp',
'PeerIdentity.cpp', 'PeerIdentity.cpp',
] ]

2
dom/media/webspeech/synth/pico/moz.build
View file

@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # 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/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
SOURCES += [ UNIFIED_SOURCES += [
'nsPicoService.cpp', 'nsPicoService.cpp',
'PicoModule.cpp' 'PicoModule.cpp'
] ]

2
dom/media/webspeech/synth/speechd/moz.build
View file

@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # 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/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
SOURCES += [ UNIFIED_SOURCES += [
'SpeechDispatcherModule.cpp', 'SpeechDispatcherModule.cpp',
'SpeechDispatcherService.cpp' 'SpeechDispatcherService.cpp'
] ]

2
dom/media/webspeech/synth/windows/moz.build
View file

@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # 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/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
SOURCES += [ UNIFIED_SOURCES += [
'SapiModule.cpp', 'SapiModule.cpp',
'SapiService.cpp' 'SapiService.cpp'
] ]

2
dom/messagechannel/moz.build
View file

@ -12,7 +12,7 @@ EXPORTS.mozilla.dom += [
'MessagePortParent.h', 'MessagePortParent.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'MessageChannel.cpp', 'MessageChannel.cpp',
'MessagePort.cpp', 'MessagePort.cpp',
'MessagePortChild.cpp', 'MessagePortChild.cpp',

2
dom/network/moz.build
View file

@ -26,7 +26,7 @@ EXPORTS.mozilla.dom.network += [
'UDPSocketParent.h', 'UDPSocketParent.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'Connection.cpp', 'Connection.cpp',
'TCPServerSocket.cpp', 'TCPServerSocket.cpp',
'TCPServerSocketChild.cpp', 'TCPServerSocketChild.cpp',

2
dom/notification/moz.build
View file

@ -16,7 +16,7 @@ EXPORTS.mozilla.dom += [
'NotificationEvent.h', 'NotificationEvent.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'DesktopNotification.cpp', 'DesktopNotification.cpp',
'Notification.cpp', 'Notification.cpp',
'NotificationEvent.cpp', 'NotificationEvent.cpp',

13
dom/offline/moz.build
View file

@ -3,10 +3,15 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # 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/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
EXPORTS += ['nsDOMOfflineResourceList.h'] EXPORTS += [
'nsDOMOfflineResourceList.h',
]
UNIFIED_SOURCES += [
'nsDOMOfflineResourceList.cpp',
]
SOURCES += ['nsDOMOfflineResourceList.cpp'] LOCAL_INCLUDES += [
'/dom/base',
LOCAL_INCLUDES += ['/dom/base'] ]
FINAL_LIBRARY = 'xul' FINAL_LIBRARY = 'xul'

2
dom/performance/moz.build
View file

@ -17,7 +17,7 @@ EXPORTS.mozilla.dom += [
'PerformanceTiming.h', 'PerformanceTiming.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'Performance.cpp', 'Performance.cpp',
'PerformanceEntry.cpp', 'PerformanceEntry.cpp',
'PerformanceMainThread.cpp', 'PerformanceMainThread.cpp',

2
dom/permission/moz.build
View file

@ -8,7 +8,7 @@ EXPORTS.mozilla.dom += [
'PermissionStatus.h', 'PermissionStatus.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'PermissionObserver.cpp', 'PermissionObserver.cpp',
'Permissions.cpp', 'Permissions.cpp',
'PermissionStatus.cpp', 'PermissionStatus.cpp',

17
dom/plugins/base/moz.build
View file

@ -37,12 +37,10 @@ EXPORTS.mozilla += [
'PluginPRLibrary.h', 'PluginPRLibrary.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'nsJSNPRuntime.cpp', 'nsJSNPRuntime.cpp',
'nsNPAPIPlugin.cpp',
'nsNPAPIPluginInstance.cpp', 'nsNPAPIPluginInstance.cpp',
'nsNPAPIPluginStreamListener.cpp', 'nsNPAPIPluginStreamListener.cpp',
'nsPluginHost.cpp',
'nsPluginInstanceOwner.cpp', 'nsPluginInstanceOwner.cpp',
'nsPluginModule.cpp', 'nsPluginModule.cpp',
'nsPluginStreamListenerPeer.cpp', 'nsPluginStreamListenerPeer.cpp',
@ -50,19 +48,24 @@ SOURCES += [
'PluginPRLibrary.cpp', 'PluginPRLibrary.cpp',
] ]
SOURCES += [
'nsNPAPIPlugin.cpp', # Conflict with X11 headers
'nsPluginHost.cpp', # Conflict with NS_NPAPIPLUGIN_CALLBACK
]
if CONFIG['OS_ARCH'] == 'WINNT': if CONFIG['OS_ARCH'] == 'WINNT':
SOURCES += [ UNIFIED_SOURCES += [
'nsPluginDirServiceProvider.cpp', 'nsPluginDirServiceProvider.cpp',
'nsPluginNativeWindowWin.cpp', 'nsPluginNativeWindowWin.cpp',
'nsPluginsDirWin.cpp', 'nsPluginsDirWin.cpp',
] ]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
SOURCES += [ UNIFIED_SOURCES += [
'nsPluginNativeWindow.cpp', 'nsPluginNativeWindow.cpp',
'nsPluginsDirDarwin.cpp', 'nsPluginsDirDarwin.cpp',
] ]
else: else:
SOURCES += [ UNIFIED_SOURCES += [
'nsPluginsDirUnix.cpp', 'nsPluginsDirUnix.cpp',
] ]
if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
@ -71,7 +74,7 @@ else:
'nsPluginNativeWindowGtk.cpp', 'nsPluginNativeWindowGtk.cpp',
] ]
else: else:
SOURCES += [ UNIFIED_SOURCES += [
'nsPluginNativeWindow.cpp', 'nsPluginNativeWindow.cpp',
] ]

19
dom/plugins/ipc/moz.build
View file

@ -47,11 +47,13 @@ if CONFIG['OS_ARCH'] == 'WINNT':
EXPORTS.mozilla.plugins += [ EXPORTS.mozilla.plugins += [
'PluginSurfaceParent.h', 'PluginSurfaceParent.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'MiniShmParent.cpp',
'PluginHangUIParent.cpp', 'PluginHangUIParent.cpp',
'PluginSurfaceParent.cpp', 'PluginSurfaceParent.cpp',
] ]
SOURCES += [
'MiniShmParent.cpp', # Issues with CreateEvent
]
DEFINES['MOZ_HANGUI_PROCESS_NAME'] = '"plugin-hang-ui%s"' % CONFIG['BIN_SUFFIX'] DEFINES['MOZ_HANGUI_PROCESS_NAME'] = '"plugin-hang-ui%s"' % CONFIG['BIN_SUFFIX']
LOCAL_INCLUDES += [ LOCAL_INCLUDES += [
'/widget', '/widget',
@ -63,17 +65,15 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
'PluginInterposeOSX.h', 'PluginInterposeOSX.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'BrowserStreamChild.cpp', 'BrowserStreamChild.cpp',
'BrowserStreamParent.cpp', 'BrowserStreamParent.cpp',
'ChildAsyncCall.cpp', 'ChildAsyncCall.cpp',
'ChildTimer.cpp', 'ChildTimer.cpp',
'PluginAsyncSurrogate.cpp', 'PluginAsyncSurrogate.cpp',
'PluginBackgroundDestroyer.cpp', 'PluginBackgroundDestroyer.cpp',
'PluginInstanceChild.cpp',
'PluginInstanceParent.cpp', 'PluginInstanceParent.cpp',
'PluginMessageUtils.cpp', 'PluginMessageUtils.cpp',
'PluginModuleChild.cpp',
'PluginModuleParent.cpp', 'PluginModuleParent.cpp',
'PluginProcessChild.cpp', 'PluginProcessChild.cpp',
'PluginProcessParent.cpp', 'PluginProcessParent.cpp',
@ -82,18 +82,23 @@ SOURCES += [
'PluginScriptableObjectParent.cpp', 'PluginScriptableObjectParent.cpp',
'PluginStreamChild.cpp', 'PluginStreamChild.cpp',
'PluginStreamParent.cpp', 'PluginStreamParent.cpp',
]
SOURCES += [
'PluginInstanceChild.cpp', # 'PluginThreadCallback' : ambiguous symbol
'PluginModuleChild.cpp', # Redefinition of mozilla::WindowsDllInterceptor sUser32Intercept
'PluginWidgetChild.cpp', 'PluginWidgetChild.cpp',
'PluginWidgetParent.cpp', 'PluginWidgetParent.cpp',
] ]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
SOURCES += [ UNIFIED_SOURCES += [
'PluginInterposeOSX.mm', 'PluginInterposeOSX.mm',
'PluginUtilsOSX.mm', 'PluginUtilsOSX.mm',
] ]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
SOURCES += [ UNIFIED_SOURCES += [
'D3D11SurfaceHolder.cpp', 'D3D11SurfaceHolder.cpp',
'PluginUtilsWin.cpp' 'PluginUtilsWin.cpp'
] ]

2
dom/power/moz.build
View file

@ -20,7 +20,7 @@ EXPORTS.mozilla.dom.power += [
'Types.h', 'Types.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'PowerManager.cpp', 'PowerManager.cpp',
'PowerManagerService.cpp', 'PowerManagerService.cpp',
'WakeLock.cpp', 'WakeLock.cpp',

2
dom/push/moz.build
View file

@ -33,7 +33,7 @@ EXPORTS.mozilla.dom += [
'PushUtil.h', 'PushUtil.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'PushManager.cpp', 'PushManager.cpp',
'PushNotifier.cpp', 'PushNotifier.cpp',
'PushSubscription.cpp', 'PushSubscription.cpp',

2
dom/quota/moz.build
View file

@ -30,7 +30,7 @@ EXPORTS.mozilla.dom.quota += [
'UsageInfo.h', 'UsageInfo.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'ActorsChild.cpp', 'ActorsChild.cpp',
'ActorsParent.cpp', 'ActorsParent.cpp',
'FileStreams.cpp', 'FileStreams.cpp',

7
dom/security/moz.build
View file

@ -23,15 +23,12 @@ EXPORTS += [
] ]
UNIFIED_SOURCES += [ UNIFIED_SOURCES += [
'nsCSPContext.cpp',
'nsCSPUtils.cpp',
]
SOURCES += [
'ContentVerifier.cpp', 'ContentVerifier.cpp',
'nsContentSecurityManager.cpp', 'nsContentSecurityManager.cpp',
'nsCSPContext.cpp',
'nsCSPParser.cpp', 'nsCSPParser.cpp',
'nsCSPService.cpp', 'nsCSPService.cpp',
'nsCSPUtils.cpp',
'nsMixedContentBlocker.cpp', 'nsMixedContentBlocker.cpp',
'SRICheck.cpp', 'SRICheck.cpp',
'SRIMetadata.cpp', 'SRIMetadata.cpp',

44
dom/security/nsCSPParser.cpp
View file

@ -31,29 +31,6 @@ GetCspParserLog()
#define CSPPARSERLOG(args) MOZ_LOG(GetCspParserLog(), mozilla::LogLevel::Debug, args) #define CSPPARSERLOG(args) MOZ_LOG(GetCspParserLog(), mozilla::LogLevel::Debug, args)
#define CSPPARSERLOGENABLED() MOZ_LOG_TEST(GetCspParserLog(), mozilla::LogLevel::Debug) #define CSPPARSERLOGENABLED() MOZ_LOG_TEST(GetCspParserLog(), mozilla::LogLevel::Debug)
static const char16_t COLON = ':';
static const char16_t SEMICOLON = ';';
static const char16_t SLASH = '/';
static const char16_t PLUS = '+';
static const char16_t DASH = '-';
static const char16_t DOT = '.';
static const char16_t UNDERLINE = '_';
static const char16_t TILDE = '~';
static const char16_t WILDCARD = '*';
static const char16_t SINGLEQUOTE = '\'';
static const char16_t OPEN_CURL = '{';
static const char16_t CLOSE_CURL = '}';
static const char16_t NUMBER_SIGN = '#';
static const char16_t QUESTIONMARK = '?';
static const char16_t PERCENT_SIGN = '%';
static const char16_t EXCLAMATION = '!';
static const char16_t DOLLAR = '$';
static const char16_t AMPERSAND = '&';
static const char16_t OPENBRACE = '(';
static const char16_t CLOSINGBRACE = ')';
static const char16_t EQUALS = '=';
static const char16_t ATSYMBOL = '@';
static const uint32_t kSubHostPathCharacterCutoff = 512; static const uint32_t kSubHostPathCharacterCutoff = 512;
static const char *const kHashSourceValidFns [] = { "sha256", "sha384", "sha512" }; static const char *const kHashSourceValidFns [] = { "sha256", "sha384", "sha512" };
@ -158,27 +135,6 @@ nsCSPParser::~nsCSPParser()
CSPPARSERLOG(("nsCSPParser::~nsCSPParser")); CSPPARSERLOG(("nsCSPParser::~nsCSPParser"));
} }
static bool
isCharacterToken(char16_t aSymbol)
{
return (aSymbol >= 'a' && aSymbol <= 'z') ||
(aSymbol >= 'A' && aSymbol <= 'Z');
}
static bool
isNumberToken(char16_t aSymbol)
{
return (aSymbol >= '0' && aSymbol <= '9');
}
static bool
isValidHexDig(char16_t aHexDig)
{
return (isNumberToken(aHexDig) ||
(aHexDig >= 'A' && aHexDig <= 'F') ||
(aHexDig >= 'a' && aHexDig <= 'f'));
}
void void
nsCSPParser::resetCurChar(const nsAString& aToken) nsCSPParser::resetCurChar(const nsAString& aToken)
{ {

27
dom/security/nsCSPUtils.cpp
View file

@ -16,10 +16,6 @@
#include "nsIURL.h" #include "nsIURL.h"
#include "nsReadableUtils.h" #include "nsReadableUtils.h"
#include "nsSandboxFlags.h" #include "nsSandboxFlags.h"
#include "nsString.h"
#include "mozilla/Logging.h"
using namespace mozilla;
#define DEFAULT_PORT -1 #define DEFAULT_PORT -1
@ -33,29 +29,6 @@ GetCspUtilsLog()
#define CSPUTILSLOG(args) MOZ_LOG(GetCspUtilsLog(), mozilla::LogLevel::Debug, args) #define CSPUTILSLOG(args) MOZ_LOG(GetCspUtilsLog(), mozilla::LogLevel::Debug, args)
#define CSPUTILSLOGENABLED() MOZ_LOG_TEST(GetCspUtilsLog(), mozilla::LogLevel::Debug) #define CSPUTILSLOGENABLED() MOZ_LOG_TEST(GetCspUtilsLog(), mozilla::LogLevel::Debug)
static const char16_t PERCENT_SIGN = '%';
static bool
isCharacterToken(char16_t aSymbol)
{
return (aSymbol >= 'a' && aSymbol <= 'z') ||
(aSymbol >= 'A' && aSymbol <= 'Z');
}
static bool
isNumberToken(char16_t aSymbol)
{
return (aSymbol >= '0' && aSymbol <= '9');
}
static bool
isValidHexDig(char16_t aHexDig)
{
return (isNumberToken(aHexDig) ||
(aHexDig >= 'A' && aHexDig <= 'F') ||
(aHexDig >= 'a' && aHexDig <= 'f'));
}
void void
CSP_PercentDecodeStr(const nsAString& aEncStr, nsAString& outDecStr) CSP_PercentDecodeStr(const nsAString& aEncStr, nsAString& outDecStr)
{ {

48
dom/security/nsCSPUtils.h
View file

@ -15,6 +15,54 @@
#include "nsUnicharUtils.h" #include "nsUnicharUtils.h"
#include "mozilla/Logging.h" #include "mozilla/Logging.h"
// ======= Defines and helper functions =======
static const char16_t COLON = ':';
static const char16_t SEMICOLON = ';';
static const char16_t SLASH = '/';
static const char16_t PLUS = '+';
static const char16_t DASH = '-';
static const char16_t DOT = '.';
static const char16_t UNDERLINE = '_';
static const char16_t TILDE = '~';
static const char16_t WILDCARD = '*';
static const char16_t SINGLEQUOTE = '\'';
static const char16_t OPEN_CURL = '{';
static const char16_t CLOSE_CURL = '}';
static const char16_t NUMBER_SIGN = '#';
static const char16_t QUESTIONMARK = '?';
static const char16_t PERCENT_SIGN = '%';
static const char16_t EXCLAMATION = '!';
static const char16_t DOLLAR = '$';
static const char16_t AMPERSAND = '&';
static const char16_t OPENBRACE = '(';
static const char16_t CLOSINGBRACE = ')';
static const char16_t EQUALS = '=';
static const char16_t ATSYMBOL = '@';
static bool
isCharacterToken(char16_t aSymbol)
{
return (aSymbol >= 'a' && aSymbol <= 'z') ||
(aSymbol >= 'A' && aSymbol <= 'Z');
}
static bool
isNumberToken(char16_t aSymbol)
{
return (aSymbol >= '0' && aSymbol <= '9');
}
static bool
isValidHexDig(char16_t aHexDig)
{
return (isNumberToken(aHexDig) ||
(aHexDig >= 'A' && aHexDig <= 'F') ||
(aHexDig >= 'a' && aHexDig <= 'f'));
}
// ============================================
namespace mozilla { namespace mozilla {
namespace dom { namespace dom {
struct CSP; struct CSP;

2
dom/smil/moz.build
View file

@ -34,7 +34,7 @@ EXPORTS.mozilla.dom += [
'TimeEvent.h', 'TimeEvent.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'nsSMILAnimationController.cpp', 'nsSMILAnimationController.cpp',
'nsSMILAnimationFunction.cpp', 'nsSMILAnimationFunction.cpp',
'nsSMILCompositor.cpp', 'nsSMILCompositor.cpp',

2
dom/storage/moz.build
View file

@ -8,7 +8,7 @@ EXPORTS.mozilla.dom += [
'DOMStorageIPC.h', 'DOMStorageIPC.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'DOMStorage.cpp', 'DOMStorage.cpp',
'DOMStorageCache.cpp', 'DOMStorageCache.cpp',
'DOMStorageDBThread.cpp', 'DOMStorageDBThread.cpp',

2
dom/svg/moz.build
View file

@ -102,7 +102,7 @@ EXPORTS.mozilla.dom += [
'SVGZoomEvent.h', 'SVGZoomEvent.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'DOMSVGAnimatedLengthList.cpp', 'DOMSVGAnimatedLengthList.cpp',
'DOMSVGAnimatedNumberList.cpp', 'DOMSVGAnimatedNumberList.cpp',
'DOMSVGLength.cpp', 'DOMSVGLength.cpp',

2
dom/system/moz.build
View file

@ -29,7 +29,7 @@ EXPORTS.mozilla += [
'OSFileConstants.h', 'OSFileConstants.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'nsDeviceSensors.cpp', 'nsDeviceSensors.cpp',
'OSFileConstants.cpp', 'OSFileConstants.cpp',
] ]

2
dom/time/moz.build
View file

@ -14,7 +14,7 @@ EXPORTS.mozilla.dom.time += [
'TimeService.h', 'TimeService.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'DateCacheCleaner.cpp', 'DateCacheCleaner.cpp',
'TimeChangeObserver.cpp', 'TimeChangeObserver.cpp',
'TimeManager.cpp', 'TimeManager.cpp',

2
dom/u2f/moz.build
View file

@ -9,7 +9,7 @@ EXPORTS.mozilla.dom += [
'USBToken.h', 'USBToken.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'NSSU2FTokenRemote.cpp', 'NSSU2FTokenRemote.cpp',
'U2F.cpp', 'U2F.cpp',
'USBToken.cpp', 'USBToken.cpp',

2
dom/url/moz.build
View file

@ -8,7 +8,7 @@ EXPORTS.mozilla.dom += [
'URLSearchParams.h', 'URLSearchParams.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'URL.cpp', 'URL.cpp',
'URLSearchParams.cpp', 'URLSearchParams.cpp',
] ]

2
dom/workers/moz.build
View file

@ -46,7 +46,7 @@ XPIDL_SOURCES += [
'nsIWorkerDebuggerManager.idl', 'nsIWorkerDebuggerManager.idl',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'ChromeWorkerScope.cpp', 'ChromeWorkerScope.cpp',
'FileReaderSync.cpp', 'FileReaderSync.cpp',
'Principal.cpp', 'Principal.cpp',

2
dom/worklet/moz.build
View file

@ -8,7 +8,7 @@ EXPORTS.mozilla.dom += [
'WorkletGlobalScope.h', 'WorkletGlobalScope.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'Worklet.cpp', 'Worklet.cpp',
'WorkletGlobalScope.cpp', 'WorkletGlobalScope.cpp',
] ]

2
dom/xbl/moz.build
View file

@ -15,7 +15,7 @@ EXPORTS.mozilla.dom += [
'XBLChildrenElement.h', 'XBLChildrenElement.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'nsBindingManager.cpp', 'nsBindingManager.cpp',
'nsXBLBinding.cpp', 'nsXBLBinding.cpp',
'nsXBLContentSink.cpp', 'nsXBLContentSink.cpp',

2
dom/xhr/moz.build
View file

@ -17,7 +17,7 @@ EXPORTS.mozilla.dom += [
'XMLHttpRequestUpload.h', 'XMLHttpRequestUpload.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'XMLHttpRequest.cpp', 'XMLHttpRequest.cpp',
'XMLHttpRequestEventTarget.cpp', 'XMLHttpRequestEventTarget.cpp',
'XMLHttpRequestMainThread.cpp', 'XMLHttpRequestMainThread.cpp',

2
dom/xml/moz.build
View file

@ -19,7 +19,7 @@ EXPORTS.mozilla.dom += [
'XMLStylesheetProcessingInstruction.h', 'XMLStylesheetProcessingInstruction.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'CDATASection.cpp', 'CDATASection.cpp',
'nsXMLContentSink.cpp', 'nsXMLContentSink.cpp',
'nsXMLElement.cpp', 'nsXMLElement.cpp',

2
dom/xslt/base/moz.build
View file

@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # 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/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
SOURCES += [ UNIFIED_SOURCES += [
'txDouble.cpp', 'txDouble.cpp',
'txExpandedName.cpp', 'txExpandedName.cpp',
'txExpandedNameMap.cpp', 'txExpandedNameMap.cpp',

2
dom/xslt/xml/moz.build
View file

@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # 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/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
SOURCES += [ UNIFIED_SOURCES += [
'txXMLParser.cpp', 'txXMLParser.cpp',
'txXMLUtils.cpp', 'txXMLUtils.cpp',
] ]

2
dom/xslt/xpath/moz.build
View file

@ -9,7 +9,7 @@ EXPORTS.mozilla.dom += [
'XPathResult.h', 'XPathResult.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'txBooleanExpr.cpp', 'txBooleanExpr.cpp',
'txBooleanResult.cpp', 'txBooleanResult.cpp',
'txCoreFunctionCall.cpp', 'txCoreFunctionCall.cpp',

2
dom/xslt/xslt/moz.build
View file

@ -7,7 +7,7 @@ EXPORTS.mozilla.dom += [
'txMozillaXSLTProcessor.h' 'txMozillaXSLTProcessor.h'
] ]
SOURCES += [ UNIFIED_SOURCES += [
'txBufferingHandler.cpp', 'txBufferingHandler.cpp',
'txCurrentFunctionCall.cpp', 'txCurrentFunctionCall.cpp',
'txDocumentFunctionCall.cpp', 'txDocumentFunctionCall.cpp',

2
dom/xul/moz.build
View file

@ -35,7 +35,7 @@ XPIDL_SOURCES += [
XPIDL_MODULE = 'xul' XPIDL_MODULE = 'xul'
SOURCES += [ UNIFIED_SOURCES += [
'nsXULControllers.cpp', 'nsXULControllers.cpp',
] ]

2
dom/xul/templates/moz.build
View file

@ -16,7 +16,7 @@ XPIDL_SOURCES += [
XPIDL_MODULE = 'xultmpl' XPIDL_MODULE = 'xultmpl'
SOURCES += [ UNIFIED_SOURCES += [
'nsContentSupportMap.cpp', 'nsContentSupportMap.cpp',
'nsContentTestNode.cpp', 'nsContentTestNode.cpp',
'nsInstantiationNode.cpp', 'nsInstantiationNode.cpp',

2
editor/composer/moz.build
View file

@ -13,7 +13,7 @@ XPIDL_SOURCES += [
XPIDL_MODULE = 'composer' XPIDL_MODULE = 'composer'
SOURCES += [ UNIFIED_SOURCES += [
'nsComposerCommands.cpp', 'nsComposerCommands.cpp',
'nsComposerCommandsUpdater.cpp', 'nsComposerCommandsUpdater.cpp',
'nsComposerController.cpp', 'nsComposerController.cpp',

2
editor/libeditor/moz.build
View file

@ -29,7 +29,7 @@ EXPORTS.mozilla += [
'TextEditRules.h', 'TextEditRules.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'ChangeAttributeTransaction.cpp', 'ChangeAttributeTransaction.cpp',
'ChangeStyleTransaction.cpp', 'ChangeStyleTransaction.cpp',
'CompositionTransaction.cpp', 'CompositionTransaction.cpp',

4
gfx/angle/src/compiler/translator/EmulateGLFragColorBroadcast.h
View file

@ -11,10 +11,12 @@
#define COMPILER_TRANSLATOR_EMULATEGLFRAGCOLORBROADCAST_H_ #define COMPILER_TRANSLATOR_EMULATEGLFRAGCOLORBROADCAST_H_
#include <vector> #include <vector>
// For COMPILER_EXPORT
#include "GLSLANG/ShaderLang.h"
namespace sh namespace sh
{ {
struct OutputVariable; struct COMPILER_EXPORT OutputVariable;
} }
class TIntermNode; class TIntermNode;

6
gfx/graphite2/src/moz.build
View file

@ -12,16 +12,16 @@ EXPORTS.graphite2 += [
] ]
if CONFIG['GNU_CC']: if CONFIG['GNU_CC']:
SOURCES += [ UNIFIED_SOURCES += [
'direct_machine.cpp' 'direct_machine.cpp'
] ]
else: else:
SOURCES += [ UNIFIED_SOURCES += [
'call_machine.cpp' 'call_machine.cpp'
] ]
# This should contain all of the _SOURCES from files.mk, except *_machine.cpp # This should contain all of the _SOURCES from files.mk, except *_machine.cpp
SOURCES += [ UNIFIED_SOURCES += [
'CachedFace.cpp', 'CachedFace.cpp',
'CmapCache.cpp', 'CmapCache.cpp',
'Code.cpp', 'Code.cpp',

19
gfx/harfbuzz/src/moz.build
View file

@ -26,32 +26,35 @@ EXPORTS.harfbuzz += [
] ]
SOURCES += [ SOURCES += [
'hb-blob.cc', 'hb-blob.cc', # error: use of undeclared identifier 'snprintf' (FreeBSD)
'hb-common.cc', # error: use of undeclared identifier 'strdup'
'hb-ot-math.cc', # conflict with hb-ot-layout.cc
'hb-ot-shape-complex-hangul.cc', # error: redefinition of enumerator 'NONE'
'hb-ot-shape-complex-indic.cc', # error: redefinition of enumerator 'INIT'
'hb-ot-shape-complex-use.cc', # error: redefinition of 'basic_features'
'hb-ot-shape.cc', # error: functions that differ only in their return type cannot be overloaded
'hb-shape-plan.cc', # error: redefinition of 'hb_ot_shaper_face_data_ensure'
]
UNIFIED_SOURCES += [
'hb-buffer.cc', 'hb-buffer.cc',
'hb-common.cc',
'hb-face.cc', 'hb-face.cc',
'hb-font.cc', 'hb-font.cc',
'hb-ot-layout.cc', 'hb-ot-layout.cc',
'hb-ot-map.cc', 'hb-ot-map.cc',
'hb-ot-math.cc',
'hb-ot-shape-complex-arabic.cc', 'hb-ot-shape-complex-arabic.cc',
'hb-ot-shape-complex-default.cc', 'hb-ot-shape-complex-default.cc',
'hb-ot-shape-complex-hangul.cc',
'hb-ot-shape-complex-hebrew.cc', 'hb-ot-shape-complex-hebrew.cc',
'hb-ot-shape-complex-indic-table.cc', 'hb-ot-shape-complex-indic-table.cc',
'hb-ot-shape-complex-indic.cc',
'hb-ot-shape-complex-myanmar.cc', 'hb-ot-shape-complex-myanmar.cc',
'hb-ot-shape-complex-thai.cc', 'hb-ot-shape-complex-thai.cc',
'hb-ot-shape-complex-tibetan.cc', 'hb-ot-shape-complex-tibetan.cc',
'hb-ot-shape-complex-use-table.cc', 'hb-ot-shape-complex-use-table.cc',
'hb-ot-shape-complex-use.cc',
'hb-ot-shape-fallback.cc', 'hb-ot-shape-fallback.cc',
'hb-ot-shape-normalize.cc', 'hb-ot-shape-normalize.cc',
'hb-ot-shape.cc',
'hb-ot-tag.cc', 'hb-ot-tag.cc',
'hb-ot-var.cc', 'hb-ot-var.cc',
'hb-set.cc', 'hb-set.cc',
'hb-shape-plan.cc',
'hb-shape.cc', 'hb-shape.cc',
'hb-shaper.cc', 'hb-shaper.cc',
'hb-unicode.cc', 'hb-unicode.cc',

4
gfx/ipc/moz.build
View file

@ -36,12 +36,12 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
'SharedDIBSurface.h', 'SharedDIBSurface.h',
'SharedDIBWin.h', 'SharedDIBWin.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'SharedDIBSurface.cpp', 'SharedDIBSurface.cpp',
'SharedDIBWin.cpp', 'SharedDIBWin.cpp',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'CompositorSession.cpp', 'CompositorSession.cpp',
'CompositorWidgetVsyncObserver.cpp', 'CompositorWidgetVsyncObserver.cpp',
'D3DMessageUtils.cpp', 'D3DMessageUtils.cpp',

2
gfx/ots/src/moz.build
View file

@ -8,7 +8,7 @@ EXPORTS += [
'../include/ots-memory-stream.h', '../include/ots-memory-stream.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'avar.cc', 'avar.cc',
'cff.cc', 'cff.cc',
'cff_charstring.cc', 'cff_charstring.cc',

4
gfx/skia/generate_mozbuild.py
View file

@ -79,7 +79,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in {
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
DEFINES['UNICODE'] = True DEFINES['UNICODE'] = True
DEFINES['_UNICODE'] = True DEFINES['_UNICODE'] = True
SOURCES += [ UNIFIED_SOURCES += [
'skia/src/fonts/SkFontMgr_indirect.cpp', 'skia/src/fonts/SkFontMgr_indirect.cpp',
'skia/src/fonts/SkRemotableFontMgr.cpp', 'skia/src/fonts/SkRemotableFontMgr.cpp',
] ]
@ -415,7 +415,7 @@ def write_sources(f, values, indent):
else: else:
sources['unified'].add(item) sources['unified'].add(item)
write_list(f, "SOURCES", sources['unified'], indent) write_list(f, "UNIFIED_SOURCES", sources['unified'], indent)
write_list(f, "SOURCES", sources['nonunified'], indent) write_list(f, "SOURCES", sources['nonunified'], indent)
def write_list(f, name, values, indent): def write_list(f, name, values, indent):

16
gfx/skia/moz.build
View file

@ -22,7 +22,7 @@ if CONFIG['MOZ_OPTIMIZE']:
elif CONFIG['GNU_CC']: elif CONFIG['GNU_CC']:
skia_opt_flags += ['-O2'] skia_opt_flags += ['-O2']
SOURCES += [ UNIFIED_SOURCES += [
'skia/src/core/SkAAClip.cpp', 'skia/src/core/SkAAClip.cpp',
'skia/src/core/SkAlphaRuns.cpp', 'skia/src/core/SkAlphaRuns.cpp',
'skia/src/core/SkAnnotation.cpp', 'skia/src/core/SkAnnotation.cpp',
@ -308,7 +308,7 @@ SOURCES['skia/src/core/SkSpriteBlitter4f.cpp'].flags += skia_opt_flags
SOURCES['skia/src/core/SkSpriteBlitter_ARGB32.cpp'].flags += skia_opt_flags SOURCES['skia/src/core/SkSpriteBlitter_ARGB32.cpp'].flags += skia_opt_flags
SOURCES['skia/src/core/SkSpriteBlitter_RGB16.cpp'].flags += skia_opt_flags SOURCES['skia/src/core/SkSpriteBlitter_RGB16.cpp'].flags += skia_opt_flags
if CONFIG['MOZ_ENABLE_SKIA_PDF']: if CONFIG['MOZ_ENABLE_SKIA_PDF']:
SOURCES += [ UNIFIED_SOURCES += [
'skia/src/core/SkMD5.cpp', 'skia/src/core/SkMD5.cpp',
'skia/src/pdf/SkDeflate.cpp', 'skia/src/pdf/SkDeflate.cpp',
'skia/src/pdf/SkJpegInfo.cpp', 'skia/src/pdf/SkJpegInfo.cpp',
@ -332,7 +332,7 @@ if CONFIG['MOZ_ENABLE_SKIA_PDF']:
'skia/src/pdf/SkPDFFont.cpp', 'skia/src/pdf/SkPDFFont.cpp',
] ]
if CONFIG['MOZ_ENABLE_SKIA_GPU']: if CONFIG['MOZ_ENABLE_SKIA_GPU']:
SOURCES += [ UNIFIED_SOURCES += [
'skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp', 'skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp',
'skia/src/gpu/batches/GrAnalyticRectBatch.cpp', 'skia/src/gpu/batches/GrAnalyticRectBatch.cpp',
'skia/src/gpu/batches/GrAtlasTextBatch.cpp', 'skia/src/gpu/batches/GrAtlasTextBatch.cpp',
@ -517,7 +517,7 @@ if CONFIG['MOZ_ENABLE_SKIA_GPU']:
'skia/src/image/SkImage_Gpu.cpp', 'skia/src/image/SkImage_Gpu.cpp',
] ]
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android'): if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android'):
SOURCES += [ UNIFIED_SOURCES += [
'skia/src/ports/SkDebug_android.cpp', 'skia/src/ports/SkDebug_android.cpp',
'skia/src/ports/SkOSFile_posix.cpp', 'skia/src/ports/SkOSFile_posix.cpp',
'skia/src/ports/SkOSLibrary_posix.cpp', 'skia/src/ports/SkOSLibrary_posix.cpp',
@ -529,7 +529,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android'):
'skia/src/ports/SkFontHost_FreeType_common.cpp', 'skia/src/ports/SkFontHost_FreeType_common.cpp',
] ]
if CONFIG['MOZ_WIDGET_TOOLKIT'] in {'cocoa', 'uikit'}: if CONFIG['MOZ_WIDGET_TOOLKIT'] in {'cocoa', 'uikit'}:
SOURCES += [ UNIFIED_SOURCES += [
'skia/src/ports/SkDebug_stdio.cpp', 'skia/src/ports/SkDebug_stdio.cpp',
'skia/src/ports/SkOSFile_posix.cpp', 'skia/src/ports/SkOSFile_posix.cpp',
'skia/src/ports/SkOSLibrary_posix.cpp', 'skia/src/ports/SkOSLibrary_posix.cpp',
@ -542,7 +542,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in {'cocoa', 'uikit'}:
'skia/src/ports/SkFontHost_mac.cpp', 'skia/src/ports/SkFontHost_mac.cpp',
] ]
if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
SOURCES += [ UNIFIED_SOURCES += [
'skia/src/ports/SkDebug_stdio.cpp', 'skia/src/ports/SkDebug_stdio.cpp',
'skia/src/ports/SkOSFile_posix.cpp', 'skia/src/ports/SkOSFile_posix.cpp',
'skia/src/ports/SkOSLibrary_posix.cpp', 'skia/src/ports/SkOSLibrary_posix.cpp',
@ -574,7 +574,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
'skia/src/utils/win/SkIStream.cpp', 'skia/src/utils/win/SkIStream.cpp',
] ]
if CONFIG['INTEL_ARCHITECTURE']: if CONFIG['INTEL_ARCHITECTURE']:
SOURCES += [ UNIFIED_SOURCES += [
'skia/src/opts/opts_check_x86.cpp', 'skia/src/opts/opts_check_x86.cpp',
] ]
SOURCES += [ SOURCES += [
@ -598,7 +598,7 @@ if CONFIG['INTEL_ARCHITECTURE']:
SOURCES['skia/src/opts/SkOpts_sse42.cpp'].flags += skia_opt_flags SOURCES['skia/src/opts/SkOpts_sse42.cpp'].flags += skia_opt_flags
SOURCES['skia/src/opts/SkOpts_ssse3.cpp'].flags += skia_opt_flags SOURCES['skia/src/opts/SkOpts_ssse3.cpp'].flags += skia_opt_flags
elif CONFIG['CPU_ARCH'] in ('arm', 'aarch64') and CONFIG['GNU_CC']: elif CONFIG['CPU_ARCH'] in ('arm', 'aarch64') and CONFIG['GNU_CC']:
SOURCES += [ UNIFIED_SOURCES += [
'skia/src/core/SkUtilsArm.cpp', 'skia/src/core/SkUtilsArm.cpp',
] ]
SOURCES += [ SOURCES += [

8
gfx/src/moz.build
View file

@ -55,12 +55,11 @@ if CONFIG['MOZ_X11']:
'X11Util.cpp', 'X11Util.cpp',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'DriverCrashGuard.cpp', 'DriverCrashGuard.cpp',
'FilterSupport.cpp', 'FilterSupport.cpp',
'gfxTelemetry.cpp', 'gfxTelemetry.cpp',
'nsColor.cpp', 'nsColor.cpp',
'nsDeviceContext.cpp',
'nsFont.cpp', 'nsFont.cpp',
'nsFontMetrics.cpp', 'nsFontMetrics.cpp',
'nsRect.cpp', 'nsRect.cpp',
@ -72,6 +71,11 @@ SOURCES += [
'TiledRegion.cpp', 'TiledRegion.cpp',
] ]
# nsDeviceContext.cpp cannot be built in unified mode because it pulls in OS X system headers.
SOURCES += [
'nsDeviceContext.cpp',
]
include('/ipc/chromium/chromium-config.mozbuild') include('/ipc/chromium/chromium-config.mozbuild')
LOCAL_INCLUDES += [ LOCAL_INCLUDES += [

2
gfx/ycbcr/moz.build
View file

@ -7,7 +7,7 @@ EXPORTS += [
'YCbCrUtils.h', 'YCbCrUtils.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'scale_yuv_argb.cpp', 'scale_yuv_argb.cpp',
'ycbcr_to_rgb565.cpp', 'ycbcr_to_rgb565.cpp',
'YCbCrUtils.cpp', 'YCbCrUtils.cpp',

23
ipc/chromium/src/base/file_path.h
View file

@ -70,7 +70,6 @@
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "base/hash_tables.h"
// Windows-style drive letter support and pathname separator characters can be // Windows-style drive letter support and pathname separator characters can be
// enabled and disabled independently, to aid testing. These #defines are // enabled and disabled independently, to aid testing. These #defines are
@ -251,26 +250,4 @@ class FilePath {
#define FILE_PATH_LITERAL(x) L ## x #define FILE_PATH_LITERAL(x) L ## x
#endif // OS_WIN #endif // OS_WIN
// Implement hash function so that we can use FilePaths in hashsets and maps.
#if defined(COMPILER_GCC) && !defined(ANDROID)
namespace __gnu_cxx {
template<>
struct hash<FilePath> {
size_t operator()(const FilePath& f) const {
return hash<FilePath::StringType>()(f.value());
}
};
} // namespace __gnu_cxx
#elif defined(COMPILER_MSVC)
namespace stdext {
inline size_t hash_value(const FilePath& f) {
return hash_value(f.value());
}
} // namespace stdext
#endif // COMPILER
#endif // BASE_FILE_PATH_H_ #endif // BASE_FILE_PATH_H_

131
ipc/chromium/src/base/hash_tables.h
View file

@ -1,131 +0,0 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
//
// Deal with the differences between Microsoft and GNU implemenations
// of hash_map. Allows all platforms to use |base::hash_map| and
// |base::hash_set|.
// eg:
// base::hash_map<int> my_map;
// base::hash_set<int> my_set;
//
#ifndef BASE_HASH_TABLES_H_
#define BASE_HASH_TABLES_H_
#include "build/build_config.h"
#include "base/string16.h"
#if defined(COMPILER_MSVC) || (defined(ANDROID) && defined(_STLP_STD_NAME))
#ifdef COMPILER_MSVC
#pragma push_macro("_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS")
#define _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS
#endif
// Suppress -Wshadow warnings from stlport headers.
#ifdef __GNUC__
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wshadow"
# pragma GCC diagnostic ignored "-Wshadow-local"
#endif
#include <hash_map>
#include <hash_set>
#ifdef __GNUC__
# pragma GCC diagnostic pop // -Wshadow-local
# pragma GCC diagnostic pop // -Wshadow
#endif
#ifdef COMPILER_MSVC
#pragma pop_macro("_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS")
#endif
namespace base {
#ifdef ANDROID
using _STLP_STD_NAME::hash_map;
using _STLP_STD_NAME::hash_set;
#else
using stdext::hash_map;
using stdext::hash_set;
#endif
}
#elif defined(COMPILER_GCC)
// This is a hack to disable the gcc 4.4 warning about hash_map and hash_set
// being deprecated. We can get rid of this when we upgrade to VS2008 and we
// can use <tr1/unordered_map> and <tr1/unordered_set>.
#ifdef __DEPRECATED
#define CHROME_OLD__DEPRECATED __DEPRECATED
#undef __DEPRECATED
#endif
#include <ext/hash_map>
#include <ext/hash_set>
#include <string>
#ifdef CHROME_OLD__DEPRECATED
#define __DEPRECATED CHROME_OLD__DEPRECATED
#undef CHROME_OLD__DEPRECATED
#endif
namespace base {
using __gnu_cxx::hash_map;
using __gnu_cxx::hash_set;
} // namespace base
namespace __gnu_cxx {
// The GNU C++ library provides identiy hash functions for many integral types,
// but not for |long long|. This hash function will truncate if |size_t| is
// narrower than |long long|. This is probably good enough for what we will
// use it for.
#define DEFINE_TRIVIAL_HASH(integral_type) \
template<> \
struct hash<integral_type> { \
std::size_t operator()(integral_type value) const { \
return static_cast<std::size_t>(value); \
} \
}
DEFINE_TRIVIAL_HASH(long long);
DEFINE_TRIVIAL_HASH(unsigned long long);
#undef DEFINE_TRIVIAL_HASH
// Implement string hash functions so that strings of various flavors can
// be used as keys in STL maps and sets. The hash algorithm comes from the
// GNU C++ library, in <tr1/functional>. It is duplicated here because GCC
// versions prior to 4.3.2 are unable to compile <tr1/functional> when RTTI
// is disabled, as it is in our build.
#define DEFINE_STRING_HASH(string_type) \
template<> \
struct hash<string_type> { \
std::size_t operator()(const string_type& s) const { \
std::size_t result = 0; \
for (string_type::const_iterator i = s.begin(); i != s.end(); ++i) \
result = (result * 131) + *i; \
return result; \
} \
}
DEFINE_STRING_HASH(std::string);
DEFINE_STRING_HASH(std::wstring);
#if defined(WCHAR_T_IS_UTF32)
// If string16 and std::wstring are not the same type, provide a
// specialization for string16.
DEFINE_STRING_HASH(string16);
#endif // WCHAR_T_IS_UTF32
#undef DEFINE_STRING_HASH
} // namespace __gnu_cxx
#endif // COMPILER
#endif // BASE_HASH_TABLES_H_

4
ipc/chromium/src/base/id_map.h
View file

@ -7,8 +7,8 @@
#define BASE_ID_MAP_H__ #define BASE_ID_MAP_H__
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/hash_tables.h"
#include "base/logging.h" #include "base/logging.h"
#include <unordered_map>
// This object maintains a list of IDs that can be quickly converted to // This object maintains a list of IDs that can be quickly converted to
// pointers to objects. It is implemented as a hash table, optimized for // pointers to objects. It is implemented as a hash table, optimized for
@ -21,7 +21,7 @@
template<class T> template<class T>
class IDMap { class IDMap {
private: private:
typedef base::hash_map<int32_t, T*> HashTable; typedef std::unordered_map<int32_t, T*> HashTable;
typedef typename HashTable::iterator iterator; typedef typename HashTable::iterator iterator;
public: public:

73
js/src/builtin/moz.build
View file

@ -1,73 +0,0 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
# 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('../js-config.mozbuild')
include('../js-cxxflags.mozbuild')
FINAL_LIBRARY = "js"
# Includes should be relative to parent path
LOCAL_INCLUDES += ["!..", ".."]
SOURCES += [
'AtomicsObject.cpp',
'Eval.cpp',
'Intl.cpp',
'MapObject.cpp',
'ModuleObject.cpp',
'Object.cpp',
'Profilers.cpp',
'Promise.cpp',
'Reflect.cpp',
'ReflectParse.cpp',
'RegExp.cpp',
'SIMD.cpp',
'SymbolObject.cpp',
'TestingFunctions.cpp',
'TypedObject.cpp',
'WeakMapObject.cpp',
'WeakSetObject.cpp',
]
if CONFIG['_MSC_VER']:
if CONFIG['CPU_ARCH'] == 'x86':
SOURCES['RegExp.cpp'].no_pgo = True # Bug 772303
# Prepare self-hosted JS code for embedding
GENERATED_FILES += [('selfhosted.out.h', 'selfhosted.js')]
selfhosted = GENERATED_FILES[('selfhosted.out.h', 'selfhosted.js')]
selfhosted.script = 'embedjs.py:generate_selfhosted'
selfhosted.inputs = [
'../js.msg',
'TypedObjectConstants.h',
'SelfHostingDefines.h',
'Utilities.js',
'Array.js',
'AsyncIteration.js',
'Classes.js',
'Date.js',
'Error.js',
'Function.js',
'Generator.js',
'Intl.js',
'IntlData.js',
'Iterator.js',
'Map.js',
'Module.js',
'Number.js',
'Object.js',
'Promise.js',
'Reflect.js',
'RegExp.js',
'RegExpGlobalReplaceOpt.h.js',
'RegExpLocalReplaceOpt.h.js',
'String.js',
'Set.js',
'Sorting.js',
'TypedArray.js',
'TypedObject.js',
'WeakMap.js',
'WeakSet.js',
]

26
js/src/ctypes/moz.build
View file

@ -1,26 +0,0 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
# 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('../js-config.mozbuild')
include('../js-cxxflags.mozbuild')
FINAL_LIBRARY = "js"
# Includes should be relative to parent path
LOCAL_INCLUDES += ["!..", ".."]
SOURCES += [
'CTypes.cpp',
'Library.cpp',
]
if not CONFIG['MOZ_SYSTEM_FFI']:
LOCAL_INCLUDES += [
'!libffi/include',
'libffi/src/%s' % CONFIG['FFI_TARGET_DIR'],
]
if CONFIG['_MSC_VER'] and CONFIG['CPU_ARCH'] == 'x86_64':
SOURCES['CTypes.cpp'].no_pgo = True # Bug 810661

25
js/src/devtools/moz.build
View file

@ -1,25 +0,0 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
# 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('../js-config.mozbuild')
include('../js-cxxflags.mozbuild')
FINAL_LIBRARY = "js"
# Includes should be relative to parent path
LOCAL_INCLUDES += ["!..", ".."]
CONFIGURE_SUBST_FILES += [
'rootAnalysis/Makefile',
]
SOURCES += [
'sharkctl.cpp',
]
if CONFIG['MOZ_INSTRUMENTS']:
SOURCES += [
'Instruments.cpp',
]

17
js/src/ds/moz.build
View file

@ -1,17 +0,0 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
# 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('../js-config.mozbuild')
include('../js-cxxflags.mozbuild')
FINAL_LIBRARY = "js"
# Includes should be relative to parent path
LOCAL_INCLUDES += ["!..", ".."]
SOURCES += [
'LifoAlloc.cpp',
'MemoryProtectionExceptionHandler.cpp',
]

2
js/src/editline/moz.build
View file

@ -5,7 +5,7 @@
Library('editline') Library('editline')
SOURCES += [ UNIFIED_SOURCES += [
'editline.c', 'editline.c',
'sysunix.c', 'sysunix.c',
] ]

27
js/src/frontend/moz.build
View file

@ -1,27 +0,0 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
# 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('../js-config.mozbuild')
include('../js-cxxflags.mozbuild')
FINAL_LIBRARY = "js"
# Includes should be relative to parent path
LOCAL_INCLUDES += ["!..", ".."]
SOURCES += [
'BytecodeCompiler.cpp',
'BytecodeEmitter.cpp',
'FoldConstants.cpp',
'NameFunctions.cpp',
'ParseNode.cpp',
'Parser.cpp',
'TokenStream.cpp',
]
GENERATED_FILES += ['ReservedWordsGenerated.h']
ReservedWordsGenerated = GENERATED_FILES['ReservedWordsGenerated.h']
ReservedWordsGenerated.script = 'GenerateReservedWords.py'
ReservedWordsGenerated.inputs += ['ReservedWords.h']

31
js/src/gc/moz.build
View file

@ -1,31 +0,0 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
# 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('../js-config.mozbuild')
include('../js-cxxflags.mozbuild')
FINAL_LIBRARY = "js"
# Includes should be relative to parent path
LOCAL_INCLUDES += ["!..", ".."]
SOURCES += [
'Allocator.cpp',
'Barrier.cpp',
'GCTrace.cpp',
'Iteration.cpp',
'Marking.cpp',
'Memory.cpp',
'MemoryProfiler.cpp',
'Nursery.cpp',
'RootMarking.cpp',
'Statistics.cpp',
'StoreBuffer.cpp',
'Tracer.cpp',
'Zone.cpp',
]
if CONFIG['MOZ_DEBUG']:
SOURCES += ['Verifier.cpp']

23
js/src/irregexp/moz.build
View file

@ -1,23 +0,0 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
# 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('../js-config.mozbuild')
include('../js-cxxflags.mozbuild')
FINAL_LIBRARY = "js"
# Includes should be relative to parent path
LOCAL_INCLUDES += ["!..", ".."]
SOURCES += [
'NativeRegExpMacroAssembler.cpp',
'RegExpAST.cpp',
'RegExpCharacters.cpp',
'RegExpEngine.cpp',
'RegExpInterpreter.cpp',
'RegExpMacroAssembler.cpp',
'RegExpParser.cpp',
'RegExpStack.cpp',
]

Some files were not shown because too many files have changed in this diff Show more