458b14b8ed
* chore: bump chromium in DEPS to 136.0.7052.0 * chore: update mas_avoid_private_macos_api_usage.patch.patch6318359patch applied manually due to context shear * chore: update preconnect_manager.patch Xref:6318420patch applied manually due to context shear * chore: e patches all * chore: bump chromium to 136.0.7053.1 * chore: update fix_remove_profiles_from_spellcheck_service.patch Xref:6326575patch applied manually due to context shear * chore: e patches all * chore: revert removal of v8 API used by Node.js * devtools: Remove DevToolsUIBindings::SendJsonRequest() |6326236* 6244461: Merge //content/common/user_agent.cc into //components/embedder_support:user_agent |6244461* 6313744: Migrate views::Background factory methods to ColorVariant |6313744* 6314545: Remove multiple argument support from base::ToString() |6314545* 6317362: [Extensions] Inline MessagingDelegate::CreateReceiverForTab() |6317362* 6308998: Add SettingAccess structured metrics event for DevTools |6308998* 6295214: Remove redundant state field in per-extension preferences |6295214NB: this change is copied from the upstream change to extensions/shell/browser/shell_extension_loader.cc * fix: ui/ linter error This is showing up in an eslint build step in Electron: > /__w/electron/electron/src/out/Default/gen/ui/webui/resources/cr_elements/preprocessed/cr_menu_selector/cr_menu_selector.ts > 77:23 error This assertion is unnecessary since the receiver accepts the original type of the expression @typescript-eslint/no-unnecessary-type-assertion > > ✖ 1 problem (1 error, 0 warnings) > 1 error and 0 warnings potentially fixable with the `--fix` option. However, removing the assertion causes a typescript build failure: > gen/ui/webui/resources/cr_elements/preprocessed/cr_menu_selector/cr_menu_selector.ts:77:23 - error TS2345: Argument of type 'HTMLElement | null' is not assignable to parameter of type 'HTMLElement'. > Type 'null' is not assignable to type 'HTMLElement'. > > 77 items.indexOf(this.querySelector<HTMLElement>(':focus')); > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ So I think the two different steps may be picking up typescript definitions. This patch should be removed after the issue is tracked down and fixed in a followup task. * fix: -Wnonnull warning Fixes this warning: > 2025-03-07T01:05:01.8637705Z ../../third_party/electron_node/src/debug_utils.cc(257,12): error: null passed to a callee that requires a non-null argument [-Werror,-Wnonnull] > 2025-03-07T01:05:01.8638267Z 257 | return nullptr; > 2025-03-07T01:05:01.8638481Z | ^~~~~~~ > 2025-03-07T01:05:01.8638700Z 1 error generated. Not sure why this warning was never triggered before; `git blame` indicates this code hasn't changed in ages: > c40a8273ef2 (Michaël Zasso 2024-05-10 09:50:20 +0200 255) #endif // DEBUG > 8e2d33f1562 (Anna Henningsen 2018-06-07 16:54:29 +0200 256) } > 247b5130595 (Refael Ackermann 2018-10-22 15:07:00 -0400 257) return nullptr; > 247b5130595 (Refael Ackermann 2018-10-22 15:07:00 -0400 258) } Presumably this is failing in this Chromium roll due to a clang version bump. We should remove this patch after upstreaming it. * docs: add upstream pr link for Node patch --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com>
73 lines
3.5 KiB
Diff
73 lines
3.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Anonymous <anonymous@electronjs.org>
|
|
Date: Thu, 20 Sep 2018 17:46:21 -0700
|
|
Subject: render_widget_host_view_base.patch
|
|
|
|
... something to do with OSR? and maybe <webview> as well? terrifying.
|
|
|
|
diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc
|
|
index ce00b0540a7ac7f7c7b4c65f1a1343f72ae21c42..cc3b694431f14b166a305a446a48c25d5099b152 100644
|
|
--- a/content/browser/renderer_host/render_widget_host_view_base.cc
|
|
+++ b/content/browser/renderer_host/render_widget_host_view_base.cc
|
|
@@ -654,6 +654,13 @@ void RenderWidgetHostViewBase::OnFrameTokenChangedForView(
|
|
host()->DidProcessFrame(frame_token, activation_time);
|
|
}
|
|
|
|
+RenderWidgetHostViewBase* RenderWidgetHostViewBase::CreateViewForWidget(
|
|
+ RenderWidgetHost* render_widget_host,
|
|
+ RenderWidgetHost* embedder_render_widget_host,
|
|
+ WebContentsView* web_contents_view) {
|
|
+ return web_contents_view->CreateViewForWidget(render_widget_host);
|
|
+}
|
|
+
|
|
void RenderWidgetHostViewBase::ProcessMouseEvent(
|
|
const blink::WebMouseEvent& event,
|
|
const ui::LatencyInfo& latency) {
|
|
diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h
|
|
index 568a87065acb56faf3f91e35b4e9ad2782edbe28..90a8f27e5d240c7d88a314c580b459d1090b1d25 100644
|
|
--- a/content/browser/renderer_host/render_widget_host_view_base.h
|
|
+++ b/content/browser/renderer_host/render_widget_host_view_base.h
|
|
@@ -30,6 +30,8 @@
|
|
#include "components/viz/common/surfaces/scoped_surface_id_allocator.h"
|
|
#include "components/viz/common/surfaces/surface_id.h"
|
|
#include "content/browser/renderer_host/display_feature.h"
|
|
+#include "content/browser/renderer_host/visible_time_request_trigger.h"
|
|
+#include "content/browser/web_contents/web_contents_view.h"
|
|
#include "content/common/content_export.h"
|
|
#include "content/public/browser/render_frame_metadata_provider.h"
|
|
#include "content/public/browser/render_widget_host.h"
|
|
@@ -72,11 +74,13 @@ namespace content {
|
|
class DevicePosturePlatformProvider;
|
|
class MouseWheelPhaseHandler;
|
|
class RenderWidgetHostImpl;
|
|
+class RenderWidgetHostViewGuest;
|
|
class ScopedViewTransitionResources;
|
|
class TextInputManager;
|
|
class TouchSelectionControllerClientManager;
|
|
class TouchSelectionControllerInputObserver;
|
|
class WebContentsAccessibility;
|
|
+class WebContentsView;
|
|
class DelegatedFrameHost;
|
|
class SyntheticGestureTarget;
|
|
|
|
@@ -150,6 +154,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
|
|
void ProcessGestureEvent(const blink::WebGestureEvent& event,
|
|
const ui::LatencyInfo& latency) override;
|
|
RenderWidgetHostViewBase* GetRootView() override;
|
|
+ virtual RenderWidgetHostViewBase* CreateViewForWidget(
|
|
+ RenderWidgetHost* render_widget_host,
|
|
+ RenderWidgetHost* embedder_render_widget_host,
|
|
+ WebContentsView* web_contents_view);
|
|
void OnAutoscrollStart() override;
|
|
const viz::DisplayHitTestQueryMap& GetDisplayHitTestQuery() const override;
|
|
|
|
@@ -195,6 +203,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
|
|
const gfx::Rect& keyboard_rect) override {}
|
|
bool IsHTMLFormPopup() const override;
|
|
|
|
+ virtual void InitAsGuest(RenderWidgetHostView* parent_host_view,
|
|
+ RenderWidgetHostViewGuest* guest_view) {}
|
|
+
|
|
// This only needs to be overridden by RenderWidgetHostViewBase subclasses
|
|
// that handle content embedded within other RenderWidgetHostViews.
|
|
gfx::PointF TransformPointToRootCoordSpaceF(
|