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

Merged
merged 2 commits into from Sep 26, 2019
Merged

Sync changes from mozilla-central #3764

merged 2 commits into from Sep 26, 2019

Conversation

@moz-gfx
Copy link

moz-gfx commented Sep 26, 2019

This change is Reviewable

bholley added 2 commits Sep 26, 2019
…colors to be explicitly specified. r=gw

The current code doesn't permit fully opaque debug rects.

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

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/90162306864cefa2889b2fe56701c8149ea25433
This approach does have some stacking issues. The way to fix this would
be to instrument the brush_image shader rather than adding debug rects.

Something like: #ifdef WR_FEATURE_SFW frag.color = vec4(0,1,1,1); #endif

That's slightly more involved though, so I'm going to leave it for now.

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

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/f59ec3966f5f3242b18a188b52217496ec65b42a
@moz-gfx
Copy link
Author

moz-gfx commented Sep 26, 2019

@bors-servo
Copy link
Contributor

bors-servo commented Sep 26, 2019

📌 Commit e4b0080 has been approved by moz-gfx

@bors-servo
Copy link
Contributor

bors-servo commented Sep 26, 2019

Testing commit e4b0080 with merge efec276...

bors-servo added a commit that referenced this pull request Sep 26, 2019
Sync changes from mozilla-central
@ghost
Copy link

ghost commented Sep 26, 2019

Submitting the task to Taskcluster failed. Details

Cannot read property 'length' of undefined

@bors-servo
Copy link
Contributor

bors-servo commented Sep 26, 2019

☀️ Test successful - status-appveyor, status-taskcluster
Approved by: moz-gfx
Pushing efec276 to master...

@bors-servo bors-servo merged commit e4b0080 into servo:master Sep 26, 2019
3 checks passed
3 checks passed
Taskcluster (pull_request) TaskGroup: success
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
@ghost
Copy link

ghost commented Sep 26, 2019

Submitting the task to Taskcluster failed. Details

Cannot read property 'length' of undefined

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.