<!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>[201031] branches/safari-602.1.32-branch</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/201031">201031</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-05-17 11:49:16 -0700 (Tue, 17 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/200908">r200908</a>. rdar://problem/26273173</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602132branchLayoutTestsChangeLog">branches/safari-602.1.32-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari602132branchLayoutTestsplatformiossimulatorwk2TestExpectations">branches/safari-602.1.32-branch/LayoutTests/platform/ios-simulator-wk2/TestExpectations</a></li>
<li><a href="#branchessafari602132branchSourceWebCoreChangeLog">branches/safari-602.1.32-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602132branchSourceWebCoredomUserGestureIndicatorh">branches/safari-602.1.32-branch/Source/WebCore/dom/UserGestureIndicator.h</a></li>
<li><a href="#branchessafari602132branchSourceWebCorepageDOMWindowcpp">branches/safari-602.1.32-branch/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#branchessafari602132branchSourceWebCoretestingInternalscpp">branches/safari-602.1.32-branch/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#branchessafari602132branchSourceWebCoretestingInternalsh">branches/safari-602.1.32-branch/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#branchessafari602132branchSourceWebCoretestingInternalsidl">branches/safari-602.1.32-branch/Source/WebCore/testing/Internals.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari602132branchLayoutTestsfastdomWindowpostmessageuseractionexpectedtxt">branches/safari-602.1.32-branch/LayoutTests/fast/dom/Window/post-message-user-action-expected.txt</a></li>
<li><a href="#branchessafari602132branchLayoutTestsfastdomWindowpostmessageuseractionhtml">branches/safari-602.1.32-branch/LayoutTests/fast/dom/Window/post-message-user-action.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602132branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/LayoutTests/ChangeLog (201030 => 201031)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/LayoutTests/ChangeLog 2016-05-17 18:49:11 UTC (rev 201030)
+++ branches/safari-602.1.32-branch/LayoutTests/ChangeLog 2016-05-17 18:49:16 UTC (rev 201031)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2016-05-17 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r200908. rdar://problem/26273173
+
+ 2016-05-13 Sam Weinig <sam@webkit.org>
+
+ ScriptController::processingUserGesture should propagate across postMessage boundaries
+ <rdar://problem/26273173>
+ https://bugs.webkit.org/show_bug.cgi?id=157686
+
+ Reviewed by Anders Carlsson.
+
+ * fast/dom/Window/post-message-user-action-expected.txt: Added.
+ * fast/dom/Window/post-message-user-action.html: Added.
+
+2016-05-17 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r200876. rdar://problem/26180300
</span><span class="cx">
</span><span class="cx"> 2016-05-13 Doug Russell <d_russell@apple.com>
</span></span></pre></div>
<a id="branchessafari602132branchLayoutTestsfastdomWindowpostmessageuseractionexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-602.1.32-branch/LayoutTests/fast/dom/Window/post-message-user-action-expected.txt (0 => 201031)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/LayoutTests/fast/dom/Window/post-message-user-action-expected.txt (rev 0)
+++ branches/safari-602.1.32-branch/LayoutTests/fast/dom/Window/post-message-user-action-expected.txt 2016-05-17 18:49:16 UTC (rev 201031)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+Test that the processing user gesture bit is maintained through postMessage.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Testing that isProcessingUserGesture() is false on load.
+PASS window.internals.isProcessingUserGesture() is false
+Testing that isProcessingUserGesture() is true in response to a click.
+PASS window.internals.isProcessingUserGesture() is true
+Testing that isProcessingUserGesture() is true after processing a postMessage.
+PASS window.internals.isProcessingUserGesture() is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+Click
</ins></span></pre></div>
<a id="branchessafari602132branchLayoutTestsfastdomWindowpostmessageuseractionhtml"></a>
<div class="addfile"><h4>Added: branches/safari-602.1.32-branch/LayoutTests/fast/dom/Window/post-message-user-action.html (0 => 201031)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/LayoutTests/fast/dom/Window/post-message-user-action.html (rev 0)
+++ branches/safari-602.1.32-branch/LayoutTests/fast/dom/Window/post-message-user-action.html 2016-05-17 18:49:16 UTC (rev 201031)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<script src="../../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<button id="clicker" onclick="go()">Click</button>
+<script>
+
+description("Test that the processing user gesture bit is maintained through postMessage.");
+
+window.jsTestIsAsync = true;
+
+function go()
+{
+ debug("Testing that isProcessingUserGesture() is true in response to a click.")
+ shouldBeTrue("window.internals.isProcessingUserGesture()");
+ window.postMessage("go", "*");
+}
+
+window.onmessage = function(evt)
+{
+ if (evt.data == "go") {
+ if (window.internals) {
+ debug("Testing that isProcessingUserGesture() is true after processing a postMessage.")
+ shouldBeTrue("window.internals.isProcessingUserGesture()");
+ }
+ finishJSTest();
+ }
+}
+
+debug("Testing that isProcessingUserGesture() is false on load.")
+shouldBeFalse("window.internals.isProcessingUserGesture()");
+
+if (window.eventSender) {
+ var element = document.getElementById('clicker');
+ eventSender.mouseMoveTo(element.offsetLeft + 5, element.offsetTop + 5);
+ eventSender.mouseDown();
+ eventSender.mouseUp();
+}
+
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari602132branchLayoutTestsplatformiossimulatorwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/LayoutTests/platform/ios-simulator-wk2/TestExpectations (201030 => 201031)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2016-05-17 18:49:11 UTC (rev 201030)
+++ branches/safari-602.1.32-branch/LayoutTests/platform/ios-simulator-wk2/TestExpectations 2016-05-17 18:49:16 UTC (rev 201031)
</span><span class="lines">@@ -1842,6 +1842,7 @@
</span><span class="cx"> # eventSender.mouseDown is not implemented
</span><span class="cx"> fast/loader/location-hash-user-gesture.html [ Skip ]
</span><span class="cx"> imported/blink/editing/selection/selectstart-event-crash.html [ Skip ]
</span><ins>+fast/dom/Window/post-message-user-action.html [ Skip ]
</ins><span class="cx">
</span><span class="cx"> # No touch events
</span><span class="cx"> http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-always.html [ Skip ]
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebCore/ChangeLog (201030 => 201031)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebCore/ChangeLog 2016-05-17 18:49:11 UTC (rev 201030)
+++ branches/safari-602.1.32-branch/Source/WebCore/ChangeLog 2016-05-17 18:49:16 UTC (rev 201031)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2016-05-17 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r200908. rdar://problem/26273173
+
+ 2016-05-13 Sam Weinig <sam@webkit.org>
+
+ ScriptController::processingUserGesture should propagate across postMessage boundaries
+ <rdar://problem/26273173>
+ https://bugs.webkit.org/show_bug.cgi?id=157686
+
+ Reviewed by Anders Carlsson.
+
+ Test: fast/dom/Window/post-message-user-action.html
+
+ * dom/UserGestureIndicator.h:
+ Export processingUserGesture() for testing.
+
+ * page/DOMWindow.cpp:
+ (WebCore::PostMessageTimer::PostMessageTimer):
+ (WebCore::PostMessageTimer::event):
+ Maintain the processingUserGesture bit through postMessage.
+
+ * testing/Internals.cpp:
+ (WebCore::Internals::setResourceTimingSupport):
+ (WebCore::Internals::isProcessingUserGesture):
+ * testing/Internals.h:
+ * testing/Internals.idl:
+ Add new internals function to get the current state of the UseGestureIndicator for testing.
+
+2016-05-17 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r200876. rdar://problem/26180300
</span><span class="cx">
</span><span class="cx"> 2016-05-13 Doug Russell <d_russell@apple.com>
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebCoredomUserGestureIndicatorh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebCore/dom/UserGestureIndicator.h (201030 => 201031)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebCore/dom/UserGestureIndicator.h 2016-05-17 18:49:11 UTC (rev 201030)
+++ branches/safari-602.1.32-branch/Source/WebCore/dom/UserGestureIndicator.h 2016-05-17 18:49:16 UTC (rev 201031)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> class UserGestureIndicator {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(UserGestureIndicator);
</span><span class="cx"> public:
</span><del>- static bool processingUserGesture();
</del><ins>+ WEBCORE_EXPORT static bool processingUserGesture();
</ins><span class="cx"> static bool processingUserGestureForMedia();
</span><span class="cx">
</span><span class="cx"> // If a document is provided, its last known user gesture timestamp is updated.
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebCore/page/DOMWindow.cpp (201030 => 201031)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebCore/page/DOMWindow.cpp 2016-05-17 18:49:11 UTC (rev 201030)
+++ branches/safari-602.1.32-branch/Source/WebCore/page/DOMWindow.cpp 2016-05-17 18:49:16 UTC (rev 201031)
</span><span class="lines">@@ -97,6 +97,7 @@
</span><span class="cx"> #include "StyleResolver.h"
</span><span class="cx"> #include "SuddenTermination.h"
</span><span class="cx"> #include "URL.h"
</span><ins>+#include "UserGestureIndicator.h"
</ins><span class="cx"> #include "WebKitPoint.h"
</span><span class="cx"> #include "WindowFeatures.h"
</span><span class="cx"> #include "WindowFocusAllowedIndicator.h"
</span><span class="lines">@@ -152,6 +153,7 @@
</span><span class="cx"> , m_channels(WTFMove(channels))
</span><span class="cx"> , m_targetOrigin(WTFMove(targetOrigin))
</span><span class="cx"> , m_stackTrace(stackTrace)
</span><ins>+ , m_wasProcessingUserGesture(UserGestureIndicator::processingUserGesture())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -159,6 +161,7 @@
</span><span class="cx"> {
</span><span class="cx"> return MessageEvent::create(MessagePort::entanglePorts(context, WTFMove(m_channels)), WTFMove(m_message), m_origin, { }, m_source.ptr());
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> SecurityOrigin* targetOrigin() const { return m_targetOrigin.get(); }
</span><span class="cx"> ScriptCallStack* stackTrace() const { return m_stackTrace.get(); }
</span><span class="cx">
</span><span class="lines">@@ -167,6 +170,8 @@
</span><span class="cx"> {
</span><span class="cx"> // This object gets deleted when std::unique_ptr falls out of scope..
</span><span class="cx"> std::unique_ptr<PostMessageTimer> timer(this);
</span><ins>+
+ UserGestureIndicator userGestureIndicator(m_wasProcessingUserGesture ? DefinitelyProcessingUserGesture : DefinitelyNotProcessingUserGesture);
</ins><span class="cx"> m_window->postMessageTimerFired(*timer);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -177,6 +182,7 @@
</span><span class="cx"> std::unique_ptr<MessagePortChannelArray> m_channels;
</span><span class="cx"> RefPtr<SecurityOrigin> m_targetOrigin;
</span><span class="cx"> RefPtr<ScriptCallStack> m_stackTrace;
</span><ins>+ bool m_wasProcessingUserGesture;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef HashCountedSet<DOMWindow*> DOMWindowSet;
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebCore/testing/Internals.cpp (201030 => 201031)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebCore/testing/Internals.cpp 2016-05-17 18:49:11 UTC (rev 201030)
+++ branches/safari-602.1.32-branch/Source/WebCore/testing/Internals.cpp 2016-05-17 18:49:16 UTC (rev 201031)
</span><span class="lines">@@ -119,6 +119,7 @@
</span><span class="cx"> #include "TextIterator.h"
</span><span class="cx"> #include "TreeScope.h"
</span><span class="cx"> #include "TypeConversions.h"
</span><ins>+#include "UserGestureIndicator.h"
</ins><span class="cx"> #include "UserMediaController.h"
</span><span class="cx"> #include "ViewportArguments.h"
</span><span class="cx"> #include "WebCoreJSClientData.h"
</span><span class="lines">@@ -3333,4 +3334,9 @@
</span><span class="cx"> RuntimeEnabledFeatures::sharedFeatures().setResourceTimingEnabled(enable);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool Internals::isProcessingUserGesture()
+{
+ return UserGestureIndicator::processingUserGesture();
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre></div>
<a id="branchessafari602132branchSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebCore/testing/Internals.h (201030 => 201031)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebCore/testing/Internals.h 2016-05-17 18:49:11 UTC (rev 201030)
+++ branches/safari-602.1.32-branch/Source/WebCore/testing/Internals.h 2016-05-17 18:49:16 UTC (rev 201031)
</span><span class="lines">@@ -483,6 +483,8 @@
</span><span class="cx"> void setWebGL2Enabled(bool);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ bool isProcessingUserGesture();
+
</ins><span class="cx"> private:
</span><span class="cx"> explicit Internals(Document&);
</span><span class="cx"> Document* contextDocument() const;
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebCore/testing/Internals.idl (201030 => 201031)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebCore/testing/Internals.idl 2016-05-17 18:49:11 UTC (rev 201030)
+++ branches/safari-602.1.32-branch/Source/WebCore/testing/Internals.idl 2016-05-17 18:49:16 UTC (rev 201031)
</span><span class="lines">@@ -459,4 +459,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void setResourceTimingSupport(boolean scalable);
</span><ins>+
+ boolean isProcessingUserGesture();
</ins><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>