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: backport upstream fixes for color chooser dialogs #17227

Merged
merged 4 commits into from Mar 7, 2019

Conversation

brenca
Copy link
Contributor

@brenca brenca commented Mar 5, 2019

Description of Change

Fixes #13596 and replaces an old patch with a better one. Both patches should be removed once we get to a chromium version that includes the two fixes:
https://chromium-review.googlesource.com/c/chromium/src/+/1479332
https://chromium-review.googlesource.com/c/chromium/src/+/1469461

Not sure which version that would be, maybe @nornagon can help me with that.
The Windows fix is there to avoid a DCHECK, so I left that out of the release notes, since no user should see a debug build.

Checklist

Release Notes

Notes: Backported a fix for crashing color picker dialogs on MacOS.

@brenca brenca requested a review from nornagon March 5, 2019 01:24
@electron-cation electron-cation bot added the new-pr 🌱 PR opened in the last 24 hours label Mar 5, 2019
@deepak1556
Copy link
Member

deepak1556 commented Mar 5, 2019

You can use https://chromiumdash.appspot.com/commits to find out which version a commit has landed in. Also with upstream backports its not necessary to find out and specify the version, our script/git-import-patches will take care of it during upgrades.

patches/common/chromium/color_chooser_mac.patch Outdated Show resolved Hide resolved
patches/common/chromium/color_chooser_win.patch Outdated Show resolved Hide resolved
@brenca
Copy link
Contributor Author

brenca commented Mar 6, 2019

I updated the patches, thanks for the guidance @nornagon!

@electron-cation electron-cation bot removed the new-pr 🌱 PR opened in the last 24 hours label Mar 6, 2019
@deepak1556 deepak1556 merged commit 5422fd9 into master Mar 7, 2019
@release-clerk
Copy link

release-clerk bot commented Mar 7, 2019

Release Notes Persisted

Backported a fix for crashing color picker dialogs on MacOS.

@trop
Copy link
Contributor

trop bot commented Mar 7, 2019

I have automatically backported this PR to "5-0-x", please check out #17254

@deepak1556 deepak1556 deleted the brenca/color-chooser branch March 7, 2019 01:56
@deepak1556
Copy link
Member

Should the release notes also mention the DCHECK fix on windows ?

@nornagon
Copy link
Member

nornagon commented Mar 7, 2019

DCHECK generally isn't observable by app devs, so I'd say no.

@sofianguy sofianguy added this to Fixed in 5.0.0-beta.6 in 5.0.x Mar 20, 2019
kiku-jw pushed a commit to kiku-jw/electron that referenced this pull request May 16, 2019
* fix: backport upstream fixes for color chooser dialogs

* chore: fix patches, Windows bad, linux good

* Update color_chooser_mac.patch

* Update color_chooser_win.patch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
5.0.x
Fixed in 5.0.0-beta.6
Development

Successfully merging this pull request may close these issues.

Segmentation fault on color picker close
3 participants