Changeset 288723 in webkit

Timestamp:

Jan 27, 2022 10:53:57 PM (6 months ago)

Author:

graouts@webkit.org

Message:

<model> should not be draggable on macOS
​https://bugs.webkit.org/show_bug.cgi?id=235697

Reviewed by Dean Jackson.

Source/WebCore:

As part of bug 229246 we added support for dragging <model> elements. However, it did not
work on macOS in practice so we make that explicit.

This is also important leading up to bug 227621, where we'll implement the "interactive"
HTML attribute and IDL property, since disabling dragging over a <model> element to adjust
the camera would trigger a crash under Pasteboard::write() on macOS due to not having an
image set on the pasteboard data.

• Modules/model-element/HTMLModelElement.cpp:

(WebCore::HTMLModelElement::supportsDragging const):
(WebCore::HTMLModelElement::isDraggableIgnoringAttributes const):

• Modules/model-element/HTMLModelElement.h:
• Modules/model-element/ModelPlayer.cpp:

(WebCore::ModelPlayer::supportsDragging):

• Modules/model-element/ModelPlayer.h:
• page/DragController.cpp:

(WebCore::modelElementIsDraggable):

Source/WebKit:

Override the ModelPlayer method to disable <model> dragging on macOS.

• WebProcess/Model/mac/ARKitInlinePreviewModelPlayerMac.h:
• WebProcess/Model/mac/ARKitInlinePreviewModelPlayerMac.mm:

(WebKit::ARKitInlinePreviewModelPlayerMac::supportsDragging):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/Modules/model-element/HTMLModelElement.cpp (modified) (1 diff)
• WebCore/Modules/model-element/HTMLModelElement.h (modified) (1 diff)
• WebCore/Modules/model-element/ModelPlayer.cpp (modified) (1 diff)
• WebCore/Modules/model-element/ModelPlayer.h (modified) (1 diff)
• WebCore/page/DragController.cpp (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebProcess/Model/mac/ARKitInlinePreviewModelPlayerMac.h (modified) (1 diff)
• WebKit/WebProcess/Model/mac/ARKitInlinePreviewModelPlayerMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-01-27  Antoine Quint  <graouts@webkit.org>
+
+        <model> should not be draggable on macOS
+        https://bugs.webkit.org/show_bug.cgi?id=235697
+
+        Reviewed by Dean Jackson.
+
+        As part of bug 229246 we added support for dragging <model> elements. However, it did not
+        work on macOS in practice so we make that explicit.
+
+        This is also important leading up to bug 227621, where we'll implement the "interactive"
+        HTML attribute and IDL property, since disabling dragging over a <model> element to adjust
+        the camera would trigger a crash under Pasteboard::write() on macOS due to not having an
+        image set on the pasteboard data.
+
+        * Modules/model-element/HTMLModelElement.cpp:
+        (WebCore::HTMLModelElement::supportsDragging const):
+        (WebCore::HTMLModelElement::isDraggableIgnoringAttributes const):
+        * Modules/model-element/HTMLModelElement.h:
+        * Modules/model-element/ModelPlayer.cpp:
+        (WebCore::ModelPlayer::supportsDragging):
+        * Modules/model-element/ModelPlayer.h:
+        * page/DragController.cpp:
+        (WebCore::modelElementIsDraggable):
+
 2022-01-27  Megan Gardner  <megan_gardner@apple.com>
 

trunk/Source/WebCore/Modules/model-element/HTMLModelElement.cpp

@@ -322 +322 @@
 // MARK: - Interaction support.
 
+bool HTMLModelElement::supportsDragging() const
+{
+    if (!m_modelPlayer)
+        return true;
+
+    return m_modelPlayer->supportsDragging();
+}
+
+bool HTMLModelElement::isDraggableIgnoringAttributes() const
+{
+    return supportsDragging();
+}
+
 void HTMLModelElement::defaultEventHandler(Event& event)
 {

trunk/Source/WebCore/Modules/model-element/HTMLModelElement.h

@@ -98 +98 @@
     void setIsMuted(bool, DOMPromiseDeferred<void>&&);
 
-    bool isDraggableIgnoringAttributes() const final { return true; }
+    bool supportsDragging() const;
+    bool isDraggableIgnoringAttributes() const final;
 
 #if PLATFORM(COCOA)

trunk/Source/WebCore/Modules/model-element/ModelPlayer.cpp

@@ -36 +36 @@
 }
 
+bool ModelPlayer::supportsDragging()
+{
+    return true;
 }
+
+}

trunk/Source/WebCore/Modules/model-element/ModelPlayer.h

@@ -48 +48 @@
     virtual void enterFullscreen() = 0;
     virtual bool supportsMouseInteraction();
+    virtual bool supportsDragging();
     virtual void handleMouseDown(const LayoutPoint&, MonotonicTime) = 0;
     virtual void handleMouseMove(const LayoutPoint&, MonotonicTime) = 0;

trunk/Source/WebCore/page/DragController.cpp

@@ -756 +756 @@
 static bool modelElementIsDraggable(const HTMLModelElement& modelElement)
 {
-    return !!modelElement.model();
+    return modelElement.supportsDragging() && !!modelElement.model();
 }
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2022-01-27  Antoine Quint  <graouts@webkit.org>
+
+        <model> should not be draggable on macOS
+        https://bugs.webkit.org/show_bug.cgi?id=235697
+
+        Reviewed by Dean Jackson.
+
+        Override the ModelPlayer method to disable <model> dragging on macOS.
+
+        * WebProcess/Model/mac/ARKitInlinePreviewModelPlayerMac.h:
+        * WebProcess/Model/mac/ARKitInlinePreviewModelPlayerMac.mm:
+        (WebKit::ARKitInlinePreviewModelPlayerMac::supportsDragging):
+
 2022-01-27  Antoine Quint  <graouts@webkit.org>
 

trunk/Source/WebKit/WebProcess/Model/mac/ARKitInlinePreviewModelPlayerMac.h

@@ -54 +54 @@
     PlatformLayer* layer() override;
     bool supportsMouseInteraction() override;
+    bool supportsDragging() override;
     void handleMouseDown(const WebCore::LayoutPoint&, MonotonicTime) override;
     void handleMouseMove(const WebCore::LayoutPoint&, MonotonicTime) override;

trunk/Source/WebKit/WebProcess/Model/mac/ARKitInlinePreviewModelPlayerMac.mm

@@ -183 +183 @@
 }
 
+bool ARKitInlinePreviewModelPlayerMac::supportsDragging()
+{
+    return false;
+}
+
 void ARKitInlinePreviewModelPlayerMac::handleMouseDown(const LayoutPoint& flippedLocationInElement, MonotonicTime timestamp)
 {