Skip to content

fix: get subframes directly rather than from main frame #29241

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
Merged
merged 2 commits into from
May 25, 2021
Merged

fix: get subframes directly rather than from main frame #29241

merged 2 commits into from
May 25, 2021

Conversation

rzhao271
Copy link
Contributor

Description of Change

This change fixes the test case where a concurrent search in two iframes cannot occur.

CC @deepak1556

Checklist

Release Notes

Notes:

@electron-cation electron-cation bot added the new-pr 🌱 PR opened recently label May 19, 2021
@rzhao271 rzhao271 mentioned this pull request May 19, 2021
Closed
deepak1556
deepak1556 reviewed May 20, 2021
View reviewed changes
@zcbenz zcbenz changed the title Get subframes directly rather than from main frame fix: get subframes directly rather than from main frame May 25, 2021
@zcbenz zcbenz added semver/patch backwards-compatible bug fixes target/12-x-y and removed new-pr 🌱 PR opened recently labels May 25, 2021
@rzhao271 rzhao271 requested a review from deepak1556 May 25, 2021 20:16
@deepak1556 deepak1556 merged commit 2f89e24 into electron:robo/find_in_frame May 25, 2021
@deepak1556 deepak1556 removed semver/patch backwards-compatible bug fixes target/12-x-y labels May 25, 2021
@trop
Copy link
Contributor

trop bot commented May 25, 2021

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

@electron-cation electron-cation bot added the new-pr 🌱 PR opened recently label May 25, 2021
@trop
Copy link
Contributor

trop bot commented May 25, 2021

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

georgexu99 pushed a commit to georgexu99/electron that referenced this pull request Jun 17, 2021
@rzhao271
fix: get subframes directly rather than from main frame (electron#29241)
3c38b6f 
* Get subframes directly rather than from main frame

* Add parent frame check
@georgexu99 georgexu99 mentioned this pull request Jun 17, 2021
Closed
@trop
Copy link
Contributor

trop bot commented Jun 17, 2021

@georgexu99 has manually backported this PR to "13-x-y", please check out #29763

@electron-cation electron-cation bot removed the new-pr 🌱 PR opened recently label Jun 17, 2021
@VerteDinde
Copy link
Member

This was merged into a sub-branch, looks like Trop still targeted it for backport after the labels were removed. Removed the labels again so it doesn't show up in pre-release checks 🙂 (Thanks to @georgexu99 for the help)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MarshallOfSound MarshallOfSound MarshallOfSound approved these changes

@deepak1556 deepak1556 Awaiting requested review from deepak1556

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@rzhao271 @VerteDinde @deepak1556 @MarshallOfSound @zcbenz