Fixed scaling artefacts in paint worklets caused by zoom and hidpi #17499

asajeffrey · 2017-06-23T20:20:15Z

This PR renders paint worklet canvases at the device pixel resolution, rather than the CSS pixel resolution.

It's a dependent PR, building on #17239, #17326 and #17364.

./mach build -d does not report any errors
./mach test-tidy does not report any errors
These changes fix Paint worklets: scaling artefacts with zoom #17454
These changes do not require tests because we don't run reftests with zoom enabled

This change is

highfive · 2017-06-23T20:20:20Z

Heads up! This PR modifies the following files:

@bholley: components/style/context.rs, components/style/servo/restyle_damage.rs, components/style/servo/media_queries.rs
@KiChjang: components/script/dom/webidls/PaintWorkletGlobalScope.webidl, components/script/dom/webidls/StylePropertyMapReadOnly.webidl, components/script_layout_interface/lib.rs, components/script/dom/testworkletglobalscope.rs, components/script/dom/mod.rs and 27 more
@fitzgen: components/script/dom/webidls/PaintWorkletGlobalScope.webidl, components/script/dom/webidls/StylePropertyMapReadOnly.webidl, components/script_layout_interface/lib.rs, components/script/dom/testworkletglobalscope.rs, components/script/dom/mod.rs and 27 more
@emilio: components/layout/display_list_builder.rs, components/layout/Cargo.toml, components/style/context.rs, components/style/servo/restyle_damage.rs, components/layout/context.rs and 2 more

highfive · 2017-06-23T20:20:22Z

Warning

These commits modify unsafe code. Please review it carefully!

asajeffrey · 2017-06-23T20:21:37Z

r? @glennw

jdm · 2017-06-23T21:06:14Z

error: no method named `device_pixel_ratio` found for type `&gecko::media_queries::Device` in the current scope

   --> /home/travis/build/servo/servo/components/style/context.rs:150:31

    |

150 |         self.stylist.device().device_pixel_ratio()

    |                               ^^^^^^^^^^^^^^^^^^

error: aborting due to previous error

error: Could not compile `style`.

asajeffrey · 2017-06-24T00:22:16Z

OK, I added a definition to style/gecko/media_queries.rs, but I'm not sure it's the right one...

    pub fn device_pixel_ratio(&self) -> ScaleFactor<f32, CSSPixel, DevicePixel> {
        let mut dppx = self.pres_context().mOverrideDPPX;
        if dppx <= 0.0 { dppx = 1.0; }
        ScaleFactor::new(dppx)
    }

@emilio or @bzbarsky does this look right?

bzbarsky · 2017-06-24T01:04:41Z

No, that's not right. That's an override value if someone really needs to override the normal value and have the prescontext pretend like the override is what's going on. The normal value is nsPresContext::AppUnitsPerCSSPixel()/presContext->AppUnitsPerDevPixel() or so.

asajeffrey · 2017-06-24T01:17:09Z

@bzbarsky: thanks!

asajeffrey · 2017-06-24T02:48:18Z

Slightly annoyingly, those functions aren't exported by our Gecko bindings. I think this is equivalent:

    pub fn device_pixel_ratio(&self) -> ScaleFactor<f32, CSSPixel, DevicePixel> {
        let au_per_dpx = self.pres_context().mCurAppUnitsPerDevPixel as f32;
        let au_per_px = AU_PER_PX as f32;
        ScaleFactor::new(au_per_px / au_per_dpx)
    }

bzbarsky · 2017-06-24T03:27:47Z

Yes, that seems reasonable. But again, mOverrideDPPX overrides if it's > 0.

asajeffrey · 2017-06-24T03:50:57Z

Good point. Thanks!

bors-servo · 2017-06-30T09:22:45Z

☔ The latest upstream changes (presumably #17239) made this pull request unmergeable. Please resolve the merge conflicts.

asajeffrey · 2017-07-17T16:27:10Z

@glennw This PR's dependencies have been merged, so it's ready for review!

bors-servo · 2017-07-18T03:57:56Z

☔ The latest upstream changes (presumably #17767) made this pull request unmergeable. Please resolve the merge conflicts.

jdm · 2017-07-18T13:19:10Z

error[E0432]: unresolved import `script_traits::DevicePixel`

  --> /home/travis/build/servo/servo/ports/glutin/window.rs:27:21

   |

27 | use script_traits::{DevicePixel, LoadData, TouchEventType, TouchpadPressurePhase};

   |                     ^^^^^^^^^^^ no `DevicePixel` in the root

error[E0412]: cannot find type `IpcSender` in this scope

    --> /home/travis/build/servo/servo/ports/glutin/window.rs:1304:60

     |

1304 |     fn allow_navigation(&self, _: ServoUrl, response_chan: IpcSender<bool>) {

     |                                                            ^^^^^^^^^ not found in this scope

     |

help: possible candidate is found in another module, you can import it into scope

     |

36   | use servo::ipc_channel::ipc::IpcSender;

     |

error: aborting due to 2 previous errors

error: Could not compile `glutin_app`.

glennw · 2017-07-19T21:11:35Z

@asajeffrey r=me on the changes - it'd be good if we could add a reftest either here or as a follow up though (I'm not sure if the reftest harness allows setting dpi ratio though).

asajeffrey · 2017-07-20T17:50:56Z

Squashed. @bors-servo: r=glennw

bors-servo · 2017-07-20T17:50:57Z

📌 Commit c9c569a has been approved by glennw

bors-servo · 2017-07-20T19:42:08Z

⌛ Testing commit c9c569a with merge 91a157d...

Fixed scaling artefacts in paint worklets caused by zoom and hidpi  This PR renders paint worklet canvases at the device pixel resolution, rather than the CSS pixel resolution. It's a dependent PR, building on #17239, #17326 and #17364. ---  - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #17454 - [X] These changes do not require tests because we don't run reftests with zoom enabled    --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17499)

bors-servo · 2017-07-20T20:08:55Z

💔 Test failed - linux-dev

asajeffrey · 2017-07-20T22:26:43Z

Got build-cef to compile. @bors-servo r=glennw

bors-servo · 2017-07-20T22:26:43Z

📌 Commit caa3585 has been approved by glennw

bors-servo · 2017-07-21T00:09:07Z

⌛ Testing commit caa3585 with merge 9fcbeb3...

Fixed scaling artefacts in paint worklets caused by zoom and hidpi  This PR renders paint worklet canvases at the device pixel resolution, rather than the CSS pixel resolution. It's a dependent PR, building on #17239, #17326 and #17364. ---  - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #17454 - [X] These changes do not require tests because we don't run reftests with zoom enabled    --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17499)

bors-servo · 2017-07-21T01:20:33Z

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: glennw
Pushing 9fcbeb3 to master...

asajeffrey added A-content/css Interacting with CSS from web content (parsing, serializing, introspection) A-content/script Related to the script thread labels Jun 23, 2017

highfive assigned pcwalton Jun 23, 2017

highfive added the S-awaiting-review There is new code that needs to be reviewed. label Jun 23, 2017

highfive assigned glennw and unassigned pcwalton Jun 23, 2017

jdm added the S-fails-travis label Jun 23, 2017

asajeffrey force-pushed the script-paint-worklets-zoom branch from 335eb86 to 73c21e8 Compare June 24, 2017 02:46

asajeffrey force-pushed the script-paint-worklets-zoom branch from 73c21e8 to ee387a5 Compare June 24, 2017 03:37

highfive added the S-needs-rebase There are merge conflict errors. label Jun 30, 2017

nox added the S-blocked-on-external Something, somewhere else, needs to happen before this PR can be merged. label Jul 5, 2017

asajeffrey force-pushed the script-paint-worklets-zoom branch from ec193d7 to b7e22dd Compare July 17, 2017 16:25

asajeffrey removed S-blocked-on-external Something, somewhere else, needs to happen before this PR can be merged. S-fails-travis S-needs-rebase There are merge conflict errors. labels Jul 17, 2017

highfive added the S-needs-rebase There are merge conflict errors. label Jul 18, 2017

asajeffrey removed the S-needs-rebase There are merge conflict errors. label Jul 19, 2017

asajeffrey mentioned this pull request Jul 20, 2017

Paint worklets: add a reftest to check that hidpi is working #17805

Open

asajeffrey force-pushed the script-paint-worklets-zoom branch from 8eb8de3 to c9c569a Compare July 20, 2017 17:50

highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Jul 20, 2017

highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Jul 20, 2017

Fixed scaling artefacts in paint worklets caused by zoom and hidpi.

caa3585

asajeffrey force-pushed the script-paint-worklets-zoom branch from c9c569a to caa3585 Compare July 20, 2017 22:25

highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-tests-failed The changes caused existing tests to fail. labels Jul 20, 2017

highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Jul 20, 2017

bors-servo merged commit caa3585 into servo:master Jul 21, 2017

highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Jul 21, 2017

This was referenced Jul 21, 2017

cleanup embedder/compositor/constellation/script messages #17425

Merged

Script paint worklets arguments #17546

Merged

Script paint worklets speculative evaluation #17810

Merged

Implement drawing an image from a CSS style value into a canvas #17634

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixed scaling artefacts in paint worklets caused by zoom and hidpi #17499

Fixed scaling artefacts in paint worklets caused by zoom and hidpi #17499

asajeffrey commented Jun 23, 2017 •

edited by larsbergstrom

highfive commented Jun 23, 2017

highfive commented Jun 23, 2017

asajeffrey commented Jun 23, 2017

jdm commented Jun 23, 2017

asajeffrey commented Jun 24, 2017

bzbarsky commented Jun 24, 2017

asajeffrey commented Jun 24, 2017

asajeffrey commented Jun 24, 2017

bzbarsky commented Jun 24, 2017 •

edited

asajeffrey commented Jun 24, 2017

bors-servo commented Jun 30, 2017

asajeffrey commented Jul 17, 2017

bors-servo commented Jul 18, 2017

jdm commented Jul 18, 2017

glennw commented Jul 19, 2017

asajeffrey commented Jul 20, 2017

bors-servo commented Jul 20, 2017

bors-servo commented Jul 20, 2017

bors-servo commented Jul 20, 2017

asajeffrey commented Jul 20, 2017

bors-servo commented Jul 20, 2017

bors-servo commented Jul 21, 2017

bors-servo commented Jul 21, 2017

Fixed scaling artefacts in paint worklets caused by zoom and hidpi #17499

Fixed scaling artefacts in paint worklets caused by zoom and hidpi #17499

Conversation

asajeffrey commented Jun 23, 2017 • edited by larsbergstrom

highfive commented Jun 23, 2017

highfive commented Jun 23, 2017

asajeffrey commented Jun 23, 2017

jdm commented Jun 23, 2017

asajeffrey commented Jun 24, 2017

bzbarsky commented Jun 24, 2017

asajeffrey commented Jun 24, 2017

asajeffrey commented Jun 24, 2017

bzbarsky commented Jun 24, 2017 • edited

asajeffrey commented Jun 24, 2017

bors-servo commented Jun 30, 2017

asajeffrey commented Jul 17, 2017

bors-servo commented Jul 18, 2017

jdm commented Jul 18, 2017

glennw commented Jul 19, 2017

asajeffrey commented Jul 20, 2017

bors-servo commented Jul 20, 2017

bors-servo commented Jul 20, 2017

bors-servo commented Jul 20, 2017

asajeffrey commented Jul 20, 2017

bors-servo commented Jul 20, 2017

bors-servo commented Jul 21, 2017

bors-servo commented Jul 21, 2017

asajeffrey commented Jun 23, 2017 •

edited by larsbergstrom

bzbarsky commented Jun 24, 2017 •

edited