Note for myself: We need to skip notifying the document about inserting of an import rule if the rule still has a pending children.

Comment on attachment 8872218 [details] Bug 1352968 part 0 - Fix up before adding new files. https://reviewboard.mozilla.org/r/143684/#review147440

Comment on attachment 8872219 [details] Bug 1352968 part 1 - Add separate CSSImportRule base class. https://reviewboard.mozilla.org/r/143686/#review147444

Comment on attachment 8872220 [details] Bug 1352968 part 2 - Move mOwnerRule to StyleSheet and use dom::CSSImportRule instead of css::ImportRule. https://reviewboard.mozilla.org/r/143688/#review147448

Comment on attachment 8872221 [details] Bug 1352968 part 3 - Add basic CSSOM support for @import rule. https://reviewboard.mozilla.org/r/143690/#review147452 ::: layout/style/ServoImportRule.h:53 (Diff revision 1) > + > + RefPtr<RawServoImportRule> mRawRule; > + RefPtr<ServoStyleSheet> mChildSheet; > +}; > + > +} // namespace mozill mozilla

Comment on attachment 8872222 [details] Bug 1352968 part 4 - Change the direction of child stylesheet list. https://reviewboard.mozilla.org/r/143692/#review147454

Comment on attachment 8872223 [details] Bug 1352968 part 5 - Add a param to ctor of ServoCSSRuleList for top level list. https://reviewboard.mozilla.org/r/143694/#review147456 ::: commit-message-189b4:3 (Diff revision 1) > +Bug 1352968 part 5 - Add a param to ctor of ServoCSSRuleList for top level list. r?heycam > + > +@import rules can only exists in top level rule lists, and we need the *exist ::: layout/style/ServoCSSRuleList.h:31 (Diff revision 1) > { > public: > - explicit ServoCSSRuleList(already_AddRefed<ServoCssRules> aRawRules); > + // @param aDirectOwnerStyleSheet should be set to the owner stylesheet > + // if this rule list is owned directly by a stylesheet, which means it > + // is a top level CSSRuleList. If it's owned by a group rule, nullptr. > + // If this param is set, the caller don't need to call SetStyleSheet. *doesn't

Comment on attachment 8872224 [details] Bug 1352968 part 6 - Remove unused Servo_ImportRule_GetSheet. https://reviewboard.mozilla.org/r/143696/#review147458

Comment on attachment 8872225 [details] Bug 1352968 part 7 - Make RuleHasPendingChildSheet a static method of StyleSheet. https://reviewboard.mozilla.org/r/143698/#review147460

Comment on attachment 8872226 [details] Bug 1352968 part 8 - Construct @import rule object eagerly. https://reviewboard.mozilla.org/r/143700/#review147464 ::: layout/style/ServoCSSRuleList.cpp:270 (Diff revision 1) > + } > - mRules.InsertElementAt(aIndex, type); > + mRules.InsertElementAt(aIndex, type); > + if (type == nsIDOMCSSRule::IMPORT_RULE) { > + MOZ_ASSERT(!nested, "@import rule cannot be nested"); > + ConstructImportRule(aIndex, [this](const RawServoStyleSheet* raw) { > + StyleSheet* sheet = mStyleSheet->GetFirstChild(); Maybe we should have a function named StyleSheet::GetMostRecentlyAddedChildSheet, that just forwards to GetFirstChild, to make it a bit clearer that that is why we're getting the first child (and we're store the child linked list in that order)?

Comment on attachment 8872227 [details] Bug 1352968 part 9 - Notify document about rule insertion only if a rule doesn't have pending child sheet. https://reviewboard.mozilla.org/r/143702/#review147466

Comment on attachment 8872228 [details] Bug 1352968 part 10 - Update test expectation. https://reviewboard.mozilla.org/r/143704/#review147468

Servo side: servo/servo#17086

We're sorry, Autoland could not rebase your commits for you automatically. Please manually rebase your commits and try again. hg error in cmd: hg rebase -s b22cf2f18349 -d c0a910347a2e: rebasing 398805:b22cf2f18349 "Bug 1352968 part 0 - Fix up before adding new files. r=heycam" rebasing 398806:5205d8d42a0f "Bug 1352968 part 1 - Add separate CSSImportRule base class. r=heycam" rebasing 398807:6e84cc987e02 "Bug 1352968 part 2 - Move mOwnerRule to StyleSheet and use dom::CSSImportRule instead of css::ImportRule. r=heycam" merging layout/style/CSSStyleSheet.cpp merging layout/style/CSSStyleSheet.h merging layout/style/ServoStyleSheet.cpp merging layout/style/ServoStyleSheet.h merging layout/style/StyleSheet.cpp merging layout/style/StyleSheet.h rebasing 398808:e45a434d0e9d "Bug 1352968 part 3 - Add basic CSSOM support for @import rule. r=heycam" merging layout/style/ServoBindingList.h rebasing 398809:6b2b471b993f "Bug 1352968 part 4 - Change the direction of child stylesheet list. r=heycam" merging layout/style/Loader.cpp merging layout/style/StyleSheet.cpp merging layout/style/StyleSheet.h rebasing 398810:b9b78672249f "Bug 1352968 part 5 - Add a param to ctor of ServoCSSRuleList for top level list. r=heycam" merging layout/style/ServoStyleSheet.cpp rebasing 398811:3f7f683b64f4 "Bug 1352968 part 6 - Remove unused Servo_ImportRule_GetSheet. r=heycam" merging layout/style/ServoBindingList.h rebasing 398812:1895bd31f6c8 "Bug 1352968 part 7 - Make RuleHasPendingChildSheet a static method of StyleSheet. r=heycam" merging layout/style/CSSStyleSheet.cpp merging layout/style/StyleSheet.cpp merging layout/style/StyleSheet.h warning: conflicts while merging layout/style/StyleSheet.h! (edit, then use 'hg resolve --mark') unresolved conflicts (see hg resolve, then hg rebase --continue)

Pushed by xquan@mozilla.com: https://hg.mozilla.org/integration/autoland/rev/0ac37006d5ac part 0 - Fix up before adding new files. r=heycam https://hg.mozilla.org/integration/autoland/rev/f94836492020 part 1 - Add separate CSSImportRule base class. r=heycam https://hg.mozilla.org/integration/autoland/rev/c1ff58ddedbb part 2 - Move mOwnerRule to StyleSheet and use dom::CSSImportRule instead of css::ImportRule. r=heycam https://hg.mozilla.org/integration/autoland/rev/58cf5a6058fc part 3 - Add basic CSSOM support for @import rule. r=heycam https://hg.mozilla.org/integration/autoland/rev/28676da16b16 part 4 - Change the direction of child stylesheet list. r=heycam https://hg.mozilla.org/integration/autoland/rev/afe344d43816 part 5 - Add a param to ctor of ServoCSSRuleList for top level list. r=heycam https://hg.mozilla.org/integration/autoland/rev/dd3c0e2db9cb part 6 - Remove unused Servo_ImportRule_GetSheet. r=heycam https://hg.mozilla.org/integration/autoland/rev/74b069ba31d6 part 7 - Make RuleHasPendingChildSheet a static method of StyleSheet. r=heycam https://hg.mozilla.org/integration/autoland/rev/80ccd7212532 part 8 - Construct @import rule object eagerly. r=heycam https://hg.mozilla.org/integration/autoland/rev/3a5052f5e48f part 9 - Notify document about rule insertion only if a rule doesn't have pending child sheet. r=heycam https://hg.mozilla.org/integration/autoland/rev/2965e8e275e6 part 10 - Update test expectation. r=heycam

https://hg.mozilla.org/mozilla-central/rev/0ac37006d5ac https://hg.mozilla.org/mozilla-central/rev/f94836492020 https://hg.mozilla.org/mozilla-central/rev/c1ff58ddedbb https://hg.mozilla.org/mozilla-central/rev/58cf5a6058fc https://hg.mozilla.org/mozilla-central/rev/28676da16b16 https://hg.mozilla.org/mozilla-central/rev/afe344d43816 https://hg.mozilla.org/mozilla-central/rev/dd3c0e2db9cb https://hg.mozilla.org/mozilla-central/rev/74b069ba31d6 https://hg.mozilla.org/mozilla-central/rev/80ccd7212532 https://hg.mozilla.org/mozilla-central/rev/3a5052f5e48f https://hg.mozilla.org/mozilla-central/rev/2965e8e275e6