<!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>[181971] trunk/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/181971">181971</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2015-03-25 14:09:18 -0700 (Wed, 25 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/181660">r181660</a>): Safari navigates to link after a starting and canceling a
force preview
https://bugs.webkit.org/show_bug.cgi?id=143057
-and corresponding-
rdar://problem/20251436
Reviewed by Tim Horton.
Source/WebCore:
This patch adds a value for ActionUpdated to the ImmediateActionStage enum. Now if
m_immediateActionStage indicates that an immediate action has either begun or
completed then we can have the same behavior.
* page/EventHandler.cpp:
(WebCore::EventHandler::handleMouseReleaseEvent):
* page/EventHandler.h:
Source/WebKit2:
Always call _page->immediateActionDidUpdate() so that the EventHandler’s
ImmediateActionStage is appropriately updated.
* UIProcess/mac/WKImmediateActionController.mm:
(-[WKImmediateActionController immediateActionRecognizerDidUpdateAnimation:]):
Update the EventHandler’s ImmediateActionStage.
* WebProcess/WebPage/mac/WebPageMac.mm:
(WebKit::WebPage::immediateActionDidUpdate):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlerh">trunk/Source/WebCore/page/EventHandler.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKImmediateActionControllermm">trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm">trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181970 => 181971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-25 20:59:18 UTC (rev 181970)
+++ trunk/Source/WebCore/ChangeLog 2015-03-25 21:09:18 UTC (rev 181971)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-03-25 Beth Dakin <bdakin@apple.com>
+
+ REGRESSION (r181660): Safari navigates to link after a starting and canceling a
+ force preview
+ https://bugs.webkit.org/show_bug.cgi?id=143057
+ -and corresponding-
+ rdar://problem/20251436
+
+ Reviewed by Tim Horton.
+
+ This patch adds a value for ActionUpdated to the ImmediateActionStage enum. Now if
+ m_immediateActionStage indicates that an immediate action has either begun or
+ completed then we can have the same behavior.
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::handleMouseReleaseEvent):
+ * page/EventHandler.h:
+
</ins><span class="cx"> 2015-03-25 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> MediaControls: Use font with fixed number width
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (181970 => 181971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp 2015-03-25 20:59:18 UTC (rev 181970)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2015-03-25 21:09:18 UTC (rev 181971)
</span><span class="lines">@@ -2061,9 +2061,9 @@
</span><span class="cx"> if (m_frameSetBeingResized)
</span><span class="cx"> return !dispatchMouseEvent(eventNames().mouseupEvent, m_frameSetBeingResized.get(), true, m_clickCount, platformMouseEvent, false);
</span><span class="cx">
</span><del>- // If an immediate action was completed using this series of mouse events, then we should send mouseup to
</del><ins>+ // If an immediate action began or was completed using this series of mouse events, then we should send mouseup to
</ins><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) {
</del><ins>+ if (m_immediateActionStage == ImmediateActionStage::ActionCompleted || m_immediateActionStage == ImmediateActionStage::ActionUpdated) {
</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="trunkSourceWebCorepageEventHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.h (181970 => 181971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.h 2015-03-25 20:59:18 UTC (rev 181970)
+++ trunk/Source/WebCore/page/EventHandler.h 2015-03-25 21:09:18 UTC (rev 181971)
</span><span class="lines">@@ -120,6 +120,7 @@
</span><span class="cx"> enum class ImmediateActionStage {
</span><span class="cx"> None,
</span><span class="cx"> PerformedHitTest,
</span><ins>+ ActionUpdated,
</ins><span class="cx"> ActionCancelled,
</span><span class="cx"> ActionCompleted
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (181970 => 181971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-25 20:59:18 UTC (rev 181970)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-25 21:09:18 UTC (rev 181971)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-03-25 Beth Dakin <bdakin@apple.com>
+
+ REGRESSION (r181660): Safari navigates to link after a starting and canceling a
+ force preview
+ https://bugs.webkit.org/show_bug.cgi?id=143057
+ -and corresponding-
+ rdar://problem/20251436
+
+ Reviewed by Tim Horton.
+
+ Always call _page->immediateActionDidUpdate() so that the EventHandler’s
+ ImmediateActionStage is appropriately updated.
+ * UIProcess/mac/WKImmediateActionController.mm:
+ (-[WKImmediateActionController immediateActionRecognizerDidUpdateAnimation:]):
+
+ Update the EventHandler’s ImmediateActionStage.
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::WebPage::immediateActionDidUpdate):
+
</ins><span class="cx"> 2015-03-25 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Separate entry decoding from validation
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKImmediateActionControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (181970 => 181971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-03-25 20:59:18 UTC (rev 181970)
+++ trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-03-25 21:09:18 UTC (rev 181971)
</span><span class="lines">@@ -212,10 +212,9 @@
</span><span class="cx"> if (immediateActionRecognizer != _immediateActionRecognizer)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (_hitTestResult.contentPreventsDefault) {
- _page->immediateActionDidUpdate([immediateActionRecognizer animationProgress]);
</del><ins>+ _page->immediateActionDidUpdate([immediateActionRecognizer animationProgress]);
+ if (_hitTestResult.contentPreventsDefault)
</ins><span class="cx"> return;
</span><del>- }
</del><span class="cx">
</span><span class="cx"> _page->setTextIndicatorAnimationProgress([immediateActionRecognizer animationProgress]);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (181970 => 181971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2015-03-25 20:59:18 UTC (rev 181970)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2015-03-25 21:09:18 UTC (rev 181971)
</span><span class="lines">@@ -1158,6 +1158,8 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::immediateActionDidUpdate(float force)
</span><span class="cx"> {
</span><ins>+ m_page->mainFrame().eventHandler().setImmediateActionStage(ImmediateActionStage::ActionUpdated);
+
</ins><span class="cx"> Element* element = m_lastActionMenuHitTestResult.innerElement();
</span><span class="cx"> if (!element)
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>