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

can_create_window.patch 6.0 KB
History Raw

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

  2. From: Cheng Zhao <[email protected]>
    3. 

  3. Date: Thu, 20 Sep 2018 17:45:32 -0700
    4. 

  4. Subject: can_create_window.patch
    5. 

  5. 

  6. This adds a hook to the window creation flow so that Electron can intercede and
    7. 

  7. potentially prevent a window from being created.
    8. 

  8. 

  9. TODO(loc): this patch is currently broken.
    10. 

  10. 

  11. diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
    12. 

  12. index 563e07a5ac2d9c44c4484d59e3fc025c70b961ea..60e36fab0e6999688b88665d9ad3181a26525a38 100644
    13. 

  13. --- a/content/browser/frame_host/render_frame_host_impl.cc
    14. 

  14. +++ b/content/browser/frame_host/render_frame_host_impl.cc
    15. 

  15. @@ -4369,6 +4369,7 @@ void RenderFrameHostImpl::CreateNewWindow(
    16. 

  16.            last_committed_origin_, params->window_container_type,
    17. 

  17.            params->target_url, params->referrer.To<Referrer>(),
    18. 

  18.            params->frame_name, params->disposition, *params->features,
    19. 

  19. +          params->additional_features, params->body,
    20. 

  20.            effective_transient_activation_state, params->opener_suppressed,
    21. 

  21.            &no_javascript_access);
    22. 

  22.  
    23. 

  23. diff --git a/content/common/frame.mojom b/content/common/frame.mojom
    24. 

  24. index fb4cdca43e59c2dd8156cbe12bec391b128a6dd9..5c3645bebf2009def133fcd845f50e7745a243ca 100644
    25. 

  25. --- a/content/common/frame.mojom
    26. 

  26. +++ b/content/common/frame.mojom
    27. 

  27. @@ -302,6 +302,10 @@ struct CreateNewWindowParams {
    28. 

  28.  
    29. 

  29.    // The window features to use for the new window.
    30. 

  30.    blink.mojom.WindowFeatures features;
    31. 

  31. +
    32. 

  32. +  // Extra fields added by Electron.
    33. 

  33. +  array<string> additional_features;
    34. 

  34. +  network.mojom.URLRequestBody? body;
    35. 

  35.  };
    36. 

  36.  
    37. 

  37.  // Operation result when the renderer asks the browser to create a new window.
    38. 

  38. diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
    39. 

  39. index 0788e0f5e4311d8978768cb0d4d09736c19d2d25..0baf2ab441d48ee32a3ccf40fbc73c2c5cbcea2a 100644
    40. 

  40. --- a/content/public/browser/content_browser_client.cc
    41. 

  41. +++ b/content/public/browser/content_browser_client.cc
    42. 

  42. @@ -501,6 +501,8 @@ bool ContentBrowserClient::CanCreateWindow(
    43. 

  43.      const std::string& frame_name,
    44. 

  44.      WindowOpenDisposition disposition,
    45. 

  45.      const blink::mojom::WindowFeatures& features,
    46. 

  46. +    const std::vector<std::string>& additional_features,
    47. 

  47. +    const scoped_refptr<network::ResourceRequestBody>& body,
    48. 

  48.      bool user_gesture,
    49. 

  49.      bool opener_suppressed,
    50. 

  50.      bool* no_javascript_access) {
    51. 

  51. diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
    52. 

  52. index 16c89377db5909ace2d12281a5ad4db49076e805..3a32228e8c131468c535f3586b1c54b307062c42 100644
    53. 

  53. --- a/content/public/browser/content_browser_client.h
    54. 

  54. +++ b/content/public/browser/content_browser_client.h
    55. 

  55. @@ -139,6 +139,7 @@ class NetworkService;
    56. 

  56.  class TrustedURLLoaderHeaderClient;
    57. 

  57.  }  // namespace mojom
    58. 

  58.  struct ResourceRequest;
    59. 

  59. +class ResourceRequestBody;
    60. 

  60.  }  // namespace network
    61. 

  61.  
    62. 

  62.  namespace rappor {
    63. 

  63. @@ -824,6 +825,8 @@ class CONTENT_EXPORT ContentBrowserClient {
    64. 

  64.        const std::string& frame_name,
    65. 

  65.        WindowOpenDisposition disposition,
    66. 

  66.        const blink::mojom::WindowFeatures& features,
    67. 

  67. +      const std::vector<std::string>& additional_features,
    68. 

  68. +      const scoped_refptr<network::ResourceRequestBody>& body,
    69. 

  69.        bool user_gesture,
    70. 

  70.        bool opener_suppressed,
    71. 

  71.        bool* no_javascript_access);
    72. 

  72. diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
    73. 

  73. index 23ea7af344a1eaca2d0301cee9fe4bedde57b93a..37ac96bb7d42fe4caeb31861875219079d986982 100644
    74. 

  74. --- a/content/renderer/render_view_impl.cc
    75. 

  75. +++ b/content/renderer/render_view_impl.cc
    76. 

  76. @@ -69,6 +69,7 @@
    77. 

  77.  #include "content/renderer/ime_event_guard.h"
    78. 

  78.  #include "content/renderer/internal_document_state_data.h"
    79. 

  79.  #include "content/renderer/loader/request_extra_data.h"
    80. 

  80. +#include "content/renderer/loader/web_url_request_util.h"
    81. 

  81.  #include "content/renderer/media/audio/audio_device_factory.h"
    82. 

  82.  #include "content/renderer/render_frame_impl.h"
    83. 

  83.  #include "content/renderer/render_frame_proxy.h"
    84. 

  84. @@ -1294,6 +1295,8 @@ WebView* RenderViewImpl::CreateView(
    85. 

  85.    }
    86. 

  86.    params->features = ConvertWebWindowFeaturesToMojoWindowFeatures(features);
    87. 

  87.  
    88. 

  88. +  params->body = GetRequestBodyForWebURLRequest(request);
    89. 

  89. +
    90. 

  90.    // We preserve this information before sending the message since |params| is
    91. 

  91.    // moved on send.
    92. 

  92.    bool is_background_tab =
    93. 

  93. diff --git a/content/shell/browser/web_test/web_test_content_browser_client.cc b/content/shell/browser/web_test/web_test_content_browser_client.cc
    94. 

  94. index 4497b2d0c264f3e8ebc05230bdc117b6abccc23b..2eaa105035208d92cdcfe0e4de2a62ebbce1414b 100644
    95. 

  95. --- a/content/shell/browser/web_test/web_test_content_browser_client.cc
    96. 

  96. +++ b/content/shell/browser/web_test/web_test_content_browser_client.cc
    97. 

  97. @@ -326,6 +326,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
    98. 

  98.      const std::string& frame_name,
    99. 

  99.      WindowOpenDisposition disposition,
    100. 

  100.      const blink::mojom::WindowFeatures& features,
    101. 

  101. +    const std::vector<std::string>& additional_features,
    102. 

  102. +    const scoped_refptr<network::ResourceRequestBody>& body,
    103. 

  103.      bool user_gesture,
    104. 

  104.      bool opener_suppressed,
    105. 

  105.      bool* no_javascript_access) {
    106. 

  106. diff --git a/content/shell/browser/web_test/web_test_content_browser_client.h b/content/shell/browser/web_test/web_test_content_browser_client.h
    107. 

  107. index 5f985e2f11ebef42ed676260297e5e699096ba4a..2f3e68199f50b0e85dbb0d5cb95388279a194028 100644
    108. 

  108. --- a/content/shell/browser/web_test/web_test_content_browser_client.h
    109. 

  109. +++ b/content/shell/browser/web_test/web_test_content_browser_client.h
    110. 

  110. @@ -66,6 +66,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient {
    111. 

  111.                         const std::string& frame_name,
    112. 

  112.                         WindowOpenDisposition disposition,
    113. 

  113.                         const blink::mojom::WindowFeatures& features,
    114. 

  114. +                       const std::vector<std::string>& additional_features,
    115. 

  115. +                       const scoped_refptr<network::ResourceRequestBody>& body,
    116. 

  116.                         bool user_gesture,
    117. 

  117.                         bool opener_suppressed,
    118. 

  118.                         bool* no_javascript_access) override;
    119.