<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[214589] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/214589">214589</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2017-03-29 18:31:53 -0700 (Wed, 29 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasteventstouchiostoucheventregionsexpectedtxt">trunk/LayoutTests/fast/events/touch/ios/touch-event-regions-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventstouchiostoucheventregionshtml">trunk/LayoutTests/fast/events/touch/ios/touch-event-regions.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (214588 => 214589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-30 01:25:00 UTC (rev 214588)
+++ trunk/LayoutTests/ChangeLog 2017-03-30 01:31:53 UTC (rev 214589)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+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.
+
</ins><span class="cx"> 2017-03-29 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> RenderBlockFlow::addFloatsToNewParent should check if float is already added to the object list.
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventstouchiostoucheventregionsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/touch/ios/touch-event-regions-expected.txt (0 => 214589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/touch/ios/touch-event-regions-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/events/touch/ios/touch-event-regions-expected.txt 2017-03-30 01:31:53 UTC (rev 214589)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+touch start touch move touch end touch force change passive
+Overflowing
+touchstart
+250, 50 - 266, 66
+50, 100 - 192, 222
+250, 400 - 392, 522
+touchstart
+250, 50 - 266, 66
+250, 100 - 392, 222
+250, 400 - 392, 522
+touchend
+250, 50 - 266, 66
+50, 250 - 192, 372
+250, 400 - 392, 522
+touchforcechange
+250, 50 - 266, 66
+250, 250 - 392, 372
+250, 400 - 392, 522
+passive
+50, 400 - 192, 522
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventstouchiostoucheventregionshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/touch/ios/touch-event-regions.html (0 => 214589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/touch/ios/touch-event-regions.html (rev 0)
+++ trunk/LayoutTests/fast/events/touch/ios/touch-event-regions.html 2017-03-30 01:31:53 UTC (rev 214589)
</span><span class="lines">@@ -0,0 +1,104 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <meta name="viewport" content="initial-scale=1.0">
+ <style>
+ .box {
+ position: absolute;
+ height: 100px;
+ width: 120px;
+ border: 1px solid black;
+ padding: 10px;
+ }
+
+ input {
+ display: block;
+ margin: 50px;
+ width: 400px;
+ }
+
+ .overflow div {
+ height: 500px;
+ }
+ </style>
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ }
+
+ function rectsAsString(rects)
+ {
+ var result = "";
+ for (var i = 0; i < rects.length; ++i) {
+ var rect = rects[i];
+ if (i)
+ result += '\n';
+ result += rect.left + ', ' + rect.top + ' - ' + rect.right + ', ' + rect.bottom;
+ }
+ return result;
+ }
+
+ function doTest()
+ {
+ document.getElementById('passive').addEventListener('touchstart', function(e) { }, { 'passive': true })
+
+ if (!window.internals)
+ return;
+
+ var resultString = 'touchstart\n';
+ var rectList = internals.touchEventRectsForEvent('touchstart');
+ resultString += rectsAsString(rectList);
+
+ rectList = internals.touchEventRectsForEvent('touchmove');
+ resultString += '\ntouchstart\n' + rectsAsString(rectList);
+
+ rectList = internals.touchEventRectsForEvent('touchend');
+ resultString += '\ntouchend\n' + rectsAsString(rectList);
+
+ rectList = internals.touchEventRectsForEvent('touchforcechange');
+ resultString += '\ntouchforcechange\n' + rectsAsString(rectList);
+
+ rectList = internals.passiveTouchEventListenerRects();
+ resultString += '\npassive\n' + rectsAsString(rectList);
+
+ document.getElementById('results').textContent = resultString;
+ }
+
+ window.addEventListener('load', doTest, false);
+ </script>
+</head>
+<body>
+
+<input type="range">
+
+<div class="box" style="left: 50px; top: 100px;" ontouchstart="(void)0">
+ touch start
+</div>
+
+<div class="box" style="left: 250px; top: 100px;" ontouchmove="(void)0">
+ touch move
+</div>
+
+<div class="box" style="left: 50px; top: 250px;" ontouchend="(void)0">
+ touch end
+</div>
+
+<div class="box" style="left: 250px; top: 250px;" ontouchforcechange="(void)0">
+ touch force change
+</div>
+
+<div id="passive" class="box" style="left: 50px; top: 400px;">
+ passive
+</div>
+
+<div id="passive" class="overflow box" style="left: 250px; top: 400px; overflow: scroll">
+ <div>
+ Overflowing
+ </div>
+</div>
+
+<pre id="results"></pre>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214588 => 214589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-30 01:25:00 UTC (rev 214588)
+++ trunk/Source/WebCore/ChangeLog 2017-03-30 01:31:53 UTC (rev 214589)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+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:
+
</ins><span class="cx"> 2017-03-29 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> RenderBlockFlow::addFloatsToNewParent should check if float is already added to the object list.
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (214588 => 214589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2017-03-30 01:25:00 UTC (rev 214588)
+++ trunk/Source/WebCore/page/Page.cpp 2017-03-30 01:31:53 UTC (rev 214589)
</span><span class="lines">@@ -423,6 +423,49 @@
</span><span class="cx"> return ClientRectList::create(quads);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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);
+}
+
</ins><span class="cx"> #if ENABLE(VIEW_MODE_CSS_MEDIA)
</span><span class="cx"> struct ViewModeInfo {
</span><span class="cx"> const char* name;
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (214588 => 214589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2017-03-30 01:25:00 UTC (rev 214588)
+++ trunk/Source/WebCore/page/Page.h 2017-03-30 01:31:53 UTC (rev 214589)
</span><span class="lines">@@ -237,6 +237,9 @@
</span><span class="cx"> WEBCORE_EXPORT String synchronousScrollingReasonsAsText();
</span><span class="cx"> WEBCORE_EXPORT Ref<ClientRectList> nonFastScrollableRects();
</span><span class="cx">
</span><ins>+ WEBCORE_EXPORT Ref<ClientRectList> touchEventRectsForEvent(const String& eventName);
+ WEBCORE_EXPORT Ref<ClientRectList> passiveTouchEventListenerRects();
+
</ins><span class="cx"> Settings& settings() const { return *m_settings; }
</span><span class="cx"> ProgressTracker& progress() const { return *m_progress; }
</span><span class="cx"> BackForwardController& backForward() const { return *m_backForwardController; }
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (214588 => 214589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2017-03-30 01:25:00 UTC (rev 214588)
+++ trunk/Source/WebCore/testing/Internals.cpp 2017-03-30 01:31:53 UTC (rev 214589)
</span><span class="lines">@@ -1719,6 +1719,24 @@
</span><span class="cx"> return document->touchEventHandlerCount();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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();
+}
+
</ins><span class="cx"> // FIXME: Remove the document argument. It is almost always the same as
</span><span class="cx"> // contextDocument(), with the exception of a few tests that pass a
</span><span class="cx"> // different document, and could just make the call through another Internals
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (214588 => 214589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2017-03-30 01:25:00 UTC (rev 214588)
+++ trunk/Source/WebCore/testing/Internals.h 2017-03-30 01:31:53 UTC (rev 214589)
</span><span class="lines">@@ -234,6 +234,9 @@
</span><span class="cx"> ExceptionOr<unsigned> wheelEventHandlerCount();
</span><span class="cx"> ExceptionOr<unsigned> touchEventHandlerCount();
</span><span class="cx">
</span><ins>+ ExceptionOr<Ref<ClientRectList>> touchEventRectsForEvent(const String&);
+ ExceptionOr<Ref<ClientRectList>> passiveTouchEventListenerRects();
+
</ins><span class="cx"> ExceptionOr<RefPtr<NodeList>> nodesFromRect(Document&, int x, int y, unsigned topPadding, unsigned rightPadding, unsigned bottomPadding, unsigned leftPadding, bool ignoreClipping, bool allowShadowContent, bool allowChildFrameContent) const;
</span><span class="cx">
</span><span class="cx"> String parserMetaData(JSC::JSValue = JSC::JSValue::JSUndefined);
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (214588 => 214589)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2017-03-30 01:25:00 UTC (rev 214588)
+++ trunk/Source/WebCore/testing/Internals.idl 2017-03-30 01:31:53 UTC (rev 214589)
</span><span class="lines">@@ -213,6 +213,9 @@
</span><span class="cx"> [MayThrowException] unsigned long wheelEventHandlerCount();
</span><span class="cx"> [MayThrowException] unsigned long touchEventHandlerCount();
</span><span class="cx">
</span><ins>+ [MayThrowException] ClientRectList touchEventRectsForEvent(DOMString eventName);
+ [MayThrowException] ClientRectList passiveTouchEventListenerRects();
+
</ins><span class="cx"> [MayThrowException] NodeList? nodesFromRect(Document document, long x, long y,
</span><span class="cx"> unsigned long topPadding, unsigned long rightPadding, unsigned long bottomPadding, unsigned long leftPadding,
</span><span class="cx"> boolean ignoreClipping, boolean allowShadowContent, boolean allowChildFrameContent);
</span></span></pre>
</div>
</div>
</body>
</html>