1323399 - [Stylo] Fix the stylo-vs-gecko reftest harness

Status: RESOLVED FIXED

(Core :: CSS Parsing and Computation, defect)

Description

[Shing Lyu [:shinglyu]]

Our old stylo-vs-gecko reftest patch had probably landed on the private github repo. I'm trying to land them again onto m-c so they are actually run on try pushes.

Comment 1

[Shing Lyu [:shinglyu]]

Attachment: Bug 1323399 - Fix the stylo-vs-gecko reftest harness.

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

Comment 2

[Shing Lyu [:shinglyu]]

This is a try push: https://treeherder.mozilla.org/#/jobs?repo=try&revision=82a813d1bd1df2a9c4e3a0733c6de62d08f27a44

If you look into the reftest log you can actually see the "Enable/Disable Servo-backed style system" messages, which indicates that we are comparing stylo versus gecko.

Comment 3

[Cameron McCormack (:heycam)]

Comment on attachment 8818498 [details]
Bug 1323399 - Fix the stylo-vs-gecko reftest harness.

https://reviewboard.mozilla.org/r/98574/#review98830

::: layout/tools/reftest/reftest.jsm:58
(Diff revision 1)
> +#ifdef MOZ_STYLO
> +var gCompareStyloToGecko = false;
> +#endif

I think we can get rid of the #ifdefs around this.

::: layout/tools/reftest/reftest.jsm:1318
(Diff revision 1)
>      gState = aState;
>      gCurrentURL = gURLs[0]["url" + aState].spec;
>  
>      RestoreChangedPreferences();
>  
> +#ifdef MOZ_STYLO

And this one.  But then keep the one above that could set gCompareStyloToGecko to true.

::: layout/tools/reftest/reftest.jsm:1320
(Diff revision 1)
> +        var prefs = Components.classes["@mozilla.org/preferences-service;1"].
> +            getService(Components.interfaces.nsIPrefBranch);

Please move this up to the top level of the function, outside the #ifdef MOZ_STYLO, and then remove the equivalent |var prefs| that's in the |if (prefSettings.length > 0| below.

::: layout/tools/reftest/reftest.jsm:1323
(Diff revision 1)
> +#ifdef MOZ_STYLO
> +    if (gCompareStyloToGecko) {
> +        var prefs = Components.classes["@mozilla.org/preferences-service;1"].
> +            getService(Components.interfaces.nsIPrefBranch);
> +        if (gState == 2){
> +            logger.info("Disalbing Servo-backed style system");

*Disabling

Comment 4

[Shing Lyu [:shinglyu]]

Comment on attachment 8818498 [details]
Bug 1323399 - Fix the stylo-vs-gecko reftest harness.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/98574/diff/1-2/

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/c4fa2b29abe7
Fix the stylo-vs-gecko reftest harness. r=heycam

Comment 6

[Carsten Book [:Tomcat]]

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