Verified Commit 295809d5 authored by Emilio Cobos Álvarez's avatar Emilio Cobos Álvarez Committed by ma1
Browse files

Bug 1914106 - Deal with insertRule edge-case. r=jwatt a=RyanVM 

When there's trailing garbage after an @import rule we throw, but we
still trigger the load (that's not great but not trivial to change).

Deal with that case before calling ImportRuleLoaded().

Differential Revision: https://phabricator.services.mozilla.com/D219783
parent efdf2b74

dom/base/Document.cpp

+1 −1
Original line number Diff line number Diff line
@@ -8263,7 +8263,7 @@ void Document::RuleAdded(StyleSheet& aSheet, css::Rule& aRule) { 
  }

}









void Document::ImportRuleLoaded(dom::CSSImportRule& aRule, StyleSheet& aSheet) {









void Document::ImportRuleLoaded(StyleSheet& aSheet) {









  if (aSheet.IsApplicable()) {









    ApplicableStylesChanged();









  }
































dom/base/Document.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -2135,7 +2135,7 @@ class Document : public nsINode,







  void RuleAdded(StyleSheet&, css::Rule&);









  void RuleRemoved(StyleSheet&, css::Rule&);









  void SheetCloned(StyleSheet&) {}









  void ImportRuleLoaded(CSSImportRule&, StyleSheet&);









  void ImportRuleLoaded(StyleSheet&);



















  /**









   * Flush notifications for this document and its parent documents
































dom/base/ShadowRoot.cpp



+1
−1






























Original line number
Diff line number
Diff line







@@ -412,7 +412,7 @@ void ShadowRoot::RuleChanged(StyleSheet& aSheet, css::Rule*,







  ApplicableRulesChanged();









}



















void ShadowRoot::ImportRuleLoaded(CSSImportRule&, StyleSheet& aSheet) {









void ShadowRoot::ImportRuleLoaded(StyleSheet& aSheet) {









  if (mStyleRuleMap) {









    mStyleRuleMap->SheetAdded(aSheet);









  }
































dom/base/ShadowRoot.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -86,7 +86,7 @@ class ShadowRoot final : public DocumentFragment,







  void RuleAdded(StyleSheet&, css::Rule&);









  void RuleRemoved(StyleSheet&, css::Rule&);









  void RuleChanged(StyleSheet&, css::Rule*, StyleRuleChangeKind);









  void ImportRuleLoaded(CSSImportRule&, StyleSheet&);









  void ImportRuleLoaded(StyleSheet&);









  void SheetCloned(StyleSheet&);









  void StyleSheetApplicableStateChanged(StyleSheet&);










































layout/style/ServoStyleSet.cpp



+1
−1






























Original line number
Diff line number
Diff line







@@ -954,7 +954,7 @@ static OriginFlags ToOriginFlags(StyleOrigin aOrigin) {







  }









}



















void ServoStyleSet::ImportRuleLoaded(dom::CSSImportRule&, StyleSheet& aSheet) {









void ServoStyleSet::ImportRuleLoaded(StyleSheet& aSheet) {









  if (mStyleRuleMap) {









    mStyleRuleMap->SheetAdded(aSheet);









  }