Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 19e7af9841
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 4e195f960d7b9bf50f6784ce380a84a10867914f..dbf85ffe8504bdbab1c4c29f085e5307654d42f6 100644
    14. 

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

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

  16. @@ -115,6 +115,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 5586d724ef30e8183787c1cbba21fe9741d587c5..a5a95523e16fd35018f9646ae4a4d51e5ca626c0 100644
    27. 

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

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

  29. @@ -4735,6 +4735,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 745610204f08a39912b92f8b8ba9028465c9c57f..ddc571fbec08a38ada5c84acdadd618f1b349bed 100644
    44. 

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

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

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

  47.    bool ShouldTrackUseCounter(const blink::WebURL& url) 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 902504b8399c53fee972fe5549a4dbd39274a3c8..ddf6b6b696f7d990b7455ac6c9b8156a733b6c07 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. @@ -542,6 +542,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 5ac9a7ed3d0f91764452579992471c83104de64f..15ac214bc9177f2fc228cf93c459a7b385bdc582 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. @@ -201,6 +201,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/exported/local_frame_client_impl.cc b/third_party/blink/renderer/core/exported/local_frame_client_impl.cc
    82. 

  82. index f9d867fb84e544a2705d22c9fef1f04e639c052b..9b26988f4c7dd96269fd44c57dc9632f47ec409f 100644
    83. 

  83. --- a/third_party/blink/renderer/core/exported/local_frame_client_impl.cc
    84. 

  84. +++ b/third_party/blink/renderer/core/exported/local_frame_client_impl.cc
    85. 

  85. @@ -363,6 +363,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
    86. 

  86.      web_frame_->Client()->DidCreateScriptContext(context, world_id);
    87. 

  87.  }
    88. 

  88.  
    89. 

  89. +void LocalFrameClientImpl::DidInstallConditionalFeatures(
    90. 

  90. +    v8::Local<v8::Context> context,
    91. 

  91. +    int32_t world_id) {
    92. 

  92. +  if (web_frame_->Client())
    93. 

  93. +    web_frame_->Client()->DidInstallConditionalFeatures(context, world_id);
    94. 

  94. +}
    95. 

  95. +
    96. 

  96.  void LocalFrameClientImpl::WillReleaseScriptContext(
    97. 

  97.      v8::Local<v8::Context> context,
    98. 

  98.      int32_t world_id) {
    99. 

  99. diff --git a/third_party/blink/renderer/core/exported/local_frame_client_impl.h b/third_party/blink/renderer/core/exported/local_frame_client_impl.h
    100. 

  100. index 183a009cf58399966c9002786ede3d540aa068cb..dbe445cf40ec53e4b36e4a323334662c70359a38 100644
    101. 

  101. --- a/third_party/blink/renderer/core/exported/local_frame_client_impl.h
    102. 

  102. +++ b/third_party/blink/renderer/core/exported/local_frame_client_impl.h
    103. 

  103. @@ -78,6 +78,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
    104. 

  104.  
    105. 

  105.    void DidCreateScriptContext(v8::Local<v8::Context>,
    106. 

  106.                                int32_t world_id) override;
    107. 

  107. +  void DidInstallConditionalFeatures(v8::Local<v8::Context>,
    108. 

  108. +                                     int32_t world_id) override;
    109. 

  109.    void WillReleaseScriptContext(v8::Local<v8::Context>,
    110. 

  110.                                  int32_t world_id) override;
    111. 

  111.  
    112. 

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

  113. index a8443a8bfc2542ffad472206214279c1223d493f..8c7a4dec19d6fbca615b7bc282b0388189eef886 100644
    114. 

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

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

  116. @@ -297,6 +297,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
    117. 

  117.  
    118. 

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

  119.                                        int32_t world_id) = 0;
    120. 

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

  121. +                                             int32_t world_id) = 0;
    122. 

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

  123.                                          int32_t world_id) = 0;
    124. 

  124.    virtual bool AllowScriptExtensions() = 0;
    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 a3797ca04ff968d67ce4c5da6b9f17abc1d7651d..e3f26a61cdc4042131ea58d744a9b487dd6f52ca 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. @@ -336,6 +336,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.