From 3272147d97757673898da87bf02ea93438cae1a1 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Thu, 17 Sep 2020 23:48:58 +0000 Subject: Issue #1224 - Remove constant expressions from /dom This excludes DOMProxy handlers in dom bindings because that's intertwined with codegen and js that needs to be handled together. --- dom/media/MediaCache.cpp | 2 +- dom/media/platforms/PDMFactory.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'dom/media') diff --git a/dom/media/MediaCache.cpp b/dom/media/MediaCache.cpp index 37399f851..64523afcb 100644 --- a/dom/media/MediaCache.cpp +++ b/dom/media/MediaCache.cpp @@ -277,7 +277,7 @@ protected: }; struct BlockOwner { - constexpr BlockOwner() {} + BlockOwner() {} // The stream that owns this block, or null if the block is free. MediaCacheStream* mStream = nullptr; diff --git a/dom/media/platforms/PDMFactory.h b/dom/media/platforms/PDMFactory.h index 2b43fa1ab..a13c99ac0 100644 --- a/dom/media/platforms/PDMFactory.h +++ b/dom/media/platforms/PDMFactory.h @@ -49,10 +49,10 @@ public: void SetCDMProxy(CDMProxy* aProxy); #endif - static constexpr int kYUV400 = 0; - static constexpr int kYUV420 = 1; - static constexpr int kYUV422 = 2; - static constexpr int kYUV444 = 3; + static const int kYUV400 = 0; + static const int kYUV420 = 1; + static const int kYUV422 = 2; + static const int kYUV444 = 3; private: virtual ~PDMFactory(); -- cgit v1.2.3