Fixed a problem where changes to inline-style were not causing the correct clearing of the style system's cached rules. b=97874 r=pierre sr=hyatt

layout/base/nsCSSFrameConstructor.cpp

@@ -10146,6 +10146,15 @@ nsCSSFrameConstructor::AttributeChanged(nsIPresContext* aPresContext,
     }
   }
 
+  // first see if we need to manage the style system: 
+  //  inlineStyle changes require us to clear out style data associated with the style attribute
+  if (inlineStyle && 
+      (reconstruct || reframe || restyle)) {
+    nsCOMPtr<nsIStyleSet> set;
+    shell->GetStyleSet(getter_AddRefs(set));
+    set->ClearStyleData(aPresContext, rule, styleContext);
+  }
+
   // apply changes
   if (primaryFrame && aHint == NS_STYLE_HINT_ATTRCHANGE)
     result = primaryFrame->AttributeChanged(aPresContext, aContent, aNameSpaceID, aAttribute, aModType, aHint);
@@ -10156,12 +10165,6 @@ nsCSSFrameConstructor::AttributeChanged(nsIPresContext* aPresContext,
     result = RecreateFramesForContent(aPresContext, aContent, inlineStyle, rule, styleContext);
   }
   else if (restyle) {
-    if (inlineStyle) {
-      nsCOMPtr<nsIStyleSet> set;
-      shell->GetStyleSet(getter_AddRefs(set));
-      set->ClearStyleData(aPresContext, rule, styleContext);
-    }
-
     // If there is no frame then there is no point in re-styling it,
     // is there?
     if (primaryFrame) {

layout/html/style/src/nsCSSFrameConstructor.cpp

@@ -10146,6 +10146,15 @@ nsCSSFrameConstructor::AttributeChanged(nsIPresContext* aPresContext,
     }
   }
 
+  // first see if we need to manage the style system: 
+  //  inlineStyle changes require us to clear out style data associated with the style attribute
+  if (inlineStyle && 
+      (reconstruct || reframe || restyle)) {
+    nsCOMPtr<nsIStyleSet> set;
+    shell->GetStyleSet(getter_AddRefs(set));
+    set->ClearStyleData(aPresContext, rule, styleContext);
+  }
+
   // apply changes
   if (primaryFrame && aHint == NS_STYLE_HINT_ATTRCHANGE)
     result = primaryFrame->AttributeChanged(aPresContext, aContent, aNameSpaceID, aAttribute, aModType, aHint);
@@ -10156,12 +10165,6 @@ nsCSSFrameConstructor::AttributeChanged(nsIPresContext* aPresContext,
     result = RecreateFramesForContent(aPresContext, aContent, inlineStyle, rule, styleContext);
   }
   else if (restyle) {
-    if (inlineStyle) {
-      nsCOMPtr<nsIStyleSet> set;
-      shell->GetStyleSet(getter_AddRefs(set));
-      set->ClearStyleData(aPresContext, rule, styleContext);
-    }
-
     // If there is no frame then there is no point in re-styling it,
     // is there?
     if (primaryFrame) {