1495462 - Add a mechanism to get a WR capture on a reftest

Status: RESOLVED FIXED

(Core :: Graphics: WebRender, enhancement, P2)

Description

[Kartikaya Gupta (email:[e-mail])]

I have patches for this from a while back that I needed to use again, so it's probably worth landing them into the tree.

Comment 1

[Kartikaya Gupta (email:[e-mail])]

Attachment: Part 1 - Add a reftest.list annotation to trigger a capture

Comment 2

[Kartikaya Gupta (email:[e-mail])]

Attachment: Part 2 - Avoid captures clobbering previous captures

Comment 3

[Kartikaya Gupta (email:[e-mail])]

Actually I should move the print at [1] into bindings.rs as well and have it emit the corrected full path.

[1] https://searchfox.org/mozilla-central/rev/819cd31a93fd50b7167979607371878c4d6f18e8/gfx/webrender_bindings/WebRenderAPI.cpp#587

Comment 4

[Jeff Muizelaar [:jrmuizel]]

Comment on attachment 9013346 [details] [diff] [review]
Part 2 - Avoid captures clobbering previous captures

Review of attachment 9013346 [details] [diff] [review]:
-----------------------------------------------------------------

::: gfx/webrender_bindings/src/bindings.rs
@@ +1503,5 @@
> +        let count = if let Some(old_extension) = path.extension() {
> +            old_extension.to_str().unwrap_or("0").parse::<u32>().unwrap_or(0)
> +        } else {
> +            0
> +        };

Do you like:
let count: u32 = path.extension()
                     .and(|x| x.to_str())
                     .map(|x| x.parse())
                     .unwrap_or(0)

better?

@@ +1504,5 @@
> +            old_extension.to_str().unwrap_or("0").parse::<u32>().unwrap_or(0)
> +        } else {
> +            0
> +        };
> +        path.set_extension(format!("{}", count + 1));

(count + 1).to_string()? is probably better.

Comment 5

[Jeff Muizelaar [:jrmuizel]]

Comment on attachment 9013342 [details] [diff] [review]
Part 1 - Add a reftest.list annotation to trigger a capture

Review of attachment 9013342 [details] [diff] [review]:
-----------------------------------------------------------------

It'd be sort of nice if the name of the test made it into the name of capture directory. But this is fine.

Comment 6

[Kartikaya Gupta (email:[e-mail])]

(In reply to Jeff Muizelaar [:jrmuizel] from comment #4)
> Do you like:
> let count: u32 = path.extension()
>                      .and(|x| x.to_str())
>                      .map(|x| x.parse())
>                      .unwrap_or(0)
> 
> better?

I do! Except it doesn't work quite as you wrote it. I had to s/.and/.and_then/ and s/.parse()/.parse().ok()/ to make it work. But yeah, that's cleaner.

> > +        path.set_extension(format!("{}", count + 1));
> 
> (count + 1).to_string()? is probably better.

Ok, will change.

Comment 7

[Kartikaya Gupta (email:[e-mail])]

(In reply to Kartikaya Gupta (email:[e-mail]) from comment #6)
> I do! Except it doesn't work quite as you wrote it. I had to
> s/.and/.and_then/ and s/.parse()/.parse().ok()/ to make it work. But yeah,
> that's cleaner.

Also s/map/and_then/. i.e. https://play.rust-lang.org/?gist=621237cdcfb02ba41c85fe9bacad5027&version=stable&mode=debug&edition=2015

Comment 8

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/174c7b333596
Add a mechanism for grabbing a WR capture of a reftest. r=jrmuizel
https://hg.mozilla.org/integration/mozilla-inbound/rev/fdbc4d498652
Increment the capture path extension until we find a fresh path. r=jrmuizel

Comment 9

[Cristian Brindusan [:cbrindusan]]

https://hg.mozilla.org/mozilla-central/rev/174c7b333596
https://hg.mozilla.org/mozilla-central/rev/fdbc4d498652