<!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>[214982] 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/214982">214982</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2017-04-05 17:55:14 -0700 (Wed, 05 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Set lastHandledUserGestureTimestamp on all ancestor documents, not just the top document
https://bugs.webkit.org/show_bug.cgi?id=170479
Reviewed by Sam Weinig.
Source/WebCore:
When interacting with a subframe document, set lastHandledUserGestureTimestamp on all ancestor
documents up to the root.
This will be used in future for requestAnimationFrame throttling.
Test: fast/frames/user-gesture-timestamp-propagation.html
* dom/Document.cpp:
(WebCore::Document::updateLastHandledUserGestureTimestamp):
* dom/Document.h:
* dom/UserGestureIndicator.cpp:
(WebCore::UserGestureIndicator::UserGestureIndicator):
* testing/Internals.cpp:
(WebCore::Internals::lastHandledUserGestureTimestamp):
* testing/Internals.h:
* testing/Internals.idl:
LayoutTests:
* fast/frames/user-gesture-timestamp-propagation-expected.txt: Added.
* fast/frames/user-gesture-timestamp-propagation.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformiosTestExpectations">trunk/LayoutTests/platform/ios/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomUserGestureIndicatorcpp">trunk/Source/WebCore/dom/UserGestureIndicator.cpp</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="#trunkLayoutTestsfastframesusergesturetimestamppropagationexpectedtxt">trunk/LayoutTests/fast/frames/user-gesture-timestamp-propagation-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastframesusergesturetimestamppropagationhtml">trunk/LayoutTests/fast/frames/user-gesture-timestamp-propagation.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (214981 => 214982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-04-06 00:13:52 UTC (rev 214981)
+++ trunk/LayoutTests/ChangeLog 2017-04-06 00:55:14 UTC (rev 214982)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-04-05 Simon Fraser <simon.fraser@apple.com>
+
+ Set lastHandledUserGestureTimestamp on all ancestor documents, not just the top document
+ https://bugs.webkit.org/show_bug.cgi?id=170479
+
+ Reviewed by Sam Weinig.
+
+ * fast/frames/user-gesture-timestamp-propagation-expected.txt: Added.
+ * fast/frames/user-gesture-timestamp-propagation.html: Added.
+ * platform/ios/TestExpectations:
+
</ins><span class="cx"> 2017-04-05 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [MediaStream] Host application should be able to mute and unmute media streams
</span></span></pre></div>
<a id="trunkLayoutTestsfastframesusergesturetimestamppropagationexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/frames/user-gesture-timestamp-propagation-expected.txt (0 => 214982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/frames/user-gesture-timestamp-propagation-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/frames/user-gesture-timestamp-propagation-expected.txt 2017-04-06 00:55:14 UTC (rev 214982)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+Tests that the EventTarget API is no longer working on detached frames.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+PASS internals.lastHandledUserGestureTimestamp() is 0
+PASS frame.contentWindow.internals.lastHandledUserGestureTimestamp() is 0
+PASS innerFrame.contentWindow.internals.lastHandledUserGestureTimestamp() is 0
+PASS innerFrame2.contentWindow.internals.lastHandledUserGestureTimestamp() is 0
+Dispatching click
+PASS internals.lastHandledUserGestureTimestamp() is not 0
+PASS frame.contentWindow.internals.lastHandledUserGestureTimestamp() is not 0
+PASS innerFrame.contentWindow.internals.lastHandledUserGestureTimestamp() is not 0
+PASS innerFrame2.contentWindow.internals.lastHandledUserGestureTimestamp() is 0
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastframesusergesturetimestamppropagationhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/frames/user-gesture-timestamp-propagation.html (0 => 214982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/frames/user-gesture-timestamp-propagation.html (rev 0)
+++ trunk/LayoutTests/fast/frames/user-gesture-timestamp-propagation.html 2017-04-06 00:55:14 UTC (rev 214982)
</span><span class="lines">@@ -0,0 +1,63 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <script src="../../resources/js-test-pre.js"></script>
+ <script>
+ description("Tests that the EventTarget API is no longer working on detached frames.");
+
+ var frame;
+ var innerFrame;
+ var innerFrame2;
+
+ function dispatchClick()
+ {
+ var x = frame.offsetLeft + frame.offsetWidth / 2;
+ var y = frame.offsetTop + frame.offsetHeight / 2;
+
+ eventSender.mouseMoveTo(x, y);
+ eventSender.mouseDown();
+ eventSender.mouseUp();
+ }
+
+ function doTest()
+ {
+ frame = document.getElementById('frame');
+ innerFrame = frame.contentWindow.document.getElementById('frame');
+ innerFrame2 = frame.contentWindow.document.getElementById('frame2');
+
+ shouldBe('internals.lastHandledUserGestureTimestamp()', '0');
+ shouldBe('frame.contentWindow.internals.lastHandledUserGestureTimestamp()', '0');
+ shouldBe('innerFrame.contentWindow.internals.lastHandledUserGestureTimestamp()', '0');
+ shouldBe('innerFrame2.contentWindow.internals.lastHandledUserGestureTimestamp()', '0');
+
+ debug('Dispatching click');
+ dispatchClick();
+
+ shouldNotBe('internals.lastHandledUserGestureTimestamp()', '0');
+ shouldNotBe('frame.contentWindow.internals.lastHandledUserGestureTimestamp()', '0');
+ shouldNotBe('innerFrame.contentWindow.internals.lastHandledUserGestureTimestamp()', '0');
+ // Should have not hit frame2
+ shouldBe('innerFrame2.contentWindow.internals.lastHandledUserGestureTimestamp()', '0');
+ }
+
+ window.addEventListener('load', doTest, false);
+ </script>
+</head>
+<body>
+ <iframe id="frame" srcdoc="
+ <body>
+ <iframe id='frame' srcdoc='
+ Inner frame
+ '>
+ </iframe>
+ <iframe id='frame2' srcdoc='
+ Inner frame
+ '>
+ </iframe>
+ </body>">
+ </iframe>
+ <script src="../../resources/js-test-post.js"></script>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiosTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios/TestExpectations (214981 => 214982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios/TestExpectations 2017-04-06 00:13:52 UTC (rev 214981)
+++ trunk/LayoutTests/platform/ios/TestExpectations 2017-04-06 00:55:14 UTC (rev 214982)
</span><span class="lines">@@ -379,10 +379,10 @@
</span><span class="cx"> http/tests/navigation/keyboard-events-during-provisional-navigation.html [ Skip ]
</span><span class="cx"> media/audio-dealloc-crash.html [ Skip ]
</span><span class="cx">
</span><del>-# This test uses EventSender's mouseMoveTo, mouseUp and mouseDown
</del><ins>+# Tests that use EventSender's mouseMoveTo, mouseUp and mouseDown
</ins><span class="cx"> fast/forms/range/disabled-while-dragging.html [ Skip ]
</span><span class="cx"> fast/forms/range/range-drag-when-toggled-disabled.html [ Skip ]
</span><del>-fast/media/video-element-in-details-collapse.html [ Skip ]
</del><ins>+fast/frames/user-gesture-timestamp-propagation.html [ Failure ]
</ins><span class="cx">
</span><span class="cx"> # The file-wrapper part of <attachment> is not yet working on iOS
</span><span class="cx"> fast/attachment/attachment-type-attribute.html [ Skip ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214981 => 214982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-04-06 00:13:52 UTC (rev 214981)
+++ trunk/Source/WebCore/ChangeLog 2017-04-06 00:55:14 UTC (rev 214982)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2017-04-05 Simon Fraser <simon.fraser@apple.com>
+
+ Set lastHandledUserGestureTimestamp on all ancestor documents, not just the top document
+ https://bugs.webkit.org/show_bug.cgi?id=170479
+
+ Reviewed by Sam Weinig.
+
+ When interacting with a subframe document, set lastHandledUserGestureTimestamp on all ancestor
+ documents up to the root.
+
+ This will be used in future for requestAnimationFrame throttling.
+
+ Test: fast/frames/user-gesture-timestamp-propagation.html
+
+ * dom/Document.cpp:
+ (WebCore::Document::updateLastHandledUserGestureTimestamp):
+ * dom/Document.h:
+ * dom/UserGestureIndicator.cpp:
+ (WebCore::UserGestureIndicator::UserGestureIndicator):
+ * testing/Internals.cpp:
+ (WebCore::Internals::lastHandledUserGestureTimestamp):
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
</ins><span class="cx"> 2017-04-05 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [MediaStream] Host application should be able to mute and unmute media streams
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (214981 => 214982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2017-04-06 00:13:52 UTC (rev 214981)
+++ trunk/Source/WebCore/dom/Document.cpp 2017-04-06 00:55:14 UTC (rev 214982)
</span><span class="lines">@@ -142,7 +142,6 @@
</span><span class="cx"> #include "RenderView.h"
</span><span class="cx"> #include "RenderWidget.h"
</span><span class="cx"> #include "RequestAnimationFrameCallback.h"
</span><del>-#include "ResourceLoadObserver.h"
</del><span class="cx"> #include "RuntimeEnabledFeatures.h"
</span><span class="cx"> #include "SVGDocumentExtensions.h"
</span><span class="cx"> #include "SVGElement.h"
</span><span class="lines">@@ -6313,10 +6312,12 @@
</span><span class="cx"> return RegionFixedPair(targetRegion, insideFixedPosition);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::updateLastHandledUserGestureTimestamp()
</del><ins>+void Document::updateLastHandledUserGestureTimestamp(MonotonicTime time)
</ins><span class="cx"> {
</span><del>- m_lastHandledUserGestureTimestamp = MonotonicTime::now();
- ResourceLoadObserver::sharedObserver().logUserInteractionWithReducedTimeResolution(*this);
</del><ins>+ m_lastHandledUserGestureTimestamp = time;
+
+ if (HTMLFrameOwnerElement* element = ownerElement())
+ element->document().updateLastHandledUserGestureTimestamp(time);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Document::startTrackingStyleRecalcs()
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (214981 => 214982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2017-04-06 00:13:52 UTC (rev 214981)
+++ trunk/Source/WebCore/dom/Document.h 2017-04-06 00:55:14 UTC (rev 214982)
</span><span class="lines">@@ -1144,7 +1144,7 @@
</span><span class="cx"> void didRemoveWheelEventHandler(Node&, EventHandlerRemoval = EventHandlerRemoval::One);
</span><span class="cx">
</span><span class="cx"> MonotonicTime lastHandledUserGestureTimestamp() const { return m_lastHandledUserGestureTimestamp; }
</span><del>- void updateLastHandledUserGestureTimestamp();
</del><ins>+ void updateLastHandledUserGestureTimestamp(MonotonicTime);
</ins><span class="cx">
</span><span class="cx"> // Used for testing. Count handlers in the main document, and one per frame which contains handlers.
</span><span class="cx"> WEBCORE_EXPORT unsigned wheelEventHandlerCount() const;
</span></span></pre></div>
<a id="trunkSourceWebCoredomUserGestureIndicatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/UserGestureIndicator.cpp (214981 => 214982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/UserGestureIndicator.cpp 2017-04-06 00:13:52 UTC (rev 214981)
+++ trunk/Source/WebCore/dom/UserGestureIndicator.cpp 2017-04-06 00:55:14 UTC (rev 214982)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "UserGestureIndicator.h"
</span><span class="cx">
</span><span class="cx"> #include "Document.h"
</span><ins>+#include "ResourceLoadObserver.h"
</ins><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="lines">@@ -54,8 +55,10 @@
</span><span class="cx"> if (state)
</span><span class="cx"> currentToken() = UserGestureToken::create(state.value());
</span><span class="cx">
</span><del>- if (document && currentToken()->processingUserGesture())
- document->topDocument().updateLastHandledUserGestureTimestamp();
</del><ins>+ if (document && currentToken()->processingUserGesture()) {
+ document->updateLastHandledUserGestureTimestamp(MonotonicTime::now());
+ ResourceLoadObserver::sharedObserver().logUserInteractionWithReducedTimeResolution(*document);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> UserGestureIndicator::UserGestureIndicator(RefPtr<UserGestureToken> token)
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (214981 => 214982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2017-04-06 00:13:52 UTC (rev 214981)
+++ trunk/Source/WebCore/testing/Internals.cpp 2017-04-06 00:55:14 UTC (rev 214982)
</span><span class="lines">@@ -3773,6 +3773,15 @@
</span><span class="cx"> return UserGestureIndicator::processingUserGesture();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+double Internals::lastHandledUserGestureTimestamp()
+{
+ Document* document = contextDocument();
+ if (!document)
+ return 0;
+
+ return document->lastHandledUserGestureTimestamp().secondsSinceEpoch().value();
+}
+
</ins><span class="cx"> RefPtr<GCObservation> Internals::observeGC(JSC::JSValue value)
</span><span class="cx"> {
</span><span class="cx"> if (!value.isObject())
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (214981 => 214982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2017-04-06 00:13:52 UTC (rev 214981)
+++ trunk/Source/WebCore/testing/Internals.h 2017-04-06 00:55:14 UTC (rev 214982)
</span><span class="lines">@@ -532,6 +532,7 @@
</span><span class="cx"> String composedTreeAsText(Node&);
</span><span class="cx">
</span><span class="cx"> bool isProcessingUserGesture();
</span><ins>+ double lastHandledUserGestureTimestamp();
</ins><span class="cx">
</span><span class="cx"> RefPtr<GCObservation> observeGC(JSC::JSValue);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (214981 => 214982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2017-04-06 00:13:52 UTC (rev 214981)
+++ trunk/Source/WebCore/testing/Internals.idl 2017-04-06 00:55:14 UTC (rev 214982)
</span><span class="lines">@@ -501,6 +501,7 @@
</span><span class="cx"> DOMString composedTreeAsText(Node parent);
</span><span class="cx">
</span><span class="cx"> boolean isProcessingUserGesture();
</span><ins>+ double lastHandledUserGestureTimestamp();
</ins><span class="cx">
</span><span class="cx"> GCObservation? observeGC(any observed);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>