| Index: third_party/WebKit/Source/core/style/ComputedStyle.h
|
| diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.h b/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| index d426901cccfe2404852a35d8b88094dad80af327..992e024b3739b5170afd8595103fcaaac23c47a3 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| @@ -335,7 +335,7 @@ protected:
|
| noninherited_flags.breakBefore = initialBreakBefore();
|
| noninherited_flags.breakAfter = initialBreakAfter();
|
| noninherited_flags.breakInside = initialBreakInside();
|
| - noninherited_flags.styleType = NOPSEUDO;
|
| + noninherited_flags.styleType = PseudoIdNoPseudo;
|
| noninherited_flags.pseudoBits = 0;
|
| noninherited_flags.explicitInheritance = false;
|
| noninherited_flags.variableReference = false;
|
| @@ -2011,26 +2011,26 @@ inline bool ComputedStyle::setTextOrientation(TextOrientation textOrientation)
|
|
|
| inline bool ComputedStyle::hasAnyPublicPseudoStyles() const
|
| {
|
| - return PUBLIC_PSEUDOID_MASK & noninherited_flags.pseudoBits;
|
| + return PublicPseudoIdMask & noninherited_flags.pseudoBits;
|
| }
|
|
|
| inline bool ComputedStyle::hasPseudoStyle(PseudoId pseudo) const
|
| {
|
| - ASSERT(pseudo > NOPSEUDO);
|
| - ASSERT(pseudo < FIRST_INTERNAL_PSEUDOID);
|
| + ASSERT(pseudo > PseudoIdNoPseudo);
|
| + ASSERT(pseudo < FirstInternalPseudoId);
|
| return (1 << (pseudo - 1)) & noninherited_flags.pseudoBits;
|
| }
|
|
|
| inline void ComputedStyle::setHasPseudoStyle(PseudoId pseudo)
|
| {
|
| - ASSERT(pseudo > NOPSEUDO);
|
| - ASSERT(pseudo < FIRST_INTERNAL_PSEUDOID);
|
| + ASSERT(pseudo > PseudoIdNoPseudo);
|
| + ASSERT(pseudo < FirstInternalPseudoId);
|
| noninherited_flags.pseudoBits |= 1 << (pseudo - 1);
|
| }
|
|
|
| inline bool ComputedStyle::hasPseudoElementStyle() const
|
| {
|
| - return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;
|
| + return noninherited_flags.pseudoBits & ElementPseudoIdMask;
|
| }
|
|
|
| } // namespace blink
|
|
|