Bug 1228921 patch 2 - Fix nsRestyleHint constants to match the same style. r=xidorn

--HG--
extra : commitid : EwDr20MLKlQ
This commit is contained in:
L. David Baron 2015-11-30 21:37:08 -08:00
parent 3ad29c50ac
commit 7dc263f595

View File

@ -390,42 +390,42 @@ enum nsRestyleHint {
// results, update the style contexts of descendants. (Irrelevant if
// eRestyle_Subtree is also set, since that implies a superset of the
// work.)
eRestyle_Self = (1<<0),
eRestyle_Self = 1 << 0,
// Rerun selector matching on descendants of the element that match
// a given selector.
eRestyle_SomeDescendants = (1<<1),
eRestyle_SomeDescendants = 1 << 1,
// Rerun selector matching on the element and all of its descendants.
// (Implies eRestyle_ForceDescendants, which ensures that we continue
// the restyling process for all descendants, but doesn't cause
// selector matching.)
eRestyle_Subtree = (1<<2),
eRestyle_Subtree = 1 << 2,
// Rerun selector matching on all later siblings of the element and
// all of their descendants.
eRestyle_LaterSiblings = (1<<3),
eRestyle_LaterSiblings = 1 << 3,
// Replace the style data coming from CSS transitions without updating
// any other style data. If a new style context results, update style
// contexts on the descendants. (Irrelevant if eRestyle_Self or
// eRestyle_Subtree is also set, since those imply a superset of the
// work.)
eRestyle_CSSTransitions = (1<<4),
eRestyle_CSSTransitions = 1 << 4,
// Replace the style data coming from CSS animations without updating
// any other style data. If a new style context results, update style
// contexts on the descendants. (Irrelevant if eRestyle_Self or
// eRestyle_Subtree is also set, since those imply a superset of the
// work.)
eRestyle_CSSAnimations = (1<<5),
eRestyle_CSSAnimations = 1 << 5,
// Replace the style data coming from SVG animations (SMIL Animations)
// without updating any other style data. If a new style context
// results, update style contexts on the descendants. (Irrelevant if
// eRestyle_Self or eRestyle_Subtree is also set, since those imply a
// superset of the work.)
eRestyle_SVGAttrAnimations = (1<<6),
eRestyle_SVGAttrAnimations = 1 << 6,
// Replace the style data coming from inline style without updating
// any other style data. If a new style context results, update style
@ -436,22 +436,22 @@ enum nsRestyleHint {
// eRestyle_Self.
// If the change is for the advance of a declarative animation, use
// the value below instead.
eRestyle_StyleAttribute = (1<<7),
eRestyle_StyleAttribute = 1 << 7,
// Same as eRestyle_StyleAttribute, but for when the change results
// from the advance of a declarative animation.
eRestyle_StyleAttribute_Animations = (1<<8),
eRestyle_StyleAttribute_Animations = 1 << 8,
// Continue the restyling process to the current frame's children even
// if this frame's restyling resulted in no style changes.
eRestyle_Force = (1<<9),
eRestyle_Force = 1 << 9,
// Continue the restyling process to all of the current frame's
// descendants, even if any frame's restyling resulted in no style
// changes. (Implies eRestyle_Force.) Note that this is weaker than
// eRestyle_Subtree, which makes us rerun selector matching on all
// descendants rather than just continuing the restyling process.
eRestyle_ForceDescendants = (1<<10),
eRestyle_ForceDescendants = 1 << 10,
// Useful unions:
eRestyle_AllHintsWithAnimations = eRestyle_CSSTransitions |