Diff
Modified: trunk/Source/WebCore/ChangeLog (288693 => 288694)
--- trunk/Source/WebCore/ChangeLog 2022-01-27 20:07:27 UTC (rev 288693)
+++ trunk/Source/WebCore/ChangeLog 2022-01-27 20:10:55 UTC (rev 288694)
@@ -1,3 +1,17 @@
+2022-01-27 Commit Queue <[email protected]>
+
+ Unreviewed, reverting r288670.
+ https://bugs.webkit.org/show_bug.cgi?id=235725
+
+ broke TestWebKitAPI.DragAndDropTests.CanStartDragOnModel on
+ iOS
+
+ Reverted changeset:
+
+ "<model> should only be draggable on iOS"
+ https://bugs.webkit.org/show_bug.cgi?id=235697
+ https://commits.webkit.org/r288670
+
2022-01-27 Tyler Wilcock <[email protected]>
AX: Remove ancestor flag initialized ASSERT in AXIsolatedObject::initializeAttributeData
Modified: trunk/Source/WebCore/Modules/model-element/HTMLModelElement.cpp (288693 => 288694)
--- trunk/Source/WebCore/Modules/model-element/HTMLModelElement.cpp 2022-01-27 20:07:27 UTC (rev 288693)
+++ trunk/Source/WebCore/Modules/model-element/HTMLModelElement.cpp 2022-01-27 20:10:55 UTC (rev 288694)
@@ -321,16 +321,6 @@
// MARK: - Interaction support.
-bool HTMLModelElement::supportsDragging() const
-{
- return m_modelPlayer && m_modelPlayer->supportsDragging();
-}
-
-bool HTMLModelElement::isDraggableIgnoringAttributes() const
-{
- return supportsDragging();
-}
-
void HTMLModelElement::defaultEventHandler(Event& event)
{
if (!m_modelPlayer || !m_modelPlayer->supportsMouseInteraction())
Modified: trunk/Source/WebCore/Modules/model-element/HTMLModelElement.h (288693 => 288694)
--- trunk/Source/WebCore/Modules/model-element/HTMLModelElement.h 2022-01-27 20:07:27 UTC (rev 288693)
+++ trunk/Source/WebCore/Modules/model-element/HTMLModelElement.h 2022-01-27 20:10:55 UTC (rev 288694)
@@ -97,8 +97,7 @@
void isMuted(IsMutedPromise&&);
void setIsMuted(bool, DOMPromiseDeferred<void>&&);
- bool supportsDragging() const;
- bool isDraggableIgnoringAttributes() const final;
+ bool isDraggableIgnoringAttributes() const final { return true; }
#if PLATFORM(COCOA)
Vector<RetainPtr<id>> accessibilityChildren();
Modified: trunk/Source/WebCore/Modules/model-element/ModelPlayer.cpp (288693 => 288694)
--- trunk/Source/WebCore/Modules/model-element/ModelPlayer.cpp 2022-01-27 20:07:27 UTC (rev 288693)
+++ trunk/Source/WebCore/Modules/model-element/ModelPlayer.cpp 2022-01-27 20:10:55 UTC (rev 288694)
@@ -35,9 +35,4 @@
return false;
}
-bool ModelPlayer::supportsDragging()
-{
- return false;
}
-
-}
Modified: trunk/Source/WebCore/Modules/model-element/ModelPlayer.h (288693 => 288694)
--- trunk/Source/WebCore/Modules/model-element/ModelPlayer.h 2022-01-27 20:07:27 UTC (rev 288693)
+++ trunk/Source/WebCore/Modules/model-element/ModelPlayer.h 2022-01-27 20:10:55 UTC (rev 288694)
@@ -47,7 +47,6 @@
virtual PlatformLayer* layer() = 0;
virtual void enterFullscreen() = 0;
virtual bool supportsMouseInteraction();
- virtual bool supportsDragging();
virtual void handleMouseDown(const LayoutPoint&, MonotonicTime) = 0;
virtual void handleMouseMove(const LayoutPoint&, MonotonicTime) = 0;
virtual void handleMouseUp(const LayoutPoint&, MonotonicTime) = 0;
Modified: trunk/Source/WebCore/page/DragController.cpp (288693 => 288694)
--- trunk/Source/WebCore/page/DragController.cpp 2022-01-27 20:07:27 UTC (rev 288693)
+++ trunk/Source/WebCore/page/DragController.cpp 2022-01-27 20:10:55 UTC (rev 288694)
@@ -755,7 +755,7 @@
static bool modelElementIsDraggable(const HTMLModelElement& modelElement)
{
- return modelElement.supportsDragging() && !!modelElement.model();
+ return !!modelElement.model();
}
#endif
Modified: trunk/Source/WebKit/ChangeLog (288693 => 288694)
--- trunk/Source/WebKit/ChangeLog 2022-01-27 20:07:27 UTC (rev 288693)
+++ trunk/Source/WebKit/ChangeLog 2022-01-27 20:10:55 UTC (rev 288694)
@@ -1,3 +1,17 @@
+2022-01-27 Commit Queue <[email protected]>
+
+ Unreviewed, reverting r288670.
+ https://bugs.webkit.org/show_bug.cgi?id=235725
+
+ broke TestWebKitAPI.DragAndDropTests.CanStartDragOnModel on
+ iOS
+
+ Reverted changeset:
+
+ "<model> should only be draggable on iOS"
+ https://bugs.webkit.org/show_bug.cgi?id=235697
+ https://commits.webkit.org/r288670
+
2022-01-27 Elliott Williams <[email protected]>
Generated xcfilelists contain symlinks when building for macOS
Modified: trunk/Source/WebKit/WebProcess/Model/ios/ARKitInlinePreviewModelPlayerIOS.h (288693 => 288694)
--- trunk/Source/WebKit/WebProcess/Model/ios/ARKitInlinePreviewModelPlayerIOS.h 2022-01-27 20:07:27 UTC (rev 288693)
+++ trunk/Source/WebKit/WebProcess/Model/ios/ARKitInlinePreviewModelPlayerIOS.h 2022-01-27 20:10:55 UTC (rev 288694)
@@ -44,7 +44,6 @@
std::optional<ModelIdentifier> modelIdentifier() override;
// WebCore::ModelPlayer overrides.
- bool supportsDragging() override;
void enterFullscreen() override;
void handleMouseDown(const WebCore::LayoutPoint&, MonotonicTime) override;
void handleMouseMove(const WebCore::LayoutPoint&, MonotonicTime) override;
Modified: trunk/Source/WebKit/WebProcess/Model/ios/ARKitInlinePreviewModelPlayerIOS.mm (288693 => 288694)
--- trunk/Source/WebKit/WebProcess/Model/ios/ARKitInlinePreviewModelPlayerIOS.mm 2022-01-27 20:07:27 UTC (rev 288693)
+++ trunk/Source/WebKit/WebProcess/Model/ios/ARKitInlinePreviewModelPlayerIOS.mm 2022-01-27 20:10:55 UTC (rev 288694)
@@ -61,11 +61,6 @@
// MARK: - WebCore::ModelPlayer overrides.
-bool ARKitInlinePreviewModelPlayerIOS::supportsDragging()
-{
- return true;
-}
-
void ARKitInlinePreviewModelPlayerIOS::enterFullscreen()
{
RefPtr strongPage = page();
