From 493e3c4537bfa70405a2da998503e82594eada14 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@charleskerr.com>
Date: Mon, 2 Dec 2024 10:13:38 -0600
Subject: [PATCH] fix: don't use deprecated ui::MouseEvent constructor (#44868)

* refactor: do not use deprecated gfx::Point constructor for MouseEvent

Deprecated in https://chromium-review.googlesource.com/c/1444251

* refactor: use WebInputEvent::GetTypeAsUiEventType() instead of rolling our own

Added in https://chromium-review.googlesource.com/c/chromium/src/+/2180291
---
 .../osr/osr_render_widget_host_view.cc        | 37 +++----------------
 1 file changed, 6 insertions(+), 31 deletions(-)

diff --git a/shell/browser/osr/osr_render_widget_host_view.cc b/shell/browser/osr/osr_render_widget_host_view.cc
index dbddfe3e96d8..525c3e48f691 100644
--- a/shell/browser/osr/osr_render_widget_host_view.cc
+++ b/shell/browser/osr/osr_render_widget_host_view.cc
@@ -56,31 +56,6 @@ namespace {
 const float kDefaultScaleFactor = 1.0;
 
 ui::MouseEvent UiMouseEventFromWebMouseEvent(blink::WebMouseEvent event) {
-  ui::EventType type = ui::EventType::kUnknown;
-  switch (event.GetType()) {
-    case blink::WebInputEvent::Type::kMouseDown:
-      type = ui::EventType::kMousePressed;
-      break;
-    case blink::WebInputEvent::Type::kMouseUp:
-      type = ui::EventType::kMouseReleased;
-      break;
-    case blink::WebInputEvent::Type::kMouseMove:
-      type = ui::EventType::kMouseMoved;
-      break;
-    case blink::WebInputEvent::Type::kMouseEnter:
-      type = ui::EventType::kMouseEntered;
-      break;
-    case blink::WebInputEvent::Type::kMouseLeave:
-      type = ui::EventType::kMouseExited;
-      break;
-    case blink::WebInputEvent::Type::kMouseWheel:
-      type = ui::EventType::kMousewheel;
-      break;
-    default:
-      type = ui::EventType::kUnknown;
-      break;
-  }
-
   int button_flags = 0;
   switch (event.button) {
     case blink::WebMouseEvent::Button::kBack:
@@ -103,12 +78,12 @@ ui::MouseEvent UiMouseEventFromWebMouseEvent(blink::WebMouseEvent event) {
       break;
   }
 
-  ui::MouseEvent ui_event(type,
-                          gfx::Point(std::floor(event.PositionInWidget().x()),
-                                     std::floor(event.PositionInWidget().y())),
-                          gfx::Point(std::floor(event.PositionInWidget().x()),
-                                     std::floor(event.PositionInWidget().y())),
-                          ui::EventTimeForNow(), button_flags, button_flags);
+  ui::MouseEvent ui_event{event.GetTypeAsUiEventType(),
+                          event.PositionInWidget(),
+                          event.PositionInWidget(),
+                          ui::EventTimeForNow(),
+                          button_flags,
+                          button_flags};
   ui_event.SetClickCount(event.click_count);
 
   return ui_event;