<!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>[167284] 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/167284">167284</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-04-14 17:41:37 -0700 (Mon, 14 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Sometimes-crash under handleSwipeGesture after closing a window or quitting
https://bugs.webkit.org/show_bug.cgi?id=131648
<rdar://problem/15966106>
Reviewed by Simon Fraser.
* UIProcess/mac/ViewGestureController.h:
* UIProcess/mac/ViewGestureControllerMac.mm:
(WebKit::ViewGestureController::~ViewGestureController):
(WebKit::ViewGestureController::trackSwipeGesture):
Keep a Objective C object with a single boolean property, isCancelled, on
the ViewGestureController, and also retained by the swipe-tracking block.
When the ViewGestureController is destroyed, we set isCancelled to YES,
and the next time the block is invoked, we will cancel the swipe without
touching the destroyed ViewGestureController.
(WebKit::ViewGestureController::handleSwipeGesture):
Don't try to handle a swipe gesture if the drawing area is missing.
(WebKit::ViewGestureController::endSwipeGesture):
Clear the swipe cancellation tracker when the gesture completes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacViewGestureControllerh">trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacViewGestureControllerMacmm">trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (167283 => 167284)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-15 00:27:13 UTC (rev 167283)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-15 00:41:37 UTC (rev 167284)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-04-14 Tim Horton <timothy_horton@apple.com>
+
+ Sometimes-crash under handleSwipeGesture after closing a window or quitting
+ https://bugs.webkit.org/show_bug.cgi?id=131648
+ <rdar://problem/15966106>
+
+ Reviewed by Simon Fraser.
+
+ * UIProcess/mac/ViewGestureController.h:
+ * UIProcess/mac/ViewGestureControllerMac.mm:
+ (WebKit::ViewGestureController::~ViewGestureController):
+ (WebKit::ViewGestureController::trackSwipeGesture):
+ Keep a Objective C object with a single boolean property, isCancelled, on
+ the ViewGestureController, and also retained by the swipe-tracking block.
+ When the ViewGestureController is destroyed, we set isCancelled to YES,
+ and the next time the block is invoked, we will cancel the swipe without
+ touching the destroyed ViewGestureController.
+
+ (WebKit::ViewGestureController::handleSwipeGesture):
+ Don't try to handle a swipe gesture if the drawing area is missing.
+
+ (WebKit::ViewGestureController::endSwipeGesture):
+ Clear the swipe cancellation tracker when the gesture completes.
+
</ins><span class="cx"> 2014-04-14 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r166027) Menu is shown and immediately hidden after doubletap gesture.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewGestureControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h (167283 => 167284)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h 2014-04-15 00:27:13 UTC (rev 167283)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h 2014-04-15 00:41:37 UTC (rev 167284)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> #else
</span><span class="cx"> OBJC_CLASS NSEvent;
</span><span class="cx"> OBJC_CLASS NSView;
</span><ins>+OBJC_CLASS WKSwipeCancellationTracker;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -148,6 +149,7 @@
</span><span class="cx"> bool m_visibleContentRectIsValid;
</span><span class="cx"> bool m_frameHandlesMagnificationGesture;
</span><span class="cx">
</span><ins>+ RetainPtr<WKSwipeCancellationTracker> m_swipeCancellationTracker;
</ins><span class="cx"> RetainPtr<CALayer> m_swipeSnapshotLayer;
</span><span class="cx"> Vector<RetainPtr<CALayer>> m_currentSwipeLiveLayers;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewGestureControllerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm (167283 => 167284)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm 2014-04-15 00:27:13 UTC (rev 167283)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm 2014-04-15 00:41:37 UTC (rev 167284)
</span><span class="lines">@@ -79,6 +79,13 @@
</span><span class="cx"> static const float swipeSnapshotRemovalRenderTreeSizeTargetFraction = 0.5;
</span><span class="cx"> static const std::chrono::seconds swipeSnapshotRemovalWatchdogDuration = 3_s;
</span><span class="cx">
</span><ins>+@interface WKSwipeCancellationTracker : NSObject
+@property (nonatomic) BOOL isCancelled;
+@end
+
+@implementation WKSwipeCancellationTracker
+@end
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> ViewGestureController::ViewGestureController(WebPageProxy& webPageProxy)
</span><span class="lines">@@ -96,6 +103,9 @@
</span><span class="cx">
</span><span class="cx"> ViewGestureController::~ViewGestureController()
</span><span class="cx"> {
</span><ins>+ if (m_swipeCancellationTracker)
+ [m_swipeCancellationTracker setIsCancelled:YES];
+
</ins><span class="cx"> m_webPageProxy.process().removeMessageReceiver(Messages::ViewGestureController::messageReceiverName(), m_webPageProxy.pageID());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -352,7 +362,15 @@
</span><span class="cx"> RefPtr<WebBackForwardListItem> targetItem = (direction == SwipeDirection::Left) ? m_webPageProxy.backForwardList().backItem() : m_webPageProxy.backForwardList().forwardItem();
</span><span class="cx"> __block bool swipeCancelled = false;
</span><span class="cx">
</span><ins>+ ASSERT(!m_swipeCancellationTracker);
+ RetainPtr<WKSwipeCancellationTracker> swipeCancellationTracker = adoptNS([[WKSwipeCancellationTracker alloc] init]);
+ m_swipeCancellationTracker = swipeCancellationTracker;
+
</ins><span class="cx"> [event trackSwipeEventWithOptions:0 dampenAmountThresholdMin:minProgress max:maxProgress usingHandler:^(CGFloat progress, NSEventPhase phase, BOOL isComplete, BOOL *stop) {
</span><ins>+ if ([swipeCancellationTracker isCancelled]) {
+ *stop = YES;
+ return;
+ }
</ins><span class="cx"> if (phase == NSEventPhaseBegan)
</span><span class="cx"> this->beginSwipeGesture(targetItem.get(), direction);
</span><span class="cx"> CGFloat clampedProgress = std::min(std::max(progress, minProgress), maxProgress);
</span><span class="lines">@@ -487,6 +505,9 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_activeGestureType == ViewGestureType::Swipe);
</span><span class="cx">
</span><ins>+ if (!m_webPageProxy.drawingArea())
+ return;
+
</ins><span class="cx"> double width;
</span><span class="cx"> if (!m_customSwipeViews.isEmpty())
</span><span class="cx"> width = m_currentSwipeCustomViewBounds.width();
</span><span class="lines">@@ -514,6 +535,8 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_activeGestureType == ViewGestureType::Swipe);
</span><span class="cx">
</span><ins>+ m_swipeCancellationTracker = nullptr;
+
</ins><span class="cx"> CALayer *rootLayer = m_webPageProxy.acceleratedCompositingRootLayer();
</span><span class="cx">
</span><span class="cx"> [rootLayer setShadowOpacity:0];
</span></span></pre>
</div>
</div>
</body>
</html>