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 #3958

Merged
merged 7 commits into from May 22, 2020
Merged

Conversation

@moz-gfx
Copy link

moz-gfx commented May 22, 2020

No description provided.

nical and others added 7 commits May 22, 2020
Previously, WR would attempt to detect at the start of frame
building if the spatial node of any picture cache contained
a non-axis-aligned transform, and disable picture caching in
that edge case.

However, picture caching can't (currently) be disabled when the
native compositor is active. In this mode, picture caching was
force enabled, causing an assertion failure due to unexpected
coordinate systems when updating pictures.

This patch changes the way the detection of scroll root logic
works such that we don't consider any scroll frame inside a
reference frame to be a valid scroll root for picture caching
purposes. Thus it's not possible to create a picture cache
where the reference spatial node has a non-axis-aligned transform.

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

[ghsync] From https://hg.mozilla.org/mozilla-central/rev/b04340bad99d70638efda2e7d528e89df77e47c4
…r=Bert,jrmuizel

Some pages created nesting levels of scroll roots where the outer
scroll frames are redundant (the scrollable size is zero if the
content rect is the same as the frame rect).

In these cases, it is of no benefit to select these as a scroll
root for picture cache tiles.

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

[ghsync] From https://hg.mozilla.org/mozilla-central/rev/a2078244558da928f2df9943595ab8ad03485c29
…E_2D. r=gw

The android emulator appears to have a bug in its OpenGL
implementation where it gets confused about whether a texture is bound
to GL_TEXTURE_EXTERNAL_OES or GL_TEXTURE_2D. This was causing spurious
errors when attempting to use a regular 2D texture, due to the fact
that an external texture had previously been bound.

Work around this by explicitly unbinding from GL_TEXTURE_EXTERNAL_OES
immediately before binding to GL_TEXTURE_2D.

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

[ghsync] From https://hg.mozilla.org/mozilla-central/rev/b9d97c8a708eb0c8b567d352833884c3103b0afc
…r=Bert,jrmuizel

Some pages created nesting levels of scroll roots where the outer
scroll frames are redundant (the scrollable size is zero if the
content rect is the same as the frame rect).

In these cases, it is of no benefit to select these as a scroll
root for picture cache tiles.

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

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

moz-gfx commented May 22, 2020

@bors-servo r=auto

@bors-servo
Copy link
Contributor

bors-servo commented May 22, 2020

📌 Commit 1f1529f has been approved by auto

@bors-servo
Copy link
Contributor

bors-servo commented May 22, 2020

Testing commit 1f1529f with merge fae8a24...

@bors-servo
Copy link
Contributor

bors-servo commented May 22, 2020

☀️ Test successful - status-taskcluster
Approved by: auto
Pushing fae8a24 to master...

@bors-servo bors-servo merged commit fae8a24 into servo:master May 22, 2020
2 checks passed
2 checks passed
Community-TC (pull_request) TaskGroup: success
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

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