<!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>[179151] branches/safari-600.4-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/179151">179151</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-01-26 16:19:10 -0800 (Mon, 26 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/178938">r178938</a>. rdar://problem/19558472</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6004branchSourceWebKitmacChangeLog">branches/safari-600.4-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari6004branchSourceWebKitmacWebViewWebImmediateActionControllerh">branches/safari-600.4-branch/Source/WebKit/mac/WebView/WebImmediateActionController.h</a></li>
<li><a href="#branchessafari6004branchSourceWebKitmacWebViewWebImmediateActionControllermm">branches/safari-600.4-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm</a></li>
<li><a href="#branchessafari6004branchSourceWebKit2ChangeLog">branches/safari-600.4-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6004branchSourceWebKit2UIProcessmacWKImmediateActionControllerh">branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.h</a></li>
<li><a href="#branchessafari6004branchSourceWebKit2UIProcessmacWKImmediateActionControllermm">branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6004branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Source/WebKit/mac/ChangeLog (179150 => 179151)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Source/WebKit/mac/ChangeLog 2015-01-27 00:19:07 UTC (rev 179150)
+++ branches/safari-600.4-branch/Source/WebKit/mac/ChangeLog 2015-01-27 00:19:10 UTC (rev 179151)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2015-01-26 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r178938. rdar://problem/19558472
+
+ 2015-01-22 Beth Dakin <bdakin@apple.com>
+
+ ibtoold crash below -[WebView close]
+ https://bugs.webkit.org/show_bug.cgi?id=140782
+ -and corresponding-
+ rdar://problem/19558472
+
+ Reviewed by Tim Horton.
+
+ Retain the NSImmediateActionGestureRecognizer. This should not be necessary, but
+ it is because interface builder is messing with our views.
+ * WebView/WebImmediateActionController.h:
+ * WebView/WebImmediateActionController.mm:
+ (-[WebImmediateActionController webViewClosed]):
+ (-[WebImmediateActionController _cancelImmediateAction]):
+ (-[WebImmediateActionController immediateActionRecognizerWillPrepare:]):
+ (-[WebImmediateActionController _updateImmediateActionItem]):
+
+2015-01-26 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r178858. rdar://problem/19540806
</span><span class="cx">
</span><span class="cx"> 2015-01-21 Beth Dakin <bdakin@apple.com>
</span></span></pre></div>
<a id="branchessafari6004branchSourceWebKitmacWebViewWebImmediateActionControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Source/WebKit/mac/WebView/WebImmediateActionController.h (179150 => 179151)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Source/WebKit/mac/WebView/WebImmediateActionController.h 2015-01-27 00:19:07 UTC (rev 179150)
+++ branches/safari-600.4-branch/Source/WebKit/mac/WebView/WebImmediateActionController.h 2015-01-27 00:19:10 UTC (rev 179151)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> WebView *_webView;
</span><span class="cx"> WebImmediateActionType _type;
</span><span class="cx"> WebCore::HitTestResult _hitTestResult;
</span><del>- NSImmediateActionGestureRecognizer *_immediateActionRecognizer;
</del><ins>+ RetainPtr<NSImmediateActionGestureRecognizer> _immediateActionRecognizer;
</ins><span class="cx">
</span><span class="cx"> RetainPtr<DDActionContext> _currentActionContext;
</span><span class="cx"> BOOL _isShowingTextIndicator;
</span></span></pre></div>
<a id="branchessafari6004branchSourceWebKitmacWebViewWebImmediateActionControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm (179150 => 179151)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-01-27 00:19:07 UTC (rev 179150)
+++ branches/safari-600.4-branch/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2015-01-27 00:19:10 UTC (rev 179151)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> {
</span><span class="cx"> _webView = nil;
</span><span class="cx">
</span><del>- id animationController = _immediateActionRecognizer.animationController;
</del><ins>+ id animationController = [_immediateActionRecognizer animationController];
</ins><span class="cx"> if ([animationController isKindOfClass:NSClassFromString(@"QLPreviewMenuItem")]) {
</span><span class="cx"> QLPreviewMenuItem *menuItem = (QLPreviewMenuItem *)animationController;
</span><span class="cx"> menuItem.delegate = nil;
</span><span class="lines">@@ -101,8 +101,8 @@
</span><span class="cx"> - (void)_cancelImmediateAction
</span><span class="cx"> {
</span><span class="cx"> // Reset the recognizer by turning it off and on again.
</span><del>- _immediateActionRecognizer.enabled = NO;
- _immediateActionRecognizer.enabled = YES;
</del><ins>+ [_immediateActionRecognizer setEnabled:NO];
+ [_immediateActionRecognizer setEnabled:YES];
</ins><span class="cx">
</span><span class="cx"> [self _clearImmediateActionState];
</span><span class="cx"> }
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> [self performHitTestAtPoint:locationInDocumentView];
</span><span class="cx"> [self _updateImmediateActionItem];
</span><span class="cx">
</span><del>- if (!_immediateActionRecognizer.animationController) {
</del><ins>+ if (![_immediateActionRecognizer animationController]) {
</ins><span class="cx"> // FIXME: We should be able to remove the dispatch_async when rdar://problem/19502927 is resolved.
</span><span class="cx"> dispatch_async(dispatch_get_main_queue(), ^{
</span><span class="cx"> [self _cancelImmediateAction];
</span><span class="lines">@@ -241,9 +241,9 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (customClientAnimationController && [customClientAnimationController conformsToProtocol:@protocol(NSImmediateActionAnimationController)])
</span><del>- _immediateActionRecognizer.animationController = (id <NSImmediateActionAnimationController>)customClientAnimationController;
</del><ins>+ [_immediateActionRecognizer setAnimationController:(id <NSImmediateActionAnimationController>)customClientAnimationController];
</ins><span class="cx"> else
</span><del>- _immediateActionRecognizer.animationController = defaultAnimationController;
</del><ins>+ [_immediateActionRecognizer setAnimationController:defaultAnimationController];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark QLPreviewMenuItemDelegate implementation
</span></span></pre></div>
<a id="branchessafari6004branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Source/WebKit2/ChangeLog (179150 => 179151)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Source/WebKit2/ChangeLog 2015-01-27 00:19:07 UTC (rev 179150)
+++ branches/safari-600.4-branch/Source/WebKit2/ChangeLog 2015-01-27 00:19:10 UTC (rev 179151)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2015-01-26 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r178938. rdar://problem/19558472
+
+ 2015-01-22 Beth Dakin <bdakin@apple.com>
+
+ ibtoold crash below -[WebView close]
+ https://bugs.webkit.org/show_bug.cgi?id=140782
+ -and corresponding-
+ rdar://problem/19558472
+
+ Reviewed by Tim Horton.
+
+ Retain the NSImmediateActionGestureRecognizer. This should not be necessary, but
+ it is because interface builder can mess with our views.
+ * UIProcess/mac/WKImmediateActionController.h:
+ * UIProcess/mac/WKImmediateActionController.mm:
+ (-[WKImmediateActionController willDestroyView:]):
+ (-[WKImmediateActionController _cancelImmediateAction]):
+ (-[WKImmediateActionController _cancelImmediateActionIfNeeded]):
+ (-[WKImmediateActionController _updateImmediateActionItem]):
+
+2015-01-26 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r178858. rdar://problem/19540806
</span><span class="cx">
</span><span class="cx"> 2015-01-21 Beth Dakin <bdakin@apple.com>
</span></span></pre></div>
<a id="branchessafari6004branchSourceWebKit2UIProcessmacWKImmediateActionControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.h (179150 => 179151)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.h 2015-01-27 00:19:07 UTC (rev 179150)
+++ branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.h 2015-01-27 00:19:10 UTC (rev 179151)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> WebKit::ActionMenuHitTestResult _hitTestResult;
</span><span class="cx"> RefPtr<API::Object> _userData;
</span><span class="cx"> _WKImmediateActionType _type;
</span><del>- NSImmediateActionGestureRecognizer *_immediateActionRecognizer;
</del><ins>+ RetainPtr<NSImmediateActionGestureRecognizer> _immediateActionRecognizer;
</ins><span class="cx">
</span><span class="cx"> BOOL _hasActivatedActionContext;
</span><span class="cx"> RetainPtr<DDActionContext> _currentActionContext;
</span></span></pre></div>
<a id="branchessafari6004branchSourceWebKit2UIProcessmacWKImmediateActionControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (179150 => 179151)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-01-27 00:19:07 UTC (rev 179150)
+++ branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-01-27 00:19:10 UTC (rev 179151)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> _wkView = nil;
</span><span class="cx"> _hitTestResult = ActionMenuHitTestResult();
</span><span class="cx">
</span><del>- id animationController = _immediateActionRecognizer.animationController;
</del><ins>+ id animationController = [_immediateActionRecognizer animationController];
</ins><span class="cx"> if ([animationController isKindOfClass:NSClassFromString(@"QLPreviewMenuItem")]) {
</span><span class="cx"> QLPreviewMenuItem *menuItem = (QLPreviewMenuItem *)animationController;
</span><span class="cx"> menuItem.delegate = nil;
</span><span class="lines">@@ -94,15 +94,15 @@
</span><span class="cx"> - (void)_cancelImmediateAction
</span><span class="cx"> {
</span><span class="cx"> // Reset the recognizer by turning it off and on again.
</span><del>- _immediateActionRecognizer.enabled = NO;
- _immediateActionRecognizer.enabled = YES;
</del><ins>+ [_immediateActionRecognizer setEnabled:NO];
+ [_immediateActionRecognizer setEnabled:YES];
</ins><span class="cx">
</span><span class="cx"> [self _clearImmediateActionState];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_cancelImmediateActionIfNeeded
</span><span class="cx"> {
</span><del>- if (!_immediateActionRecognizer.animationController)
</del><ins>+ if (![_immediateActionRecognizer animationController])
</ins><span class="cx"> [self _cancelImmediateAction];
</span><span class="cx">
</span><span class="cx"> if (_currentActionContext) {
</span><span class="lines">@@ -268,9 +268,9 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (customClientAnimationController && [customClientAnimationController conformsToProtocol:@protocol(NSImmediateActionAnimationController)])
</span><del>- _immediateActionRecognizer.animationController = (id <NSImmediateActionAnimationController>)customClientAnimationController;
</del><ins>+ [_immediateActionRecognizer setAnimationController:(id <NSImmediateActionAnimationController>)customClientAnimationController];
</ins><span class="cx"> else
</span><del>- _immediateActionRecognizer.animationController = defaultAnimationController;
</del><ins>+ [_immediateActionRecognizer setAnimationController:defaultAnimationController];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark QLPreviewMenuItemDelegate implementation
</span></span></pre>
</div>
</div>
</body>
</html>