-
Notifications
You must be signed in to change notification settings - Fork 965
Fixed shields v2 crash with multiple windows #12984
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
Merged
Merged
Conversation
This file contains hidden or 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
3fac6ae
to
4658a10
Compare
bridiver
reviewed
Apr 12, 2022
bridiver
reviewed
Apr 12, 2022
nullhook
reviewed
Apr 12, 2022
4658a10
to
96be299
Compare
bridiver
reviewed
Apr 12, 2022
47e40b3
to
0602c1f
Compare
bridiver
approved these changes
Apr 12, 2022
nullhook
suggested changes
Apr 13, 2022
0602c1f
to
6d566e8
Compare
nullhook
suggested changes
Apr 13, 2022
this issue seems related: brave/brave-browser#22275 |
6d566e8
to
b9ef1b2
Compare
nullhook
approved these changes
Apr 13, 2022
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm - other than the comment change
7e190a8
to
a93666c
Compare
fix brave/brave-browser#22224 ShieldsPanelDataHandler should keep observed data controller instead of getting data controller from active web contents of current active window because active window could be different on it's created or destroyed. Crash happened because ShieldsPanelDataHandler tried to remove itself from wrong data controller due to above reason.
a93666c
to
c1c35b7
Compare
This was referenced Apr 14, 2022
7 tasks
Verified
Confirmed no more/new crashes when following my original steps + exploratory testing, too. |
Verified
|
Brave | 1.39.68 Chromium: 101.0.4951.34 (Official Build) nightly (x86_64) |
---|---|
Revision | 8f93af5d759634c5256b65997dedd138ed60992f-refs/branch-heads/4951@{#710} |
OS | macOS Version 12.4 (Build 21F5048e) |
Checked:
- Crash in BraveShieldsDataController::OnFaviconUpdated when toggling Brave Shields status between two same-site windows brave-browser#22224 using
twitch.tv
(two or more windows), toggling Brave Shields on/off - Crashing in BraveShieldsDataController::ClearAllResourcesList() toggling Block scripts brave-browser#21575 using
aol.com/news
(two or more windows), toggling Brave Shields on/off - Crash in BraveShieldsDataController::HandleItemBlocked brave-browser#22031 using
cnn.com
andyoutube.com
, toggling Brave Shields on/off - Crash on Mac Nightly brave-browser#21934 using
https://d3ward.github.io/toolz/adblock.html
, toggling Brave Shields on/off, changing options
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.
fix brave/brave-browser#22224
fix brave/brave-browser#21575
fix brave/brave-browser#22031
fix brave/brave-browser#21934
ShieldsPanelDataHandler should keep observed data controller
instead of getting data controller from active web contents of current
active window because active window could be different on it's created
or destroyed.
Crash happened because ShieldsPanelDataHandler tried to remove itself
from wrong data controller due to above reason.
Resolves
Submitter Checklist:
QA/Yes
orQA/No
;release-notes/include
orrelease-notes/exclude
;OS/...
) to the associated issuenpm run test -- brave_browser_tests
,npm run test -- brave_unit_tests
,npm run lint
,npm run gn_check
,npm run tslint
git rebase master
(if needed)Reviewer Checklist:
gn
After-merge Checklist:
changes has landed on
Test Plan:
See the linked issue