Bug 977991 patch 6 - Use the faster eRestyle_StyleAttribute path for style attribute changes. r=birtles

Bug 977991 patch 5 - Add eRestyle_ChangeAnimationPhase to switch between the with-animation and without-animation styles. r=birtles This is an additional bit on nsRestyleHint that says that the restyling operation should also perform all the work needed to switch between style-without-animation and style-with-animation (based on nsPresContext::IsProcessingAnimationStyleChange). These concepts will go away in bug 960465. Note that we don't want this behavior for the animation-only style update code (bug 996796, etc.), and I wanted to make this explicit so that it was clear when it was happening, and so that it was clear what code should be removed when we git rid of it. This is the workaround needed to land bug 977991 prior to bug 960465. (I think there's also a minor dependency in the other direction, so we need a workaround one way or the other.) Note that this depends on bug 1057231.

Bug 977991 patch 4 - Ensure we don't try to use the style attribute optimization on pseudo-elements. r=birtles This is needed because patch 1 and patch 3 did not add a mechanism that allows restyling pseudo-elements, which would be substantially more work and very little use (since the only case in which they have style attributes is for our internal use on the ::-moz-color-swatch pseudo-element). RestyleUndisplayedChildren does not need the same fix because it's only used on elements, and never on pseudo-elements or anonymous boxes.

Bug 977991 patch 3 - Add ability for RuleNodeWithReplacement to replace the style attribute rule and its important rule. r=birtles This allows posting a restyle that says that only the rule(s) from the StyleAttrSheet cascade level will be replaced, which avoids running selector matching. Part 4 will ensure that we only invoke this code for element styles (and not pseudo-element or anonymous box styles). Despite that, I prefer having the runtime check here as well given that it's a very simple way to ensure we don't do something silly that might have security implications.

Bug 977991 patch 2 - Add mCheckForImportantRules to the information nsStyleSet::RuleNodeWithReplacement keeps about cascade levels. r=birtles This is needed to support doing replacements of levels that can contain important rules, which will happen in patch 3.

Bug 977991 patch 1 - Expose variant of RulesMatching on nsHTMLCSSStyleSheet that is less work to call. r=birtles This allows nsStyleSet::RuleNodeWithReplacement to call it without constructing an entire (and unnecessary) ElementRuleProcessorData, which will happen in patch 3.

Bug 977991 patch 0 - Add bitwise operators to nsRestyleHint. r=birtles This avoids having to cast back to nsRestyleHint after using bitwise operators, and allows |= (etc.). (In the future we should consider converting nsRestyleHint, and probably also nsChangeHint, to use MOZ_MAKE_ENUM_CLASS_BITWISE_OPERATORS.)

Bug 1058346 patch 2 - Add eRestyle_SVGAttrAnimations and support it in nsStyleSet::RuleNodeWithReplacement. r=birtles This allows posting a restyle that says that only the rule(s) from the SVGAttrAnimationSheet cascade level will be replaced, which avoids running selector matching. This is needed to land bug 977991 prior to landing bug 960465, since that requires replacing all levels that contain animations. (I'll rename this to match the name determined in bug 1057231.)

Bug 1058346 patch 1 - Expose a simpler variant of RulesMatching from SVGAttrAnimationRuleProcessor. r=birtles This allows nsStyleSet::RuleNodeWithReplacement to call it without constructing an entire (and unnecessary) ElementRuleProcessorData, which will happen in patch 2.

Bug 1057231 patch 4 - Move SVG Attribute Animation rules from the pres hint level to their own cascade level. r=dholbert This is only a very slight reordering of their position in the cascade, since they were previously walked at the end of nsSVGElement::WalkContentStyleRules, which was called near the end of nsHTMLStyleSheet::RulesMatching. So the only change should be that they now take priority over the xml:lang rule added by nsHTMLStyleSheet, a rule with which they do not interact.

Bug 1057231 patch 3 - Add new cascade level for rules from SMIL Animation of SVG attributes to the style set. r=dholbert I will fix the indentation of gCascadeLevels in bug 977991 patch 2, which adds a member to each element of the array. Note that this bumps the maximum sheetType from 8 to 9 (and number of them from 9 to 10), which does not require updating NS_RULE_NODE_LEVEL_MASK, since NS_RULE_NODE_LEVEL_MASK currently has 4 bits and allows a maximum of 15.

Bug 1057231 patch 2 - Add SVG Attribute Animation rule processor to the document. r=dholbert

Bug 1057231 patch 1 - Add a rule processor class for rules from SMIL Animation of SVG attributes. r=dholbert This patch series (to move SVG Animation rules to their own level of the cascade) is needed so that they can participate in the mechanism for updating only animation styles to the present time without touching any other styles. In theory, this should have been done as part of 996796 or even as part of prior work on off main thread animations, except that it doesn't seem possible to have SVG Animations and CSS Transitions interacting on the same element and have that element's style out of date, which means it wasn't necessary for the existing code to update only animation styles. However, bug 960465 will use this similar mechanism as the new mechanism for making sure transitions start in a reasonable way (replacing the mechanism of phases, going from style without animation to style with animation via nsPresContext::IsProcessingAnimationStyleChange). This will require that, for SVG Animations to continue interacting correctly with CSS Transitions, that they have their own cascade level so that they can participate in RestyleManager::UpdateOnlyAnimationStyles. Additionally, this is needed even sooner, for bug 977991, which needs (temporarily, until bug 960465 lands) a mechanism for updating the style attribute style *and* all animation-phase-dependent styles. Yes, it's a little bit annoying to have to have another class, and another object per-document for this, but that's currently what comes with being a level of the cascade. But it's one class and one object per document, and I believe there will be substantial benefits to having all rule processor levels be only-animation-related or not-animation-related (except for the style attribute level, which is simple enough that it isn't needed yet).

Bug 1066911 - Allow eRestyle_Force{,Descendants} in RuleNodeWithReplacement. r=heycam This is fine since the assertion is just checking that we're not calling RuleNodeWithReplacement in cases when stronger restyling (i.e., restyling that does more work) is needed; the new eRestyle_Force and eRestyle_ForceDescendants flags control whether we restyle at all. This probably should have been done in bug 931668 (since bug 996796 landed before bug 931668, although not before the patches were written), but it doesn't actually show up in our test suite until bug 977991 (or maybe slightly earlier in bug 1057231 or bug 1058346).

Merge b-i to m-c, a=merge

Bumping manifests a=b2g-bump

Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/37ff07d95f18 Author: Kevin Grandon <kevingrandon@yahoo.com> Desc: Merge pull request #23975 from KevinGrandon/bug_1066339_statusbar_height_variables Bug 1066339 - Use CSS variables for statusbar height ======== https://hg.mozilla.org/integration/gaia-central/rev/4118d6feef43 Author: Kevin Grandon <kevingrandon@yahoo.com> Desc: Bug 1066339 - Use CSS variables for statusbar height r=alive

Merge m-c to b-i

Bumping manifests a=b2g-bump

Bumping manifests a=b2g-bump