I'm having trouble with bug 1011802, so I'm spinning this part off to unblock bug 999931.

This also moves related members to improve packing.

Comment on attachment 8426227 [details] [diff] [review] part 1 - add methods to nsIDocument to help determine its type r=me

Comment on attachment 8426228 [details] [diff] [review] part 2 - only load the html.css UA style sheet on-demand for SVG documents r=me. This does depend on SVG documents never being quirks-mode, but that's OK. ;)

As discussed on IRC.

Comment on attachment 8426601 [details] [diff] [review] part 2 - for SVG documents, only load the number-control.css, forms.css, html.css and ua.css UA style sheets on-demand r=me

Actually the nsStyleSet.cpp change from bug 1011806 has to move into this part 2 patch too. Done locally.

Huh. Turns out adding forms.css to this patch breaks form controls in foreignObject on Fennec and B2G. This seems to be because sheets loaded via EnsureCatalogStyleSheet take precedence over sheets that have previously been loaded by nsDocumentViewer::CreateStyleSet, so rules like the |select > button| rule that appears in both content.css and forms.css reverse their precedence. Besides that it seems that EnsureCatalogStyleSheet doesn't do what I assumed and just check if the sheet is in the nsStyleSet, but rather if nsDocumentViewer::CreateStyleSet adds a sheet then EnsureCatalogStyleSheet will add a second copy of the sheet to the style set. I guess I need different (new) API.

https://hg.mozilla.org/integration/mozilla-inbound/rev/027f3c05a629 https://hg.mozilla.org/integration/mozilla-inbound/rev/feff69cd698f

https://hg.mozilla.org/mozilla-central/rev/027f3c05a629 https://hg.mozilla.org/mozilla-central/rev/feff69cd698f