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

Fixes blocking parent-child segment will also block parent segment #9852

Merged
merged 1 commit into from
Aug 26, 2021

Conversation

tmancey
Copy link
Collaborator

@tmancey tmancey commented Aug 25, 2021

Resolves brave/brave-browser#17670

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally: npm run test -- brave_browser_tests, npm run test -- brave_unit_tests, npm run lint, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

See brave/brave-browser#17670

@tmancey tmancey requested review from moritzhaller and aseren August 25, 2021 15:53
@tmancey tmancey self-assigned this Aug 25, 2021
@tmancey tmancey force-pushed the issues/17670 branch 3 times, most recently from 57aefc0 to 595e5be Compare August 25, 2021 15:58
const std::vector<std::string> segment_components = SplitSegment(segment);
bool ParentSegmentsMatch(const std::string& lhs, const std::string& rhs) {
const std::vector<std::string> lhs_segment_components = SplitSegment(lhs);
const std::string lhs_parent_segment = lhs_segment_components.front();
Copy link
Collaborator

Choose a reason for hiding this comment

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

Maybe we should add DCHECK here that components are not empty

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Fixed

@tmancey tmancey force-pushed the issues/17670 branch 2 times, most recently from 1f49439 to 908661f Compare August 25, 2021 16:43
@tmancey tmancey requested a review from aseren August 25, 2021 16:43
@tmancey tmancey force-pushed the issues/17670 branch 6 times, most recently from 6df91da to 7bd019b Compare August 25, 2021 17:06
@tmancey tmancey force-pushed the issues/17670 branch 2 times, most recently from e8d6076 to 89b759c Compare August 25, 2021 20:58
Copy link
Contributor

@moritzhaller moritzhaller left a comment

Choose a reason for hiding this comment

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

LGTM

@tmancey tmancey merged commit 0caee13 into master Aug 26, 2021
@tmancey tmancey deleted the issues/17670 branch August 26, 2021 13:14
@tmancey tmancey added this to the 1.30.x - Nightly milestone Aug 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Blocking parent-child segment will also block parent segment
3 participants