From 95fba5516e771c7ff2ad4823a27ff05bb74c9a1b Mon Sep 17 00:00:00 2001 From: Daniel Holbert Date: Wed, 30 Dec 2015 23:36:31 -0800 Subject: [PATCH] Bug 1208344 part 6: Move new CSS_PROPERTY_LOGICAL_CUSTOM flag up with other LOGICAL flags, and adjust bits accordingly. r=heycam --- layout/style/nsCSSProps.h | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/layout/style/nsCSSProps.h b/layout/style/nsCSSProps.h index 3723080841d5..398cebbc0615 100644 --- a/layout/style/nsCSSProps.h +++ b/layout/style/nsCSSProps.h @@ -247,20 +247,26 @@ static_assert((CSS_PROPERTY_PARSE_PROPERTY_MASK & // margin-block-start or margin-inline-start). #define CSS_PROPERTY_LOGICAL_END_EDGE (1<<26) +// This property is a logical property which always maps to the same physical +// property, and its values have some custom processing when being mapped to +// the physical property's values. Must not be used in conjunction with +// CSS_PROPERTY_LOGICAL_{AXIS,BLOCK_AXIS,END_EDGE}. +#define CSS_PROPERTY_LOGICAL_SINGLE_CUSTOM_VALMAPPING (1<<27) + // This property can be animated on the compositor. -#define CSS_PROPERTY_CAN_ANIMATE_ON_COMPOSITOR (1<<27) +#define CSS_PROPERTY_CAN_ANIMATE_ON_COMPOSITOR (1<<28) // This property is an internal property that is not represented // in the DOM. Properties with this flag must be defined in an #ifndef // CSS_PROP_LIST_EXCLUDE_INTERNAL section of nsCSSPropList.h. -#define CSS_PROPERTY_INTERNAL (1<<28) +#define CSS_PROPERTY_INTERNAL (1<<29) // This property has values that can establish a containing block for // fixed positioned and absolutely positioned elements. // This should be set for any properties that can cause an element to be // such a containing block, as implemented in // nsStyleDisplay::IsFixedPosContainingBlock. -#define CSS_PROPERTY_FIXPOS_CB (1<<29) +#define CSS_PROPERTY_FIXPOS_CB (1<<30) // This property has values that can establish a containing block for // absolutely positioned elements. @@ -269,14 +275,10 @@ static_assert((CSS_PROPERTY_PARSE_PROPERTY_MASK & // nsStyleDisplay::IsAbsPosContainingBlock. // It does not need to be set for properties that also have // CSS_PROPERTY_FIXPOS_CB set. -#define CSS_PROPERTY_ABSPOS_CB (1<<30) +#define CSS_PROPERTY_ABSPOS_CB (1u<<31) -// XXXdholbert Move this up to be with other _LOGICAL flags in a later patch. -// This property is a logical property which always maps to the same physical -// property, and its values have some custom processing when being mapped to -// the physical property's values. Must not be used in conjunction with -// CSS_PROPERTY_LOGICAL_{AXIS,BLOCK_AXIS,END_EDGE}. -#define CSS_PROPERTY_LOGICAL_SINGLE_CUSTOM_VALMAPPING (1u << 31) +// NOTE: Before adding any new CSS_PROPERTY_* flags here, we'll need to +// upgrade kFlagsTable to 64-bits -- see bug 1231384. /** * Types of animatable values.