Changeset 295309 in webkit

Timestamp:

Jun 6, 2022, 5:35:58 PM (4 years ago)

Author:

Alan Coon

Message:

Cherry-pick b8c770451902. rdar://problem/84570717

[Modern Media Controls] macCatalyst should not use touch events
​https://bugs.webkit.org/show_bug.cgi?id=240704
<rdar://problem/84570717>

Reviewed by Eric Carlson.

• Source/WebCore/Modules/modern-media-controls/controls/layout-traits.js: (LayoutTraits.prototype.supportsTouches): Added.
• Source/WebCore/Modules/modern-media-controls/controls/macos-layout-traits.js: (MacOSLayoutTraits.prototype.supportsTouches): Added. Allow LayoutTraits to indicate whether touches are supported.

• Source/WebCore/Modules/modern-media-controls/controls/auto-hide-controller.js: (AutoHideController):
• Source/WebCore/Modules/modern-media-controls/controls/button.js: (Button):
• Source/WebCore/Modules/modern-media-controls/controls/range-button.js: (RangeButton):
• Source/WebCore/Modules/modern-media-controls/controls/slider.js: (Slider.prototype._interactionEndTarget):
• Source/WebCore/Modules/modern-media-controls/media/media-document-controller.js: (MediaDocumentController): Use LayoutTraits.prototype.supportsTouches instead of GestureRecognizer.SupportsTouches so that macOS (including macCatalyst) can always act as though touches are not supported (which is fine since mouse events are fully functional on macOS).

• LayoutTests/media/modern-media-controls/button/button-icon-name.html:
• LayoutTests/media/modern-media-controls/button/button.html:
• LayoutTests/media/modern-media-controls/buttons-container/buttons-container-buttons-property.html:
• LayoutTests/media/modern-media-controls/buttons-container/buttons-container-constructor.html:
• LayoutTests/media/modern-media-controls/buttons-container/buttons-container-layout.html: Add layoutDelegate/layoutTraits where needed.

Canonical link: ​https://commits.webkit.org/250814@main
git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@294573 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-613-branch

Files:

• LayoutTests/media/modern-media-controls/button/button-icon-name.html (modified) (2 diffs)
• LayoutTests/media/modern-media-controls/button/button.html (modified) (1 diff)
• LayoutTests/media/modern-media-controls/buttons-container/buttons-container-buttons-property.html (modified) (2 diffs)
• LayoutTests/media/modern-media-controls/buttons-container/buttons-container-constructor.html (modified) (2 diffs)
• LayoutTests/media/modern-media-controls/buttons-container/buttons-container-layout.html (modified) (1 diff)
• Source/WebCore/Modules/modern-media-controls/controls/auto-hide-controller.js (modified) (1 diff)
• Source/WebCore/Modules/modern-media-controls/controls/button.js (modified) (1 diff)
• Source/WebCore/Modules/modern-media-controls/controls/layout-traits.js (modified) (1 diff)
• Source/WebCore/Modules/modern-media-controls/controls/macos-layout-traits.js (modified) (1 diff)
• Source/WebCore/Modules/modern-media-controls/controls/range-button.js (modified) (1 diff)
• Source/WebCore/Modules/modern-media-controls/media/media-document-controller.js (modified) (1 diff)

branches/safari-613-branch/LayoutTests/media/modern-media-controls/button/button-icon-name.html

@@ -9 +9 @@
 description("Testing the <code>Button</code> class <code>iconName</code> property.");
 
-const layoutDelegate = {};
+const layoutDelegate = { layoutTraits: new MacOSLayoutTraits(LayoutTraits.Mode.Inline) };
 
 const button = new Button({ layoutDelegate });
@@ -19 +19 @@
 debug("");
 debug("Setting an iconName with invalid layout traits should throw");
+layoutDelegate.layoutTraits = null;
 shouldThrow(function() { button.iconName = Icons.Pause });
 shouldBeEqualToString("button.iconName", "");

branches/safari-613-branch/LayoutTests/media/modern-media-controls/button/button.html

@@ -18 +18 @@
 description("Testing the <code>Button</code> class.");
 
-const button = new Button;
+const layoutDelegate = { layoutTraits: new MacOSLayoutTraits(LayoutTraits.Mode.Inline) };
+
+const button = new Button({ layoutDelegate });
 document.body.appendChild(button.element);
 

branches/safari-613-branch/LayoutTests/media/modern-media-controls/buttons-container/buttons-container-buttons-property.html

@@ -9 +9 @@
 window.jsTestIsAsync = true;
 
+const layoutDelegate = { layoutTraits: new MacOSLayoutTraits(LayoutTraits.Mode.Inline) };
+
 const container = new ButtonsContainer({
     leftMargin: 20,
@@ -15 +17 @@
 });
 
-container.children = [new Button, new Button, new Button];
+container.children = [
+    new Button({ layoutDelegate }),
+    new Button({ layoutDelegate }),
+    new Button({ layoutDelegate }),
+];
 
 scheduler.frameDidFire = function()

branches/safari-613-branch/LayoutTests/media/modern-media-controls/buttons-container/buttons-container-constructor.html

@@ -5 +5 @@
 
 description("Testing the <code>ButtonsContainer</code> constructor.");
+
+const layoutDelegate = { layoutTraits: new MacOSLayoutTraits(LayoutTraits.Mode.Inline) };
 
 const defaultContainer = new ButtonsContainer;
@@ -14 +16 @@
 shouldBe("defaultContainer.children", "[]");
 
-const buttons = [new Button, new Button];
+const buttons = [
+    new Button({ layoutDelegate }),
+    new Button({ layoutDelegate }),
+];
+
 const containerWithParameters = new ButtonsContainer({
     buttonMargin: 10,

branches/safari-613-branch/LayoutTests/media/modern-media-controls/buttons-container/buttons-container-layout.html

@@ -6 +6 @@
 description("Testing <code>ButtonsContainer</code> layout.");
 
-const tenPtWideButton = new Button;
+const layoutDelegate = { layoutTraits: new MacOSLayoutTraits(LayoutTraits.Mode.Inline) };
+
+const tenPtWideButton = new Button({ layoutDelegate });
 tenPtWideButton.width = 10;
 
-const twentyPtWideButton = new Button;
+const twentyPtWideButton = new Button({ layoutDelegate });
 twentyPtWideButton.width = 20;
 
-const thirtyPtWideButton = new Button;
+const thirtyPtWideButton = new Button({ layoutDelegate });
 thirtyPtWideButton.width = 30;
 
 // Should be disregarded by the container.
-const disabledButton = new Button;
+const disabledButton = new Button({ layoutDelegate });
 disabledButton.width = 15;
 disabledButton.enabled = false;
 
 // Should be disregarded by the container.
-const droppedButton = new Button;
+const droppedButton = new Button({ layoutDelegate });
 droppedButton.width = 25;
 droppedButton.dropped = true;

branches/safari-613-branch/Source/WebCore/Modules/modern-media-controls/controls/auto-hide-controller.js

@@ -42 +42 @@
         this._mediaControls.element.addEventListener("pointerout", this);
 
-        if (GestureRecognizer.SupportsTouches)
+        if (this._mediaControls.layoutTraits.supportsTouches())
             this._tapGestureRecognizer = new TapGestureRecognizer(this._mediaControls.element, this);
 

branches/safari-613-branch/Source/WebCore/Modules/modern-media-controls/controls/button.js

@@ -49 +49 @@
         this._enabled = true;
 
-        if (GestureRecognizer.SupportsTouches)
+        if (this.layoutTraits.supportsTouches())
             this._tapGestureRecognizer = new TapGestureRecognizer(this.element, this);
         else

branches/safari-613-branch/Source/WebCore/Modules/modern-media-controls/controls/layout-traits.js

@@ -92 +92 @@
     }
 
+    supportsTouches()
+    {
+        // Can be overridden by subclasses.
+
+        return GestureRecognizer.SupportsTouches;
+    }
+
     additionalControlScaleFactor()
     {

branches/safari-613-branch/Source/WebCore/Modules/modern-media-controls/controls/macos-layout-traits.js

@@ -82 +82 @@
         return true;
     }
+
+    supportsTouches()
+    {
+        return false;
+    }
     
     toString()

branches/safari-613-branch/Source/WebCore/Modules/modern-media-controls/controls/range-button.js

@@ -42 +42 @@
         this._indicator.visible = false;
 
-        if (GestureRecognizer.SupportsTouches)
+        if (this.layoutTraits.supportsTouches())
             this._tapGestureRecognizer.enabled = false;
         else

branches/safari-613-branch/Source/WebCore/Modules/modern-media-controls/media/media-document-controller.js

@@ -43 +43 @@
         let deviceType = window.navigator.platform;
         if (deviceType == "MacIntel")
-            deviceType = GestureRecognizer.SupportsTouches ? "ipad" : "mac";
+            deviceType = mediaController.layoutTraits.supportsTouches() ? "ipad" : "mac";
 
         media.classList.add(deviceType);