github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: cherry-pick f5101995acd2 from chromium (#32638)

Browse Source
This commit is contained in:
Jeremy Rose
2022-01-27 16:54:06 -08:00
committed by GitHub
parent c63ef8529e
commit 3f521cad0c
2 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
patches/chromium/.patches
View File

@@ -114,3 +114,4 @@ build_disable_partitionalloc_on_mac.patch
revert_stop_using_nsrunloop_in_renderer_process.patch
fix_dont_delete_SerialPortManager_on_main_thread.patch
fix_crash_when_saving_edited_pdf_files.patch
cherry-pick-f5101995acd2.patch

38
patches/chromium/cherry-pick-f5101995acd2.patch Normal file
View File

@@ -0,0 +1,38 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Wed, 26 Jan 2022 23:39:50 +0000
Subject: fix draggable regions not updating without layout
This fixes draggable regions not being updated when styles change, but there is
no layout as a result of the style change. Some changes to styles can cause a
change in draggable regions without causing a layout (e.g. applying the
`-webkit-app-region: drag` style to an element without changing its size).
Bug: 1051562
Change-Id: Ifdf835be9e6c762131529b4309c6579366b80d6d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3416279
Reviewed-by: Stefan Zager <szager@chromium.org>
Commit-Queue: Jeremy Apthorp <jeremya@chromium.org>
Cr-Commit-Position: refs/heads/main@{#963777}
diff --git a/third_party/blink/renderer/core/frame/local_frame_view.cc b/third_party/blink/renderer/core/frame/local_frame_view.cc
index 5f2a765668b093bb600678967470b6371db77c01..e4b244fddc673840e8d47c781964d0146b108d47 100644
--- a/third_party/blink/renderer/core/frame/local_frame_view.cc
+++ b/third_party/blink/renderer/core/frame/local_frame_view.cc
@@ -1915,8 +1915,6 @@ void LocalFrameView::PerformPostLayoutTasks(bool visual_viewport_size_changed) {
}
}
- UpdateDocumentAnnotatedRegions();
-
GetLayoutView()->EnclosingLayer()->UpdateLayerPositionsAfterLayout();
frame_->Selection().DidLayout();
@@ -3307,6 +3305,7 @@ void LocalFrameView::UpdateStyleAndLayout() {
PerformPostLayoutTasks(visual_viewport_size_changed);
GetFrame().GetDocument()->LayoutUpdated();
}
+ UpdateDocumentAnnotatedRegions();
UpdateGeometriesIfNeeded();
}