wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-22 15:17:29 +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-09 10:31:15 +08:00
commit 92cf687331
36 changed files with 138 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

7
dom/base/moz.build
View file

@ -222,7 +222,7 @@ EXPORTS.mozilla.dom += [
'WindowOrientationObserver.h', 'WindowOrientationObserver.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'AnonymousContent.cpp', 'AnonymousContent.cpp',
'Attr.cpp', 'Attr.cpp',
'BarProps.cpp', 'BarProps.cpp',
@ -238,7 +238,6 @@ SOURCES += [
'DirectionalityUtils.cpp', 'DirectionalityUtils.cpp',
'DocGroup.cpp', 'DocGroup.cpp',
'DocumentFragment.cpp', 'DocumentFragment.cpp',
'DocumentOrShadowRoot.cpp',
'DocumentType.cpp', 'DocumentType.cpp',
'DOMCursor.cpp', 'DOMCursor.cpp',
'DOMError.cpp', 'DOMError.cpp',
@ -373,12 +372,14 @@ SOURCES += [
] ]
if CONFIG['MOZ_WEBRTC']: if CONFIG['MOZ_WEBRTC']:
SOURCES += [ UNIFIED_SOURCES += [
'nsDOMDataChannel.cpp', 'nsDOMDataChannel.cpp',
] ]
# these files couldn't be in UNIFIED_SOURCES for now for reasons given below: # these files couldn't be in UNIFIED_SOURCES for now for reasons given below:
SOURCES += [ SOURCES += [
# DocumentOrShadowRoot conflicts with mozilla::dom::ShadowRoot
'DocumentOrShadowRoot.cpp',
# Several conflicts with other bindings. # Several conflicts with other bindings.
'DOMIntersectionObserver.cpp', 'DOMIntersectionObserver.cpp',
# Because of OS X headers. # Because of OS X headers.

3
dom/canvas/ImageBitmapColorUtils.cpp
View file

@ -6,9 +6,6 @@
#include "ImageBitmapColorUtils.h" #include "ImageBitmapColorUtils.h"
#include "js/LegacyIntTypes.h"
#include <cmath>
namespace mozilla { namespace mozilla {
namespace dom { namespace dom {

4
dom/canvas/moz.build
View file

@ -41,7 +41,7 @@ EXPORTS.mozilla.dom += [
] ]
# Canvas 2D and common sources # Canvas 2D and common sources
SOURCES += [ UNIFIED_SOURCES += [
'CanvasImageCache.cpp', 'CanvasImageCache.cpp',
'CanvasRenderingContext2D.cpp', 'CanvasRenderingContext2D.cpp',
'CanvasRenderingContextHelper.cpp', 'CanvasRenderingContextHelper.cpp',
@ -59,7 +59,7 @@ SOURCES += [
] ]
# WebGL Sources # WebGL Sources
SOURCES += [ UNIFIED_SOURCES += [
'TexUnpackBlob.cpp', 'TexUnpackBlob.cpp',
'WebGL1Context.cpp', 'WebGL1Context.cpp',
'WebGL1ContextUniforms.cpp', 'WebGL1ContextUniforms.cpp',

9
dom/fetch/moz.build
View file

@ -19,14 +19,9 @@ EXPORTS.mozilla.dom += [
] ]
UNIFIED_SOURCES += [ UNIFIED_SOURCES += [
'ChannelInfo.cpp',
'Fetch.cpp', 'Fetch.cpp',
'FetchConsumer.cpp', 'FetchConsumer.cpp',
'Request.cpp',
'Response.cpp',
]
SOURCES += [
'ChannelInfo.cpp',
'FetchDriver.cpp', 'FetchDriver.cpp',
'FetchObserver.cpp', 'FetchObserver.cpp',
'FetchUtil.cpp', 'FetchUtil.cpp',
@ -34,6 +29,8 @@ SOURCES += [
'InternalHeaders.cpp', 'InternalHeaders.cpp',
'InternalRequest.cpp', 'InternalRequest.cpp',
'InternalResponse.cpp', 'InternalResponse.cpp',
'Request.cpp',
'Response.cpp',
] ]
IPDL_SOURCES += [ IPDL_SOURCES += [

12
dom/gamepad/moz.build
View file

@ -30,7 +30,7 @@ if CONFIG['MOZ_GAMEPAD']:
'ipc/GamepadTestChannelParent.h' 'ipc/GamepadTestChannelParent.h'
] ]
SOURCES = [ UNIFIED_SOURCES = [
'Gamepad.cpp', 'Gamepad.cpp',
'GamepadButton.cpp', 'GamepadButton.cpp',
'GamepadManager.cpp', 'GamepadManager.cpp',
@ -45,23 +45,23 @@ if CONFIG['MOZ_GAMEPAD']:
] ]
if CONFIG['MOZ_GAMEPAD_BACKEND'] == 'stub': if CONFIG['MOZ_GAMEPAD_BACKEND'] == 'stub':
SOURCES += [ UNIFIED_SOURCES += [
'fallback/FallbackGamepad.cpp' 'fallback/FallbackGamepad.cpp'
] ]
elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'cocoa': elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'cocoa':
SOURCES += [ UNIFIED_SOURCES += [
'cocoa/CocoaGamepad.cpp' 'cocoa/CocoaGamepad.cpp'
] ]
elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'windows': elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'windows':
SOURCES += [ UNIFIED_SOURCES += [
'windows/WindowsGamepad.cpp' 'windows/WindowsGamepad.cpp'
] ]
elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'linux': elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'linux':
SOURCES += [ UNIFIED_SOURCES += [
'linux/LinuxGamepad.cpp' 'linux/LinuxGamepad.cpp'
] ]
elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'android': elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'android':
SOURCES += [ UNIFIED_SOURCES += [
'android/AndroidGamepad.cpp' 'android/AndroidGamepad.cpp'
] ]

2
dom/ipc/ContentChild.cpp
View file

@ -160,7 +160,7 @@
#include "mozilla/dom/time/DateCacheCleaner.h" #include "mozilla/dom/time/DateCacheCleaner.h"
#include "mozilla/net/NeckoMessageUtils.h" #include "mozilla/net/NeckoMessageUtils.h"
#include "mozilla/widget/PuppetBidiKeyboard.h" #include "mozilla/widget/PuppetBidiKeyboard.h"
#include "mozilla/RemoteSpellCheckEngineChild.h" #include "mozilla/mozSpellChecker.h"
#include "GMPServiceChild.h" #include "GMPServiceChild.h"
#include "gfxPlatform.h" #include "gfxPlatform.h"
#include "nscore.h" // for NS_FREE_PERMANENT_DATA #include "nscore.h" // for NS_FREE_PERMANENT_DATA

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

@ -22,7 +22,7 @@ EXPORTS.mozilla += [
'EMEUtils.h', 'EMEUtils.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'CDMCaps.cpp', 'CDMCaps.cpp',
'DetailedPromise.cpp', 'DetailedPromise.cpp',
'EMEUtils.cpp', 'EMEUtils.cpp',

4
dom/media/encoder/moz.build
View file

@ -15,7 +15,7 @@ EXPORTS += [
'TrackMetadataBase.h', 'TrackMetadataBase.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'MediaEncoder.cpp', 'MediaEncoder.cpp',
'OpusTrackEncoder.cpp', 'OpusTrackEncoder.cpp',
'TrackEncoder.cpp', 'TrackEncoder.cpp',
@ -25,7 +25,7 @@ if CONFIG['MOZ_WEBM_ENCODER']:
EXPORTS += ['VP8TrackEncoder.h', EXPORTS += ['VP8TrackEncoder.h',
] ]
SOURCES += ['VP8TrackEncoder.cpp', UNIFIED_SOURCES += ['VP8TrackEncoder.cpp',
] ]
LOCAL_INCLUDES += ['/media/libyuv/include'] LOCAL_INCLUDES += ['/media/libyuv/include']

4
dom/media/gmp/moz.build
View file

@ -75,14 +75,14 @@ EXPORTS += [
# We link GMPLoader into xul on B2G/Fennec as its code does not need to be # We link GMPLoader into xul on B2G/Fennec as its code does not need to be
# covered by a DRM vendor's voucher. # covered by a DRM vendor's voucher.
if CONFIG['OS_TARGET'] == 'Android': if CONFIG['OS_TARGET'] == 'Android':
SOURCES += [ UNIFIED_SOURCES += [
'GMPLoader.cpp', 'GMPLoader.cpp',
] ]
USE_LIBS += [ USE_LIBS += [
'rlz', 'rlz',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'GMPAudioDecoderChild.cpp', 'GMPAudioDecoderChild.cpp',
'GMPAudioDecoderParent.cpp', 'GMPAudioDecoderParent.cpp',
'GMPAudioHost.cpp', 'GMPAudioHost.cpp',

2
dom/media/platforms/agnostic/eme/moz.build
View file

@ -10,7 +10,7 @@ EXPORTS += [
'SamplesWaitingForKey.h', 'SamplesWaitingForKey.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'EMEAudioDecoder.cpp', 'EMEAudioDecoder.cpp',
'EMEDecoderModule.cpp', 'EMEDecoderModule.cpp',
'EMEVideoDecoder.cpp', 'EMEVideoDecoder.cpp',

2
dom/media/platforms/agnostic/gmp/moz.build
View file

@ -10,7 +10,7 @@ EXPORTS += [
'MediaDataDecoderProxy.h', 'MediaDataDecoderProxy.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'GMPAudioDecoder.cpp', 'GMPAudioDecoder.cpp',
'GMPDecoderModule.cpp', 'GMPDecoderModule.cpp',
'GMPVideoDecoder.cpp', 'GMPVideoDecoder.cpp',

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

@ -15,7 +15,7 @@ DIRS += [
'ffmpeg58', 'ffmpeg58',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'FFmpegRuntimeLinker.cpp', 'FFmpegRuntimeLinker.cpp',
] ]

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

@ -74,7 +74,7 @@ EXPORTS.mozilla.dom += [
'WaveShaperNode.h', 'WaveShaperNode.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'AnalyserNode.cpp', 'AnalyserNode.cpp',
'AudioBlock.cpp', 'AudioBlock.cpp',
'AudioBuffer.cpp', 'AudioBuffer.cpp',

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

@ -19,7 +19,7 @@ EXPORTS.mozilla.dom += [
'SpeechSynthesisVoice.h', 'SpeechSynthesisVoice.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'ipc/SpeechSynthesisChild.cpp', 'ipc/SpeechSynthesisChild.cpp',
'ipc/SpeechSynthesisParent.cpp', 'ipc/SpeechSynthesisParent.cpp',
'nsSpeechTask.cpp', 'nsSpeechTask.cpp',

2
dom/plugins/ipc/hangui/moz.build
View file

@ -5,7 +5,7 @@
Program('plugin-hang-ui') Program('plugin-hang-ui')
SOURCES += [ UNIFIED_SOURCES += [
'MiniShmChild.cpp', 'MiniShmChild.cpp',
'PluginHangUIChild.cpp', 'PluginHangUIChild.cpp',
] ]

2
dom/plugins/ipc/interpose/moz.build
View file

@ -5,7 +5,7 @@
SharedLibrary('plugin_child_interpose') SharedLibrary('plugin_child_interpose')
SOURCES += [ "%s.mm" % (LIBRARY_NAME) ] UNIFIED_SOURCES += [ "%s.mm" % (LIBRARY_NAME) ]
OS_LIBS += ['-framework Carbon'] OS_LIBS += ['-framework Carbon']

2
dom/xul/moz.build
View file

@ -18,7 +18,7 @@ if CONFIG['MOZ_XUL']:
'nsIXULDocument.h', 'nsIXULDocument.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'nsXULCommandDispatcher.cpp', 'nsXULCommandDispatcher.cpp',
'nsXULContentSink.cpp', 'nsXULContentSink.cpp',
'nsXULElement.cpp', 'nsXULElement.cpp',

13
gfx/2d/moz.build
View file

@ -62,7 +62,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'uikit'):
EXPORTS.mozilla.gfx += [ EXPORTS.mozilla.gfx += [
'MacIOSurface.h', 'MacIOSurface.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'NativeFontResourceMac.cpp', 'NativeFontResourceMac.cpp',
'PathCG.cpp', 'PathCG.cpp',
'ScaledFontMac.cpp', 'ScaledFontMac.cpp',
@ -94,8 +94,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
] ]
if CONFIG['MOZ_ENABLE_SKIA']: if CONFIG['MOZ_ENABLE_SKIA']:
SOURCES += [ UNIFIED_SOURCES += [
'convolver.cpp', 'convolver.cpp',
]
SOURCES += [
'DrawTargetSkia.cpp', 'DrawTargetSkia.cpp',
'image_operations.cpp', # Uses _USE_MATH_DEFINES 'image_operations.cpp', # Uses _USE_MATH_DEFINES
'PathSkia.cpp', 'PathSkia.cpp',
@ -140,7 +142,7 @@ elif CONFIG['CPU_ARCH'].startswith('mips'):
'convolverLS3.cpp', 'convolverLS3.cpp',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'BezierUtils.cpp', 'BezierUtils.cpp',
'Blur.cpp', 'Blur.cpp',
'DataSourceSurface.cpp', 'DataSourceSurface.cpp',
@ -153,7 +155,6 @@ SOURCES += [
'DrawTargetDual.cpp', 'DrawTargetDual.cpp',
'DrawTargetRecording.cpp', 'DrawTargetRecording.cpp',
'DrawTargetTiled.cpp', 'DrawTargetTiled.cpp',
'Factory.cpp', # Need to suppress warnings in Skia header files.
'FilterNodeSoftware.cpp', 'FilterNodeSoftware.cpp',
'FilterProcessing.cpp', 'FilterProcessing.cpp',
'FilterProcessingScalar.cpp', 'FilterProcessingScalar.cpp',
@ -175,6 +176,10 @@ SOURCES += [
'SourceSurfaceRawData.cpp', 'SourceSurfaceRawData.cpp',
] ]
SOURCES += [
'Factory.cpp', # Need to suppress warnings in Skia header files.
]
if CONFIG['CLANG_CXX']: if CONFIG['CLANG_CXX']:
SOURCES['Factory.cpp'].flags += ['-Wno-implicit-fallthrough'] SOURCES['Factory.cpp'].flags += ['-Wno-implicit-fallthrough']

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

@ -109,7 +109,7 @@ SOURCES += [
'cairo-surface-wrapper.c', # redefinition of '_copy_transformed_pattern' 'cairo-surface-wrapper.c', # redefinition of '_copy_transformed_pattern'
] ]
SOURCES += [ UNIFIED_SOURCES += [
'cairo-analysis-surface.c', 'cairo-analysis-surface.c',
'cairo-arc.c', 'cairo-arc.c',
'cairo-array.c', 'cairo-array.c',

2
gfx/config/moz.build
View file

@ -14,7 +14,7 @@ EXPORTS.mozilla.gfx += [
'gfxVars.h', 'gfxVars.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'gfxConfig.cpp', 'gfxConfig.cpp',
'gfxFeature.cpp', 'gfxFeature.cpp',
'gfxVars.cpp', 'gfxVars.cpp',

4
gfx/gl/moz.build
View file

@ -64,7 +64,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
'SharedSurfaceD3D11Interop.h', 'SharedSurfaceD3D11Interop.h',
'WGLLibrary.h', 'WGLLibrary.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'GLContextProviderWGL.cpp', 'GLContextProviderWGL.cpp',
'SharedSurfaceANGLE.cpp', 'SharedSurfaceANGLE.cpp',
'SharedSurfaceD3D11Interop.cpp', 'SharedSurfaceD3D11Interop.cpp',
@ -114,7 +114,7 @@ elif gl_provider == 'GLX':
'SharedSurfaceGLX.h' 'SharedSurfaceGLX.h'
] ]
SOURCES += [ UNIFIED_SOURCES += [
'DecomposeIntoNoRepeatTriangles.cpp', 'DecomposeIntoNoRepeatTriangles.cpp',
'EGLUtils.cpp', 'EGLUtils.cpp',
'GfxTexturesReporter.cpp', 'GfxTexturesReporter.cpp',

10
gfx/layers/apz/public/IAPZCTreeManager.cpp
View file

@ -9,21 +9,11 @@
#include "InputData.h" // for InputData, etc #include "InputData.h" // for InputData, etc
#include "mozilla/EventStateManager.h" // for WheelPrefs #include "mozilla/EventStateManager.h" // for WheelPrefs
#include "mozilla/layers/APZThreadUtils.h" // for AssertOnCompositorThread, etc #include "mozilla/layers/APZThreadUtils.h" // for AssertOnCompositorThread, etc
#include "mozilla/MouseEvents.h" // for WidgetMouseEvent
#include "mozilla/TouchEvents.h" // for WidgetTouchEvent #include "mozilla/TouchEvents.h" // for WidgetTouchEvent
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {
static bool
WillHandleMouseEvent(const WidgetMouseEventBase& aEvent)
{
return aEvent.mMessage == eMouseMove ||
aEvent.mMessage == eMouseDown ||
aEvent.mMessage == eMouseUp ||
aEvent.mMessage == eDragEnd;
}
// Returns whether or not a wheel event action will be (or was) performed by // Returns whether or not a wheel event action will be (or was) performed by
// APZ. If this returns true, the event must not perform a synchronous // APZ. If this returns true, the event must not perform a synchronous
// scroll. // scroll.

10
gfx/layers/apz/public/IAPZCTreeManager.h
View file

@ -11,6 +11,7 @@
#include "FrameMetrics.h" // for FrameMetrics, etc #include "FrameMetrics.h" // for FrameMetrics, etc
#include "mozilla/EventForwards.h" // for WidgetInputEvent, nsEventStatus #include "mozilla/EventForwards.h" // for WidgetInputEvent, nsEventStatus
#include "mozilla/layers/APZUtils.h" // for HitTestResult #include "mozilla/layers/APZUtils.h" // for HitTestResult
#include "mozilla/MouseEvents.h" // for WidgetMouseEvent
#include "nsTArrayForwardDeclare.h" // for nsTArray, nsTArray_Impl, etc #include "nsTArrayForwardDeclare.h" // for nsTArray, nsTArray_Impl, etc
#include "nsISupportsImpl.h" // for MOZ_COUNT_CTOR, etc #include "nsISupportsImpl.h" // for MOZ_COUNT_CTOR, etc
#include "Units.h" // for CSSPoint, CSSRect, etc #include "Units.h" // for CSSPoint, CSSRect, etc
@ -38,6 +39,15 @@ enum ZoomToRectBehavior : uint32_t {
class AsyncDragMetrics; class AsyncDragMetrics;
static bool
WillHandleMouseEvent(const WidgetMouseEventBase& aEvent)
{
return aEvent.mMessage == eMouseMove ||
aEvent.mMessage == eMouseDown ||
aEvent.mMessage == eMouseUp ||
aEvent.mMessage == eDragEnd;
}
class IAPZCTreeManager { class IAPZCTreeManager {
NS_INLINE_DECL_THREADSAFE_VIRTUAL_REFCOUNTING(IAPZCTreeManager) NS_INLINE_DECL_THREADSAFE_VIRTUAL_REFCOUNTING(IAPZCTreeManager)

15
gfx/layers/apz/src/APZCTreeManager.cpp
View file

@ -85,21 +85,6 @@ struct APZCTreeManager::TreeBuildingState {
std::map<ScrollableLayerGuid, AsyncPanZoomController*> mApzcMap; std::map<ScrollableLayerGuid, AsyncPanZoomController*> mApzcMap;
}; };
// Returns whether or not a wheel event action will be (or was) performed by
// APZ. If this returns true, the event must not perform a synchronous
// scroll.
//
// Even if this returns false, all wheel events in APZ-aware widgets must
// be sent through APZ so they are transformed correctly for TabParent.
static bool
WillHandleWheelEvent(WidgetWheelEvent* aEvent)
{
return EventStateManager::WheelEventIsScrollAction(aEvent) &&
(aEvent->mDeltaMode == nsIDOMWheelEvent::DOM_DELTA_LINE ||
aEvent->mDeltaMode == nsIDOMWheelEvent::DOM_DELTA_PIXEL ||
aEvent->mDeltaMode == nsIDOMWheelEvent::DOM_DELTA_PAGE);
}
class APZCTreeManager::CheckerboardFlushObserver : public nsIObserver { class APZCTreeManager::CheckerboardFlushObserver : public nsIObserver {
public: public:
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS

31
gfx/layers/moz.build
View file

@ -48,6 +48,8 @@ EXPORTS += [
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
SOURCES += [ SOURCES += [
'D3D11ShareHandleImage.cpp', 'D3D11ShareHandleImage.cpp',
]
UNIFIED_SOURCES += [
'D3D9SurfaceImage.cpp', 'D3D9SurfaceImage.cpp',
'IMFYCbCrImage.cpp', 'IMFYCbCrImage.cpp',
'TextureDIB.cpp', 'TextureDIB.cpp',
@ -77,6 +79,8 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
SOURCES += [ SOURCES += [
'd3d11/CompositorD3D11.cpp', 'd3d11/CompositorD3D11.cpp',
'd3d11/ReadbackManagerD3D11.cpp', 'd3d11/ReadbackManagerD3D11.cpp',
]
UNIFIED_SOURCES += [
'd3d11/TextureD3D11.cpp', 'd3d11/TextureD3D11.cpp',
] ]
@ -221,14 +225,16 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
'MacIOSurfaceHelpers.h', 'MacIOSurfaceHelpers.h',
'MacIOSurfaceImage.h', 'MacIOSurfaceImage.h',
] ]
UNIFIED_SOURCES += [
'opengl/GLManager.cpp',
]
SOURCES += [ SOURCES += [
'ipc/ShadowLayerUtilsMac.cpp', 'ipc/ShadowLayerUtilsMac.cpp',
'MacIOSurfaceHelpers.cpp', 'MacIOSurfaceHelpers.cpp',
'MacIOSurfaceImage.cpp', 'MacIOSurfaceImage.cpp',
'opengl/GLManager.cpp',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'apz/public/IAPZCTreeManager.cpp', 'apz/public/IAPZCTreeManager.cpp',
'apz/src/APZCTreeManager.cpp', 'apz/src/APZCTreeManager.cpp',
'apz/src/AsyncPanZoomController.cpp', 'apz/src/AsyncPanZoomController.cpp',
@ -263,7 +269,6 @@ SOURCES += [
'basic/BasicColorLayer.cpp', 'basic/BasicColorLayer.cpp',
'basic/BasicCompositor.cpp', 'basic/BasicCompositor.cpp',
'basic/BasicContainerLayer.cpp', 'basic/BasicContainerLayer.cpp',
'basic/BasicImageLayer.cpp',
'basic/BasicImages.cpp', 'basic/BasicImages.cpp',
'basic/BasicLayerManager.cpp', 'basic/BasicLayerManager.cpp',
'basic/BasicLayersImpl.cpp', 'basic/BasicLayersImpl.cpp',
@ -312,7 +317,6 @@ SOURCES += [
'Effects.cpp', 'Effects.cpp',
'FrameMetrics.cpp', 'FrameMetrics.cpp',
'GLImages.cpp', 'GLImages.cpp',
'ImageContainer.cpp',
'ImageDataSerializer.cpp', 'ImageDataSerializer.cpp',
'ImageLayers.cpp', 'ImageLayers.cpp',
'ipc/APZChild.cpp', 'ipc/APZChild.cpp',
@ -322,7 +326,9 @@ SOURCES += [
'ipc/CompositableTransactionParent.cpp', 'ipc/CompositableTransactionParent.cpp',
'ipc/CompositorBench.cpp', 'ipc/CompositorBench.cpp',
'ipc/CompositorBridgeChild.cpp', 'ipc/CompositorBridgeChild.cpp',
'ipc/CompositorBridgeParent.cpp',
'ipc/CompositorThread.cpp', 'ipc/CompositorThread.cpp',
'ipc/CrossProcessCompositorBridgeParent.cpp',
'ipc/ImageBridgeChild.cpp', 'ipc/ImageBridgeChild.cpp',
'ipc/ImageBridgeParent.cpp', 'ipc/ImageBridgeParent.cpp',
'ipc/ImageContainerChild.cpp', 'ipc/ImageContainerChild.cpp',
@ -340,12 +346,10 @@ SOURCES += [
'ipc/SharedRGBImage.cpp', 'ipc/SharedRGBImage.cpp',
'ipc/VideoBridgeChild.cpp', 'ipc/VideoBridgeChild.cpp',
'ipc/VideoBridgeParent.cpp', 'ipc/VideoBridgeParent.cpp',
'Layers.cpp',
'LayerScope.cpp', 'LayerScope.cpp',
'LayersLogging.cpp', 'LayersLogging.cpp',
'LayerSorter.cpp', 'LayerSorter.cpp',
'LayersTypes.cpp', 'LayersTypes.cpp',
'LayerTreeInvalidation.cpp',
'opengl/CompositingRenderTargetOGL.cpp', 'opengl/CompositingRenderTargetOGL.cpp',
'opengl/CompositorOGL.cpp', 'opengl/CompositorOGL.cpp',
'opengl/GLBlitTextureImageHelper.cpp', 'opengl/GLBlitTextureImageHelper.cpp',
@ -353,7 +357,6 @@ SOURCES += [
'opengl/TextureClientOGL.cpp', 'opengl/TextureClientOGL.cpp',
'opengl/TextureHostOGL.cpp', 'opengl/TextureHostOGL.cpp',
'opengl/TexturePoolOGL.cpp', 'opengl/TexturePoolOGL.cpp',
'PersistentBufferProvider.cpp',
'protobuf/LayerScopePacket.pb.cc', 'protobuf/LayerScopePacket.pb.cc',
'ReadbackProcessor.cpp', 'ReadbackProcessor.cpp',
'RenderTrace.cpp', 'RenderTrace.cpp',
@ -361,11 +364,13 @@ SOURCES += [
'TextureWrapperImage.cpp', 'TextureWrapperImage.cpp',
] ]
# Implementation in CBP.cpp of things used in CPCBP.cpp # Cannot be built unified
# EraseLayerState, UpdateIndirectTree and map<uint64_t, CompositorBridgeParent::LayerTreeState> SOURCES += [
UNIFIED_SOURCES += [ 'basic/BasicImageLayer.cpp',
'ipc/CompositorBridgeParent.cpp', 'ImageContainer.cpp',
'ipc/CrossProcessCompositorBridgeParent.cpp', 'Layers.cpp',
'LayerTreeInvalidation.cpp',
'PersistentBufferProvider.cpp',
] ]
# Disable RTTI in google protocol buffer # Disable RTTI in google protocol buffer
@ -433,6 +438,6 @@ if CONFIG['GNU_CXX']:
CXXFLAGS += ['-Wno-error=shadow'] CXXFLAGS += ['-Wno-error=shadow']
if CONFIG['MOZ_ENABLE_SKIA']: if CONFIG['MOZ_ENABLE_SKIA']:
SOURCES += [ UNIFIED_SOURCES += [
'composite/PaintCounter.cpp', 'composite/PaintCounter.cpp',
] ]

35
gfx/thebes/moz.build
View file

@ -121,9 +121,11 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
'PrintTargetPDF.h', 'PrintTargetPDF.h',
'PrintTargetWindows.h', 'PrintTargetWindows.h',
] ]
UNIFIED_SOURCES += [
'gfxGDIFontList.cpp',
]
SOURCES += [ SOURCES += [
'gfxGDIFont.cpp', 'gfxGDIFont.cpp',
'gfxGDIFontList.cpp',
'gfxWindowsNativeDrawing.cpp', 'gfxWindowsNativeDrawing.cpp',
'gfxWindowsPlatform.cpp', 'gfxWindowsPlatform.cpp',
'gfxWindowsSurface.cpp', 'gfxWindowsSurface.cpp',
@ -131,9 +133,11 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
'PrintTargetWindows.cpp', 'PrintTargetWindows.cpp',
] ]
if CONFIG['MOZ_ENABLE_DWRITE_FONT']: if CONFIG['MOZ_ENABLE_DWRITE_FONT']:
UNIFIED_SOURCES += [
'gfxDWriteFontList.cpp',
]
SOURCES += [ SOURCES += [
'gfxDWriteCommon.cpp', 'gfxDWriteCommon.cpp',
'gfxDWriteFontList.cpp',
'gfxDWriteFonts.cpp', 'gfxDWriteFonts.cpp',
] ]
@ -145,14 +149,27 @@ if CONFIG['INTEL_ARCHITECTURE']:
SOURCES['gfxAlphaRecoverySSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] SOURCES['gfxAlphaRecoverySSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
SOURCES += [ SOURCES += [
'CJKCompatSVS.cpp',
'ContextStateTracker.cpp', 'ContextStateTracker.cpp',
'gfxAlphaRecovery.cpp', # Includes mac system header conflicting with point/size,
# and includes glxXlibSurface.h which drags in Xrender.h
'gfxASurface.cpp', 'gfxASurface.cpp',
# on X11, gfxDrawable.cpp includes X headers for an old workaround which
# we could consider removing soon (affects Ubuntus older than 10.04 LTS)
# which currently prevent it from joining UNIFIED_SOURCES.
'gfxDrawable.cpp',
# gfxPlatform.cpp includes mac system header conflicting with point/size
'gfxPlatform.cpp',
'gfxPrefs.cpp',
'PrintTarget.cpp',
'PrintTargetThebes.cpp',
]
UNIFIED_SOURCES += [
'CJKCompatSVS.cpp',
'gfxAlphaRecovery.cpp',
'gfxBaseSharedMemorySurface.cpp', 'gfxBaseSharedMemorySurface.cpp',
'gfxBlur.cpp', 'gfxBlur.cpp',
'gfxContext.cpp', 'gfxContext.cpp',
'gfxDrawable.cpp',
'gfxFont.cpp', 'gfxFont.cpp',
'gfxFontEntry.cpp', 'gfxFontEntry.cpp',
'gfxFontFeatures.cpp', 'gfxFontFeatures.cpp',
@ -168,9 +185,7 @@ SOURCES += [
'gfxMathTable.cpp', 'gfxMathTable.cpp',
'gfxMatrix.cpp', 'gfxMatrix.cpp',
'gfxPattern.cpp', 'gfxPattern.cpp',
'gfxPlatform.cpp',
'gfxPlatformFontList.cpp', 'gfxPlatformFontList.cpp',
'gfxPrefs.cpp',
'gfxRect.cpp', 'gfxRect.cpp',
'gfxScriptItemizer.cpp', 'gfxScriptItemizer.cpp',
'gfxSkipChars.cpp', 'gfxSkipChars.cpp',
@ -179,18 +194,16 @@ SOURCES += [
'gfxUserFontSet.cpp', 'gfxUserFontSet.cpp',
'gfxUtils.cpp', 'gfxUtils.cpp',
'nsUnicodeRange.cpp', 'nsUnicodeRange.cpp',
'PrintTarget.cpp',
'PrintTargetThebes.cpp',
'SoftwareVsyncSource.cpp', 'SoftwareVsyncSource.cpp',
'VsyncSource.cpp', 'VsyncSource.cpp',
] ]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
SOURCES += [ UNIFIED_SOURCES += [
'gfxMacPlatformFontList.mm', 'gfxMacPlatformFontList.mm',
] ]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
SOURCES += [ UNIFIED_SOURCES += [
'D3D11Checks.cpp', 'D3D11Checks.cpp',
'DeviceManagerDx.cpp', 'DeviceManagerDx.cpp',
] ]

11
layout/base/moz.build
View file

@ -118,7 +118,7 @@ EXPORTS.mozilla += [
'StaticPresData.h', 'StaticPresData.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'AccessibleCaret.cpp', 'AccessibleCaret.cpp',
'AccessibleCaretEventHub.cpp', 'AccessibleCaretEventHub.cpp',
'AccessibleCaretManager.cpp', 'AccessibleCaretManager.cpp',
@ -150,11 +150,9 @@ SOURCES += [
'nsLayoutDebugger.cpp', 'nsLayoutDebugger.cpp',
'nsLayoutHistoryState.cpp', 'nsLayoutHistoryState.cpp',
'nsLayoutUtils.cpp', 'nsLayoutUtils.cpp',
'nsPresArena.cpp',
'nsPresContext.cpp', 'nsPresContext.cpp',
'nsPresShell.cpp', 'nsPresShell.cpp',
'nsQuoteList.cpp', 'nsQuoteList.cpp',
'nsRefreshDriver.cpp',
'nsStyleChangeList.cpp', 'nsStyleChangeList.cpp',
'nsStyleSheetService.cpp', 'nsStyleSheetService.cpp',
'PaintTracker.cpp', 'PaintTracker.cpp',
@ -170,6 +168,13 @@ SOURCES += [
'ZoomConstraintsClient.cpp', 'ZoomConstraintsClient.cpp',
] ]
# nsPresArena.cpp needs to be built separately because it uses plarena.h.
# nsRefreshDriver.cpp needs to be built separately because of name clashes in the OS X headers
SOURCES += [
'nsPresArena.cpp',
'nsRefreshDriver.cpp',
]
if CONFIG['ENABLE_TESTS']: if CONFIG['ENABLE_TESTS']:
DIRS += ['gtest'] DIRS += ['gtest']

11
layout/generic/moz.build
View file

@ -123,7 +123,7 @@ EXPORTS.mozilla.layout += [
'FrameChildList.h', 'FrameChildList.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'AsyncScrollBase.cpp', 'AsyncScrollBase.cpp',
'BlockReflowInput.cpp', 'BlockReflowInput.cpp',
'CSSAlignUtils.cpp', 'CSSAlignUtils.cpp',
@ -157,11 +157,9 @@ SOURCES += [
'nsIntervalSet.cpp', 'nsIntervalSet.cpp',
'nsLeafFrame.cpp', 'nsLeafFrame.cpp',
'nsLineBox.cpp', 'nsLineBox.cpp',
'nsLineLayout.cpp',
'nsPageContentFrame.cpp', 'nsPageContentFrame.cpp',
'nsPageFrame.cpp', 'nsPageFrame.cpp',
'nsPlaceholderFrame.cpp', 'nsPlaceholderFrame.cpp',
'nsPluginFrame.cpp',
'nsRubyBaseContainerFrame.cpp', 'nsRubyBaseContainerFrame.cpp',
'nsRubyBaseFrame.cpp', 'nsRubyBaseFrame.cpp',
'nsRubyContentFrame.cpp', 'nsRubyContentFrame.cpp',
@ -187,6 +185,13 @@ SOURCES += [
'TextOverflow.cpp', 'TextOverflow.cpp',
] ]
# nsLineLayout.cpp needs to be built separately because it uses plarena.h.
# nsPluginFrame.cpp needs to be built separately because of name clashes in the OS X headers.
SOURCES += [
'nsLineLayout.cpp',
'nsPluginFrame.cpp',
]
include('/ipc/chromium/chromium-config.mozbuild') include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul' FINAL_LIBRARY = 'xul'

2
layout/printing/moz.build
View file

@ -17,7 +17,7 @@ EXPORTS.mozilla.layout += [
XPIDL_MODULE = 'layout_printing' XPIDL_MODULE = 'layout_printing'
SOURCES += [ UNIFIED_SOURCES += [
'ipc/RemotePrintJobChild.cpp', 'ipc/RemotePrintJobChild.cpp',
'ipc/RemotePrintJobParent.cpp', 'ipc/RemotePrintJobParent.cpp',
'nsPagePrintTimer.cpp', 'nsPagePrintTimer.cpp',

12
layout/style/moz.build
View file

@ -139,7 +139,7 @@ EXPORTS.mozilla.css += [
'StyleRule.h', 'StyleRule.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'AnimationCollection.cpp', 'AnimationCollection.cpp',
'AnimationCommon.cpp', 'AnimationCommon.cpp',
'CounterStyleManager.cpp', 'CounterStyleManager.cpp',
@ -170,7 +170,6 @@ SOURCES += [
'nsCSSProps.cpp', 'nsCSSProps.cpp',
'nsCSSPseudoClasses.cpp', 'nsCSSPseudoClasses.cpp',
'nsCSSPseudoElements.cpp', 'nsCSSPseudoElements.cpp',
'nsCSSRuleProcessor.cpp',
'nsCSSRules.cpp', 'nsCSSRules.cpp',
'nsCSSScanner.cpp', 'nsCSSScanner.cpp',
'nsCSSValue.cpp', 'nsCSSValue.cpp',
@ -183,7 +182,6 @@ SOURCES += [
'nsFontFaceUtils.cpp', 'nsFontFaceUtils.cpp',
'nsHTMLCSSStyleSheet.cpp', 'nsHTMLCSSStyleSheet.cpp',
'nsHTMLStyleSheet.cpp', 'nsHTMLStyleSheet.cpp',
'nsLayoutStylesheetCache.cpp',
'nsMediaFeatures.cpp', 'nsMediaFeatures.cpp',
'nsNthIndexCache.cpp', 'nsNthIndexCache.cpp',
'nsROCSSPrimitiveValue.cpp', 'nsROCSSPrimitiveValue.cpp',
@ -209,6 +207,14 @@ SOURCES += [
'SVGAttrAnimationRuleProcessor.cpp', 'SVGAttrAnimationRuleProcessor.cpp',
] ]
# nsCSSRuleProcessor.cpp needs to be built separately because it uses plarena.h.
# nsLayoutStylesheetCache.cpp needs to be built separately because it uses
# nsExceptionHandler.h, which includes windows.h.
SOURCES += [
'nsCSSRuleProcessor.cpp',
'nsLayoutStylesheetCache.cpp',
]
EXTRA_COMPONENTS += [ EXTRA_COMPONENTS += [
'CSSUnprefixingService.js', 'CSSUnprefixingService.js',
'CSSUnprefixingService.manifest', 'CSSUnprefixingService.manifest',

2
layout/svg/moz.build
View file

@ -20,7 +20,7 @@ EXPORTS.mozilla += [
'SVGContextPaint.h', 'SVGContextPaint.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'nsCSSClipPathInstance.cpp', 'nsCSSClipPathInstance.cpp',
'nsCSSFilterInstance.cpp', 'nsCSSFilterInstance.cpp',
'nsFilterInstance.cpp', 'nsFilterInstance.cpp',

2
layout/tables/moz.build
View file

@ -12,7 +12,7 @@ EXPORTS += [
'nsITableCellLayout.h', 'nsITableCellLayout.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'BasicTableLayoutStrategy.cpp', 'BasicTableLayoutStrategy.cpp',
'FixedTableLayoutStrategy.cpp', 'FixedTableLayoutStrategy.cpp',
'nsCellMap.cpp', 'nsCellMap.cpp',

2
layout/xul/grid/moz.build
View file

@ -18,7 +18,7 @@ EXPORTS += [
'nsIGridPart.h', 'nsIGridPart.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'nsGrid.cpp', 'nsGrid.cpp',
'nsGridCell.cpp', 'nsGridCell.cpp',
'nsGridLayout2.cpp', 'nsGridLayout2.cpp',

4
layout/xul/moz.build
View file

@ -43,7 +43,7 @@ EXPORTS.mozilla.dom += [
'ScrollBoxObject.h', 'ScrollBoxObject.h',
] ]
SOURCES += [ UNIFIED_SOURCES += [
'BoxObject.cpp', 'BoxObject.cpp',
'nsBox.cpp', 'nsBox.cpp',
'nsBoxFrame.cpp', 'nsBoxFrame.cpp',
@ -63,7 +63,7 @@ SOURCES += [
] ]
if CONFIG['MOZ_XUL']: if CONFIG['MOZ_XUL']:
SOURCES += [ UNIFIED_SOURCES += [
'ContainerBoxObject.cpp', 'ContainerBoxObject.cpp',
'ListBoxObject.cpp', 'ListBoxObject.cpp',
'MenuBoxObject.cpp', 'MenuBoxObject.cpp',

2
layout/xul/tree/moz.build
View file

@ -26,7 +26,7 @@ EXPORTS.mozilla.dom += [
'TreeBoxObject.h' 'TreeBoxObject.h'
] ]
SOURCES += [ UNIFIED_SOURCES += [
'nsTreeBodyFrame.cpp', 'nsTreeBodyFrame.cpp',
'nsTreeColFrame.cpp', 'nsTreeColFrame.cpp',
'nsTreeColumns.cpp', 'nsTreeColumns.cpp',

13
media/libaom/moz.build
View file

@ -117,7 +117,18 @@ if CONFIG['CLANG_CL'] or not CONFIG['_MSC_VER']:
SOURCES[f].flags += ['-mavx'] SOURCES[f].flags += ['-mavx']
elif f.endswith('avx2.c'): elif f.endswith('avx2.c'):
SOURCES[f].flags += ['-mavx2'] SOURCES[f].flags += ['-mavx2']
if CONFIG['_MSC_VER']:
for f in SOURCES:
# MSVC massively chokes on inlining these SIMD sources, so disable inlining for them.
if f.endswith('cdef_block_sse2.c'):
SOURCES[f].flags += ['-Ob0']
elif f.endswith('cdef_block_ssse3.c'):
SOURCES[f].flags += ['-Ob0']
elif f.endswith('cdef_block_sse4.c'):
SOURCES[f].flags += ['-Ob0']
elif f.endswith('cdef_block_avx2.c'):
SOURCES[f].flags += ['-Ob0']
# Suppress warnings in third-party code. # Suppress warnings in third-party code.
if CONFIG['GNU_CC'] or CONFIG['CLANG_CL']: if CONFIG['GNU_CC'] or CONFIG['CLANG_CL']:
CFLAGS += [ CFLAGS += [