From 549476357c4d620975f0fee6d26d38ab15e19177 Mon Sep 17 00:00:00 2001
From: Ben Wagner <bungeman@google.com>
Date: Tue, 6 Aug 2019 17:10:55 -0400
Subject: [PATCH] Mark SkBitmaskEnum operators constexpr.

Change-Id: I498beee590ff7728f4d49da28d9a2b9909409c48
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/232763
Reviewed-by: Hal Canary <halcanary@skia.org>
Commit-Queue: Ben Wagner <bungeman@google.com>
---
 include/private/SkBitmaskEnum.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/private/SkBitmaskEnum.h b/include/private/SkBitmaskEnum.h
index 34ee2003f7..0f7aa15eaf 100644
--- a/include/private/SkBitmaskEnum.h
+++ b/include/private/SkBitmaskEnum.h
@@ -13,21 +13,21 @@ namespace skstd {
 template <typename T> struct is_bitmask_enum : std::false_type {};
 }
 
-template <typename E> SK_WHEN(skstd::is_bitmask_enum<E>::value, E) operator|(E l, E r) {
+template <typename E> SK_WHEN(skstd::is_bitmask_enum<E>::value, E) constexpr operator|(E l, E r) {
     using U = typename std::underlying_type<E>::type;
     return static_cast<E>(static_cast<U>(l) | static_cast<U>(r));
 }
 
-template <typename E> SK_WHEN(skstd::is_bitmask_enum<E>::value, E&) operator|=(E& l, E r) {
+template <typename E> SK_WHEN(skstd::is_bitmask_enum<E>::value, E&) constexpr operator|=(E& l, E r) {
     return l = l | r;
 }
 
-template <typename E> SK_WHEN(skstd::is_bitmask_enum<E>::value, E) operator&(E l, E r) {
+template <typename E> SK_WHEN(skstd::is_bitmask_enum<E>::value, E) constexpr operator&(E l, E r) {
     using U = typename std::underlying_type<E>::type;
     return static_cast<E>(static_cast<U>(l) & static_cast<U>(r));
 }
 
-template <typename E> SK_WHEN(skstd::is_bitmask_enum<E>::value, E&) operator&=(E& l, E r) {
+template <typename E> SK_WHEN(skstd::is_bitmask_enum<E>::value, E&) constexpr operator&=(E& l, E r) {
     return l = l & r;
 }