<!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>[190498] branches/safari-601-branch/Source</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/190498">190498</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-10-02 06:57:34 -0700 (Fri, 02 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/188990">r188990</a>. rdar://problem/22802029</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCorepageEventHandlercpp">branches/safari-601-branch/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorepageEventHandlerh">branches/safari-601-branch/Source/WebCore/page/EventHandler.h</a></li>
<li><a href="#branchessafari601branchSourceWebKitmacChangeLog">branches/safari-601-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebKitmacWebViewWebImmediateActionControllermm">branches/safari-601-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm</a></li>
<li><a href="#branchessafari601branchSourceWebKit2ChangeLog">branches/safari-601-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebKit2WebProcessWebPagemacWebPageMacmm">branches/safari-601-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (190497 => 190498)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-10-02 13:57:22 UTC (rev 190497)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-10-02 13:57:34 UTC (rev 190498)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2015-10-02 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188990. rdar://problem/22802029
+
+ 2015-08-26 Beth Dakin <bdakin@apple.com>
+
+ REGRESSION: Safari navigates after a cancelled force click
+ https://bugs.webkit.org/show_bug.cgi?id=148491
+ -and corresponding-
+ rdar://problem/22394323
+
+ Reviewed by Tim Horton.
+
+ This regression was introduced on El Capitan because AppKit sends ‘cancel’ to
+ gesture recognizer BEFORE it sends the mouseUp. So the ImmediateActionStage needs
+ to track whether a cancel happened after updates or without any updates since they
+ signify different things.
+
+ Don’t perform default behaviors when the stage is ActionCancelledAfterUpdate.
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::handleMouseReleaseEvent):
+
+ New possible stages, and new getter for the current stage.
+ * page/EventHandler.h:
+ (WebCore::EventHandler::immediateActionStage):
+
+2015-10-02 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r188768. rdar://problem/22802019
</span><span class="cx">
</span><span class="cx"> 2015-08-21 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/page/EventHandler.cpp (190497 => 190498)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/page/EventHandler.cpp 2015-10-02 13:57:22 UTC (rev 190497)
+++ branches/safari-601-branch/Source/WebCore/page/EventHandler.cpp 2015-10-02 13:57:34 UTC (rev 190498)
</span><span class="lines">@@ -2096,7 +2096,7 @@
</span><span class="cx">
</span><span class="cx"> // If an immediate action began or was completed using this series of mouse events, then we should send mouseup to
</span><span class="cx"> // the DOM and return now so that we don't perform our own default behaviors.
</span><del>- if (m_immediateActionStage == ImmediateActionStage::ActionCompleted || m_immediateActionStage == ImmediateActionStage::ActionUpdated) {
</del><ins>+ if (m_immediateActionStage == ImmediateActionStage::ActionCompleted || m_immediateActionStage == ImmediateActionStage::ActionUpdated || m_immediateActionStage == ImmediateActionStage::ActionCancelledAfterUpdate) {
</ins><span class="cx"> m_immediateActionStage = ImmediateActionStage::None;
</span><span class="cx"> return !dispatchMouseEvent(eventNames().mouseupEvent, m_lastElementUnderMouse.get(), true, m_clickCount, platformMouseEvent, false);
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorepageEventHandlerh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/page/EventHandler.h (190497 => 190498)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/page/EventHandler.h 2015-10-02 13:57:22 UTC (rev 190497)
+++ branches/safari-601-branch/Source/WebCore/page/EventHandler.h 2015-10-02 13:57:34 UTC (rev 190498)
</span><span class="lines">@@ -121,7 +121,8 @@
</span><span class="cx"> None,
</span><span class="cx"> PerformedHitTest,
</span><span class="cx"> ActionUpdated,
</span><del>- ActionCancelled,
</del><ins>+ ActionCancelledWithoutUpdate,
+ ActionCancelledAfterUpdate,
</ins><span class="cx"> ActionCompleted
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -313,6 +314,7 @@
</span><span class="cx"> bool isHandlingWheelEvent() const { return m_isHandlingWheelEvent; }
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void setImmediateActionStage(ImmediateActionStage stage);
</span><ins>+ WEBCORE_EXPORT ImmediateActionStage immediateActionStage() const { return m_immediateActionStage; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit/mac/ChangeLog (190497 => 190498)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit/mac/ChangeLog 2015-10-02 13:57:22 UTC (rev 190497)
+++ branches/safari-601-branch/Source/WebKit/mac/ChangeLog 2015-10-02 13:57:34 UTC (rev 190498)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2015-10-02 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188990. rdar://problem/22802029
+
+ 2015-08-26 Beth Dakin <bdakin@apple.com>
+
+ REGRESSION: Safari navigates after a cancelled force click
+ https://bugs.webkit.org/show_bug.cgi?id=148491
+ -and corresponding-
+ rdar://problem/22394323
+
+ Reviewed by Tim Horton.
+
+ Use the current stage to determine which type of cancel this is.
+ * WebView/WebImmediateActionController.mm:
+ (-[WebImmediateActionController immediateActionRecognizerDidCancelAnimation:]):
+
+2015-10-02 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r189102. rdar://problem/22802034
</span><span class="cx">
</span><span class="cx"> 2015-08-28 Timothy Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKitmacWebViewWebImmediateActionControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm (190497 => 190498)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-10-02 13:57:22 UTC (rev 190497)
+++ branches/safari-601-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-10-02 13:57:34 UTC (rev 190498)
</span><span class="lines">@@ -210,8 +210,13 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> Frame* coreFrame = core([[[[_webView _selectedOrMainFrame] frameView] documentView] _frame]);
</span><del>- if (coreFrame)
- coreFrame->eventHandler().setImmediateActionStage(ImmediateActionStage::ActionCancelled);
</del><ins>+ if (coreFrame) {
+ ImmediateActionStage lastStage = coreFrame->eventHandler().immediateActionStage();
+ if (lastStage == ImmediateActionStage::ActionUpdated)
+ coreFrame->eventHandler().setImmediateActionStage(ImmediateActionStage::ActionCancelledAfterUpdate);
+ else
+ coreFrame->eventHandler().setImmediateActionStage(ImmediateActionStage::ActionCancelledWithoutUpdate);
+ }
</ins><span class="cx">
</span><span class="cx"> [_webView _setTextIndicatorAnimationProgress:0];
</span><span class="cx"> [self _clearImmediateActionState];
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit2/ChangeLog (190497 => 190498)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit2/ChangeLog 2015-10-02 13:57:22 UTC (rev 190497)
+++ branches/safari-601-branch/Source/WebKit2/ChangeLog 2015-10-02 13:57:34 UTC (rev 190498)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2015-10-02 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188990. rdar://problem/22802029
+
+ 2015-08-26 Beth Dakin <bdakin@apple.com>
+
+ REGRESSION: Safari navigates after a cancelled force click
+ https://bugs.webkit.org/show_bug.cgi?id=148491
+ -and corresponding-
+ rdar://problem/22394323
+
+ Reviewed by Tim Horton.
+
+ Use the current stage to determine which type of cancel this is.
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::WebPage::immediateActionDidCancel):
+
+2015-10-02 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r188755. rdar://problem/22802005
</span><span class="cx">
</span><span class="cx"> 2015-08-21 Chris Dumez <cdumez@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebKit2WebProcessWebPagemacWebPageMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (190497 => 190498)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2015-10-02 13:57:22 UTC (rev 190497)
+++ branches/safari-601-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2015-10-02 13:57:34 UTC (rev 190498)
</span><span class="lines">@@ -1204,7 +1204,11 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::immediateActionDidCancel()
</span><span class="cx"> {
</span><del>- m_page->mainFrame().eventHandler().setImmediateActionStage(ImmediateActionStage::ActionCancelled);
</del><ins>+ ImmediateActionStage lastStage = m_page->mainFrame().eventHandler().immediateActionStage();
+ if (lastStage == ImmediateActionStage::ActionUpdated)
+ m_page->mainFrame().eventHandler().setImmediateActionStage(ImmediateActionStage::ActionCancelledAfterUpdate);
+ else
+ m_page->mainFrame().eventHandler().setImmediateActionStage(ImmediateActionStage::ActionCancelledWithoutUpdate);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::immediateActionDidComplete()
</span></span></pre>
</div>
</div>
</body>
</html>