![electron-roller[bot]](/assets/img/avatar_default.png) 47572286f3
			
		
	
	
	
	
	47572286f3* https://chromium-review.googlesource.com/c/chromium/src/+/6230977 * chore: bump chromium to 135.0.7012.0 * chore: update accelerator.patch Support parsing Ctrl+Alt shortcuts | https://chromium-review.googlesource.com/c/chromium/src/+/6238137 * 6234236: Reapply bindings: Pass CppHeap on Isolate creation | https://chromium-review.googlesource.com/c/chromium/src/+/6234236 * 6234614: [ios blink] Move to use external begin frame source | https://chromium-review.googlesource.com/c/chromium/src/+/6234614 * chore: update chromium/feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch no manual changes; patch applied with fuzz * chore: update chromium/build_libc_as_static_library.patch no manual changes; patch applied with fuzz * chore: remove chromium/cherry-pick-dd8e2822e507.patch landed upstream * 6188884: Grit: Remove output_all_resource_defines from list of valid attributes. | https://chromium-review.googlesource.com/c/chromium/src/+/6188884 * 6226981: [views-ax] Remove View::GetAccessibleNodeData() method | https://chromium-review.googlesource.com/c/chromum/src/+/6226981 * 6214895: [views-ax] Deprecate View::NotifyAccessibilityEvent | https://chromium-review.googlesource.com/c/chromium/src/+/6214895 * 6196494: Remove ImageView::SetImage() with ImageSkia param | https://chromium-review.googlesource.com/c/chromium/src/+/6196494 * 6236267: [cleanup] Remove unused PrinterBasicInfo fields | https://chromium-review.googlesource.com/c/chromium/src/+/6236267 * refactor: remove status, isDefault properties from PrinterInfo Xref: https://chromium-review.googlesource.com/c/chromium/src/+/6236267 * chore: lint * fixup: added mas bypass to new file added in https://chromium-review.googlesource.com/c/chromium/src/+/6208630 see slack for more context * chore: node script/gen-libc++-filenames.js * chore: e patches all * fix: duplicate crdtp symbols * chore: update patches * fixup! [Media Features] Remove launched features --------- Co-authored-by: alice <alice@makenotion.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
		
			
				
	
	
		
			224 lines
		
	
	
	
		
			11 KiB
			
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			224 lines
		
	
	
	
		
			11 KiB
			
		
	
	
	
		
			Diff
		
	
	
	
	
	
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 | |
| From: Cheng Zhao <zcbenz@gmail.com>
 | |
| Date: Thu, 20 Sep 2018 17:45:32 -0700
 | |
| Subject: can_create_window.patch
 | |
| 
 | |
| This adds a hook to the window creation flow so that Electron can intercede and
 | |
| potentially prevent a window from being created.
 | |
| 
 | |
| TODO(loc): this patch is currently broken.
 | |
| 
 | |
| diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
 | |
| index f0089dddae47d970a04acc0df2fb0e2bdffc4856..33088669c478d5b7f6bbaa7998e14479e539c5cc 100644
 | |
| --- a/content/browser/renderer_host/render_frame_host_impl.cc
 | |
| +++ b/content/browser/renderer_host/render_frame_host_impl.cc
 | |
| @@ -9601,6 +9601,7 @@ void RenderFrameHostImpl::CreateNewWindow(
 | |
|            last_committed_origin_, params->window_container_type,
 | |
|            params->target_url, params->referrer.To<Referrer>(),
 | |
|            params->frame_name, params->disposition, *params->features,
 | |
| +          params->raw_features, params->body,
 | |
|            effective_transient_activation_state, params->opener_suppressed,
 | |
|            &no_javascript_access);
 | |
|  
 | |
| diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
 | |
| index f9f64fefddb0c7259877f7d39100fb9caee328b7..104e06b584e9321bc1da4c0913fd36e6cee909ee 100644
 | |
| --- a/content/browser/web_contents/web_contents_impl.cc
 | |
| +++ b/content/browser/web_contents/web_contents_impl.cc
 | |
| @@ -5003,6 +5003,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
 | |
|    SetPartitionedPopinOpenerOnNewWindowIfNeeded(new_contents_impl, params,
 | |
|                                                 opener);
 | |
|  
 | |
| +  if (delegate_) {
 | |
| +    delegate_->WebContentsCreatedWithFullParams(this, render_process_id,
 | |
| +                                                opener->GetRoutingID(),
 | |
| +                                                params, new_contents_impl);
 | |
| +  }
 | |
| +
 | |
|    // If the new frame has a name, make sure any SiteInstances that can find
 | |
|    // this named frame have proxies for it.  Must be called after
 | |
|    // SetSessionStorageNamespace, since this calls CreateRenderView, which uses
 | |
| @@ -5044,12 +5050,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
 | |
|      AddWebContentsDestructionObserver(new_contents_impl);
 | |
|    }
 | |
|  
 | |
| -  if (delegate_) {
 | |
| -    delegate_->WebContentsCreated(this, render_process_id,
 | |
| -                                  opener->GetRoutingID(), params.frame_name,
 | |
| -                                  params.target_url, new_contents_impl);
 | |
| -  }
 | |
| -
 | |
|    observers_.NotifyObservers(&WebContentsObserver::DidOpenRequestedURL,
 | |
|                               new_contents_impl, opener, params.target_url,
 | |
|                               params.referrer.To<Referrer>(), params.disposition,
 | |
| diff --git a/content/common/frame.mojom b/content/common/frame.mojom
 | |
| index 91dcf6c9c4a2d840fb50cb329fe3ef1bba9103c3..cbc887a3034605a93468e73a310e9ca6838b32d8 100644
 | |
| --- a/content/common/frame.mojom
 | |
| +++ b/content/common/frame.mojom
 | |
| @@ -621,6 +621,10 @@ struct CreateNewWindowParams {
 | |
|    // The navigation initiator's user activation and ad status.
 | |
|    blink.mojom.NavigationInitiatorActivationAndAdStatus
 | |
|        initiator_activation_and_ad_status;
 | |
| +
 | |
| +  // Extra fields added by Electron.
 | |
| +  string raw_features;
 | |
| +  network.mojom.URLRequestBody? body;
 | |
|  };
 | |
|  
 | |
|  // Operation result when the renderer asks the browser to create a new window.
 | |
| diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
 | |
| index f07621fc686236a9b009d425b96d2a847ffd07cf..6d7b34575a4831eafca792a5b8ed4720d4ad5957 100644
 | |
| --- a/content/public/browser/content_browser_client.cc
 | |
| +++ b/content/public/browser/content_browser_client.cc
 | |
| @@ -805,6 +805,8 @@ bool ContentBrowserClient::CanCreateWindow(
 | |
|      const std::string& frame_name,
 | |
|      WindowOpenDisposition disposition,
 | |
|      const blink::mojom::WindowFeatures& features,
 | |
| +    const std::string& raw_features,
 | |
| +    const scoped_refptr<network::ResourceRequestBody>& body,
 | |
|      bool user_gesture,
 | |
|      bool opener_suppressed,
 | |
|      bool* no_javascript_access) {
 | |
| diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
 | |
| index 373e9128eeefb3931059fc67099b00fdc071a52e..045689f947f45e7d4c50850ba760b0861af79798 100644
 | |
| --- a/content/public/browser/content_browser_client.h
 | |
| +++ b/content/public/browser/content_browser_client.h
 | |
| @@ -203,6 +203,7 @@ class NetworkService;
 | |
|  class TrustedURLLoaderHeaderClient;
 | |
|  }  // namespace mojom
 | |
|  struct ResourceRequest;
 | |
| +class ResourceRequestBody;
 | |
|  }  // namespace network
 | |
|  
 | |
|  namespace sandbox {
 | |
| @@ -1361,6 +1362,8 @@ class CONTENT_EXPORT ContentBrowserClient {
 | |
|        const std::string& frame_name,
 | |
|        WindowOpenDisposition disposition,
 | |
|        const blink::mojom::WindowFeatures& features,
 | |
| +      const std::string& raw_features,
 | |
| +      const scoped_refptr<network::ResourceRequestBody>& body,
 | |
|        bool user_gesture,
 | |
|        bool opener_suppressed,
 | |
|        bool* no_javascript_access);
 | |
| diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
 | |
| index ece9688e5f0a06be4cb6fb2d85e60269d0f66463..a955b37b93ca0887f3fba1ebea4a3c89e62aa6bc 100644
 | |
| --- a/content/public/browser/web_contents_delegate.cc
 | |
| +++ b/content/public/browser/web_contents_delegate.cc
 | |
| @@ -32,6 +32,17 @@ namespace content {
 | |
|  
 | |
|  WebContentsDelegate::WebContentsDelegate() = default;
 | |
|  
 | |
| +void WebContentsDelegate::WebContentsCreatedWithFullParams(
 | |
| +    WebContents* source_contents,
 | |
| +    int opener_render_process_id,
 | |
| +    int opener_render_frame_id,
 | |
| +    const mojom::CreateNewWindowParams& params,
 | |
| +    WebContents* new_contents) {
 | |
| +  WebContentsCreated(source_contents, opener_render_process_id,
 | |
| +                     opener_render_frame_id, params.frame_name,
 | |
| +                     params.target_url, new_contents);
 | |
| +}
 | |
| +
 | |
|  WebContents* WebContentsDelegate::OpenURLFromTab(
 | |
|      WebContents* source,
 | |
|      const OpenURLParams& params,
 | |
| diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
 | |
| index fbd5d3275fb9dfb04bee078b5ef275926fdad926..3938045d8028abff5f44ad347b514e4f823748cd 100644
 | |
| --- a/content/public/browser/web_contents_delegate.h
 | |
| +++ b/content/public/browser/web_contents_delegate.h
 | |
| @@ -18,6 +18,7 @@
 | |
|  #include "base/types/expected.h"
 | |
|  #include "build/build_config.h"
 | |
|  #include "content/common/content_export.h"
 | |
| +#include "content/common/frame.mojom.h"
 | |
|  #include "content/public/browser/eye_dropper.h"
 | |
|  #include "content/public/browser/fullscreen_types.h"
 | |
|  #include "content/public/browser/invalidate_type.h"
 | |
| @@ -366,6 +367,13 @@ class CONTENT_EXPORT WebContentsDelegate {
 | |
|        const StoragePartitionConfig& partition_config,
 | |
|        SessionStorageNamespace* session_storage_namespace);
 | |
|  
 | |
| +  virtual void WebContentsCreatedWithFullParams(
 | |
| +      WebContents* source_contents,
 | |
| +      int opener_render_process_id,
 | |
| +      int opener_render_frame_id,
 | |
| +      const mojom::CreateNewWindowParams& params,
 | |
| +      WebContents* new_contents);
 | |
| +
 | |
|    // Notifies the delegate about the creation of a new WebContents. This
 | |
|    // typically happens when popups are created.
 | |
|    virtual void WebContentsCreated(WebContents* source_contents,
 | |
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
 | |
| index 5d9ad1b7d5dfce78ce411a7670d4b20f35747b88..51d32ef662315d4a9dcc544093dd1d5e93d39c6f 100644
 | |
| --- a/content/renderer/render_frame_impl.cc
 | |
| +++ b/content/renderer/render_frame_impl.cc
 | |
| @@ -6893,6 +6893,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
 | |
|            request.HasUserGesture(), GetWebFrame()->IsAdFrame(),
 | |
|            GetWebFrame()->IsAdScriptInStack());
 | |
|  
 | |
| +  params->raw_features = features.raw_features.Utf8(
 | |
| +      WTF::Utf8ConversionMode::kStrictReplacingErrors);
 | |
| +  params->body = GetRequestBodyForWebURLRequest(request);
 | |
| +
 | |
|    // We preserve this information before sending the message since |params| is
 | |
|    // moved on send.
 | |
|    bool is_background_tab =
 | |
| diff --git a/content/web_test/browser/web_test_content_browser_client.cc b/content/web_test/browser/web_test_content_browser_client.cc
 | |
| index 3735a52cfd6d4fcd19a59507eda7ed4349aa0b38..cc6bf491b88a404e489e445e50d3bbe33c602204 100644
 | |
| --- a/content/web_test/browser/web_test_content_browser_client.cc
 | |
| +++ b/content/web_test/browser/web_test_content_browser_client.cc
 | |
| @@ -524,6 +524,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
 | |
|      const std::string& frame_name,
 | |
|      WindowOpenDisposition disposition,
 | |
|      const blink::mojom::WindowFeatures& features,
 | |
| +    const std::string& raw_features,
 | |
| +    const scoped_refptr<network::ResourceRequestBody>& body,
 | |
|      bool user_gesture,
 | |
|      bool opener_suppressed,
 | |
|      bool* no_javascript_access) {
 | |
| diff --git a/content/web_test/browser/web_test_content_browser_client.h b/content/web_test/browser/web_test_content_browser_client.h
 | |
| index e6212744a71fffa8aec3244e336eca0a38acab8b..537bde0bdd836183f90a8d44e911d508fb5f396d 100644
 | |
| --- a/content/web_test/browser/web_test_content_browser_client.h
 | |
| +++ b/content/web_test/browser/web_test_content_browser_client.h
 | |
| @@ -93,6 +93,8 @@ class WebTestContentBrowserClient : public ShellContentBrowserClient {
 | |
|                         const std::string& frame_name,
 | |
|                         WindowOpenDisposition disposition,
 | |
|                         const blink::mojom::WindowFeatures& features,
 | |
| +                       const std::string& raw_features,
 | |
| +                       const scoped_refptr<network::ResourceRequestBody>& body,
 | |
|                         bool user_gesture,
 | |
|                         bool opener_suppressed,
 | |
|                         bool* no_javascript_access) override;
 | |
| diff --git a/third_party/blink/public/web/web_window_features.h b/third_party/blink/public/web/web_window_features.h
 | |
| index 82e9d3dfb5f7da76d89fe15ae61d379fa46e177d..fd035512099a54dff6cc951a2226c23a252a90e2 100644
 | |
| --- a/third_party/blink/public/web/web_window_features.h
 | |
| +++ b/third_party/blink/public/web/web_window_features.h
 | |
| @@ -35,6 +35,7 @@
 | |
|  #include <vector>
 | |
|  
 | |
|  #include "third_party/blink/public/platform/web_string.h"
 | |
| +#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
 | |
|  
 | |
|  namespace blink {
 | |
|  
 | |
| @@ -74,6 +75,8 @@ struct WebWindowFeatures {
 | |
|    // TODO(apaseltiner): Investigate moving this field to a non-public struct
 | |
|    // since it is only needed within //third_party/blink.
 | |
|    std::optional<std::vector<WebString>> attribution_srcs;
 | |
| +
 | |
| +  String raw_features;
 | |
|  };
 | |
|  
 | |
|  }  // namespace blink
 | |
| diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
 | |
| index 3fa7cfabb084914d4fe9c65a17daacb6e274a40d..ca4bc6cd7060da4bdff70e896bb824a3d75f9dea 100644
 | |
| --- a/third_party/blink/renderer/core/frame/local_dom_window.cc
 | |
| +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
 | |
| @@ -2269,6 +2269,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
 | |
|    WebWindowFeatures window_features =
 | |
|        GetWindowFeaturesFromString(features, entered_window);
 | |
|  
 | |
| +  window_features.raw_features = features;
 | |
| +
 | |
|    if (window_features.is_partitioned_popin) {
 | |
|      UseCounter::Count(*entered_window,
 | |
|                        WebFeature::kPartitionedPopin_OpenAttempt);
 |