Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 6be1151ffc
Branches Tags
electron
/
patches
/
chromium
/
fix_font_face_resolution_when_renderer_is_blocked.patch

fix_font_face_resolution_when_renderer_is_blocked.patch 2.4 KB
History Raw

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859 
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Shelley Vohr <[email protected]>
    3. 

  3. Date: Tue, 4 Jun 2024 15:29:10 +0200
    4. 

  4. Subject: Fix font face resolution when renderer is blocked
    5. 

  5. 

  6. Backports https://chromium-review.googlesource.com/c/chromium/src/+/5584820
    7. 

  7. 

  8. As a result of https://chromium-review.googlesource.com/c/chromium/src/+/5290838,
    9. 

  9. the FontFaceSet promise in e.g. contentWindow.document.fonts.ready will never resolve
    10. 

  10. while the renderer is blocked. This Cl takes an approach similar to that taken in
    11. 

  11. MediaQueryList in order to enable the promise to be resolved.
    12. 

  12. 

  13. 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
    14. 

  14. index a477f3364122643cd79305adf86bb3cbbbded37e..479778c0118c7813ab424f4adb4f424f89ce3596 100644
    15. 

  15. --- a/third_party/blink/renderer/core/css/font_face_set_document.cc
    16. 

  16. +++ b/third_party/blink/renderer/core/css/font_face_set_document.cc
    17. 

  17. @@ -27,6 +27,7 @@
    18. 

  18.  
    19. 

  19.  #include "base/metrics/histogram_functions.h"
    20. 

  20.  #include "third_party/blink/public/common/features.h"
    21. 

  21. +#include "third_party/blink/public/common/metrics/document_update_reason.h"
    22. 

  22.  #include "third_party/blink/renderer/bindings/core/v8/dictionary.h"
    23. 

  23.  #include "third_party/blink/renderer/core/css/css_font_face.h"
    24. 

  24.  #include "third_party/blink/renderer/core/css/css_font_selector.h"
    25. 

  25. @@ -141,21 +142,27 @@ FontFaceSetDocument::CSSConnectedFontFaceList() const {
    26. 

  26.  }
    27. 

  27.  
    28. 

  28.  void FontFaceSetDocument::FireDoneEventIfPossible() {
    29. 

  29. -  if (should_fire_loading_event_) {
    30. 

  30. +  Document* d = GetDocument();
    31. 

  31. +  if (!d || !d->View()) {
    32. 

  32.      return;
    33. 

  33.    }
    34. 

  34. +
    35. 

  35.    if (!ShouldSignalReady()) {
    36. 

  36.      return;
    37. 

  37.    }
    38. 

  38. -  Document* d = GetDocument();
    39. 

  39. -  if (!d) {
    40. 

  40. +
    41. 

  41. +  // FireDoneEventIfPossible gets scheduled via PostTask at the end of a
    42. 

  42. +  // successful style+layout update. An invalidation may have occurred in
    43. 

  43. +  // the interim, so update style and layout synchronously here.
    44. 

  44. +  d->UpdateStyleAndLayout(DocumentUpdateReason::kUnknown);
    45. 

  45. +
    46. 

  46. +  // These values can change during style+layout update, so check them
    47. 

  47. +  // *after* the call to UpdateStyleAndLayout.
    48. 

  48. +  if (should_fire_loading_event_) {
    49. 

  49.      return;
    50. 

  50.    }
    51. 

  51.  
    52. 

  52. -  // If the layout was invalidated in between when we thought layout
    53. 

  53. -  // was updated and when we're ready to fire the event, just wait
    54. 

  54. -  // until after the next layout before firing events.
    55. 

  55. -  if (!d->View() || d->View()->NeedsLayout()) {
    56. 

  56. +  if (!ShouldSignalReady()) {
    57. 

  57.      return;
    58. 

  58.    }
    59. 

  59.  
    60.