diff options
| author | New Tobin Paradigm <email@mattatobin.com> | 2020-04-24 12:50:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-24 12:50:34 -0400 |
| commit | b6534366698201c43b968b89d6b1f49b339680a8 (patch) | |
| tree | e00abac26d19358718dd46dbb580be7fbdcb023c | |
| parent | e2f88ae0bc8a87f8b17581b6216063aee8ea1eb6 (diff) | |
| parent | 3e63479f3747f783cb0b3026d87b07da63b23134 (diff) | |
| download | UXP-b6534366698201c43b968b89d6b1f49b339680a8.tar UXP-b6534366698201c43b968b89d6b1f49b339680a8.tar.gz UXP-b6534366698201c43b968b89d6b1f49b339680a8.tar.lz UXP-b6534366698201c43b968b89d6b1f49b339680a8.tar.xz UXP-b6534366698201c43b968b89d6b1f49b339680a8.zip | |
Merge pull request #1523 from adeshkp/deunify_dom
De-unify dom: Fix build bustage on Mac
| -rw-r--r-- | dom/media/platforms/apple/AppleCMLinker.cpp | 2 | ||||
| -rw-r--r-- | dom/media/platforms/apple/AppleVTDecoder.cpp | 5 | ||||
| -rw-r--r-- | dom/media/platforms/apple/AppleVTLinker.cpp | 2 | ||||
| -rw-r--r-- | dom/plugins/ipc/PluginInstanceParent.cpp | 1 |
4 files changed, 9 insertions, 1 deletions
diff --git a/dom/media/platforms/apple/AppleCMLinker.cpp b/dom/media/platforms/apple/AppleCMLinker.cpp index 5227bf9e5..b1417b46a 100644 --- a/dom/media/platforms/apple/AppleCMLinker.cpp +++ b/dom/media/platforms/apple/AppleCMLinker.cpp @@ -7,7 +7,9 @@ #include <dlfcn.h> #include "AppleCMLinker.h" +#include "PlatformDecoderModule.h" #include "mozilla/ArrayUtils.h" +#include "mozilla/Logging.h" #include "nsDebug.h" #define LOG(...) MOZ_LOG(sPDMLog, mozilla::LogLevel::Debug, (__VA_ARGS__)) diff --git a/dom/media/platforms/apple/AppleVTDecoder.cpp b/dom/media/platforms/apple/AppleVTDecoder.cpp index 81638870a..93a480266 100644 --- a/dom/media/platforms/apple/AppleVTDecoder.cpp +++ b/dom/media/platforms/apple/AppleVTDecoder.cpp @@ -11,12 +11,15 @@ #include "AppleUtils.h" #include "AppleVTDecoder.h" #include "AppleVTLinker.h" +#include "MacIOSurfaceImage.h" #include "MediaData.h" #include "mozilla/ArrayUtils.h" #include "mp4_demuxer/H264.h" #include "nsAutoPtr.h" #include "nsThreadUtils.h" #include "mozilla/Logging.h" +#include "mozilla/SyncRunnable.h" +#include "mozilla/gfx/MacIOSurface.h" #include "VideoUtils.h" #include "gfxPlatform.h" @@ -360,7 +363,7 @@ AppleVTDecoder::OutputFrame(CVPixelBufferRef aImage, RefPtr<MacIOSurface> macSurface = new MacIOSurface(surface); - RefPtr<layers::Image> image = new MacIOSurfaceImage(macSurface); + RefPtr<layers::Image> image = new layers::MacIOSurfaceImage(macSurface); data = VideoData::CreateFromImage(info, diff --git a/dom/media/platforms/apple/AppleVTLinker.cpp b/dom/media/platforms/apple/AppleVTLinker.cpp index 51a8a0122..287de3ed3 100644 --- a/dom/media/platforms/apple/AppleVTLinker.cpp +++ b/dom/media/platforms/apple/AppleVTLinker.cpp @@ -7,7 +7,9 @@ #include <dlfcn.h> #include "AppleVTLinker.h" +#include "PlatformDecoderModule.h" #include "mozilla/ArrayUtils.h" +#include "mozilla/Logging.h" #include "nsDebug.h" #define LOG(...) MOZ_LOG(sPDMLog, mozilla::LogLevel::Debug, (__VA_ARGS__)) diff --git a/dom/plugins/ipc/PluginInstanceParent.cpp b/dom/plugins/ipc/PluginInstanceParent.cpp index a7d4a6ff5..523dc5c80 100644 --- a/dom/plugins/ipc/PluginInstanceParent.cpp +++ b/dom/plugins/ipc/PluginInstanceParent.cpp @@ -9,6 +9,7 @@ #include "mozilla/BasicEvents.h" #include "mozilla/Preferences.h" +#include "mozilla/D3DMessageUtils.h" #include "D3D11SurfaceHolder.h" #include "PluginInstanceParent.h" #include "BrowserStreamParent.h" |