From bd900fb10ffde9ef624f464ef1358fd4700066ed Mon Sep 17 00:00:00 2001 From: Keeley Hammond Date: Mon, 13 May 2024 16:36:32 -0700 Subject: [PATCH] chore: update patches after #42126 was merged (#42156) chore: update patches after focus ring was merged --- .../fix_partially_revert_invalidate_focusring.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/patches/chromium/fix_partially_revert_invalidate_focusring.patch b/patches/chromium/fix_partially_revert_invalidate_focusring.patch index 614f42b4acd..3e61136b6c0 100644 --- a/patches/chromium/fix_partially_revert_invalidate_focusring.patch +++ b/patches/chromium/fix_partially_revert_invalidate_focusring.patch @@ -10,10 +10,10 @@ 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 +index 4116b2a3fad02e1060bb7b137804753cf97dd7ca..46d3b426f54041efe4270bfda453358418fff160 100644 --- a/ui/views/view.cc +++ b/ui/views/view.cc -@@ -911,16 +911,6 @@ void View::Layout(PassKey) { +@@ -928,16 +928,6 @@ void View::Layout(PassKey) { } void View::InvalidateLayout() { @@ -30,7 +30,7 @@ index 94b026cda4738e489f1d7201c996f6db70d018ed..32ec794f4683be5ded78dcf310d3623b // 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() { +@@ -945,11 +935,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; @@ -43,10 +43,10 @@ index 94b026cda4738e489f1d7201c996f6db70d018ed..32ec794f4683be5ded78dcf310d3623b GetLayoutManager()->InvalidateLayout(); } diff --git a/ui/views/view.h b/ui/views/view.h -index ea7d5441dbbfb713a6ffb57bcc07fb55fa574016..54b4c0a2871f214a4806fd863f32b8d010c09058 100644 +index 8f377e417231698b9146d5b79dc14730e34260f7..9936899e10505f57d3b465d5613d90df8d18ded3 100644 --- a/ui/views/view.h +++ b/ui/views/view.h -@@ -2343,9 +2343,6 @@ class VIEWS_EXPORT View : public ui::LayerDelegate, +@@ -2339,9 +2339,6 @@ class VIEWS_EXPORT View : public ui::LayerDelegate, // it is happening. int invalidates_during_layout_ = 0;