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

add_didinstallconditionalfeatures.patch 7.9 KB
History Raw

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

  2. From: Jeremy Apthorp <[email protected]>
    3. 

  3. Date: Wed, 15 Jan 2020 16:35:18 -0800
    4. 

  4. Subject: add DidInstallConditionalFeatures
    5. 

  5. 

  6. This adds a hook on script context creation _after conditional features
    7. 

  7. have been installed_. Electron uses this to run preload scripts and
    8. 

  8. various other initialization. This is necessary because at the time
    9. 

  9. DidCreateScriptContext is called, not all JS APIs are available in the
    10. 

  10. context, which can cause some preload scripts to trip.
    11. 

  11. 

  12. diff --git a/content/public/renderer/render_frame_observer.h b/content/public/renderer/render_frame_observer.h
    13. 

  13. index 5a733f2086ec10d3010da52a2758e1748d1178e1..d8c7ef2e3c03f5275c1ed58849ec892f811165ef 100644
    14. 

  14. --- a/content/public/renderer/render_frame_observer.h
    15. 

  15. +++ b/content/public/renderer/render_frame_observer.h
    16. 

  16. @@ -128,6 +128,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
    17. 

  17.    virtual void DidHandleOnloadEvents() {}
    18. 

  18.    virtual void DidCreateScriptContext(v8::Local<v8::Context> context,
    19. 

  19.                                        int32_t world_id) {}
    20. 

  20. +  virtual void DidInstallConditionalFeatures(v8::Local<v8::Context> context,
    21. 

  21. +                                             int32_t world_id) {}
    22. 

  22.    virtual void WillReleaseScriptContext(v8::Local<v8::Context> context,
    23. 

  23.                                          int32_t world_id) {}
    24. 

  24.    virtual void DidClearWindowObject() {}
    25. 

  25. diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
    26. 

  26. index dc954f7ddb115da018064437c485f91303ca9502..b04ffbc51f260e63c4217c060e87062eb301ead5 100644
    27. 

  27. --- a/content/renderer/render_frame_impl.cc
    28. 

  28. +++ b/content/renderer/render_frame_impl.cc
    29. 

  29. @@ -4536,6 +4536,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
    30. 

  30.      observer.DidCreateScriptContext(context, world_id);
    31. 

  31.  }
    32. 

  32.  
    33. 

  33. +void RenderFrameImpl::DidInstallConditionalFeatures(
    34. 

  34. +    v8::Local<v8::Context> context, int world_id) {
    35. 

  35. +  for (auto& observer : observers_)
    36. 

  36. +    observer.DidInstallConditionalFeatures(context, world_id);
    37. 

  37. +}
    38. 

  38. +
    39. 

  39.  void RenderFrameImpl::WillReleaseScriptContext(v8::Local<v8::Context> context,
    40. 

  40.                                                 int world_id) {
    41. 

  41.    for (auto& observer : observers_)
    42. 

  42. diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
    43. 

  43. index 4b9ab61b17e0fa277b00daebc71cd1cbc24ce5ce..77a5f522ba70780dedfc324abc98db6775b9eca5 100644
    44. 

  44. --- a/content/renderer/render_frame_impl.h
    45. 

  45. +++ b/content/renderer/render_frame_impl.h
    46. 

  46. @@ -579,6 +579,8 @@ class CONTENT_EXPORT RenderFrameImpl
    47. 

  47.        blink::WebLocalFrameClient::LazyLoadBehavior lazy_load_behavior) override;
    48. 

  48.    void DidCreateScriptContext(v8::Local<v8::Context> context,
    49. 

  49.                                int world_id) override;
    50. 

  50. +  void DidInstallConditionalFeatures(v8::Local<v8::Context> context,
    51. 

  51. +                                     int world_id) override;
    52. 

  52.    void WillReleaseScriptContext(v8::Local<v8::Context> context,
    53. 

  53.                                  int world_id) override;
    54. 

  54.    void DidChangeScrollOffset() override;
    55. 

  55. diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h
    56. 

  56. index 883f83327a5b04ad56d82b91e1c7d8fa674324b1..2b7d8e13dcde8cd916c1d0a804883415b2b23a16 100644
    57. 

  57. --- a/third_party/blink/public/web/web_local_frame_client.h
    58. 

  58. +++ b/third_party/blink/public/web/web_local_frame_client.h
    59. 

  59. @@ -570,6 +570,9 @@ class BLINK_EXPORT WebLocalFrameClient {
    60. 

  60.    virtual void DidCreateScriptContext(v8::Local<v8::Context>,
    61. 

  61.                                        int32_t world_id) {}
    62. 

  62.  
    63. 

  63. +  virtual void DidInstallConditionalFeatures(v8::Local<v8::Context>,
    64. 

  64. +                                             int32_t world_id) {}
    65. 

  65. +
    66. 

  66.    // WebKit is about to release its reference to a v8 context for a frame.
    67. 

  67.    virtual void WillReleaseScriptContext(v8::Local<v8::Context>,
    68. 

  68.                                          int32_t world_id) {}
    69. 

  69. diff --git a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
    70. 

  70. index 50aa1b94ac6aab922f570d78f06096226d428c33..7af7ad0b7ed50dfc1ac061a915d3a99291afaec4 100644
    71. 

  71. --- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
    72. 

  72. +++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
    73. 

  73. @@ -188,6 +188,7 @@ void LocalWindowProxy::Initialize() {
    74. 

  74.    }
    75. 

  75.  
    76. 

  76.    InstallConditionalFeatures();
    77. 

  77. +  GetFrame()->Client()->DidInstallConditionalFeatures(context, world_->GetWorldId());
    78. 

  78.  
    79. 

  79.    if (World().IsMainWorld()) {
    80. 

  80.      GetFrame()->Loader().DispatchDidClearWindowObjectInMainWorld();
    81. 

  81. diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h
    82. 

  82. index 6a581fd26b67097cf82d9cca9c11516db8c7ec04..8cdbacf5ce72faf0aaa034b36b824ce9c9235e31 100644
    83. 

  83. --- a/third_party/blink/renderer/core/frame/local_frame_client.h
    84. 

  84. +++ b/third_party/blink/renderer/core/frame/local_frame_client.h
    85. 

  85. @@ -296,6 +296,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
    86. 

  86.  
    87. 

  87.    virtual void DidCreateScriptContext(v8::Local<v8::Context>,
    88. 

  88.                                        int32_t world_id) = 0;
    89. 

  89. +  virtual void DidInstallConditionalFeatures(v8::Local<v8::Context>,
    90. 

  90. +                                             int32_t world_id) = 0;
    91. 

  91.    virtual void WillReleaseScriptContext(v8::Local<v8::Context>,
    92. 

  92.                                          int32_t world_id) = 0;
    93. 

  93.    virtual bool AllowScriptExtensions() = 0;
    94. 

  94. diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
    95. 

  95. index 37698d003248e800d4312a2fa043b8124fc7848d..8d98d11a0f8da14a243e4eb0e0f1ac2a4eb56506 100644
    96. 

  96. --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
    97. 

  97. +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
    98. 

  98. @@ -272,6 +272,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
    99. 

  99.      web_frame_->Client()->DidCreateScriptContext(context, world_id);
    100. 

  100.  }
    101. 

  101.  
    102. 

  102. +void LocalFrameClientImpl::DidInstallConditionalFeatures(
    103. 

  103. +    v8::Local<v8::Context> context,
    104. 

  104. +    int32_t world_id) {
    105. 

  105. +  if (web_frame_->Client())
    106. 

  106. +    web_frame_->Client()->DidInstallConditionalFeatures(context, world_id);
    107. 

  107. +}
    108. 

  108. +
    109. 

  109.  void LocalFrameClientImpl::WillReleaseScriptContext(
    110. 

  110.      v8::Local<v8::Context> context,
    111. 

  111.      int32_t world_id) {
    112. 

  112. diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.h b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
    113. 

  113. index 92f875eafc84a46aff388a1164d45c6acee707c0..11845b9e14ccff6ef565f4bdc3af8924d6cb05a3 100644
    114. 

  114. --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.h
    115. 

  115. +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
    116. 

  116. @@ -77,6 +77,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
    117. 

  117.  
    118. 

  118.    void DidCreateScriptContext(v8::Local<v8::Context>,
    119. 

  119.                                int32_t world_id) override;
    120. 

  120. +  void DidInstallConditionalFeatures(v8::Local<v8::Context>,
    121. 

  121. +                                     int32_t world_id) override;
    122. 

  122.    void WillReleaseScriptContext(v8::Local<v8::Context>,
    123. 

  123.                                  int32_t world_id) override;
    124. 

  124.  
    125. 

  125. diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
    126. 

  126. index 9f9e6c6188d1f108f584b1117a91fc3e9a5e38ab..05330ea84dc1555bcc9dd6fbbd63e97348b5664d 100644
    127. 

  127. --- a/third_party/blink/renderer/core/loader/empty_clients.h
    128. 

  128. +++ b/third_party/blink/renderer/core/loader/empty_clients.h
    129. 

  129. @@ -343,6 +343,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
    130. 

  130.  
    131. 

  131.    void DidCreateScriptContext(v8::Local<v8::Context>,
    132. 

  132.                                int32_t world_id) override {}
    133. 

  133. +  void DidInstallConditionalFeatures(v8::Local<v8::Context>,
    134. 

  134. +                                     int32_t world_id) override {}
    135. 

  135.    void WillReleaseScriptContext(v8::Local<v8::Context>,
    136. 

  136.                                  int32_t world_id) override {}
    137. 

  137.    bool AllowScriptExtensions() override { return false; }
    138.