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

fix: the callback of beginFrameSubscription should pass NativeImage instead of Buffer #17548

Merged
merged 2 commits into from Apr 4, 2019

Conversation

@zcbenz
Copy link
Member

commented Mar 26, 2019

Description of Change

As discussed in #13301 (comment), the callback of beginFrameSubscription should pass NativeImage instead of Buffer.

This PR makes sure NativeImage is passed, and fixes the original crash caused by the returned image not copying the bitmap pixels.

Checklist

Release Notes

Notes: Fix the callback of beginFrameSubscription passing Buffer instead of NativeImage.

@electron-cation electron-cation bot removed the new-pr 🌱 label Mar 27, 2019

@MarshallOfSound MarshallOfSound merged commit ac30185 into master Apr 4, 2019

15 of 16 checks passed

Backportable? - 5-0-x Backport Failed
Details
Artifact Comparison No Changes
Details
Semantic Pull Request ready to be squashed
Details
WIP Ready for review
Details
appveyor: win-ia32-debug AppVeyor build succeeded
Details
appveyor: win-ia32-testing AppVeyor build succeeded
Details
appveyor: win-ia32-testing-pr AppVeyor build succeeded
Details
appveyor: win-x64-debug AppVeyor build succeeded
Details
appveyor: win-x64-testing AppVeyor build succeeded
Details
appveyor: win-x64-testing-pr AppVeyor build succeeded
Details
build-linux Workflow: build-linux
Details
build-mac Workflow: build-mac
Details
electron-arm-testing Build #20190326.14 succeeded
Details
electron-arm64-testing Build #20190326.14 succeeded
Details
lint Workflow: lint
Details
release-notes Release notes found
@release-clerk

This comment has been minimized.

Copy link

commented Apr 4, 2019

Release Notes Persisted

Fix the callback of beginFrameSubscription passing Buffer instead of NativeImage.

@MarshallOfSound MarshallOfSound deleted the fix-frame-subscriber branch Apr 4, 2019

@trop

This comment has been minimized.

Copy link
Contributor

commented Apr 4, 2019

I was unable to backport this PR to "5-0-x" cleanly;
you will need to perform this backport manually.

@trop trop bot added needs-manual-bp/5-0-x and removed target/5-0-x labels Apr 4, 2019

Kiku-Reise added a commit to Kiku-Reise/electron that referenced this pull request May 16, 2019

fix: the callback of beginFrameSubscription should pass NativeImage i…
…nstead of Buffer (electron#17548)

* Revert "revert: frame subscriber deprecation and re-enable tests"

This reverts commit f643ce4.

* fix: make sure SkBitmap's pixels are copied
@codebytere

This comment has been minimized.

Copy link
Member

commented Aug 5, 2019

@zcbenz could you please backport this to 5-0-x?

zcbenz added a commit that referenced this pull request Aug 6, 2019

fix: the callback of beginFrameSubscription should pass NativeImage i…
…nstead of Buffer (#17548)

* Revert "revert: frame subscriber deprecation and re-enable tests"

This reverts commit f643ce4.

* fix: make sure SkBitmap's pixels are copied
@trop

This comment has been minimized.

Copy link
Contributor

commented Aug 6, 2019

A maintainer has manually backported this PR to "5-0-x", please check out #19647

@trop trop bot added in-flight/5-0-x and removed needs-manual-bp/5-0-x labels Aug 6, 2019

codebytere added a commit that referenced this pull request Aug 6, 2019

fix: the callback of beginFrameSubscription should pass NativeImage i…
…nstead of Buffer (#17548) (#19647)

* Revert "revert: frame subscriber deprecation and re-enable tests"

This reverts commit f643ce4.

* fix: make sure SkBitmap's pixels are copied

@sofianguy sofianguy added this to Fixed in 5.0.9 in 5.0.x Aug 7, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants
You can’t perform that action at this time.