mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: iframe.contentWindow.document.fonts resolution (#42384)

Browse source 
* fix: iframe.contentWindow.document.fonts resolution

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

* chore: update patches

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
This commit is contained in:
trop[bot] 2024-06-11 08:32:33 -05:00 committed by GitHub
parent e1675019d4
commit 0b71018107
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 60 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
patches/chromium/.patches
View file

@ -133,3 +133,4 @@ refactor_expose_file_system_access_blocklist.patch
cherry-pick-013961609785.patch
feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch
revert_fix_ime_prevent_tsf_hang_chromium_window_when_dpi_changed.patch
fix_font_face_resolution_when_renderer_is_blocked.patch

59
patches/chromium/fix_font_face_resolution_when_renderer_is_blocked.patch Normal file
View file

@ -0,0 +1,59 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 4 Jun 2024 15:29:10 +0200
Subject: Fix font face resolution when renderer is blocked
Backports https://chromium-review.googlesource.com/c/chromium/src/+/5584820
As a result of https://chromium-review.googlesource.com/c/chromium/src/+/5290838,
the FontFaceSet promise in e.g. contentWindow.document.fonts.ready will never resolve
while the renderer is blocked. This Cl takes an approach similar to that taken in
MediaQueryList in order to enable the promise to be resolved.
diff --git a/third_party/blink/renderer/core/css/font_face_set_document.cc b/third_party/blink/renderer/core/css/font_face_set_document.cc
index a88c3b56314abd5d0dfb477d359452a0afc40077..ecdf86f3aa632e226880f429a851a62071c2242b 100644
--- a/third_party/blink/renderer/core/css/font_face_set_document.cc
+++ b/third_party/blink/renderer/core/css/font_face_set_document.cc
@@ -27,6 +27,7 @@
#include "base/metrics/histogram_functions.h"
#include "third_party/blink/public/common/features.h"
+#include "third_party/blink/public/common/metrics/document_update_reason.h"
#include "third_party/blink/renderer/bindings/core/v8/dictionary.h"
#include "third_party/blink/renderer/core/css/css_font_face.h"
#include "third_party/blink/renderer/core/css/css_font_selector.h"
@@ -150,21 +151,27 @@ FontFaceSetDocument::CSSConnectedFontFaceList() const {
}
void FontFaceSetDocument::FireDoneEventIfPossible() {
- if (should_fire_loading_event_) {
+ Document* d = GetDocument();
+ if (!d || !d->View()) {
return;
}
+
if (!ShouldSignalReady()) {
return;
}
- Document* d = GetDocument();
- if (!d) {
+
+ // FireDoneEventIfPossible gets scheduled via PostTask at the end of a
+ // successful style+layout update. An invalidation may have occurred in
+ // the interim, so update style and layout synchronously here.
+ d->UpdateStyleAndLayout(DocumentUpdateReason::kUnknown);
+
+ // These values can change during style+layout update, so check them
+ // *after* the call to UpdateStyleAndLayout.
+ if (should_fire_loading_event_) {
return;
}
- // If the layout was invalidated in between when we thought layout
- // was updated and when we're ready to fire the event, just wait
- // until after the next layout before firing events.
- if (!d->View() || d->View()->NeedsLayout()) {
+ if (!ShouldSignalReady()) {
return;
}