summaryrefslogtreecommitdiffstats
path: root/gfx/layers/ImageContainer.h
diff options
context:
space:
mode:
Diffstat (limited to 'gfx/layers/ImageContainer.h')
-rw-r--r--gfx/layers/ImageContainer.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/gfx/layers/ImageContainer.h b/gfx/layers/ImageContainer.h
index 253ba417eb..6fa12cf195 100644
--- a/gfx/layers/ImageContainer.h
+++ b/gfx/layers/ImageContainer.h
@@ -63,7 +63,7 @@ class MemoryOrShmem;
class D3D11RecycleAllocator;
class D3D11YCbCrRecycleAllocator;
#endif
-#ifdef XP_MACOSX
+#ifdef XP_DARWIN
class MacIOSurfaceRecycleAllocator;
#endif
class SurfaceDescriptorBuffer;
@@ -80,7 +80,7 @@ class GLImage;
class SharedRGBImage;
#ifdef MOZ_WIDGET_ANDROID
class SurfaceTextureImage;
-#elif defined(XP_MACOSX)
+#elif defined(XP_DARWIN)
class MacIOSurfaceImage;
#elif MOZ_WIDGET_GTK
class DMABUFSurfaceImage;
@@ -159,7 +159,7 @@ class Image {
#ifdef MOZ_WIDGET_ANDROID
virtual SurfaceTextureImage* AsSurfaceTextureImage() { return nullptr; }
#endif
-#ifdef XP_MACOSX
+#ifdef XP_DARWIN
virtual MacIOSurfaceImage* AsMacIOSurfaceImage() { return nullptr; }
#endif
virtual PlanarYCbCrImage* AsPlanarYCbCrImage() { return nullptr; }
@@ -191,8 +191,8 @@ class Image {
virtual ~Image() = default;
mozilla::EnumeratedArray<mozilla::layers::LayersBackend,
- mozilla::layers::LayersBackend::LAYERS_LAST,
- UniquePtr<ImageBackendData>>
+ UniquePtr<ImageBackendData>,
+ size_t(mozilla::layers::LayersBackend::LAYERS_LAST)>
mBackendData;
void* mImplData;
@@ -530,7 +530,7 @@ class ImageContainer final : public SupportsThreadSafeWeakPtr<ImageContainer> {
KnowsCompositor* aKnowsCompositor);
#endif
-#ifdef XP_MACOSX
+#ifdef XP_DARWIN
already_AddRefed<MacIOSurfaceRecycleAllocator>
GetMacIOSurfaceRecycleAllocator();
#endif
@@ -618,7 +618,7 @@ class ImageContainer final : public SupportsThreadSafeWeakPtr<ImageContainer> {
RefPtr<D3D11YCbCrRecycleAllocator> mD3D11YCbCrRecycleAllocator
MOZ_GUARDED_BY(mRecursiveMutex);
#endif
-#ifdef XP_MACOSX
+#ifdef XP_DARWIN
RefPtr<MacIOSurfaceRecycleAllocator> mMacIOSurfaceRecycleAllocator
MOZ_GUARDED_BY(mRecursiveMutex);
#endif