119 lines
6.2 KiB
Diff
119 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 74fea36ea7f9a345b3474ea18be00704831a685e..c75785d5a26fa52a39d1a3552da9a7621e4c8430 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 7db3a07ff9e0f52f1232c25f8e4e72d3c299e623..af763ad4e441e54556854cd40c4cb9098f84bb58 100644
|
||
|
|
--- a/content/browser/renderer_host/render_widget_host_delegate.h
|
||
|
|
+++ b/content/browser/renderer_host/render_widget_host_delegate.h
|
||
|
|
@@ -103,6 +103,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 349d591b0b35421f91e70dde257a726341e94ad9..6b0bbda767d547cf8365a240692904b3c0e50985 100644
|
||
|
|
--- a/content/browser/renderer_host/render_widget_host_impl.cc
|
||
|
|
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
|
||
|
|
@@ -1595,6 +1595,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 7ec8dea94a9f97f0938f57743a35e8de09efb8c9..81eabc6be87037a54a8c9b000ce374cc2d87794f 100644
|
||
|
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
||
|
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
||
|
|
@@ -4426,6 +4426,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 9dfd229af26127dee8e21c77fcedef5285f3aafa..63a38ac602ae00e6df40e4c883937bc57d513ead 100644
|
||
|
|
--- a/content/browser/web_contents/web_contents_impl.h
|
||
|
|
+++ b/content/browser/web_contents/web_contents_impl.h
|
||
|
|
@@ -1109,6 +1109,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 ea179bdf3e702fb1d5be55affe3958f77901cd08..4b99edf823034115387c19cf1a8df9284e674d9b 100644
|
||
|
|
--- a/content/public/browser/web_contents_delegate.cc
|
||
|
|
+++ b/content/public/browser/web_contents_delegate.cc
|
||
|
|
@@ -121,6 +121,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 97def739ec2418286b76c0039c61b501293c8f5d..23acbc47f2c2e5b56b674a675e5ea92a643c4715 100644
|
||
|
|
--- a/content/public/browser/web_contents_delegate.h
|
||
|
|
+++ b/content/public/browser/web_contents_delegate.h
|
||
|
|
@@ -306,6 +306,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
|