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.

Sign up for GitHub

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

Jump to bottom

fix: crash on invalid zoomFactor #22710

Merged
merged 1 commit into from Apr 8, 2020
Merged

fix: crash on invalid zoomFactor #22710

merged 1 commit into from Apr 8, 2020

Conversation

codebytere
Copy link
Member

Backport of #22673.

See that PR for more details.

Notes: Fixed a potential crash on invalid zoomFactor values when setting the zoom factor of a webpage.

@electron-cation electron-cation bot added the new-pr 🌱 PR opened in the last 24 hours label Mar 16, 2020
@trop trop bot mentioned this pull request Mar 16, 2020
Merged
6 tasks
@trop trop bot added 7-1-x backport This is a backport PR labels Mar 16, 2020
@codebytere codebytere requested a review from a team March 16, 2020 21:54
@electron-cation electron-cation bot removed the new-pr 🌱 PR opened in the last 24 hours label Mar 16, 2020
jkleinsc
jkleinsc requested changes Mar 17, 2020
View reviewed changes
Copy link
Contributor

@jkleinsc jkleinsc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like a sneaky double comma made its way into this change 😄

shell/browser/api/atom_api_web_contents.cc Outdated Show resolved Hide resolved
@zcbenz
Copy link
Member

zcbenz commented Mar 20, 2020

The test is failing:

webContents module "after each" hook for "throws on an invalid zoomFactor" - "after each" hook for "throws on an invalid zoomFactor"
/Users/distiller/project/src/electron/spec/api-web-contents-spec.js
moreError: Object has been destroyed

@MarshallOfSound MarshallOfSound changed the base branch from 7-1-x to 7-2-x March 23, 2020 16:53
@trop trop bot added the 7-2-x label Mar 23, 2020
@codebytere codebytere force-pushed the bad-zoom-factor-7 branch 2 times, most recently from 7ee213f to c77a3a4 Compare March 23, 2020 18:25
@zcbenz
Copy link
Member

zcbenz commented Mar 24, 2020

Maybe using webContents.create to create a headless WebContents to avoid the exception?

@codebytere codebytere removed the 7-1-x label Apr 1, 2020
@jkleinsc
Copy link
Contributor

jkleinsc commented Apr 8, 2020

Merging as CI failures are known flakes unrelated to this PR.

@jkleinsc jkleinsc merged commit 779e325 into 7-2-x Apr 8, 2020
@release-clerk
Copy link

release-clerk bot commented Apr 8, 2020

Release Notes Persisted

Fixed a potential crash on invalid zoomFactor values when setting the zoom factor of a webpage.

@codebytere codebytere deleted the bad-zoom-factor-7 branch April 8, 2020 15:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jkleinsc jkleinsc jkleinsc approved these changes

@zcbenz zcbenz zcbenz approved these changes

Assignees
No one assigned
Labels
7-2-x backport This is a backport PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@codebytere @zcbenz @jkleinsc