fix: nativeImage remote serialization #23543
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nornagon
requested changes
May 12, 2020
nornagon
reviewed
May 12, 2020
zcbenz
requested changes
May 13, 2020
lib/browser/remote/server.ts
Outdated
| @@ -259,6 +262,8 @@ const fakeConstructor = (constructor: Function, name: string) => | |||
| const unwrapArgs = function (sender: electron.WebContents, frameId: number, contextId: string, args: any[]) { | |||
| const metaToValue = function (meta: MetaTypeFromRenderer): any { | |||
| switch (meta.type) { | |||
| case 'nativeimage': | |||
| return electron.nativeImage.createFromBitmap(meta.value.buffer, meta.value.size as any); | |||
There was a problem hiding this comment.
The scaleFactor option should also be passed, and we should add a way to pass the isTemplateImage information.
There was a problem hiding this comment.
If we're going to do a different serialization of native images here we should also update type-utils.
There was a problem hiding this comment.
@nornagon i was planning to handle that in a subsequent pr to prevent too much scope creep 🤔 i can do it here if preferable though.
codebytere
force-pushed
the
fix-nativeimage-serialization
branch
4 times, most recently
from
f073717
to
500160a
Compare
codebytere
force-pushed
the
fix-nativeimage-serialization
branch
5 times, most recently
from
dc3795f
to
136177b
Compare
codebytere
force-pushed
the
fix-nativeimage-serialization
branch
from
136177b
to
d5b088b
Compare
codebytere
force-pushed
the
fix-nativeimage-serialization
branch
from
d5b088b
to
17ebafa
Compare
nornagon
requested changes
May 14, 2020
codebytere
force-pushed
the
fix-nativeimage-serialization
branch
from
ae666e8
to
7d5e375
Compare
|
I was unable to backport this PR to "8-x-y" cleanly; |
|
I have automatically backported this PR to "9-x-y", please check out #23635 |
4 tasks
codebytere
added a commit
that referenced
this pull request
May 27, 2020
We weren't serializing nativeImages properly in the remote module, leading to gin conversion errors when trying to, for example, create a new context menu in the renderer with icons using nativeImage. This fixes that by adding a new special case to handle them.
|
@codebytere has manually backported this PR to "9-x-y", please check out #23796 |
codebytere
added a commit
that referenced
this pull request
May 27, 2020
We weren't serializing nativeImages properly in the remote module, leading to gin conversion errors when trying to, for example, create a new context menu in the renderer with icons using nativeImage. This fixes that by adding a new special case to handle them.
|
@codebytere has manually backported this PR to "8-x-y", please check out #23797 |
codebytere
added a commit
that referenced
this pull request
Jun 8, 2020
* fix: nativeImage remote serialization (#23543) We weren't serializing nativeImages properly in the remote module, leading to gin conversion errors when trying to, for example, create a new context menu in the renderer with icons using nativeImage. This fixes that by adding a new special case to handle them. * refactor: correctly serialize nativeImage/buffer with typeUtils (#23666) * refactor: correctly serialize nativeImage/buffer with typeUtils * test: add serialization specs * fix: construct from dataURL * test: test for dataURL specificity * refactor: use typeutils for nativeImage serialization * fix: ensure nativeImage serialization main->renderer * chore: fix FTBFS Co-authored-by: Charles Kerr <charles@charleskerr.com>
6 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of Change
Closes #23444.
We weren't serializing
nativeImagesproperly in the remote module, leading to gin conversion errors when trying to, for example, create a new context menu in the renderer with icons usingnativeImage. This fixes that by adding a new special case to handle them.Tested with https://gist.github.com/d8f1bcee2aa65c85b9cf3c8e4d34ad82.
cc @nornagon @MarshallOfSound
Checklist
npm testpassesRelease Notes
Notes: Fixed an issue where
nativeImages might throw conversion errors in the renderer process.