Changeset 242675 in webkit

Timestamp:

Mar 9, 2019, 4:09:05 PM (7 years ago)

Author:

Alan Bujtas

Message:

[ContentChangeObserver] Start observing for content change between touchEnd and mouseMoved start
​https://bugs.webkit.org/show_bug.cgi?id=195510
<rdar://problem/48735695>

Reviewed by Simon Fraser.

Source/WebCore:

This patch covers the observation of async changes triggered by touchStart/touchEnd (animations, timers, style recalcs).

Test: fast/events/touch/ios/content-observation/visibility-change-after-touch-end.html

• page/ios/ContentChangeObserver.cpp:

(WebCore::ContentChangeObserver::didCancelTouchEvent):
(WebCore::ContentChangeObserver::adjustObservedState):

• page/ios/ContentChangeObserver.h:

(WebCore::ContentChangeObserver::setIsInBetweenTouchEndAndMouseMoved):
(WebCore::ContentChangeObserver::isInBetweenTouchEndAndMouseMoved const):
(WebCore::ContentChangeObserver::isObservingContentChanges const):

Source/WebKit:

• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::cancelPotentialTapInFrame):

LayoutTests:

• fast/events/touch/ios/content-observation/visibility-change-after-touch-end-expected.txt: Added.
• fast/events/touch/ios/content-observation/visibility-change-after-touch-end.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/touch/ios/content-observation/visibility-change-after-touch-end-expected.txt (added)
• LayoutTests/fast/events/touch/ios/content-observation/visibility-change-after-touch-end.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/ios/ContentChangeObserver.cpp (modified) (2 diffs)
• Source/WebCore/page/ios/ContentChangeObserver.h (modified) (5 diffs)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-03-09  Zalan Bujtas  <zalan@apple.com>
+
+        [ContentChangeObserver] Start observing for content change between touchEnd and mouseMoved start
+        https://bugs.webkit.org/show_bug.cgi?id=195510
+        <rdar://problem/48735695>
+
+        Reviewed by Simon Fraser.
+
+        * fast/events/touch/ios/content-observation/visibility-change-after-touch-end-expected.txt: Added.
+        * fast/events/touch/ios/content-observation/visibility-change-after-touch-end.html: Added.
+
 2019-03-08  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-09  Zalan Bujtas  <zalan@apple.com>
+
+        [ContentChangeObserver] Start observing for content change between touchEnd and mouseMoved start
+        https://bugs.webkit.org/show_bug.cgi?id=195510
+        <rdar://problem/48735695>
+
+        Reviewed by Simon Fraser.
+
+        This patch covers the observation of async changes triggered by touchStart/touchEnd (animations, timers, style recalcs).
+
+        Test: fast/events/touch/ios/content-observation/visibility-change-after-touch-end.html
+
+        * page/ios/ContentChangeObserver.cpp:
+        (WebCore::ContentChangeObserver::didCancelTouchEvent):
+        (WebCore::ContentChangeObserver::adjustObservedState):
+        * page/ios/ContentChangeObserver.h:
+        (WebCore::ContentChangeObserver::setIsInBetweenTouchEndAndMouseMoved):
+        (WebCore::ContentChangeObserver::isInBetweenTouchEndAndMouseMoved const):
+        (WebCore::ContentChangeObserver::isObservingContentChanges const):
+
 2019-03-08  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/page/ios/ContentChangeObserver.cpp

@@ -89 +89 @@
 }
 
+void ContentChangeObserver::willNotProceedWithClick()
+{
+    LOG(ContentObservation, "willNotProceedWithClick: click will not happen.");
+    setIsBetweenTouchEndAndMouseMoved(false);
+    // FIXME: Add support for preventDefault() and long press.
+}
+
 void ContentChangeObserver::domTimerExecuteDidStart(const DOMTimer& timer)
 {
@@ -248 +255 @@
         setHasNoChangeState();
         clearObservedDOMTimers();
-        m_isMouseMovedPrecededByTouch = true;
         setShouldObserveDOMTimerScheduling(true);
         break;
     case Event::EndedTouchStartEventDispatching:
         setShouldObserveDOMTimerScheduling(false);
+        setIsBetweenTouchEndAndMouseMoved(true);
         break;
     case Event::StartedMouseMovedEventDispatching:
         ASSERT(!m_document.hasPendingStyleRecalc());
-        if (!m_isMouseMovedPrecededByTouch) {
+        if (!isBetweenTouchEndAndMouseMoved()) {
             setHasNoChangeState();
             clearObservedDOMTimers();
         }
+        setIsBetweenTouchEndAndMouseMoved(false);
         setShouldObserveDOMTimerScheduling(true);
-        m_isMouseMovedPrecededByTouch = false;
         break;
     case Event::EndedMouseMovedEventDispatching:

trunk/Source/WebCore/page/ios/ContentChangeObserver.h

@@ -50 +50 @@
     void didInstallDOMTimer(const DOMTimer&, Seconds timeout, bool singleShot);
     void didRemoveDOMTimer(const DOMTimer&);
+    WEBCORE_EXPORT void willNotProceedWithClick();
     void didSuspendActiveDOMObjects();
     void willDetachPage();
@@ -124 +125 @@
     bool isWaitingForStyleRecalc() const { return m_isWaitingForStyleRecalc; }
 
-    bool isObservingContentChanges() const { return m_mouseMovedEventIsBeingDispatched || m_touchEventIsBeingDispatched || m_observedDomTimerIsBeingExecuted || m_isInObservedStyleRecalc || m_contentObservationTimer.isActive(); }
+    bool isObservingContentChanges() const;
 
     void cancelPendingActivities();
@@ -135 +136 @@
     bool hasObservedDOMTimer() const { return !m_DOMTimerList.isEmpty(); }
     bool hasDeterminateState() const;
+
+    void setIsBetweenTouchEndAndMouseMoved(bool isBetween) { m_isBetweenTouchEndAndMouseMoved = isBetween; }
+    bool isBetweenTouchEndAndMouseMoved() const { return m_isBetweenTouchEndAndMouseMoved; }
 
     bool hasPendingActivity() const { return hasObservedDOMTimer() || m_document.hasPendingStyleRecalc() || isObservationTimeWindowActive(); }
@@ -169 +173 @@
     bool m_isObservingDOMTimerScheduling { false };
     bool m_observedDomTimerIsBeingExecuted { false };
-    bool m_isMouseMovedPrecededByTouch { false };
     bool m_mouseMovedEventIsBeingDispatched { false };
+    bool m_isBetweenTouchEndAndMouseMoved { false };
 };
 
@@ -189 +193 @@
 }
 
-}
+inline bool ContentChangeObserver::isObservingContentChanges() const
+{
+    return m_touchEventIsBeingDispatched
+        || m_isBetweenTouchEndAndMouseMoved
+        || m_mouseMovedEventIsBeingDispatched
+        || m_observedDomTimerIsBeingExecuted
+        || m_isInObservedStyleRecalc
+        || m_contentObservationTimer.isActive();
+    }
+}
+
 #endif

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-03-09  Zalan Bujtas  <zalan@apple.com>
+
+        [ContentChangeObserver] Start observing for content change between touchEnd and mouseMoved start
+        https://bugs.webkit.org/show_bug.cgi?id=195510
+        <rdar://problem/48735695>
+
+        Reviewed by Simon Fraser.
+
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::cancelPotentialTapInFrame):
+
 2019-03-08  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm

@@ -866 +866 @@
 {
     if (m_potentialTapNode) {
-        Frame* potentialTapFrame = m_potentialTapNode->document().frame();
+        m_potentialTapNode->document().contentChangeObserver().willNotProceedWithClick();
+        auto* potentialTapFrame = m_potentialTapNode->document().frame();
         if (potentialTapFrame && !potentialTapFrame->tree().isDescendantOf(frame.coreFrame()))
             return;