Bug 1702756 - Remove unused IntID::TouchEnabled. r=mstange

Differential Revision: https://phabricator.services.mozilla.com/D110670
iaxat · Apr 2, 2021 · f33b2ec · f33b2ec
1 parent 995df23
commit f33b2ec
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 46 deletions.
diff --git a/widget/LookAndFeel.h b/widget/LookAndFeel.h
@@ -139,15 +139,6 @@ class LookAndFeel {
      */
     WindowsGlass,
 
-    /*
-     * A Boolean value to determine whether the device is a touch enabled
-     * device. Currently this is only supported by the Windows 7 Touch API.
-     *
-     * Platforms that do not support this metric should return
-     * NS_ERROR_NOT_IMPLEMENTED when queried for this metric.
-     */
-    TouchEnabled,
-
     /*
      * A Boolean value to determine whether the Mac graphite theme is
      * being used.
@@ -284,6 +275,30 @@ class LookAndFeel {
      */
     GTKCSDCloseButton,
 
+    /**
+     * An Integer value that will represent the position of the Minimize button
+     * in GTK Client side decoration header. Its value will be between 0 and 2
+     * if it is on the left side of the tabbar, otherwise it will be between
+     * 3 and 5.
+     */
+    GTKCSDMinimizeButtonPosition,
+
+    /**
+     * An Integer value that will represent the position of the Maximize button
+     * in GTK Client side decoration header. Its value will be between 0 and 2
+     * if it is on the left side of the tabbar, otherwise it will be between
+     * 3 and 5.
+     */
+    GTKCSDMaximizeButtonPosition,
+
+    /**
+     * An Integer value that will represent the position of the Close button
+     * in GTK Client side decoration header. Its value will be between 0 and 2
+     * if it is on the left side of the tabbar, otherwise it will be between
+     * 3 and 5.
+     */
+    GTKCSDCloseButtonPosition,
+
     /*
      * A boolean value indicating whether titlebar buttons are located
      * in left titlebar corner.
@@ -318,30 +333,6 @@ class LookAndFeel {
      * 'Coarse | Fine | Hover'.
      */
     AllPointerCapabilities,
-    /**
-     * An Integer value that will represent the position of the Close button
-     * in GTK Client side decoration header. Its value will be between 0 and 2
-     * if it is on the left side of the tabbar, otherwise it will be between
-     * 3 and 5.
-     */
-    GTKCSDCloseButtonPosition,
-
-    /**
-     * An Integer value that will represent the position of the Minimize button
-     * in GTK Client side decoration header. Its value will be between 0 and 2
-     * if it is on the left side of the tabbar, otherwise it will be between
-     * 3 and 5.
-     */
-    GTKCSDMinimizeButtonPosition,
-
-    /**
-     * An Integer value that will represent the position of the Maximize button
-     * in GTK Client side decoration header. Its value will be between 0 and 2
-     * if it is on the left side of the tabbar, otherwise it will be between
-     * 3 and 5.
-     */
-    GTKCSDMaximizeButtonPosition,
-
     /** The vertical scrollbar width, in CSS pixels. */
     SystemVerticalScrollbarWidth,
 

diff --git a/widget/android/nsLookAndFeel.cpp b/widget/android/nsLookAndFeel.cpp
@@ -358,10 +358,6 @@ nsresult nsLookAndFeel::NativeGetInt(IntID aID, int32_t& aResult) {
       aResult = eScrollThumbStyle_Proportional;
       break;
 
-    case IntID::TouchEnabled:
-      aResult = 1;
-      break;
-
     case IntID::WindowsDefaultTheme:
     case IntID::WindowsThemeIdentifier:
     case IntID::OperatingSystemVersionIdentifier:

diff --git a/widget/cocoa/nsLookAndFeel.mm b/widget/cocoa/nsLookAndFeel.mm
@@ -470,7 +470,6 @@ static nscolor GetColorFromNSColorWithAlpha(NSColor* aColor, float alpha) {
     case IntID::DWMCompositor:
     case IntID::WindowsClassic:
     case IntID::WindowsDefaultTheme:
-    case IntID::TouchEnabled:
     case IntID::WindowsThemeIdentifier:
     case IntID::OperatingSystemVersionIdentifier:
       aResult = 0;

diff --git a/widget/gtk/nsLookAndFeel.cpp b/widget/gtk/nsLookAndFeel.cpp
@@ -673,9 +673,6 @@ nsresult nsLookAndFeel::NativeGetInt(IntID aID, int32_t& aResult) {
       aResult = 0;
       res = NS_ERROR_NOT_IMPLEMENTED;
       break;
-    case IntID::TouchEnabled:
-      aResult = mozilla::widget::WidgetUtils::IsTouchDeviceSupportPresent();
-      break;
     case IntID::MacGraphiteTheme:
       aResult = 0;
       res = NS_ERROR_NOT_IMPLEMENTED;

diff --git a/widget/headless/HeadlessLookAndFeelGTK.cpp b/widget/headless/HeadlessLookAndFeelGTK.cpp
@@ -215,7 +215,6 @@ nsresult HeadlessLookAndFeel::NativeGetInt(IntID aID, int32_t& aResult) {
       aResult = 0;
       res = NS_ERROR_FAILURE;
       break;
-    case IntID::TouchEnabled:
     case IntID::MacGraphiteTheme:
     case IntID::MacBigSurTheme:
       aResult = 0;

diff --git a/widget/uikit/nsLookAndFeel.mm b/widget/uikit/nsLookAndFeel.mm
@@ -322,7 +322,6 @@ static nscolor GetColorFromUIColor(UIColor* aColor) {
     case IntID::DWMCompositor:
     case IntID::WindowsClassic:
     case IntID::WindowsDefaultTheme:
-    case IntID::TouchEnabled:
       aResult = 0;
       res = NS_ERROR_NOT_IMPLEMENTED;
       break;

diff --git a/widget/windows/nsLookAndFeel.cpp b/widget/windows/nsLookAndFeel.cpp
@@ -458,9 +458,6 @@ nsresult nsLookAndFeel::NativeGetInt(IntID aID, int32_t& aResult) {
     case IntID::WindowsClassic:
       aResult = !nsUXThemeData::IsAppThemed();
       break;
-    case IntID::TouchEnabled:
-      aResult = WinUtils::IsTouchDeviceSupportPresent();
-      break;
     case IntID::WindowsDefaultTheme:
       if (XRE_IsContentProcess()) {
         aResult = mUseDefaultTheme;