diff options
| author | Moonchild <moonchild@palemoon.org> | 2022-09-07 13:04:19 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2022-09-08 06:49:40 +0000 |
| commit | 1fba5c3cc7dc145c2f7966e653e3b7cadd3f1905 (patch) | |
| tree | 6c61fd5eb6fbbeeaf4ecc8e437821d50d2b96cad /layout/generic | |
| parent | 3d99e06afe960c529d6dd2c933a32451114f07d2 (diff) | |
| download | uxp-1fba5c3cc7dc145c2f7966e653e3b7cadd3f1905.tar.gz | |
Issue #80 - Re-unify most of the layout engine
Diffstat (limited to 'layout/generic')
| -rw-r--r-- | layout/generic/moz.build | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/layout/generic/moz.build b/layout/generic/moz.build index 199b3c679b..1fb80a4d3b 100644 --- a/layout/generic/moz.build +++ b/layout/generic/moz.build @@ -123,7 +123,7 @@ EXPORTS.mozilla.layout += [ 'FrameChildList.h', ] -SOURCES += [ +UNIFIED_SOURCES += [ 'AsyncScrollBase.cpp', 'BlockReflowInput.cpp', 'CSSAlignUtils.cpp', @@ -157,11 +157,9 @@ SOURCES += [ 'nsIntervalSet.cpp', 'nsLeafFrame.cpp', 'nsLineBox.cpp', - 'nsLineLayout.cpp', 'nsPageContentFrame.cpp', 'nsPageFrame.cpp', 'nsPlaceholderFrame.cpp', - 'nsPluginFrame.cpp', 'nsRubyBaseContainerFrame.cpp', 'nsRubyBaseFrame.cpp', 'nsRubyContentFrame.cpp', @@ -187,6 +185,13 @@ SOURCES += [ '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') FINAL_LIBRARY = 'xul' |