<!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>[188700] trunk/Source/WebCore</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/188700">188700</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-08-20 14:19:13 -0700 (Thu, 20 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop using cancelCallOnMainThread in DisplayRefreshMonitorMac
https://bugs.webkit.org/show_bug.cgi?id=148241
Reviewed by Tim Horton.
Create a WeakPtrFactory in DisplayRefreshMonitorMac and bind a WeakPtr in the function passed
to callOnMainThread so we can check if the DisplayRefreshMonitorMac has gone away.
* platform/graphics/mac/DisplayRefreshMonitorMac.cpp:
(WebCore::DisplayRefreshMonitorMac::DisplayRefreshMonitorMac):
(WebCore::DisplayRefreshMonitorMac::displayLinkFired):
(WebCore::DisplayRefreshMonitorMac::~DisplayRefreshMonitorMac):
* platform/graphics/mac/DisplayRefreshMonitorMac.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacDisplayRefreshMonitorMaccpp">trunk/Source/WebCore/platform/graphics/mac/DisplayRefreshMonitorMac.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacDisplayRefreshMonitorMach">trunk/Source/WebCore/platform/graphics/mac/DisplayRefreshMonitorMac.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188699 => 188700)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-20 21:09:19 UTC (rev 188699)
+++ trunk/Source/WebCore/ChangeLog 2015-08-20 21:19:13 UTC (rev 188700)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-08-20 Anders Carlsson <andersca@apple.com>
+
+ Stop using cancelCallOnMainThread in DisplayRefreshMonitorMac
+ https://bugs.webkit.org/show_bug.cgi?id=148241
+
+ Reviewed by Tim Horton.
+
+ Create a WeakPtrFactory in DisplayRefreshMonitorMac and bind a WeakPtr in the function passed
+ to callOnMainThread so we can check if the DisplayRefreshMonitorMac has gone away.
+
+ * platform/graphics/mac/DisplayRefreshMonitorMac.cpp:
+ (WebCore::DisplayRefreshMonitorMac::DisplayRefreshMonitorMac):
+ (WebCore::DisplayRefreshMonitorMac::displayLinkFired):
+ (WebCore::DisplayRefreshMonitorMac::~DisplayRefreshMonitorMac):
+ * platform/graphics/mac/DisplayRefreshMonitorMac.h:
+
</ins><span class="cx"> 2015-08-20 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> AppleWin CMake build fix after r188696.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacDisplayRefreshMonitorMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/DisplayRefreshMonitorMac.cpp (188699 => 188700)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/DisplayRefreshMonitorMac.cpp 2015-08-20 21:09:19 UTC (rev 188699)
+++ trunk/Source/WebCore/platform/graphics/mac/DisplayRefreshMonitorMac.cpp 2015-08-20 21:19:13 UTC (rev 188700)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx">
</span><span class="cx"> DisplayRefreshMonitorMac::DisplayRefreshMonitorMac(PlatformDisplayID displayID)
</span><span class="cx"> : DisplayRefreshMonitor(displayID)
</span><ins>+ , m_weakFactory(this)
</ins><span class="cx"> , m_displayLink(nullptr)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -47,8 +48,6 @@
</span><span class="cx"> CVDisplayLinkRelease(m_displayLink);
</span><span class="cx"> m_displayLink = nullptr;
</span><span class="cx"> }
</span><del>-
- cancelCallOnMainThread(DisplayRefreshMonitor::handleDisplayRefreshedNotificationOnMainThread, this);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static CVReturn displayLinkCallback(CVDisplayLinkRef, const CVTimeStamp* now, const CVTimeStamp* outputTime, CVOptionFlags, CVOptionFlags*, void* data)
</span><span class="lines">@@ -102,7 +101,12 @@
</span><span class="cx"> // FIXME: Should this be using webKitMonotonicNow?
</span><span class="cx"> setMonotonicAnimationStartTime(webKitMonotonicNow + timeUntilOutput);
</span><span class="cx">
</span><del>- callOnMainThread(handleDisplayRefreshedNotificationOnMainThread, this);
</del><ins>+ auto weakPtr = m_weakFactory.createWeakPtr();
+
+ callOnMainThread([weakPtr] {
+ if (auto* monitor = weakPtr.get())
+ handleDisplayRefreshedNotificationOnMainThread(monitor);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacDisplayRefreshMonitorMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/DisplayRefreshMonitorMac.h (188699 => 188700)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/DisplayRefreshMonitorMac.h 2015-08-20 21:09:19 UTC (rev 188699)
+++ trunk/Source/WebCore/platform/graphics/mac/DisplayRefreshMonitorMac.h 2015-08-20 21:19:13 UTC (rev 188700)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</span><span class="cx">
</span><span class="cx"> #include "DisplayRefreshMonitor.h"
</span><ins>+#include <wtf/WeakPtr.h>
</ins><span class="cx">
</span><span class="cx"> typedef struct __CVDisplayLink *CVDisplayLinkRef;
</span><span class="cx">
</span><span class="lines">@@ -48,6 +49,8 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit DisplayRefreshMonitorMac(PlatformDisplayID);
</span><ins>+
+ WeakPtrFactory<DisplayRefreshMonitorMac> m_weakFactory;
</ins><span class="cx"> CVDisplayLinkRef m_displayLink;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>