Changeset 247483 in webkit

Timestamp:

Jul 16, 2019 9:43:27 AM (5 years ago)

Author:

Alan Bujtas

Message:

[ContentChangeObserver] Cancel ongoing content observation when tap is failed/cancelled
​https://bugs.webkit.org/show_bug.cgi?id=199828
<rdar://problem/53152696>

Reviewed by Wenson Hsieh.

Source/WebCore:

This patch ensures that we stop the content observation (initiated by touch start) when the tap
is cancelled/failed.

Not testable.

• page/ios/ContentChangeObserver.cpp:

(WebCore::ContentChangeObserver::didCancelPotentialTap):

• page/ios/ContentChangeObserver.h:

Source/WebKit:

• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::commitPotentialTapFailed):
(WebKit::WebPage::cancelPotentialTap):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/ios/ContentChangeObserver.cpp (modified) (1 diff)
• WebCore/page/ios/ContentChangeObserver.h (modified) (2 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-07-16  Zalan Bujtas  <zalan@apple.com>
+
+        [ContentChangeObserver] Cancel ongoing content observation when tap is failed/cancelled
+        https://bugs.webkit.org/show_bug.cgi?id=199828
+        <rdar://problem/53152696>
+
+        Reviewed by Wenson Hsieh.
+
+        This patch ensures that we stop the content observation (initiated by touch start) when the tap
+        is cancelled/failed.
+
+        Not testable.
+
+        * page/ios/ContentChangeObserver.cpp:
+        (WebCore::ContentChangeObserver::didCancelPotentialTap):
+        * page/ios/ContentChangeObserver.h:
+
 2019-07-16  Rob Buis  <rbuis@igalia.com>
 

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

@@ -151 +151 @@
 }
 
+void ContentChangeObserver::didCancelPotentialTap(Frame& mainFrame)
+{
+    LOG(ContentObservation, "didCancelPotentialTap: cancel ongoing content change observing.");
+    WebCore::willNotProceedWithClick(mainFrame);
+}
+
 void ContentChangeObserver::didRecognizeLongPress(Frame& mainFrame)
 {

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

@@ -60 +60 @@
     void didRemoveTransition(const Element&, CSSPropertyID);
 
-    WEBCORE_EXPORT void willNotProceedWithClick();
     WEBCORE_EXPORT static void didRecognizeLongPress(Frame& mainFrame);
     WEBCORE_EXPORT static void didPreventDefaultForEvent(Frame& mainFrame);
+    WEBCORE_EXPORT static void didCancelPotentialTap(Frame& mainFrame);
 
     void didSuspendActiveDOMObjects();
@@ -68 +68 @@
 
     void willDestroyRenderer(const Element&);
+    void willNotProceedWithClick();
 
     void setHiddenTouchTarget(Element& targetElement) { m_hiddenTouchTargetElement = makeWeakPtr(targetElement); }

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-07-16  Zalan Bujtas  <zalan@apple.com>
+
+        [ContentChangeObserver] Cancel ongoing content observation when tap is failed/cancelled
+        https://bugs.webkit.org/show_bug.cgi?id=199828
+        <rdar://problem/53152696>
+
+        Reviewed by Wenson Hsieh.
+
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::commitPotentialTapFailed):
+        (WebKit::WebPage::cancelPotentialTap):
+
 2019-07-15  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -1127 +1127 @@
 void WebPage::commitPotentialTapFailed()
 {
+    ContentChangeObserver::didCancelPotentialTap(m_page->mainFrame());
     if (!m_page->focusController().focusedOrMainFrame().selection().selection().isContentEditable())
         clearSelection();
@@ -1136 +1137 @@
 void WebPage::cancelPotentialTap()
 {
-    if (m_potentialTapNode)
-        m_potentialTapNode->document().contentChangeObserver().willNotProceedWithClick();
+    ContentChangeObserver::didCancelPotentialTap(m_page->mainFrame());
     cancelPotentialTapInFrame(*m_mainFrame);
 }