Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
electron
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
ExcellentOSS
electron
Commits
34810414
Unverified
Commit
34810414
authored
1 year ago
by
trop[bot]
Committed by
GitHub
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
fix: partially revert invalidate focus ring
Co-authored-by:
VerteDinde
<
keeleymhammond@gmail.com
>
parent
75cefdb5
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
patches/chromium/.patches
+1
-0
1 addition, 0 deletions
patches/chromium/.patches
patches/chromium/fix_partially_revert_invalidate_focusring.patch
+58
-0
58 additions, 0 deletions
.../chromium/fix_partially_revert_invalidate_focusring.patch
with
59 additions
and
0 deletions
patches/chromium/.patches
+
1
−
0
View file @
34810414
...
...
@@ -130,3 +130,4 @@ refactor_expose_file_system_access_blocklist.patch
revert_power_update_trace_counter_in_power_monitor.patch
cherry-pick-b2cc7b7ac538.patch
feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch
fix_partially_revert_invalidate_focusring.patch
This diff is collapsed.
Click to expand it.
patches/chromium/fix_partially_revert_invalidate_focusring.patch
0 → 100644
+
58
−
0
View file @
34810414
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: VerteDinde <keeleymhammond@gmail.com>
Date: Mon, 6 May 2024 11:03:08 -0700
Subject: fix: partially revert views invalidate FocusRing when its host is
invalidated
This reverts commit f425c438dfb11fb714655c999ba8c74b58393425. This
commit seems to be causing a sporadic crash on Ubuntu and other Linux
distros. This patch can be reverted when the issue is fixed upstream, or
when the crash is addressed.
diff --git a/ui/views/view.cc b/ui/views/view.cc
index 94b026cda4738e489f1d7201c996f6db70d018ed..32ec794f4683be5ded78dcf310d3623b8748c236 100644
--- a/ui/views/view.cc
+++ b/ui/views/view.cc
@@ -911,16 +911,6 @@
void View::Layout(PassKey) {
}
void View::InvalidateLayout() {
- if (invalidating_) {
- return;
- }
-
- // There is no need to `InvalidateLayout()` when `Widget::IsClosed()`.
- if (Widget* widget = GetWidget(); widget && widget->IsClosed()) {
- return;
- }
-
- base::AutoReset<bool> invalidating(&invalidating_, true);
// We should never need to invalidate during a layout call; this tracks
// how many times that is happening.
++invalidates_during_layout_;
@@ -928,11 +918,6 @@
void View::InvalidateLayout() {
// Always invalidate up. This is needed to handle the case of us already being
// valid, but not our parent.
needs_layout_ = true;
-
- for (ViewObserver& observer : observers_) {
- observer.OnViewLayoutInvalidated(this);
- }
-
if (HasLayoutManager()) {
GetLayoutManager()->InvalidateLayout();
}
diff --git a/ui/views/view.h b/ui/views/view.h
index ea7d5441dbbfb713a6ffb57bcc07fb55fa574016..54b4c0a2871f214a4806fd863f32b8d010c09058 100644
--- a/ui/views/view.h
+++ b/ui/views/view.h
@@ -2343,9 +2343,6 @@
class VIEWS_EXPORT View : public ui::LayerDelegate,
// it is happening.
int invalidates_during_layout_ = 0;
- // Whether this view is in the middle of InvalidateLayout().
- bool invalidating_ = false;
-
// The View's LayoutManager defines the sizing heuristics applied to child
// Views. The default is absolute positioning according to bounds_.
std::unique_ptr<LayoutManager> layout_manager_;
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment