Changeset 214589 in webkit

Timestamp:

Mar 29, 2017, 6:31:53 PM (9 years ago)

Author:

Simon Fraser

Message:

Make it possible to dump touch event regions for testing
​https://bugs.webkit.org/show_bug.cgi?id=170209
<rdar://problem/31309258>

Reviewed by Tim Horton.

Source/WebCore:

Expose internals.touchEventRectsForEvent() and internals.passiveTouchEventListenerRects(), which
fetch data via Page.

Because the regions are normally updated on a timer, we have to force an eager update via Document::updateTouchEventRegions().

Test: fast/events/touch/ios/touch-event-regions.html

• page/Page.cpp:

(WebCore::Page::nonFastScrollableRects):
(WebCore::Page::touchEventRectsForEvent):
(WebCore::Page::passiveTouchEventListenerRects):

• page/Page.h:
• testing/Internals.cpp:

(WebCore::Internals::touchEventRectsForEvent):
(WebCore::Internals::passiveTouchEventListenerRects):

• testing/Internals.h:
• testing/Internals.idl:

LayoutTests:

Simple test that dumps the regions.

• fast/events/touch/ios/touch-event-regions-expected.txt: Added.
• fast/events/touch/ios/touch-event-regions.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/touch/ios/touch-event-regions-expected.txt (added)
• LayoutTests/fast/events/touch/ios/touch-event-regions.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/Page.cpp (modified) (1 diff)
• Source/WebCore/page/Page.h (modified) (1 diff)
• Source/WebCore/testing/Internals.cpp (modified) (1 diff)
• Source/WebCore/testing/Internals.h (modified) (1 diff)
• Source/WebCore/testing/Internals.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-03-28  Simon Fraser  <simon.fraser@apple.com>
+
+        Make it possible to dump touch event regions for testing
+        https://bugs.webkit.org/show_bug.cgi?id=170209
+        <rdar://problem/31309258>
+
+        Reviewed by Tim Horton.
+
+        Simple test that dumps the regions.
+
+        * fast/events/touch/ios/touch-event-regions-expected.txt: Added.
+        * fast/events/touch/ios/touch-event-regions.html: Added.
+
 2017-03-29  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-03-28  Simon Fraser  <simon.fraser@apple.com>
+
+        Make it possible to dump touch event regions for testing
+        https://bugs.webkit.org/show_bug.cgi?id=170209
+        <rdar://problem/31309258>
+
+        Reviewed by Tim Horton.
+
+        Expose internals.touchEventRectsForEvent() and internals.passiveTouchEventListenerRects(), which
+        fetch data via Page.
+
+        Because the regions are normally updated on a timer, we have to force an eager update via Document::updateTouchEventRegions().
+
+        Test: fast/events/touch/ios/touch-event-regions.html
+
+        * page/Page.cpp:
+        (WebCore::Page::nonFastScrollableRects):
+        (WebCore::Page::touchEventRectsForEvent):
+        (WebCore::Page::passiveTouchEventListenerRects):
+        * page/Page.h:
+        * testing/Internals.cpp:
+        (WebCore::Internals::touchEventRectsForEvent):
+        (WebCore::Internals::passiveTouchEventListenerRects):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2017-03-29  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/page/Page.cpp

@@ -424 +424 @@
 }
 
+Ref<ClientRectList> Page::touchEventRectsForEvent(const String& eventName)
+{
+    if (Document* document = m_mainFrame->document()) {
+        document->updateLayout();
+#if ENABLE(IOS_TOUCH_EVENTS)
+        document->updateTouchEventRegions();
+#endif
+    }
+
+    Vector<IntRect> rects;
+    if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator()) {
+        const EventTrackingRegions& eventTrackingRegions = scrollingCoordinator->absoluteEventTrackingRegions();
+        const auto& region = eventTrackingRegions.eventSpecificSynchronousDispatchRegions.get(eventName);
+        rects.appendVector(region.rects());
+    }
+
+    Vector<FloatQuad> quads(rects.size());
+    for (size_t i = 0; i < rects.size(); ++i)
+        quads[i] = FloatRect(rects[i]);
+
+    return ClientRectList::create(quads);
+}
+
+Ref<ClientRectList> Page::passiveTouchEventListenerRects()
+{
+    if (Document* document = m_mainFrame->document()) {
+        document->updateLayout();
+#if ENABLE(IOS_TOUCH_EVENTS)
+        document->updateTouchEventRegions();
+#endif  
+    }
+
+    Vector<IntRect> rects;
+    if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
+        rects.appendVector(scrollingCoordinator->absoluteEventTrackingRegions().asynchronousDispatchRegion.rects());
+
+    Vector<FloatQuad> quads(rects.size());
+    for (size_t i = 0; i < rects.size(); ++i)
+        quads[i] = FloatRect(rects[i]);
+
+    return ClientRectList::create(quads);
+}
+
 #if ENABLE(VIEW_MODE_CSS_MEDIA)
 struct ViewModeInfo {

trunk/Source/WebCore/page/Page.h

@@ -238 +238 @@
     WEBCORE_EXPORT Ref<ClientRectList> nonFastScrollableRects();
 
+    WEBCORE_EXPORT Ref<ClientRectList> touchEventRectsForEvent(const String& eventName);
+    WEBCORE_EXPORT Ref<ClientRectList> passiveTouchEventListenerRects();
+
     Settings& settings() const { return *m_settings; }
     ProgressTracker& progress() const { return *m_progress; }

trunk/Source/WebCore/testing/Internals.cpp

@@ -1720 +1720 @@
 }
 
+ExceptionOr<Ref<ClientRectList>> Internals::touchEventRectsForEvent(const String& eventName)
+{
+    Document* document = contextDocument();
+    if (!document || !document->page())
+        return Exception { INVALID_ACCESS_ERR };
+
+    return document->page()->touchEventRectsForEvent(eventName);
+}
+
+ExceptionOr<Ref<ClientRectList>> Internals::passiveTouchEventListenerRects()
+{
+    Document* document = contextDocument();
+    if (!document || !document->page())
+        return Exception { INVALID_ACCESS_ERR };
+
+    return document->page()->passiveTouchEventListenerRects();
+}
+
 // FIXME: Remove the document argument. It is almost always the same as
 // contextDocument(), with the exception of a few tests that pass a

trunk/Source/WebCore/testing/Internals.h

@@ -235 +235 @@
     ExceptionOr<unsigned> touchEventHandlerCount();
 
+    ExceptionOr<Ref<ClientRectList>> touchEventRectsForEvent(const String&);
+    ExceptionOr<Ref<ClientRectList>> passiveTouchEventListenerRects();
+
     ExceptionOr<RefPtr<NodeList>> nodesFromRect(Document&, int x, int y, unsigned topPadding, unsigned rightPadding, unsigned bottomPadding, unsigned leftPadding, bool ignoreClipping, bool allowShadowContent, bool allowChildFrameContent) const;
 

trunk/Source/WebCore/testing/Internals.idl

@@ -214 +214 @@
     [MayThrowException] unsigned long touchEventHandlerCount();
 
+    [MayThrowException] ClientRectList touchEventRectsForEvent(DOMString eventName);
+    [MayThrowException] ClientRectList passiveTouchEventListenerRects();
+
     [MayThrowException] NodeList? nodesFromRect(Document document, long x, long y,
         unsigned long topPadding, unsigned long rightPadding, unsigned long bottomPadding, unsigned long leftPadding,