From 1aad51035c9598eef914d5401d5bbcbe953c71ed Mon Sep 17 00:00:00 2001
From: Edgar Chen <echen@mozilla.com>
Date: Thu, 22 Apr 2021 16:01:26 +0000
Subject: [PATCH] Bug 1672726 - Part 1: Rename
 MultiTouchInput::ToWidgetTouchEvent to ToWidgetEvent; r=botond

So it can be used in DispatchInputOnControllerThread template.

Differential Revision: https://phabricator.services.mozilla.com/D112127
---
 widget/InputData.cpp        | 2 +-
 widget/InputData.h          | 2 +-
 widget/android/nsWindow.cpp | 2 +-
 widget/nsBaseWidget.cpp     | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/widget/InputData.cpp b/widget/InputData.cpp
index a41f1003145d..27751ba721ac 100644
--- a/widget/InputData.cpp
+++ b/widget/InputData.cpp
@@ -154,7 +154,7 @@ void MultiTouchInput::Translate(const ScreenPoint& aTranslation) {
   }
 }
 
-WidgetTouchEvent MultiTouchInput::ToWidgetTouchEvent(nsIWidget* aWidget) const {
+WidgetTouchEvent MultiTouchInput::ToWidgetEvent(nsIWidget* aWidget) const {
   MOZ_ASSERT(NS_IsMainThread(),
              "Can only convert To WidgetTouchEvent on main thread");
 
diff --git a/widget/InputData.h b/widget/InputData.h
index 4c82849ef5a5..4f16731fbbb2 100644
--- a/widget/InputData.h
+++ b/widget/InputData.h
@@ -231,7 +231,7 @@ class MultiTouchInput : public InputData {
 
   void Translate(const ScreenPoint& aTranslation);
 
-  WidgetTouchEvent ToWidgetTouchEvent(nsIWidget* aWidget) const;
+  WidgetTouchEvent ToWidgetEvent(nsIWidget* aWidget) const;
 
   // Return the index into mTouches of the SingleTouchData with the given
   // identifier, or -1 if there is no such SingleTouchData.
diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp
index f10332d5c7bf..33ee540d6960 100644
--- a/widget/android/nsWindow.cpp
+++ b/widget/android/nsWindow.cpp
@@ -844,7 +844,7 @@ class NPZCSupport final
 
     // Dispatch APZ input event on Gecko thread.
     PostInputEvent([aInput, result](nsWindow* window) {
-      WidgetTouchEvent touchEvent = aInput.ToWidgetTouchEvent(window);
+      WidgetTouchEvent touchEvent = aInput.ToWidgetEvent(window);
       window->ProcessUntransformedAPZEvent(&touchEvent, result);
       window->DispatchHitTest(touchEvent);
     });
diff --git a/widget/nsBaseWidget.cpp b/widget/nsBaseWidget.cpp
index e873ca2920fc..3b46a501dade 100644
--- a/widget/nsBaseWidget.cpp
+++ b/widget/nsBaseWidget.cpp
@@ -1083,10 +1083,10 @@ void nsBaseWidget::DispatchTouchInput(MultiTouchInput& aInput) {
       return;
     }
 
-    WidgetTouchEvent event = aInput.ToWidgetTouchEvent(this);
+    WidgetTouchEvent event = aInput.ToWidgetEvent(this);
     ProcessUntransformedAPZEvent(&event, result);
   } else {
-    WidgetTouchEvent event = aInput.ToWidgetTouchEvent(this);
+    WidgetTouchEvent event = aInput.ToWidgetEvent(this);
 
     nsEventStatus status;
     DispatchEvent(&event, status);