--- a/layout/style/ServoBindings.cpp
+++ b/layout/style/ServoBindings.cpp
@@ -219,22 +219,32 @@ Gecko_CalcStyleDifference(nsStyleContext
 
   return result;
 }
 
 void
 Gecko_StoreStyleDifference(RawGeckoNode* aNode, nsChangeHint aChangeHintToStore)
 {
 #ifdef MOZ_STYLO
-  // XXXEmilio probably storing it in the nearest content parent is a sane thing
-  // to do if this case can ever happen?
   MOZ_ASSERT(aNode->IsContent());
+  MOZ_ASSERT(aNode->IsDirtyForServo(),
+             "Change hint stored in a not-dirty node");
 
-  nsIContent* aContent = aNode->AsContent();
-  nsIFrame* primaryFrame = aContent->GetPrimaryFrame();
+  // For elements, we need to store the change hint in the proper style context.
+  // For nodes, we want to store the change hint in the parent element, since
+  // Gecko's change list only operates on Elements, and we'll fail to compute
+  // the change hint for the element properly because the property won't always
+  // be in the cache of the parent's nsStyleContext.
+  //
+  // For Gecko this is not a problem, presumably because they access the
+  // inherited structs from the parent style context to inherit them?
+  Element* aElement =
+    aNode->IsElement() ? aNode->AsElement() : aNode->GetParentElement();
+
+  nsIFrame* primaryFrame = aElement->GetPrimaryFrame();
   if (!primaryFrame) {
     // TODO: Pick the undisplayed content map from the frame-constructor, and
     // stick it there. For now we're generating ReconstructFrame
     // unconditionally, which is suboptimal.
     return;
   }
 
   primaryFrame->StyleContext()->StoreChangeHint(aChangeHintToStore);

--- a/layout/style/nsStyleContext.h
+++ b/layout/style/nsStyleContext.h
@@ -529,17 +529,17 @@ public:
   // NOTE: It'd be great to assert here that the previous change hint is always
   // consumed.
   //
   // This is not the case right now, since the changes of childs of frames that
   // go through frame construction are not consumed.
   void StoreChangeHint(nsChangeHint aHint)
   {
     MOZ_ASSERT(!IsShared());
-    mStoredChangeHint = aHint;
+    mStoredChangeHint |= aHint;
 #ifdef DEBUG
     mConsumedChangeHint = false;
 #endif
   }
 
   nsChangeHint ConsumeStoredChangeHint()
   {
     MOZ_ASSERT(!mConsumedChangeHint, "Re-consuming the same change hint!");