<!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>[171317] 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/171317">171317</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-07-21 15:17:24 -0700 (Mon, 21 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Random crashes on the Web Thread due to Timers firing on the wrong thread in the UI process
https://bugs.webkit.org/show_bug.cgi?id=135132
<rdar://problem/17719832>
Reviewed by Simon Fraser.
* UIProcess/ProcessThrottler.cpp:
(WebKit::ProcessThrottler::ProcessThrottler):
(WebKit::ProcessThrottler::suspendTimerFired):
* UIProcess/ProcessThrottler.h:
* UIProcess/ios/ViewGestureControllerIOS.mm:
(WebKit::ViewGestureController::ViewGestureController):
(WebKit::ViewGestureController::swipeSnapshotWatchdogTimerFired):
* UIProcess/mac/ViewGestureController.h:
* UIProcess/mac/ViewGestureControllerMac.mm:
(WebKit::ViewGestureController::ViewGestureController):
(WebKit::ViewGestureController::swipeSnapshotWatchdogTimerFired):
We can't use WebCore timers in the UI process because of coexistence concerns
(they fire on the Web Thread if there is one!), so use RunLoop::Timer instead.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessProcessThrottlercpp">trunk/Source/WebKit2/UIProcess/ProcessThrottler.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessProcessThrottlerh">trunk/Source/WebKit2/UIProcess/ProcessThrottler.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosViewGestureControllerIOSmm">trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm</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 (171316 => 171317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-07-21 20:47:03 UTC (rev 171316)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-21 22:17:24 UTC (rev 171317)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-07-21 Timothy Horton <timothy_horton@apple.com>
+
+ Random crashes on the Web Thread due to Timers firing on the wrong thread in the UI process
+ https://bugs.webkit.org/show_bug.cgi?id=135132
+ <rdar://problem/17719832>
+
+ Reviewed by Simon Fraser.
+
+ * UIProcess/ProcessThrottler.cpp:
+ (WebKit::ProcessThrottler::ProcessThrottler):
+ (WebKit::ProcessThrottler::suspendTimerFired):
+ * UIProcess/ProcessThrottler.h:
+ * UIProcess/ios/ViewGestureControllerIOS.mm:
+ (WebKit::ViewGestureController::ViewGestureController):
+ (WebKit::ViewGestureController::swipeSnapshotWatchdogTimerFired):
+ * UIProcess/mac/ViewGestureController.h:
+ * UIProcess/mac/ViewGestureControllerMac.mm:
+ (WebKit::ViewGestureController::ViewGestureController):
+ (WebKit::ViewGestureController::swipeSnapshotWatchdogTimerFired):
+ We can't use WebCore timers in the UI process because of coexistence concerns
+ (they fire on the Web Thread if there is one!), so use RunLoop::Timer instead.
+
</ins><span class="cx"> 2014-07-21 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Handle QuickLook ResourceLoaders in the web process
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessProcessThrottlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ProcessThrottler.cpp (171316 => 171317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ProcessThrottler.cpp 2014-07-21 20:47:03 UTC (rev 171316)
+++ trunk/Source/WebKit2/UIProcess/ProcessThrottler.cpp 2014-07-21 22:17:24 UTC (rev 171317)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> ProcessThrottler::ProcessThrottler(WebProcessProxy* process)
</span><span class="cx"> : m_process(process)
</span><span class="cx"> , m_weakPtrFactory(this)
</span><del>- , m_suspendTimer(this, &ProcessThrottler::suspendTimerFired)
</del><ins>+ , m_suspendTimer(RunLoop::main(), this, &ProcessThrottler::suspendTimerFired)
</ins><span class="cx"> , m_foregroundCount(0)
</span><span class="cx"> , m_backgroundCount(0)
</span><span class="cx"> , m_suspendMessageCount(0)
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> m_assertion = std::make_unique<ProcessAndUIAssertion>(pid, assertionState());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ProcessThrottler::suspendTimerFired(WebCore::Timer<ProcessThrottler>*)
</del><ins>+void ProcessThrottler::suspendTimerFired()
</ins><span class="cx"> {
</span><span class="cx"> updateAssertionNow();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessProcessThrottlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ProcessThrottler.h (171316 => 171317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ProcessThrottler.h 2014-07-21 20:47:03 UTC (rev 171316)
+++ trunk/Source/WebKit2/UIProcess/ProcessThrottler.h 2014-07-21 22:17:24 UTC (rev 171317)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "ProcessAssertion.h"
</span><span class="cx">
</span><del>-#include <WebCore/Timer.h>
</del><ins>+#include <wtf/RunLoop.h>
</ins><span class="cx"> #include <wtf/WeakPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -69,12 +69,12 @@
</span><span class="cx"> AssertionState assertionState();
</span><span class="cx"> void updateAssertion();
</span><span class="cx"> void updateAssertionNow();
</span><del>- void suspendTimerFired(WebCore::Timer<ProcessThrottler>*);
</del><ins>+ void suspendTimerFired();
</ins><span class="cx">
</span><span class="cx"> WebProcessProxy* m_process;
</span><span class="cx"> WeakPtrFactory<ProcessThrottler> m_weakPtrFactory;
</span><span class="cx"> std::unique_ptr<ProcessAndUIAssertion> m_assertion;
</span><del>- WebCore::Timer<ProcessThrottler> m_suspendTimer;
</del><ins>+ RunLoop::Timer<ProcessThrottler> m_suspendTimer;
</ins><span class="cx"> unsigned m_foregroundCount;
</span><span class="cx"> unsigned m_backgroundCount;
</span><span class="cx"> int m_suspendMessageCount;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosViewGestureControllerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm (171316 => 171317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm 2014-07-21 20:47:03 UTC (rev 171316)
+++ trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm 2014-07-21 22:17:24 UTC (rev 171317)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> ViewGestureController::ViewGestureController(WebPageProxy& webPageProxy)
</span><span class="cx"> : m_webPageProxy(webPageProxy)
</span><span class="cx"> , m_activeGestureType(ViewGestureType::None)
</span><del>- , m_swipeWatchdogTimer(this, &ViewGestureController::swipeSnapshotWatchdogTimerFired)
</del><ins>+ , m_swipeWatchdogTimer(RunLoop::main(), this, &ViewGestureController::swipeSnapshotWatchdogTimerFired)
</ins><span class="cx"> , m_snapshotRemovalTargetRenderTreeSize(0)
</span><span class="cx"> , m_shouldRemoveSnapshotWhenTargetRenderTreeSizeHit(false)
</span><span class="cx"> {
</span><span class="lines">@@ -310,7 +310,7 @@
</span><span class="cx"> removeSwipeSnapshot();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ViewGestureController::swipeSnapshotWatchdogTimerFired(Timer<ViewGestureController>*)
</del><ins>+void ViewGestureController::swipeSnapshotWatchdogTimerFired()
</ins><span class="cx"> {
</span><span class="cx"> removeSwipeSnapshot();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewGestureControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h (171316 => 171317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h 2014-07-21 20:47:03 UTC (rev 171316)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewGestureController.h 2014-07-21 22:17:24 UTC (rev 171317)
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx"> #include "MessageReceiver.h"
</span><span class="cx"> #include "WeakObjCPtr.h"
</span><span class="cx"> #include <WebCore/FloatRect.h>
</span><del>-#include <WebCore/Timer.h>
</del><span class="cx"> #include <wtf/RetainPtr.h>
</span><ins>+#include <wtf/RunLoop.h>
</ins><span class="cx">
</span><span class="cx"> OBJC_CLASS CALayer;
</span><span class="cx">
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> virtual void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) override;
</span><span class="cx">
</span><span class="cx"> void removeSwipeSnapshot();
</span><del>- void swipeSnapshotWatchdogTimerFired(WebCore::Timer<ViewGestureController>*);
</del><ins>+ void swipeSnapshotWatchdogTimerFired();
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> // Message handlers.
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> WebPageProxy& m_webPageProxy;
</span><span class="cx"> ViewGestureType m_activeGestureType;
</span><span class="cx">
</span><del>- WebCore::Timer<ViewGestureController> m_swipeWatchdogTimer;
</del><ins>+ RunLoop::Timer<ViewGestureController> m_swipeWatchdogTimer;
</ins><span class="cx">
</span><span class="cx"> #if USE(IOSURFACE)
</span><span class="cx"> RefPtr<WebCore::IOSurface> m_currentSwipeSnapshotSurface;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacViewGestureControllerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm (171316 => 171317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm 2014-07-21 20:47:03 UTC (rev 171316)
+++ trunk/Source/WebKit2/UIProcess/mac/ViewGestureControllerMac.mm 2014-07-21 22:17:24 UTC (rev 171317)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> ViewGestureController::ViewGestureController(WebPageProxy& webPageProxy)
</span><span class="cx"> : m_webPageProxy(webPageProxy)
</span><span class="cx"> , m_activeGestureType(ViewGestureType::None)
</span><del>- , m_swipeWatchdogTimer(this, &ViewGestureController::swipeSnapshotWatchdogTimerFired)
</del><ins>+ , m_swipeWatchdogTimer(RunLoop::main(), this, &ViewGestureController::swipeSnapshotWatchdogTimerFired)
</ins><span class="cx"> , m_lastMagnificationGestureWasSmartMagnification(false)
</span><span class="cx"> , m_visibleContentRectIsValid(false)
</span><span class="cx"> , m_frameHandlesMagnificationGesture(false)
</span><span class="lines">@@ -657,7 +657,7 @@
</span><span class="cx"> removeSwipeSnapshot();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ViewGestureController::swipeSnapshotWatchdogTimerFired(WebCore::Timer<ViewGestureController>*)
</del><ins>+void ViewGestureController::swipeSnapshotWatchdogTimerFired()
</ins><span class="cx"> {
</span><span class="cx"> removeSwipeSnapshot();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>