Changeset 243677 in webkit

Timestamp:

Mar 30, 2019, 6:47:42 AM (7 years ago)

Author:

Alan Bujtas

Message:

[ContentChangeObserver] Subframe load should not reset content observation on the mainframe
​https://bugs.webkit.org/show_bug.cgi?id=196408
<rdar://problem/49436797>

Reviewed by Simon Fraser.

Source/WebKit:

Hover intent fails when an unrelated frame commits a load the same time.
cancelPotentialTapInFrame is called from didCommitLoad, but what we are looking for here is the user initiated cancel of a tap (cancelPotentialTap).
(If the current frame navigates away, willDetachPage takes care of canceling the observation.)

• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::cancelPotentialTap):
(WebKit::WebPage::cancelPotentialTapInFrame):

LayoutTests:

• fast/events/touch/ios/content-observation/hover-while-loading-subframe-expected.txt: Added.
• fast/events/touch/ios/content-observation/hover-while-loading-subframe.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/touch/ios/content-observation/hover-while-loading-subframe-expected.txt (added)
• LayoutTests/fast/events/touch/ios/content-observation/hover-while-loading-subframe.html (added)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-03-30  Zalan Bujtas  <zalan@apple.com>
+
+        [ContentChangeObserver] Subframe load should not reset content observation on the mainframe
+        https://bugs.webkit.org/show_bug.cgi?id=196408
+        <rdar://problem/49436797>
+
+        Reviewed by Simon Fraser.
+
+        * fast/events/touch/ios/content-observation/hover-while-loading-subframe-expected.txt: Added.
+        * fast/events/touch/ios/content-observation/hover-while-loading-subframe.html: Added.
+
 2019-03-30  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-03-30  Zalan Bujtas  <zalan@apple.com>
+
+        [ContentChangeObserver] Subframe load should not reset content observation on the mainframe
+        https://bugs.webkit.org/show_bug.cgi?id=196408
+        <rdar://problem/49436797>
+
+        Reviewed by Simon Fraser.
+
+        Hover intent fails when an unrelated frame commits a load the same time.
+        cancelPotentialTapInFrame is called from didCommitLoad, but what we are looking for here is the user initiated cancel of a tap (cancelPotentialTap).
+        (If the current frame navigates away, willDetachPage takes care of canceling the observation.)
+
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::cancelPotentialTap):
+        (WebKit::WebPage::cancelPotentialTapInFrame):
+
 2019-03-29  John Wilander  <wilander@apple.com>
 

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

@@ -911 +911 @@
 void WebPage::cancelPotentialTap()
 {
+    if (m_potentialTapNode)
+        m_potentialTapNode->document().contentChangeObserver().willNotProceedWithClick();
     cancelPotentialTapInFrame(*m_mainFrame);
 }
@@ -917 +919 @@
 {
     if (m_potentialTapNode) {
-        m_potentialTapNode->document().contentChangeObserver().willNotProceedWithClick();
         auto* potentialTapFrame = m_potentialTapNode->document().frame();
         if (potentialTapFrame && !potentialTapFrame->tree().isDescendantOf(frame.coreFrame()))