Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync changes from mozilla-central gfx/wr #3918

Merged
merged 2 commits into from Apr 15, 2020
Merged

Conversation

@moz-gfx
Copy link

moz-gfx commented Apr 14, 2020

No description provided.

staktrace added 2 commits Apr 14, 2020
These assertions don't hold in some perfectly legitimate cases, such as when
items have both top and bottom sticky behaviours. The actual behaviour still
seems ok, so let's just drop the assertions.

Differential Revision: https://phabricator.services.mozilla.com/D70459

[ghsync] From https://hg.mozilla.org/mozilla-central/rev/259c147efa83074869ce93c3053b4ecbd80863d6
…y ranges. r=kvark

The WR code that computed the sticky_offset didn't properly combine the offsets
from the top- and bottom- sticky calculations if an item had both. This patch
fixes the calculation, which makes the remaining test failure (in the
configuration without any dynamic toolbar) pass.

Depends on D70679

Differential Revision: https://phabricator.services.mozilla.com/D70680

[ghsync] From https://hg.mozilla.org/mozilla-central/rev/2c065921de099b97532775e1aca5973edd5512b2
@moz-gfx
Copy link
Author

moz-gfx commented Apr 14, 2020

@bors-servo r=auto

@bors-servo
Copy link
Contributor

bors-servo commented Apr 14, 2020

📌 Commit 686307b has been approved by auto

@bors-servo
Copy link
Contributor

bors-servo commented Apr 14, 2020

Testing commit 686307b with merge 921ede8...

@bors-servo
Copy link
Contributor

bors-servo commented Apr 15, 2020

☀️ Test successful - status-appveyor, status-taskcluster
Approved by: auto
Pushing 921ede8 to master...

@bors-servo bors-servo merged commit 921ede8 into servo:master Apr 15, 2020
3 checks passed
3 checks passed
Community-TC (pull_request) TaskGroup: success
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.