1459497 - Refactor the preferred style set stuff in order to move the state away from the loader.

Status: RESOLVED FIXED

(Core :: CSS Parsing and Computation, enhancement)

Description

[Emilio Cobos Álvarez (:emilio)]

The goal is to compute whether a stylesheet is alternate ahead of time, instead of with that weird reentrancy of SetHeaderData.

This is only a step in that direction.

I ended up finding another solution that doesn't require doing that right now, but I think this is still worth it.

Comment 1

[Emilio Cobos Álvarez (:emilio)]

Attachment: Bug 1459497: Refactor the preferred style set stuff in order to move the state away from the loader.

The main thing to have into account is that the styleset to use is either
mLastStyleSheetSet, or mPreferredStyleSheetSet.

This last one gets set from Loader::IsAlternateSheet, which is quite nasty and
what I'm trying to remove.

Review commit: https://reviewboard.mozilla.org/r/241876/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/241876/

Comment 2

[Cameron McCormack (:heycam)]

Comment on attachment 8973523 [details]
Bug 1459497: Refactor the preferred style set stuff in order to move the state away from the loader.

https://reviewboard.mozilla.org/r/241876/#review247764

::: dom/base/nsIDocument.h:3772
(Diff revision 1)
>    void MaybeResolveReadyForIdle();
>  
>    nsCString mReferrer;
>    nsString mLastModified;
>  
> +  nsString mPreferredStyleSheetSet;

Maybe put this next to the mLastStyleSheetSet declaration?

::: dom/xul/nsXULContentSink.cpp
(Diff revision 1)
> -    // XXX this presumes HTTP header info is already set in document
> -    // XXX if it isn't we need to set it here...
> -    // XXXbz not like GetHeaderData on the proto doc _does_ anything....
> -    nsAutoString preferredStyle;
> -    rv = mPrototype->GetHeaderData(nsGkAtoms::headerDefaultStyle,
> -                                   preferredStyle);

I'm not sure how far away we are from XUL documents going away... so maybe file a followup to remove nsXULPrototypeDocument::{Get,Set}HeaderData?

::: layout/style/Loader.cpp:426
(Diff revision 1)
>  }
>  
> -nsresult
> -Loader::SetPreferredSheet(const nsAString& aTitle)
> +void
> +Loader::DocumentStyleSheetSetChanged()
>  {
> -#ifdef DEBUG
> +  MOZ_ASSERT(mDocument, "Huh?");

Nit: no message needed for simple null checks.

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/f240bdfb1d69
Refactor the preferred style set stuff in order to move the state away from the loader. r=heycam

Comment 4

[Narcis Beleuzu [:NarcisB]]

https://hg.mozilla.org/mozilla-central/rev/f240bdfb1d69