diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-26 12:56:46 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-26 12:56:46 +0200 |
| commit | 98fe8b0ccbea37c2681ad8c788baa91554871f4d (patch) | |
| tree | 0e269a27661fea619ab07a533e0c1fa195c3c671 /layout/build | |
| parent | e08a4ad1c8096fc8de64fac4f36cf0c569cb4420 (diff) | |
| parent | 519030e688dd7075a7cd9f14dd6fb9e210b5a689 (diff) | |
| download | UXP-RELBASE_20200426.tar UXP-RELBASE_20200426.tar.gz UXP-RELBASE_20200426.tar.lz UXP-RELBASE_20200426.tar.xz UXP-RELBASE_20200426.zip | |
Merge branch 'redwood' into 28.9-platformRELBASE_20200426
Diffstat (limited to 'layout/build')
| -rw-r--r-- | layout/build/moz.build | 2 | ||||
| -rw-r--r-- | layout/build/nsLayoutStatics.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/layout/build/moz.build b/layout/build/moz.build index ecf180d78..360fe3c97 100644 --- a/layout/build/moz.build +++ b/layout/build/moz.build @@ -10,7 +10,7 @@ EXPORTS += [ 'nsLayoutStatics.h', ] -UNIFIED_SOURCES += [ +SOURCES += [ 'nsContentDLF.cpp', 'nsLayoutModule.cpp', 'nsLayoutStatics.cpp', diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp index 0f4560afe..124bcbf10 100644 --- a/layout/build/nsLayoutStatics.cpp +++ b/layout/build/nsLayoutStatics.cpp @@ -112,11 +112,13 @@ #include "nsApplicationCacheService.h" #include "mozilla/dom/CustomElementRegistry.h" #include "mozilla/dom/time/DateCacheCleaner.h" +#include "mozilla/dom/workers/ServiceWorkerManager.h" #include "mozilla/EventDispatcher.h" #include "mozilla/IMEStateManager.h" #include "mozilla/dom/HTMLVideoElement.h" #include "TouchManager.h" #include "MediaDecoder.h" +#include "MediaManager.h" #include "MediaPrefs.h" #include "mozilla/ServoBindings.h" #include "mozilla/StaticPresData.h" |