From a48bca7a4d86722b153896b05c47ebad5028c161 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Thu, 4 Feb 2021 06:16:25 +0000
Subject: [PATCH] Bug 1655967 - Clean up touch events override code. r=farre

Differential Revision: https://phabricator.services.mozilla.com/D103756
---
 docshell/base/BrowsingContext.cpp | 19 +++++--------------
 docshell/base/BrowsingContext.h   |  9 +++------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/docshell/base/BrowsingContext.cpp b/docshell/base/BrowsingContext.cpp
index 7b43d95b92fe..504d11f8d326 100644
--- a/docshell/base/BrowsingContext.cpp
+++ b/docshell/base/BrowsingContext.cpp
@@ -2475,10 +2475,8 @@ bool BrowsingContext::InactiveForSuspend() const {
   return !IsActive() && !GetHasMainMediaController();
 }
 
-bool BrowsingContext::CanSet(
-    FieldIndex<IDX_TouchEventsOverrideInternal>,
-    const enum TouchEventsOverride& aTouchEventsOverride,
-    ContentParent* aSource) {
+bool BrowsingContext::CanSet(FieldIndex<IDX_TouchEventsOverrideInternal>,
+                             dom::TouchEventsOverride, ContentParent*) {
   // TODO: Bug 1688948 - Should only be set in the parent process.
   return true;
 }
@@ -2687,16 +2685,9 @@ mozilla::dom::TouchEventsOverride BrowsingContext::TouchEventsOverride() const {
   return mozilla::dom::TouchEventsOverride::None;
 }
 
-void BrowsingContext::SetTouchEventsOverride(
-    const enum TouchEventsOverride aTouchEventsOverride, ErrorResult& aRv) {
-  SetTouchEventsOverrideInternal(aTouchEventsOverride, aRv);
-}
-
-nsresult BrowsingContext::SetTouchEventsOverride(
-    const enum TouchEventsOverride aTouchEventsOverride) {
-  ErrorResult rv;
-  SetTouchEventsOverride(aTouchEventsOverride, rv);
-  return rv.StealNSResult();
+void BrowsingContext::SetTouchEventsOverride(dom::TouchEventsOverride aOverride,
+                                             ErrorResult& aRv) {
+  SetTouchEventsOverrideInternal(aOverride, aRv);
 }
 
 // We map `watchedByDevTools` WebIDL attribute to `watchedByDevToolsInternal`
diff --git a/docshell/base/BrowsingContext.h b/docshell/base/BrowsingContext.h
index 0a1076fef663..d3c6ba44bd4f 100644
--- a/docshell/base/BrowsingContext.h
+++ b/docshell/base/BrowsingContext.h
@@ -482,11 +482,8 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
   bool WatchedByDevTools();
   void SetWatchedByDevTools(bool aWatchedByDevTools, ErrorResult& aRv);
 
-  mozilla::dom::TouchEventsOverride TouchEventsOverride() const;
-  void SetTouchEventsOverride(
-      const enum TouchEventsOverride aTouchEventsOverride, ErrorResult& aRv);
-  MOZ_MUST_USE nsresult
-  SetTouchEventsOverride(const enum TouchEventsOverride aTouchEventsOverride);
+  dom::TouchEventsOverride TouchEventsOverride() const;
+  void SetTouchEventsOverride(dom::TouchEventsOverride, ErrorResult& aRv);
 
   bool FullscreenAllowed() const;
 
@@ -916,7 +913,7 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
   }
 
   bool CanSet(FieldIndex<IDX_TouchEventsOverrideInternal>,
-              const enum TouchEventsOverride& aTouchEventsOverride,
+              dom::TouchEventsOverride aTouchEventsOverride,
               ContentParent* aSource);
 
   bool CanSet(FieldIndex<IDX_DisplayMode>, const enum DisplayMode& aDisplayMode,