<!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>[186531] trunk/Source/WebKit2</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/186531">186531</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2015-07-08 16:02:43 -0700 (Wed, 08 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS][WK2] Ignore synthetic clicks in subframes initiated on a previous page
https://bugs.webkit.org/show_bug.cgi?id=146712
Reviewed by Benjamin Poulain.
<a href="http://trac.webkit.org/projects/webkit/changeset/178980">r178980</a> fixed an issue where, if a main frame navigation occurs in response to a touch event, a synthetic click
event could fire on the navigated-to page. This change extends this fix to apply to subframes.
* WebProcess/WebPage/WebFrame.cpp:
(WebKit::WebFrame::WebFrame):
* WebProcess/WebPage/WebFrame.h:
(WebKit::WebFrame::firstLayerTreeTransactionIDAfterDidCommitLoad):
(WebKit::WebFrame::setFirstLayerTreeTransactionIDAfterDidCommitLoad):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::didCommitLoad): Stored the next layer tree transaction ID, and called cancelPotentialTapInFrame(), for the committed frame.
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::handleTap): Determined the first post-commit layer tree transaction ID from the tap target node's frame.
(WebKit::WebPage::commitPotentialTap): Ditto.
(WebKit::WebPage::cancelPotentialTap): Called cancelPotentialTapInFrame(), passing m_mainFrame.
(WebKit::WebPage::cancelPotentialTapInFrame): Taught to only cancel a potential tap whose target node is a descendant of the given frame.
(WebKit::WebPage::updateVisibleContentRects): Updated to use the main frame's first post-commit layer tree transaction ID.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebFramecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebFrameh">trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (186530 => 186531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-07-08 22:53:41 UTC (rev 186530)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-08 23:02:43 UTC (rev 186531)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-07-07 Andy Estes <aestes@apple.com>
+
+ [iOS][WK2] Ignore synthetic clicks in subframes initiated on a previous page
+ https://bugs.webkit.org/show_bug.cgi?id=146712
+
+ Reviewed by Benjamin Poulain.
+
+ r178980 fixed an issue where, if a main frame navigation occurs in response to a touch event, a synthetic click
+ event could fire on the navigated-to page. This change extends this fix to apply to subframes.
+
+ * WebProcess/WebPage/WebFrame.cpp:
+ (WebKit::WebFrame::WebFrame):
+ * WebProcess/WebPage/WebFrame.h:
+ (WebKit::WebFrame::firstLayerTreeTransactionIDAfterDidCommitLoad):
+ (WebKit::WebFrame::setFirstLayerTreeTransactionIDAfterDidCommitLoad):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::didCommitLoad): Stored the next layer tree transaction ID, and called cancelPotentialTapInFrame(), for the committed frame.
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::handleTap): Determined the first post-commit layer tree transaction ID from the tap target node's frame.
+ (WebKit::WebPage::commitPotentialTap): Ditto.
+ (WebKit::WebPage::cancelPotentialTap): Called cancelPotentialTapInFrame(), passing m_mainFrame.
+ (WebKit::WebPage::cancelPotentialTapInFrame): Taught to only cancel a potential tap whose target node is a descendant of the given frame.
+ (WebKit::WebPage::updateVisibleContentRects): Updated to use the main frame's first post-commit layer tree transaction ID.
+
</ins><span class="cx"> 2015-07-08 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Move PingLoaders to the NetworkingProcess.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp (186530 => 186531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2015-07-08 22:53:41 UTC (rev 186530)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2015-07-08 23:02:43 UTC (rev 186531)
</span><span class="lines">@@ -155,6 +155,9 @@
</span><span class="cx"> , m_frameLoaderClient(WTF::move(frameLoaderClient))
</span><span class="cx"> , m_loadListener(0)
</span><span class="cx"> , m_frameID(generateFrameID())
</span><ins>+#if PLATFORM(IOS)
+ , m_firstLayerTreeTransactionIDAfterDidCommitLoad(0)
+#endif
</ins><span class="cx"> {
</span><span class="cx"> m_frameLoaderClient->setWebFrame(this);
</span><span class="cx"> WebProcess::singleton().addWebFrame(m_frameID, this);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.h (186530 => 186531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.h 2015-07-08 22:53:41 UTC (rev 186530)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.h 2015-07-08 23:02:43 UTC (rev 186531)
</span><span class="lines">@@ -155,6 +155,11 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<ShareableBitmap> createSelectionSnapshot() const;
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+ uint64_t firstLayerTreeTransactionIDAfterDidCommitLoad() const { return m_firstLayerTreeTransactionIDAfterDidCommitLoad; }
+ void setFirstLayerTreeTransactionIDAfterDidCommitLoad(uint64_t transactionID) { m_firstLayerTreeTransactionIDAfterDidCommitLoad = transactionID; }
+#endif
+
</ins><span class="cx"> private:
</span><span class="cx"> static PassRefPtr<WebFrame> create(std::unique_ptr<WebFrameLoaderClient>);
</span><span class="cx"> WebFrame(std::unique_ptr<WebFrameLoaderClient>);
</span><span class="lines">@@ -169,6 +174,10 @@
</span><span class="cx"> LoadListener* m_loadListener;
</span><span class="cx">
</span><span class="cx"> uint64_t m_frameID;
</span><ins>+
+#if PLATFORM(IOS)
+ uint64_t m_firstLayerTreeTransactionIDAfterDidCommitLoad;
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (186530 => 186531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-07-08 22:53:41 UTC (rev 186530)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-07-08 23:02:43 UTC (rev 186531)
</span><span class="lines">@@ -317,7 +317,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> , m_selectionAnchor(Start)
</span><del>- , m_firstLayerTreeTransactionIDAfterDidCommitLoad(0)
</del><span class="cx"> , m_hasReceivedVisibleContentRectsAfterDidCommitLoad(false)
</span><span class="cx"> , m_scaleWasSetByUIProcess(false)
</span><span class="cx"> , m_userHasChangedPageScaleFactor(false)
</span><span class="lines">@@ -4612,6 +4611,11 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::didCommitLoad(WebFrame* frame)
</span><span class="cx"> {
</span><ins>+#if PLATFORM(IOS)
+ frame->setFirstLayerTreeTransactionIDAfterDidCommitLoad(downcast<RemoteLayerTreeDrawingArea>(*m_drawingArea).nextTransactionID());
+ cancelPotentialTapInFrame(*frame);
+#endif
+
</ins><span class="cx"> if (!frame->isMainFrame())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -4630,10 +4634,8 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> m_hasReceivedVisibleContentRectsAfterDidCommitLoad = false;
</span><span class="cx"> m_scaleWasSetByUIProcess = false;
</span><del>- m_firstLayerTreeTransactionIDAfterDidCommitLoad = downcast<RemoteLayerTreeDrawingArea>(*m_drawingArea).nextTransactionID();
</del><span class="cx"> m_userHasChangedPageScaleFactor = false;
</span><span class="cx"> m_estimatedLatency = std::chrono::milliseconds(1000 / 60);
</span><del>- cancelPotentialTap();
</del><span class="cx">
</span><span class="cx"> #if ENABLE(IOS_TOUCH_EVENTS)
</span><span class="cx"> WebProcess::singleton().eventDispatcher().clearQueuedTouchEventsForPage(*this);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (186530 => 186531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-07-08 22:53:41 UTC (rev 186530)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-07-08 23:02:43 UTC (rev 186531)
</span><span class="lines">@@ -489,6 +489,7 @@
</span><span class="cx"> void commitPotentialTap(uint64_t lastLayerTreeTransactionId);
</span><span class="cx"> void commitPotentialTapFailed();
</span><span class="cx"> void cancelPotentialTap();
</span><ins>+ void cancelPotentialTapInFrame(WebFrame&);
</ins><span class="cx"> void tapHighlightAtPosition(uint64_t requestID, const WebCore::FloatPoint&);
</span><span class="cx">
</span><span class="cx"> void inspectorNodeSearchMovedToPosition(const WebCore::FloatPoint&);
</span><span class="lines">@@ -1330,7 +1331,6 @@
</span><span class="cx"> WebCore::FloatPoint m_potentialTapLocation;
</span><span class="cx">
</span><span class="cx"> WebCore::ViewportConfiguration m_viewportConfiguration;
</span><del>- uint64_t m_firstLayerTreeTransactionIDAfterDidCommitLoad;
</del><span class="cx"> bool m_hasReceivedVisibleContentRectsAfterDidCommitLoad;
</span><span class="cx"> bool m_scaleWasSetByUIProcess;
</span><span class="cx"> bool m_userHasChangedPageScaleFactor;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (186530 => 186531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-07-08 22:53:41 UTC (rev 186530)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-07-08 23:02:43 UTC (rev 186531)
</span><span class="lines">@@ -610,14 +610,14 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::handleTap(const IntPoint& point, uint64_t lastLayerTreeTransactionId)
</span><span class="cx"> {
</span><del>- if (lastLayerTreeTransactionId < m_firstLayerTreeTransactionIDAfterDidCommitLoad) {
- send(Messages::WebPageProxy::DidNotHandleTapAsClick(roundedIntPoint(m_potentialTapLocation)));
- return;
- }
-
</del><span class="cx"> FloatPoint adjustedPoint;
</span><span class="cx"> Node* nodeRespondingToClick = m_page->mainFrame().nodeRespondingToClickEvents(point, adjustedPoint);
</span><del>- handleSyntheticClick(nodeRespondingToClick, adjustedPoint);
</del><ins>+ Frame* frameRespondingToClick = nodeRespondingToClick ? nodeRespondingToClick->document().frame() : nullptr;
+
+ if (!frameRespondingToClick || lastLayerTreeTransactionId < WebFrame::fromCoreFrame(*frameRespondingToClick)->firstLayerTreeTransactionIDAfterDidCommitLoad())
+ send(Messages::WebPageProxy::DidNotHandleTapAsClick(roundedIntPoint(m_potentialTapLocation)));
+ else
+ handleSyntheticClick(nodeRespondingToClick, adjustedPoint);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::sendTapHighlightForNodeIfNecessary(uint64_t requestID, Node* node)
</span><span class="lines">@@ -664,14 +664,20 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::commitPotentialTap(uint64_t lastLayerTreeTransactionId)
</span><span class="cx"> {
</span><del>- if (!m_potentialTapNode || !m_potentialTapNode->renderer() || lastLayerTreeTransactionId < m_firstLayerTreeTransactionIDAfterDidCommitLoad) {
</del><ins>+ if (!m_potentialTapNode || !m_potentialTapNode->renderer()) {
</ins><span class="cx"> commitPotentialTapFailed();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatPoint adjustedPoint;
</span><span class="cx"> Node* nodeRespondingToClick = m_page->mainFrame().nodeRespondingToClickEvents(m_potentialTapLocation, adjustedPoint);
</span><ins>+ Frame* frameRespondingToClick = nodeRespondingToClick ? nodeRespondingToClick->document().frame() : nullptr;
</ins><span class="cx">
</span><ins>+ if (!frameRespondingToClick || lastLayerTreeTransactionId < WebFrame::fromCoreFrame(*frameRespondingToClick)->firstLayerTreeTransactionIDAfterDidCommitLoad()) {
+ commitPotentialTapFailed();
+ return;
+ }
+
</ins><span class="cx"> if (m_potentialTapNode == nodeRespondingToClick)
</span><span class="cx"> handleSyntheticClick(nodeRespondingToClick, adjustedPoint);
</span><span class="cx"> else
</span><span class="lines">@@ -689,6 +695,17 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::cancelPotentialTap()
</span><span class="cx"> {
</span><ins>+ cancelPotentialTapInFrame(*m_mainFrame);
+}
+
+void WebPage::cancelPotentialTapInFrame(WebFrame& frame)
+{
+ if (m_potentialTapNode) {
+ Frame* potentialTapFrame = m_potentialTapNode->document().frame();
+ if (potentialTapFrame && !potentialTapFrame->tree().isDescendantOf(frame.coreFrame()))
+ return;
+ }
+
</ins><span class="cx"> m_potentialTapNode = nullptr;
</span><span class="cx"> m_potentialTapLocation = FloatPoint();
</span><span class="cx"> }
</span><span class="lines">@@ -2796,7 +2813,7 @@
</span><span class="cx"> void WebPage::updateVisibleContentRects(const VisibleContentRectUpdateInfo& visibleContentRectUpdateInfo, double oldestTimestamp)
</span><span class="cx"> {
</span><span class="cx"> // Skip any VisibleContentRectUpdate that have been queued before DidCommitLoad suppresses the updates in the UIProcess.
</span><del>- if (visibleContentRectUpdateInfo.lastLayerTreeTransactionID() < m_firstLayerTreeTransactionIDAfterDidCommitLoad)
</del><ins>+ if (visibleContentRectUpdateInfo.lastLayerTreeTransactionID() < m_mainFrame->firstLayerTreeTransactionIDAfterDidCommitLoad())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_hasReceivedVisibleContentRectsAfterDidCommitLoad = true;
</span></span></pre>
</div>
</div>
</body>
</html>