Changeset 245809 in webkit

Timestamp:

May 28, 2019, 5:33:11 AM (7 years ago)

Author:

graouts@webkit.org

Message:

[Pointer Events] Check that capturing data managed by the PointerCaptureController gets cleared upon navigation
​https://bugs.webkit.org/show_bug.cgi?id=198191

Reviewed by Dean Jackson.

When the document of the page's main frame changes, make sure we clear all of the data accumulated for the previous document.
I don't think this particular change is testable as none of the data contained in the PointerIdToCapturingDataMap maintained by
the PointerCaptureController contains any data that could be inspected by the page due to other fixes landed to fix wkb.ug/198129,
but I've checked that removing those fixes and using this patch correctly fixes that bug.

• page/Page.cpp:

(WebCore::Page::didChangeMainDocument):

• page/PointerCaptureController.cpp:

(WebCore::PointerCaptureController::PointerCaptureController):
(WebCore::PointerCaptureController::reset):

• page/PointerCaptureController.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/Page.cpp (modified) (1 diff)
• page/PointerCaptureController.cpp (modified) (2 diffs)
• page/PointerCaptureController.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-05-27  Antoine Quint  <graouts@apple.com>
+
+        [Pointer Events] Check that capturing data managed by the PointerCaptureController gets cleared upon navigation
+        https://bugs.webkit.org/show_bug.cgi?id=198191
+
+        Reviewed by Dean Jackson.
+
+        When the document of the page's main frame changes, make sure we clear all of the data accumulated for the previous document.
+        I don't think this particular change is testable as none of the data contained in the PointerIdToCapturingDataMap maintained by
+        the PointerCaptureController contains any data that could be inspected by the page due to other fixes landed to fix wkb.ug/198129,
+        but I've checked that removing those fixes and using this patch correctly fixes that bug.
+
+        * page/Page.cpp:
+        (WebCore::Page::didChangeMainDocument):
+        * page/PointerCaptureController.cpp:
+        (WebCore::PointerCaptureController::PointerCaptureController):
+        (WebCore::PointerCaptureController::reset):
+        * page/PointerCaptureController.h:
+
 2019-05-27  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/page/Page.cpp

@@ -2861 +2861 @@
     m_rtcController.reset(m_shouldEnableICECandidateFilteringByDefault);
 #endif
+#if ENABLE(POINTER_EVENTS)
+    m_pointerCaptureController->reset();
+#endif
 }
 

trunk/Source/WebCore/page/PointerCaptureController.cpp

@@ -45 +45 @@
     : m_page(page)
 {
-#if !ENABLE(TOUCH_EVENTS)
-    CapturingData capturingData;
-    capturingData.pointerType = PointerEvent::mousePointerType();
-    m_activePointerIdsToCapturingData.set(mousePointerID, capturingData);
-#endif
+    reset();
 }
 
@@ -147 +143 @@
 }
 
+void PointerCaptureController::reset()
+{
+    m_activePointerIdsToCapturingData.clear();
+#if !ENABLE(TOUCH_EVENTS)
+    CapturingData capturingData;
+    capturingData.pointerType = PointerEvent::mousePointerType();
+    m_activePointerIdsToCapturingData.set(mousePointerID, capturingData);
+#endif
+}
+
 void PointerCaptureController::touchWithIdentifierWasRemoved(PointerID pointerId)
 {

trunk/Source/WebCore/page/PointerCaptureController.h

@@ -45 +45 @@
     ExceptionOr<void> releasePointerCapture(Element*, PointerID);
     bool hasPointerCapture(Element*, PointerID);
+    void reset();
 
     void pointerLockWasApplied();