Bug 1418867 - getUnanimatedComputedStyle throws an exception for non-existent pseudo element. r=birtles
authorHiroyuki Ikezoe <hikezoe@mozilla.com>
Wed, 22 Nov 2017 09:57:31 +0900
changeset 437620 51ab3c3c9935e8cd332a26ab2facfd35c7ecb8b7
parent 437619 4868b9f25718ba535bccc94da7d04aa93c0f416c
child 437621 0fe9ca39473a4c71adaa53d6c9e41552ccab6099
push id117
push userfmarier@mozilla.com
push dateTue, 28 Nov 2017 20:17:16 +0000
reviewersbirtles
bugs1418867
milestone59.0a1
Bug 1418867 - getUnanimatedComputedStyle throws an exception for non-existent pseudo element. r=birtles This is a prerequisite change for passing pseudo element to Servo_StyleSet_GetBaseComputedValuesForElement which will be done in the next commit. MozReview-Commit-ID: HEGF2wjBGEP
dom/base/nsDOMWindowUtils.cpp
dom/base/test/file_domwindowutils_animation.html
layout/style/nsComputedDOMStyle.cpp
--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
@@ -3003,16 +3003,19 @@ nsDOMWindowUtils::GetUnanimatedComputedS
   if (!shell) {
     return NS_ERROR_FAILURE;
   }
 
   RefPtr<nsAtom> pseudo = nsCSSPseudoElements::GetPseudoAtom(aPseudoElement);
   RefPtr<nsStyleContext> styleContext =
     nsComputedDOMStyle::GetUnanimatedStyleContextNoFlush(element,
                                                          pseudo, shell);
+  if (!styleContext) {
+    return NS_ERROR_FAILURE;
+  }
 
   if (styleContext->IsServo()) {
     RefPtr<RawServoAnimationValue> value =
       Servo_ComputedValues_ExtractAnimationValue(styleContext->AsServo(),
                                                  propertyID).Consume();
     if (!value) {
       return NS_ERROR_FAILURE;
     }
--- a/dom/base/test/file_domwindowutils_animation.html
+++ b/dom/base/test/file_domwindowutils_animation.html
@@ -122,16 +122,21 @@ function test_getUnanimatedComputedStyle
     "FLUSH_LAYOUT option should throw");
 
   SimpleTest.doesThrow(
     () => utils.getUnanimatedComputedStyle(div, null, "opacity", utils.FLUSH_DISPLAY),
     "NS_ERROR_INVALID_ARG",
     "FLUSH_DISPLAY option should throw");
 
   if (utils.isStyledByServo) {
+    SimpleTest.doesThrow(
+      () => utils.getUnanimatedComputedStyle(div, "::before", "opacity", utils.FLUSH_NONE),
+      "NS_ERROR_FAILURE",
+      "Non-existent pseudo should throw");
+
     // Flush styles since getUnanimatedComputedStyle flushes pending styles even
     // with FLUSH_NONE option if the element hasn't yet styled.
     getComputedStyle(div).opacity;
 
     div.style.opacity = "0";
     is(utils.getUnanimatedComputedStyle(div, null, "opacity", utils.FLUSH_NONE),
        "1",
        "getUnanimatedComputedStyle with FLUSH_NONE should not flush pending styles");
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -738,16 +738,21 @@ nsComputedDOMStyle::DoGetStyleContextNoF
           nsPresContext* presContext = presShell->GetPresContext();
           MOZ_ASSERT(presContext, "Should have a prescontext if we have a frame");
           if (presContext && presContext->StyleSet()->IsGecko()) {
             nsStyleSet* styleSet = presContext->StyleSet()->AsGecko();
             return styleSet->ResolveStyleByRemovingAnimation(
                      aElement, result->AsGecko(),
                      eRestyle_AllHintsWithAnimations);
           } else {
+            Element* elementOrPseudoElement =
+              EffectCompositor::GetElementToRestyle(aElement, pseudoType);
+            if (!elementOrPseudoElement) {
+              return nullptr;
+            }
             return presContext->StyleSet()->AsServo()->
               GetBaseContextForElement(aElement, presContext,
                                        pseudoType, result->AsServo());
           }
         }
 
         // this function returns an addrefed style context
         RefPtr<nsStyleContext> ret = result;
@@ -772,16 +777,21 @@ nsComputedDOMStyle::DoGetStyleContextNoF
                                ? StyleRuleInclusion::DefaultOnly
                                : StyleRuleInclusion::All;
     RefPtr<ServoStyleContext> result =
        servoSet->ResolveStyleLazily(aElement, pseudoType, rules);
     if (aAnimationFlag == eWithAnimation) {
       return result.forget();
     }
 
+    Element* elementOrPseudoElement =
+      EffectCompositor::GetElementToRestyle(aElement, pseudoType);
+    if (!elementOrPseudoElement) {
+      return nullptr;
+    }
     return servoSet->GetBaseContextForElement(aElement, presContext,
                                               pseudoType, result);
   }
 
   RefPtr<GeckoStyleContext> parentContext;
   nsIContent* parent = aPseudo ? aElement : aElement->GetParent();
   // Don't resolve parent context for document fragments.
   if (parent && parent->IsElement()) {