--- a/layout/style/ServoStyleSet.cpp
+++ b/layout/style/ServoStyleSet.cpp
@@ -128,28 +128,60 @@ ServoStyleSet::ResolveStyleFor(Element* 
   return ResolveStyleFor(aElement, aParentContext);
 }
 
 already_AddRefed<nsStyleContext>
 ServoStyleSet::ResolveStyleForText(nsIContent* aTextNode,
                                    nsStyleContext* aParentContext)
 {
   MOZ_ASSERT(aTextNode && aTextNode->IsNodeOfType(nsINode::eTEXT));
-  return GetContext(aTextNode, aParentContext, nsCSSAnonBoxes::mozText,
-                    CSSPseudoElementType::AnonBox);
+  MOZ_ASSERT(aTextNode->GetParent());
+
+  nsIContent* parent = aTextNode->GetParent();
+  nsIAtom* parentName = parent->NodeInfo()->NameAtom();
+
+  // If this text node is a child of a generated content node, it'll never have
+  // been traversed by Servo, and thus isn't styled.
+  //
+  // We inherit the style from the parent here, but also taking into account
+  // that only the frame of the parent has the correct style, given we take it
+  // from the map, and the content hasn't also being traversed from Servo.
+  //
+  // Otherwise, we rely on the fact that this text node should have been
+  // traversed by servo to just grab the computed values as appropriate.
+  //
+  // TODO: We might want to just do this and skip styling nodes entirely from
+  // Servo. This would accidentally fix the issue of having to stash
+  // change-hints from children in the parent element just because of inherited
+  // style struct changes.
+  RefPtr<ServoComputedValues> computedValues;
+  if (parentName == nsGkAtoms::mozgeneratedcontentbefore ||
+      parentName == nsGkAtoms::mozgeneratedcontentafter) {
+    MOZ_ASSERT(aParentContext);
+    ServoComputedValues* parentComputedValues =
+      aParentContext->StyleSource().AsServoComputedValues();
+    computedValues =
+      dont_AddRef(Servo_InheritComputedValues(parentComputedValues));
+  } else {
+    computedValues = dont_AddRef(Servo_GetComputedValues(aTextNode));
+  }
+
+  return GetContext(computedValues.forget(), aParentContext,
+                    nsCSSAnonBoxes::mozText, CSSPseudoElementType::AnonBox);
 }
 
 already_AddRefed<nsStyleContext>
 ServoStyleSet::ResolveStyleForOtherNonElement(nsStyleContext* aParentContext)
 {
   // The parent context can be null if the non-element share a style context
   // with the root of an anonymous subtree.
   ServoComputedValues* parent =
     aParentContext ? aParentContext->StyleSource().AsServoComputedValues() : nullptr;
-  RefPtr<ServoComputedValues> computedValues = dont_AddRef(Servo_InheritComputedValues(parent));
+  RefPtr<ServoComputedValues> computedValues =
+    dont_AddRef(Servo_InheritComputedValues(parent));
   MOZ_ASSERT(computedValues);
 
   return GetContext(computedValues.forget(), aParentContext,
                     nsCSSAnonBoxes::mozOtherNonElement,
                     CSSPseudoElementType::AnonBox);
 }
 
 already_AddRefed<nsStyleContext>