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

chore: cherry-pick 202b40b9ae, 135a6e537f from chromium #27780

Merged
merged 4 commits into from
Feb 18, 2021
Merged

chore: cherry-pick 202b40b9ae, 135a6e537f from chromium #27780

merged 4 commits into from
Feb 18, 2021

Conversation

deepak1556
Copy link
Member

[Merge to M88] [XProto] Switch event queue from a std::list to a base::circular_deque

*** NOTE: THIS IS NOT A CLEAN MERGE ***

This is needed as a prerequisite for [1]. It also improves performance
a bit by replacing a node-based data structure with a flat one.

[1] https://chromium-review.googlesource.com/c/chromium/src/+/2622521

Change-Id: Ibe2e522f6c131876ed73793305524c25b42ab910
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2625784
Commit-Queue: Thomas Anderson thomasanderson@chromium.org
Reviewed-by: Scott Violet sky@chromium.org
Cr-Commit-Position: refs/heads/master@{#844303}

BUG=1138143
TBR=sky

Change-Id: I181af2c82d5552a3614747d8b4f6740583ec4ffe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2687828
Commit-Queue: Thomas Anderson thomasanderson@chromium.org
Reviewed-by: Thomas Anderson thomasanderson@chromium.org
Auto-Submit: Thomas Anderson thomasanderson@chromium.org
Cr-Commit-Position: refs/branch-heads/4324@{#2163}
Cr-Branched-From: c73b5a651d37a6c4d0b8e3262cc4015a5579c6c8-refs/heads/master@{#827102}

[Merge to M88] Avoid spinning a nested message loop for X11 clipboard

*** NOTE: THIS IS NOT A CLEAN MERGE ***

BUG=443355,1138143,1161141,1161143,1161144,1161145,1161146,1161147,1161149,1161151,1161152

Change-Id: I5c95a9d066683d18f344d694e517274e3ef7ccb4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2622521
Reviewed-by: Scott Violet sky@chromium.org
Commit-Queue: Thomas Anderson thomasanderson@chromium.org
Cr-Commit-Position: refs/heads/master@{#844318}

BUG=1138143
TBR=sky

Change-Id: I7269ac8af7c91988a7d5520b3faf88dac89a577e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2688137
Reviewed-by: Thomas Anderson thomasanderson@chromium.org
Commit-Queue: Thomas Anderson thomasanderson@chromium.org
Cr-Commit-Position: refs/branch-heads/4324@{#2166}
Cr-Branched-From: c73b5a651d37a6c4d0b8e3262cc4015a5579c6c8-refs/heads/master@{#827102}

Notes: Security: backported fix for 1138143.

@deepak1556 deepak1556 requested a review from a team as a code owner February 18, 2021 10:43
@electron-cation electron-cation bot added the new-pr 🌱 PR opened in the last 24 hours label Feb 18, 2021
@deepak1556 deepak1556 added 11-x-y backport-check-skip Skip trop's backport validity checking labels Feb 18, 2021
@electron-cation electron-cation bot removed the new-pr 🌱 PR opened in the last 24 hours label Feb 18, 2021
@deepak1556 deepak1556 added the semver/patch backwards-compatible bug fixes label Feb 18, 2021
@deepak1556 deepak1556 merged commit 527c767 into 11-x-y Feb 18, 2021
@release-clerk
Copy link

release-clerk bot commented Feb 18, 2021

Release Notes Persisted

Security: backported fix for 1138143.

@deepak1556 deepak1556 deleted the robo/backport_1138143 branch February 18, 2021 23:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nornagon nornagon nornagon approved these changes

@miniak miniak miniak approved these changes

Assignees
No one assigned
Labels
11-x-y backport-check-skip Skip trop's backport validity checking semver/patch backwards-compatible bug fixes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@deepak1556 @nornagon @miniak @electron-bot