mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
e5d3fbf6dc
* chore: bump chromium in DEPS to 147.0.7693.0 * chore: bump chromium in DEPS to 147.0.7694.0 * chore: bump chromium in DEPS to 147.0.7695.0 * chore: bump chromium in DEPS to 147.0.7697.0 * chore: bump chromium in DEPS to 147.0.7698.0 * fix(patch): IsGuest moved to SecurityPrincipal Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7234613 Co-Authored-By: Claude (claude-opus-4-6) * chore: update patches (trivial only) * fix(patch): v8::External API now requires ExternalPointerTypeTag Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7562476 Co-Authored-By: Claude (claude-opus-4-6) * fix: update CreateCustomWebContents signature Upstream added disposition and window_features parameters. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7585256 Co-Authored-By: Claude (claude-opus-4-6) * fix: OriginatingProcess renamed to OriginatingProcessId Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7557820 Co-Authored-By: Claude (claude-opus-4-6) * fix: kLogNetLog moved from network::switches to net::switches Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7559090 Co-Authored-By: Claude (claude-opus-4-6) * fix(patch): patch out glic and save-to-drive Profile usage in PDF Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7589312 Co-Authored-By: Claude (claude-opus-4-6) * chore: bump chromium in DEPS to 147.0.7699.0 * chore: remove upstreamed pseudonymization salt descriptor code Ref: https://chromium-review.googlesource.com/c/chromium/src/+/7568382 Co-Authored-By: Claude (claude-opus-4-6) * chore: update patches (trivial only) * chore: update reclient patch format (copy-from to new-file) Co-Authored-By: Claude (claude-opus-4-6) * chore: remove upstreamed patch and update stale patches Co-Authored-By: Claude (claude-opus-4-6) * fix: expose GetLibGdk3 and guard glic function body GetLibGdk3 needs to be public for Electron's gdk_display_beep usage. ShouldShowGlicSummarizeButton body must be guarded, not just call site. Co-Authored-By: Claude (claude-opus-4-6) * fix(patch): v8::External API in nan requires ExternalPointerTypeTag Ref: https://chromium-review.googlesource.com/c/v8/v8/+/7562476 Co-Authored-By: Claude (claude-opus-4-6) * fixup fix(patch): v8::External API in nan requires ExternalPointerTypeTag * fixup: remove extraneous changes to patches Caused bydebb3716816e51034728* fixup: revert fix: expose GetLibGdk3 and guard glic function body Reverts6e51034728as this was an unneeded changed caused by the incorrect changes made indebb371681* 7586673: Update logic for showing pdf summarize button 7586673: Update logic for showing pdf summarize button | https://chromium-review.googlesource.com/c/chromium/src/+/7586673 Also 7454131: set enable_glic=true | https://chromium-review.googlesource.com/c/chromium/src/+/7454131 (landed in previous roll) --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Alice Zhao <alicelovescake@anthropic.com> Co-authored-by: John Kleinschmidt <kleinschmidtorama@gmail.com>
67 lines
2.7 KiB
Diff
67 lines
2.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: deepak1556 <hop2deep@gmail.com>
|
|
Date: Sat, 24 Apr 2021 18:07:09 -0700
|
|
Subject: web_contents.patch
|
|
|
|
This allows overriding the RenderViewHostDelegateView of a WebContents, which
|
|
is needed for OSR.
|
|
|
|
Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
|
|
|
|
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
|
index 85a0d1eebff80d6054b80c1e9cc6e8a2ef8584e2..3237246346af539a860ff3f71c75d20292df3f7b 100644
|
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
|
@@ -4180,6 +4180,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
|
params.main_frame_name, GetOpener(), primary_main_frame_policy,
|
|
base::UnguessableToken::Create());
|
|
|
|
+ if (params.view && params.delegate_view) {
|
|
+ view_.reset(params.view);
|
|
+ render_view_host_delegate_view_ = params.delegate_view;
|
|
+ }
|
|
+
|
|
+ if (!view_) {
|
|
+
|
|
std::unique_ptr<WebContentsViewDelegate> delegate =
|
|
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
|
|
|
|
@@ -4190,6 +4197,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
|
view_ = CreateWebContentsView(this, std::move(delegate),
|
|
&render_view_host_delegate_view_);
|
|
}
|
|
+ } // !view_
|
|
CHECK(render_view_host_delegate_view_);
|
|
CHECK(view_.get());
|
|
|
|
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
|
|
index d3ff17bbff0e71ead2c3f98e90bbecd922ab6008..81bffaddac5dfd0e4fd81c5d30cffc661532c2f8 100644
|
|
--- a/content/public/browser/web_contents.h
|
|
+++ b/content/public/browser/web_contents.h
|
|
@@ -129,11 +129,14 @@ class PrerenderHandle;
|
|
class RenderFrameHost;
|
|
class RenderViewHost;
|
|
class RenderWidgetHost;
|
|
+class RenderViewHostDelegateView;
|
|
class RenderWidgetHostView;
|
|
+class RenderWidgetHostViewBase;
|
|
class ScreenOrientationDelegate;
|
|
class SiteInstance;
|
|
class UnownedInnerWebContentsClient;
|
|
class WebContentsDelegate;
|
|
+class WebContentsView;
|
|
class WebUI;
|
|
struct DropData;
|
|
struct GlobalRenderFrameHostId;
|
|
@@ -291,6 +294,10 @@ class WebContents : public PageNavigator, public base::SupportsUserData {
|
|
network::mojom::WebSandboxFlags starting_sandbox_flags =
|
|
network::mojom::WebSandboxFlags::kNone;
|
|
|
|
+ // Optionally specify the view and delegate view.
|
|
+ raw_ptr<content::WebContentsView> view = nullptr;
|
|
+ raw_ptr<content::RenderViewHostDelegateView> delegate_view = nullptr;
|
|
+
|
|
// Value used to set the last time the WebContents was made active, this is
|
|
// the value that'll be returned by GetLastActiveTimeTicks(). If this is
|
|
// left default initialized then the value is not passed on to the
|