![electron-roller[bot]](/assets/img/avatar_default.png) 4c3014944c
			
		
	
	
	
	
	4c3014944c* chore: bump chromium in DEPS to 129.0.6657.0
* chore: update patches
* chore: bump chromium in DEPS to 129.0.6658.0
* chore: update patches
* 5743786: [ServiceWorker] Populate service worker start token to WorkerId.
https://chromium-review.googlesource.com/c/chromium/src/+/5743786
* 5784424: [Extensions] Move ownership of Dispatcher to ExtensionsRendererClient
https://chromium-review.googlesource.com/c/chromium/src/+/5784424
* chore: bump chromium in DEPS to 129.0.6659.0
* chore: bump chromium in DEPS to 129.0.6660.0
* chore: update patches
* chore: bump chromium in DEPS to 129.0.6662.0
* chore: bump chromium in DEPS to 129.0.6664.0
* 5789627: [Partitioned Popins] (3) `popin` feature triggers third-party storage partitioning
https://chromium-review.googlesource.com/c/chromium/src/+/5789627
* 5791367: Remove some chrome:: namespace from chrome/browser/app_mode/*
https://chromium-review.googlesource.com/c/chromium/src/+/5791367
* 5791522: [SCK] Skip redundant getShareableContentWithCompletionHandler
https://chromium-review.googlesource.com/c/chromium/src/+/5791522
* 5761330: Send refresh rate prefs b/w RefreshRateController and DisplayPrivate
https://chromium-review.googlesource.com/c/chromium/src/+/5761330
* chore: fixup patch indices
* 5793591: Remove unused GetHeader overload
https://chromium-review.googlesource.com/c/chromium/src/+/5793591
* 5787624: [Extensions] Simplify ExtensionsRendererClient::RenderThreadStarted()
https://chromium-review.googlesource.com/c/chromium/src/+/5787624
* 5721709: Fix Incorrect last_accessed_time Tracking for Tabs
https://chromium-review.googlesource.com/c/chromium/src/+/5721709
* 5789215: [Extensions] Add a //chrome/common/extensions build target
https://chromium-review.googlesource.com/c/chromium/src/+/5789215
* Roll V8 from 48f669a0758c to eee3eb91d01c
48f669a075..eee3eb91d0
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: Shelley Vohr <shelley.vohr@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 525da84ede5f50eb3cc57fd4949f8efb16939ac6..fce0af2ae4f90250376fca109df309dc28f3b61d 100644
 | |
| --- a/content/browser/renderer_host/render_frame_host_impl.cc
 | |
| +++ b/content/browser/renderer_host/render_frame_host_impl.cc
 | |
| @@ -8870,6 +8870,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 e8eb786e8f3992046b5a0112c0fe76ff414f26b3..56c87788fdbe3c50bb5b9dea47a35510a42b4e8e 100644
 | |
| --- a/content/browser/web_contents/web_contents_impl.cc
 | |
| +++ b/content/browser/web_contents/web_contents_impl.cc
 | |
| @@ -4756,6 +4756,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
 | |
|      new_contents_impl->partitioned_popin_opener_ = opener->GetWeakPtr();
 | |
|    }
 | |
|  
 | |
| +  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
 | |
| @@ -4797,12 +4803,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 37a00f8d520e6043faa9b202e2f7a3d7a0794664..08b56afaa591137aafc4aad38da84361742bbe66 100644
 | |
| --- a/content/common/frame.mojom
 | |
| +++ b/content/common/frame.mojom
 | |
| @@ -605,6 +605,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 55c7bc676faa6b77200fb4e7507e1d87786e1010..927ab1359fb5de90225bd9a4d1f75adf5bbf9636 100644
 | |
| --- a/content/public/browser/content_browser_client.cc
 | |
| +++ b/content/public/browser/content_browser_client.cc
 | |
| @@ -751,6 +751,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 b9604add606194aa424ae4f50188e0286c547bd5..1c2a96cc187013086132468b3e14928828fd7377 100644
 | |
| --- a/content/public/browser/content_browser_client.h
 | |
| +++ b/content/public/browser/content_browser_client.h
 | |
| @@ -190,6 +190,7 @@ class NetworkService;
 | |
|  class TrustedURLLoaderHeaderClient;
 | |
|  }  // namespace mojom
 | |
|  struct ResourceRequest;
 | |
| +class ResourceRequestBody;
 | |
|  }  // namespace network
 | |
|  
 | |
|  namespace sandbox {
 | |
| @@ -1287,6 +1288,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 8b8ad58fede66aa4423fe1b17637bb26f54cd862..4998328a01525a12fa54ca5b9bf85f518c64de83 100644
 | |
| --- a/content/public/browser/web_contents_delegate.cc
 | |
| +++ b/content/public/browser/web_contents_delegate.cc
 | |
| @@ -30,6 +30,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 00c51ef739d8b369f67112a341fa8b8947d8aa90..38ab9071bdab02e855f59c93941da1153cd06d88 100644
 | |
| --- a/content/public/browser/web_contents_delegate.h
 | |
| +++ b/content/public/browser/web_contents_delegate.h
 | |
| @@ -17,6 +17,7 @@
 | |
|  #include "base/memory/scoped_refptr.h"
 | |
|  #include "build/build_config.h"
 | |
|  #include "content/common/content_export.h"
 | |
| +#include "content/common/frame.mojom.h"
 | |
|  #include "content/public/browser/back_forward_transition_animation_manager.h"
 | |
|  #include "content/public/browser/eye_dropper.h"
 | |
|  #include "content/public/browser/fullscreen_types.h"
 | |
| @@ -359,6 +360,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 3a708d41f0a10d6179dadcdbcd4c9f46bfc8149e..498cec822e5f1b36f4864bcf8bb8f31f11e96456 100644
 | |
| --- a/content/renderer/render_frame_impl.cc
 | |
| +++ b/content/renderer/render_frame_impl.cc
 | |
| @@ -6704,6 +6704,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
 | |
|            request.HasUserGesture(), GetWebFrame()->IsAdFrame(),
 | |
|            GetWebFrame()->IsAdScriptInStack());
 | |
|  
 | |
| +  params->raw_features = features.raw_features.Utf8(
 | |
| +      WTF::UTF8ConversionMode::kStrictUTF8ConversionReplacingUnpairedSurrogatesWithFFFD);
 | |
| +  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 207c7298ffb187354d4a50dad421fe78f9bc066d..10bae4861c9cac9d2c9cedae8beca16f2c4c5f5a 100644
 | |
| --- a/content/web_test/browser/web_test_content_browser_client.cc
 | |
| +++ b/content/web_test/browser/web_test_content_browser_client.cc
 | |
| @@ -520,6 +520,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 115b75966f53ee16f7886fc4152741727c7825c8..a1944f7de539f04f85fdb238ccf67e091f413ad3 100644
 | |
| --- a/content/web_test/browser/web_test_content_browser_client.h
 | |
| +++ b/content/web_test/browser/web_test_content_browser_client.h
 | |
| @@ -92,6 +92,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 c576ace24e81cc877aa2595d40e0a13a7af9f6a2..210fb97d44c19c29af424cc7b9cb31690cfcc565 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 "third_party/blink/public/platform/web_string.h"
 | |
|  #include "third_party/blink/public/platform/web_vector.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<WebVector<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 20081a8a84ffbebda7cf8e3c0d9d106b11ce0373..c232c87f9c2c6cafd76a47cae53cf5d10522a4fc 100644
 | |
| --- a/third_party/blink/renderer/core/frame/local_dom_window.cc
 | |
| +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
 | |
| @@ -2240,6 +2240,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
 | |
|    WebWindowFeatures window_features =
 | |
|        GetWindowFeaturesFromString(features, entered_window);
 | |
|  
 | |
| +  window_features.raw_features = features;
 | |
| +
 | |
|    // In fenced frames, we should always use `noopener`.
 | |
|    if (GetFrame()->IsInFencedFrameTree()) {
 | |
|      window_features.noopener = true;
 |