Changeset 247152 in webkit

Timestamp:

Jul 5, 2019 7:18:46 AM (5 years ago)

Author:

Antti Koivisto

Message:

REGRESSION(r244218): desmos.com: Cannot scroll formulas region when region is scrollable
​https://bugs.webkit.org/show_bug.cgi?id=199508
<rdar://problem/50925173>

Reviewed by Zalan Bujtas.

The page invokes preventDefault on simulated mouse events which stops scrolling.
To fix, add a quirk that turns simulated mouse events non-cancelable.

• dom/MouseEvent.h:
• dom/ios/MouseEventIOS.cpp:

(WebCore::MouseEvent::create):

• page/Quirks.cpp:

(WebCore::Quirks::simulatedMouseEventTypeForTarget const):
(WebCore::Quirks::shouldDispatchSimulatedMouseEventsOnTarget const): Deleted.

To avoid adding more similar functions, and for future flexibility, make this one return the type too.

• page/Quirks.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/MouseEvent.h (modified) (1 diff)
• dom/ios/MouseEventIOS.cpp (modified) (1 diff)
• page/Quirks.cpp (modified) (1 diff)
• page/Quirks.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-07-05  Antti Koivisto  <antti@apple.com>
+
+        REGRESSION(r244218): desmos.com: Cannot scroll formulas region when region is scrollable
+        https://bugs.webkit.org/show_bug.cgi?id=199508
+        <rdar://problem/50925173>
+
+        Reviewed by Zalan Bujtas.
+
+        The page invokes preventDefault on simulated mouse events which stops scrolling.
+        To fix, add a quirk that turns simulated mouse events non-cancelable.
+
+        * dom/MouseEvent.h:
+        * dom/ios/MouseEventIOS.cpp:
+        (WebCore::MouseEvent::create):
+        * page/Quirks.cpp:
+        (WebCore::Quirks::simulatedMouseEventTypeForTarget const):
+        (WebCore::Quirks::shouldDispatchSimulatedMouseEventsOnTarget const): Deleted.
+
+        To avoid adding more similar functions, and for future flexibility, make this one return the type too.
+
+        * page/Quirks.h:
+
 2019-07-05  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/dom/MouseEvent.h

@@ -55 +55 @@
 
 #if ENABLE(TOUCH_EVENTS) && PLATFORM(IOS_FAMILY)
-    static Ref<MouseEvent> create(const PlatformTouchEvent&, unsigned touchIndex, Ref<WindowProxy>&&);
+    static Ref<MouseEvent> create(const PlatformTouchEvent&, unsigned touchIndex, Ref<WindowProxy>&&, IsCancelable = IsCancelable::Yes);
 #endif
 

trunk/Source/WebCore/dom/ios/MouseEventIOS.cpp

@@ -49 +49 @@
 }
 
-Ref<MouseEvent> MouseEvent::create(const PlatformTouchEvent& event, unsigned index, Ref<WindowProxy>&& view)
+Ref<MouseEvent> MouseEvent::create(const PlatformTouchEvent& event, unsigned index, Ref<WindowProxy>&& view, IsCancelable cancelable)
 {
-    return adoptRef(*new MouseEvent(mouseEventType(event.touchPhaseAtIndex(index)), CanBubble::Yes, IsCancelable::Yes, IsComposed::Yes, event.timestamp().approximateMonotonicTime(), WTFMove(view), 0, event.touchLocationAtIndex(index), event.touchLocationAtIndex(index), { }, event.modifiers(), 0, 0, nullptr, 0, 0, nullptr, IsSimulated::No, IsTrusted::Yes));
+    return adoptRef(*new MouseEvent(mouseEventType(event.touchPhaseAtIndex(index)), CanBubble::Yes, cancelable, IsComposed::Yes, event.timestamp().approximateMonotonicTime(), WTFMove(view), 0, event.touchLocationAtIndex(index), event.touchLocationAtIndex(index), { }, event.modifiers(), 0, 0, nullptr, 0, 0, nullptr, IsSimulated::No, IsTrusted::Yes));
 }
 

trunk/Source/WebCore/page/Quirks.cpp

@@ -300 +300 @@
 }
 
-bool Quirks::shouldDispatchSimulatedMouseEventsOnTarget(EventTarget* target) const
+Optional<Event::IsCancelable> Quirks::simulatedMouseEventTypeForTarget(EventTarget* target) const
 {
     if (!needsQuirks() || !shouldDispatchSimulatedMouseEvents())
-        return false;
+        return { };
 
     // On Google Maps, we want to limit simulated mouse events to dragging the little man that allows entering into Street View.
     auto& url = m_document->topDocument().url();
     auto host = url.host();
-    if (equalLettersIgnoringASCIICase(host, "www.google.com") && url.path().startsWithIgnoringASCIICase("/maps/"))
-        return is<Element>(target) && downcast<Element>(target)->getAttribute("class") == "widget-expand-button-pegman-icon";
-    return true;
-}
+    if (equalLettersIgnoringASCIICase(host, "www.google.com") && url.path().startsWithIgnoringASCIICase("/maps/")) {
+        if (is<Element>(target) && downcast<Element>(target)->getAttribute("class") == "widget-expand-button-pegman-icon")
+            return Event::IsCancelable::Yes;
+        return { };
+    }
+
+    if (equalLettersIgnoringASCIICase(host, "desmos.com") || host.endsWithIgnoringASCIICase(".desmos.com"))
+        return Event::IsCancelable::No;
+
+    return Event::IsCancelable::Yes;
+}   
 #endif
 

trunk/Source/WebCore/page/Quirks.h

@@ -26 +26 @@
 #pragma once
 
+#include "Event.h"
 #include <wtf/WeakPtr.h>
 
@@ -52 +53 @@
 #if ENABLE(TOUCH_EVENTS)
     bool shouldDispatchSimulatedMouseEvents() const;
-    bool shouldDispatchSimulatedMouseEventsOnTarget(EventTarget*) const;
+    Optional<Event::IsCancelable> simulatedMouseEventTypeForTarget(EventTarget*) const;
 #endif
     bool shouldDisablePointerEventsQuirk() const;