<!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>[184246] branches/safari-601.1.32-branch/Source/WebKit/mac</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/184246">184246</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2015-05-12 21:08:45 -0700 (Tue, 12 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/183957">r183957</a>. rdar://problem/20811128</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601132branchSourceWebKitmacChangeLog">branches/safari-601.1.32-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceWebKitmacWebViewWebImmediateActionControllermm">branches/safari-601.1.32-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601132branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit/mac/ChangeLog (184245 => 184246)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit/mac/ChangeLog 2015-05-13 04:02:09 UTC (rev 184245)
+++ branches/safari-601.1.32-branch/Source/WebKit/mac/ChangeLog 2015-05-13 04:08:45 UTC (rev 184246)
</span><span class="lines">@@ -2,65 +2,85 @@
</span><span class="cx"> Dana Burkart <dburkart@apple.com
</span><span class="cx"> dburkart@apple.com>
</span><span class="cx">
</span><del>- Merge r183954. rdar://problem/20281886
</del><ins>+ Merge r183957. rdar://problem/20811128
</ins><span class="cx">
</span><del>- 2015-05-07 Beth Dakin <bdakin@apple.com>
</del><ins>+ 2015-05-07 Timothy Horton <timothy_horton@apple.com>
</ins><span class="cx">
</span><del>- New force-related DOM events should fire in WK1 views
- https://bugs.webkit.org/show_bug.cgi?id=144663
- -and corresponding-
- rdar://problem/20281886
</del><ins>+ Occasional null deref in WebImmediateActionController
+ https://bugs.webkit.org/show_bug.cgi?id=144772
+ <rdar://problem/20811128>
</ins><span class="cx">
</span><del>- Reviewed by Sam Weinig.
</del><ins>+ Reviewed by Beth Dakin.
</ins><span class="cx">
</span><del>- Pass the lastPressureEvent to WebCore.
- * WebView/WebHTMLView.mm:
- (-[WebHTMLView _updateMouseoverWithEvent:]):
- (-[WebHTMLView rightMouseUp:]):
- (-[WebHTMLView menuForEvent:]):
- (-[WebHTMLView acceptsFirstMouse:]):
- (-[WebHTMLView shouldDelayWindowOrderingForEvent:]):
- (-[WebHTMLView mouseDown:mouseDown:]):
- (-[WebHTMLView mouseDragged:]):
- (-[WebHTMLView mouseUp:mouseUp:]):
</del><ins>+ * WebView/WebImmediateActionController.mm:
+ (-[WebImmediateActionController _defaultAnimationController]):
+ (-[WebImmediateActionController _animationControllerForDataDetectedText]):
+ (-[WebImmediateActionController _animationControllerForDataDetectedLink]):
+ Null-check TextIndicators before dereferencing.
</ins><span class="cx">
</span><del>- New NSRespnder method for pressure changes.
- (-[WebHTMLView pressureChangeWithEvent:]):
</del><ins>+ 2015-05-12 Dana Burkart
+ Dana Burkart <dburkart@apple.com
+ dburkart@apple.com>
</ins><span class="cx">
</span><del>- New BOOL _contentPreventsDefault tracks whether the HitTestResult prevented the
- default action. Get rid of willHandleMouseDown; now that the gesture recognizer
- sets delaysPrimaryMouseButtonEvents to NO, we don’t need this.
- * WebView/WebImmediateActionController.h:
- * WebView/WebImmediateActionController.mm:
- (-[WebImmediateActionController _clearImmediateActionState]):
</del><ins>+ Merge r183954. rdar://problem/20281886
</ins><span class="cx">
</span><del>- Set all of the immediateActionStages on EventHandler. This is critical to keep
- link navigation happening at the right time now that
- delaysPrimaryMouseButtonEvents is set to NO.
- (-[WebImmediateActionController performHitTestAtPoint:]):
- (-[WebImmediateActionController immediateActionRecognizerDidUpdateAnimation:]):
- (-[WebImmediateActionController immediateActionRecognizerDidCancelAnimation:]):
- (-[WebImmediateActionController immediateActionRecognizerDidCompleteAnimation:]):
</del><ins>+ 2015-05-07 Beth Dakin <bdakin@apple.com>
</ins><span class="cx">
</span><del>- Use a dummy animation controller if the content prevents default.
- (-[WebImmediateActionController _defaultAnimationController]):
- (-[WebImmediateActionController _updateImmediateActionItem]):
- (-[WebImmediateActionController webView:willHandleMouseDown:]): Deleted.
</del><ins>+ New force-related DOM events should fire in WK1 views
+ https://bugs.webkit.org/show_bug.cgi?id=144663
+ -and corresponding-
+ rdar://problem/20281886
</ins><span class="cx">
</span><del>- Set delaysPrimaryMouseButtonEvents to NO so that we get existing mouse events when
- we expect to.
- * WebView/WebView.mm:
- (-[WebView _commonInitializationWithFrameName:groupName:]):
</del><ins>+ Reviewed by Sam Weinig.
</ins><span class="cx">
</span><del>- Cache the most recent pressure event so that we can send it to WebCore for all of
- the mouse events.
- (-[WebView _pressureEvent]):
- (-[WebView _setPressureEvent:]):
- * WebView/WebViewData.h:
- * WebView/WebViewData.mm:
- (-[WebViewPrivate dealloc]):
- * WebView/WebViewInternal.h:
</del><ins>+ Pass the lastPressureEvent to WebCore.
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView _updateMouseoverWithEvent:]):
+ (-[WebHTMLView rightMouseUp:]):
+ (-[WebHTMLView menuForEvent:]):
+ (-[WebHTMLView acceptsFirstMouse:]):
+ (-[WebHTMLView shouldDelayWindowOrderingForEvent:]):
+ (-[WebHTMLView mouseDown:mouseDown:]):
+ (-[WebHTMLView mouseDragged:]):
+ (-[WebHTMLView mouseUp:mouseUp:]):
</ins><span class="cx">
</span><ins>+ New NSRespnder method for pressure changes.
+ (-[WebHTMLView pressureChangeWithEvent:]):
+
+ New BOOL _contentPreventsDefault tracks whether the HitTestResult prevented the
+ default action. Get rid of willHandleMouseDown; now that the gesture recognizer
+ sets delaysPrimaryMouseButtonEvents to NO, we don’t need this.
+ * WebView/WebImmediateActionController.h:
+ * WebView/WebImmediateActionController.mm:
+ (-[WebImmediateActionController _clearImmediateActionState]):
+
+ Set all of the immediateActionStages on EventHandler. This is critical to keep
+ link navigation happening at the right time now that
+ delaysPrimaryMouseButtonEvents is set to NO.
+ (-[WebImmediateActionController performHitTestAtPoint:]):
+ (-[WebImmediateActionController immediateActionRecognizerDidUpdateAnimation:]):
+ (-[WebImmediateActionController immediateActionRecognizerDidCancelAnimation:]):
+ (-[WebImmediateActionController immediateActionRecognizerDidCompleteAnimation:]):
+
+ Use a dummy animation controller if the content prevents default.
+ (-[WebImmediateActionController _defaultAnimationController]):
+ (-[WebImmediateActionController _updateImmediateActionItem]):
+ (-[WebImmediateActionController webView:willHandleMouseDown:]): Deleted.
+
+ Set delaysPrimaryMouseButtonEvents to NO so that we get existing mouse events when
+ we expect to.
+ * WebView/WebView.mm:
+ (-[WebView _commonInitializationWithFrameName:groupName:]):
+
+ Cache the most recent pressure event so that we can send it to WebCore for all of
+ the mouse events.
+ (-[WebView _pressureEvent]):
+ (-[WebView _setPressureEvent:]):
+ * WebView/WebViewData.h:
+ * WebView/WebViewData.mm:
+ (-[WebViewPrivate dealloc]):
+ * WebView/WebViewInternal.h:
+
</ins><span class="cx"> 2015-04-02 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Introducing the Platform Abstraction Layer (PAL)
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKitmacWebViewWebImmediateActionControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm (184245 => 184246)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-05-13 04:02:09 UTC (rev 184245)
+++ branches/safari-601.1.32-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-05-13 04:08:45 UTC (rev 184246)
</span><span class="lines">@@ -260,7 +260,8 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<Range> linkRange = rangeOfContents(*_hitTestResult.URLElement());
</span><span class="cx"> RefPtr<TextIndicator> indicator = TextIndicator::createWithRange(*linkRange, TextIndicatorPresentationTransition::FadeIn);
</span><del>- [_webView _setTextIndicator:*indicator withLifetime:TextIndicatorLifetime::Permanent];
</del><ins>+ if (indicator)
+ [_webView _setTextIndicator:*indicator withLifetime:TextIndicatorLifetime::Permanent];
</ins><span class="cx">
</span><span class="cx"> QLPreviewMenuItem *item = [NSMenuItem standardQuickLookMenuItem];
</span><span class="cx"> item.previewStyle = QLPreviewStylePopover;
</span><span class="lines">@@ -419,7 +420,8 @@
</span><span class="cx">
</span><span class="cx"> _currentActionContext = [actionContext contextForView:_webView altMode:YES interactionStartedHandler:^() {
</span><span class="cx"> } interactionChangedHandler:^() {
</span><del>- [_webView _setTextIndicator:*detectedDataTextIndicator withLifetime:TextIndicatorLifetime::Permanent];
</del><ins>+ if (detectedDataTextIndicator)
+ [_webView _setTextIndicator:*detectedDataTextIndicator withLifetime:TextIndicatorLifetime::Permanent];
</ins><span class="cx"> } interactionStoppedHandler:^() {
</span><span class="cx"> [_webView _clearTextIndicatorWithAnimation:TextIndicatorDismissalAnimation::FadeOut];
</span><span class="cx"> }];
</span><span class="lines">@@ -450,7 +452,8 @@
</span><span class="cx">
</span><span class="cx"> _currentActionContext = [actionContext contextForView:_webView altMode:YES interactionStartedHandler:^() {
</span><span class="cx"> } interactionChangedHandler:^() {
</span><del>- [_webView _setTextIndicator:*indicator withLifetime:TextIndicatorLifetime::Permanent];
</del><ins>+ if (indicator)
+ [_webView _setTextIndicator:*indicator withLifetime:TextIndicatorLifetime::Permanent];
</ins><span class="cx"> } interactionStoppedHandler:^() {
</span><span class="cx"> [_webView _clearTextIndicatorWithAnimation:TextIndicatorDismissalAnimation::FadeOut];
</span><span class="cx"> }];
</span></span></pre>
</div>
</div>
</body>
</html>