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: 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

@codebytere codebytere commented Mar 16, 2020

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.

@trop trop bot mentioned this pull request Mar 16, 2020
6 tasks
@codebytere codebytere requested a review from Mar 16, 2020
@codebytere codebytere force-pushed the bad-zoom-factor-7 branch from 46b8ec2 to 358c2ec Mar 17, 2020
Copy link
Contributor

@jkleinsc jkleinsc left a comment

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
@codebytere codebytere requested a review from jkleinsc Mar 18, 2020
@codebytere codebytere force-pushed the bad-zoom-factor-7 branch from 358c2ec to 3ba78ed Mar 18, 2020
@zcbenz
Copy link
Member

@zcbenz 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 Mar 23, 2020
@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 Mar 23, 2020
@zcbenz
Copy link
Member

@zcbenz zcbenz commented Mar 24, 2020

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

@codebytere codebytere force-pushed the bad-zoom-factor-7 branch from c77a3a4 to 204f488 Apr 1, 2020
@codebytere codebytere removed the 7-1-x label Apr 1, 2020
zcbenz
zcbenz approved these changes Apr 6, 2020
@jkleinsc
Copy link
Contributor

@jkleinsc 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
14 of 16 checks passed
@release-clerk
Copy link

@release-clerk 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 Apr 8, 2020
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