mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
chore: bump chromium to 148.0.7733.0 42-x-y * chore: bump chromium in DEPS to 147.0.7727.2 * chore: bump chromium in DEPS to 148.0.7728.0 * chore: bump chromium in DEPS to 148.0.7729.0 * chore: bump chromium in DEPS to 148.0.7730.0 * chore: bump chromium in DEPS to 148.0.7732.0 * chore: update WrappablePointerTag patch Refs https://chromium-review.googlesource.com/c/chromium/src/+/7641766 * chore: update custom protocol patch for removed code Refs https://chromium-review.googlesource.com/c/chromium/src/+/7653454 * chore: update patches * fix: cleanup removed CHILD_PLUGIN code Refs https://chromium-review.googlesource.com/c/chromium/src/+/7653455 * fix: move from int to ChildProcessId Refs https://chromium-review.googlesource.com/c/chromium/src/+/7621912 * fix: update extensions CreateTab signature Refs https://chromium-review.googlesource.com/c/chromium/src/+/7644389 * fix: draggable hit region test interface update for mac windows Refs https://chromium-review.googlesource.com/c/chromium/src/+/7655245 * chore: bump chromium in DEPS to 148.0.7733.0 * feat: restore macos child plugin process Refs https://chromium-review.googlesource.com/c/chromium/src/+/7653455 * fixup! chore: merge main * chore: update patches * fix: replace clipboard IsFormatAvailable with async GetAllAvailableFormats Refs https://chromium-review.googlesource.com/c/chromium/src/+/7631097 Async API pending RFC https://github.com/electron/rfcs/pull/19 --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
120 lines
6.2 KiB
Diff
120 lines
6.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: deepak1556 <hop2deep@gmail.com>
|
|
Date: Mon, 1 Sep 2025 23:31:49 +0900
|
|
Subject: Revert: partial "Remove unused PreHandleMouseEvent"
|
|
|
|
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6880411
|
|
|
|
diff --git a/content/browser/renderer_host/render_widget_host_delegate.cc b/content/browser/renderer_host/render_widget_host_delegate.cc
|
|
index 0311764d146eb7306b52e02432609f3caa272a62..8f9f471a8d207a88ae59c069977ecaac70a09bb4 100644
|
|
--- a/content/browser/renderer_host/render_widget_host_delegate.cc
|
|
+++ b/content/browser/renderer_host/render_widget_host_delegate.cc
|
|
@@ -13,6 +13,11 @@
|
|
|
|
namespace content {
|
|
|
|
+bool RenderWidgetHostDelegate::PreHandleMouseEvent(
|
|
+ const blink::WebMouseEvent& event) {
|
|
+ return false;
|
|
+}
|
|
+
|
|
KeyboardEventProcessingResult RenderWidgetHostDelegate::PreHandleKeyboardEvent(
|
|
const input::NativeWebKeyboardEvent& event) {
|
|
return KeyboardEventProcessingResult::NOT_HANDLED;
|
|
diff --git a/content/browser/renderer_host/render_widget_host_delegate.h b/content/browser/renderer_host/render_widget_host_delegate.h
|
|
index 6c7ec195fa64e3a1a718811192c9f6fdbf9463c6..c11744d2246c3df138cdb91f1d4459c65367872c 100644
|
|
--- a/content/browser/renderer_host/render_widget_host_delegate.h
|
|
+++ b/content/browser/renderer_host/render_widget_host_delegate.h
|
|
@@ -104,6 +104,12 @@ class CONTENT_EXPORT RenderWidgetHostDelegate {
|
|
virtual void ResizeDueToAutoResize(RenderWidgetHostImpl* render_widget_host,
|
|
const gfx::Size& new_size) {}
|
|
|
|
+ // Callback to give the browser a chance to handle the specified mouse
|
|
+ // event before sending it to the renderer. Returns true if the event was
|
|
+ // handled, false otherwise. A true value means no more processing should
|
|
+ // happen on the event. The default return value is false.
|
|
+ virtual bool PreHandleMouseEvent(const blink::WebMouseEvent& event);
|
|
+
|
|
// Callback to give the browser a chance to handle the specified keyboard
|
|
// event before sending it to the renderer. See enum for details on return
|
|
// value.
|
|
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
|
|
index 1e3a09e4293b8925512f64ad2a78bccce2c83fca..30ff1afa505be3d2a2c94526e96f6cd6a566a605 100644
|
|
--- a/content/browser/renderer_host/render_widget_host_impl.cc
|
|
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
|
|
@@ -1555,6 +1555,10 @@ void RenderWidgetHostImpl::ForwardMouseEventWithLatencyInfo(
|
|
CHECK_GE(mouse_event.GetType(), WebInputEvent::Type::kMouseTypeFirst);
|
|
CHECK_LE(mouse_event.GetType(), WebInputEvent::Type::kMouseTypeLast);
|
|
|
|
+ if (delegate_ && delegate_->PreHandleMouseEvent(mouse_event)) {
|
|
+ return;
|
|
+ }
|
|
+
|
|
for (auto& mouse_event_callback : mouse_event_callbacks_) {
|
|
if (mouse_event_callback.Run(mouse_event)) {
|
|
return;
|
|
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
|
index a526b1071029a33983060e3f379e3030ac723403..28a98260183ad24529ef5848ffcb117e9e1a6e3b 100644
|
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
|
@@ -4486,6 +4486,12 @@ void WebContentsImpl::RenderWidgetWasResized(
|
|
width_changed);
|
|
}
|
|
|
|
+bool WebContentsImpl::PreHandleMouseEvent(const blink::WebMouseEvent& event) {
|
|
+ OPTIONAL_TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("content.verbose"),
|
|
+ "WebContentsImpl::PreHandleMouseEvent");
|
|
+ return delegate_ ? delegate_->PreHandleMouseEvent(this, event) : false;
|
|
+}
|
|
+
|
|
void WebContentsImpl::PreHandleDragUpdate(const DropData& drop_data,
|
|
const gfx::PointF& client_pt) {
|
|
if (delegate_) {
|
|
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
|
|
index ce46eaa39b053850e2692c906a9e991052cd7195..953deca8142154ffd0a27c11e9beb42270107a8c 100644
|
|
--- a/content/browser/web_contents/web_contents_impl.h
|
|
+++ b/content/browser/web_contents/web_contents_impl.h
|
|
@@ -1134,6 +1134,7 @@ class CONTENT_EXPORT WebContentsImpl
|
|
|
|
double GetPendingZoomLevel(RenderWidgetHostImpl* rwh) override;
|
|
|
|
+ bool PreHandleMouseEvent(const blink::WebMouseEvent& event) override;
|
|
void PreHandleDragUpdate(const DropData& drop_data,
|
|
const gfx::PointF& client_pt);
|
|
void PreHandleDragExit();
|
|
diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
|
|
index 02ec57eeb67dd5e5e0ff250853599c88c2a75ed0..5f104dccc8a4b6d50d10aac01b3fe73b781e0ac1 100644
|
|
--- a/content/public/browser/web_contents_delegate.cc
|
|
+++ b/content/public/browser/web_contents_delegate.cc
|
|
@@ -126,6 +126,12 @@ bool WebContentsDelegate::HandleContextMenu(RenderFrameHost& render_frame_host,
|
|
return false;
|
|
}
|
|
|
|
+bool WebContentsDelegate::PreHandleMouseEvent(
|
|
+ WebContents* source,
|
|
+ const blink::WebMouseEvent& event) {
|
|
+ return false;
|
|
+}
|
|
+
|
|
KeyboardEventProcessingResult WebContentsDelegate::PreHandleKeyboardEvent(
|
|
WebContents* source,
|
|
const input::NativeWebKeyboardEvent& event) {
|
|
diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
|
|
index 234d6d89d1c8c7f333b96f35dacb73daeecf7b17..2bb0499064346697fc19d012740fcacdda40f722 100644
|
|
--- a/content/public/browser/web_contents_delegate.h
|
|
+++ b/content/public/browser/web_contents_delegate.h
|
|
@@ -326,6 +326,13 @@ class CONTENT_EXPORT WebContentsDelegate {
|
|
virtual bool HandleContextMenu(RenderFrameHost& render_frame_host,
|
|
const ContextMenuParams& params);
|
|
|
|
+ // Allows delegates to handle mouse events before sending to the renderer.
|
|
+ // Returns true if the event was handled, false otherwise. A true value means
|
|
+ // no more processing should happen on the event. The default return value is
|
|
+ // false.
|
|
+ virtual bool PreHandleMouseEvent(WebContents* source,
|
|
+ const blink::WebMouseEvent& event);
|
|
+
|
|
// Allows delegates to handle mouse drag events before sending to the
|
|
// renderer. Returns true if the event was handled, false otherwise. A true
|
|
// value means no more processing should happen on the event. The default
|