Bug 1655967 - Clean up touch events override code. r=farre

Differential Revision: https://phabricator.services.mozilla.com/D103756

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`

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,