<!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>[214732] trunk/Source/JavaScriptCore</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/214732">214732</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-04-02 22:41:30 -0700 (Sun, 02 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Share implementation of JSRunLoopTimer::timerDidFire
https://bugs.webkit.org/show_bug.cgi?id=170392
Reviewed by Michael Catanzaro.
The code is cross-platform but it's duplicated in CF and GLib implementations, it could be shared instead.
* runtime/JSRunLoopTimer.cpp:
(JSC::JSRunLoopTimer::timerDidFire): Move common implementation here.
(JSC::JSRunLoopTimer::setRunLoop): Use timerDidFireCallback.
(JSC::JSRunLoopTimer::timerDidFireCallback): Call JSRunLoopTimer::timerDidFire().
* runtime/JSRunLoopTimer.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSRunLoopTimercpp">trunk/Source/JavaScriptCore/runtime/JSRunLoopTimer.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSRunLoopTimerh">trunk/Source/JavaScriptCore/runtime/JSRunLoopTimer.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (214731 => 214732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-04-03 03:30:14 UTC (rev 214731)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-04-03 05:41:30 UTC (rev 214732)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-04-02 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ Share implementation of JSRunLoopTimer::timerDidFire
+ https://bugs.webkit.org/show_bug.cgi?id=170392
+
+ Reviewed by Michael Catanzaro.
+
+ The code is cross-platform but it's duplicated in CF and GLib implementations, it could be shared instead.
+
+ * runtime/JSRunLoopTimer.cpp:
+ (JSC::JSRunLoopTimer::timerDidFire): Move common implementation here.
+ (JSC::JSRunLoopTimer::setRunLoop): Use timerDidFireCallback.
+ (JSC::JSRunLoopTimer::timerDidFireCallback): Call JSRunLoopTimer::timerDidFire().
+ * runtime/JSRunLoopTimer.h:
+
</ins><span class="cx"> 2017-04-01 Oleksandr Skachkov <gskachkov@gmail.com>
</span><span class="cx">
</span><span class="cx"> Object with numerical keys with gaps gets filled by NaN values
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSRunLoopTimercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSRunLoopTimer.cpp (214731 => 214732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSRunLoopTimer.cpp 2017-04-03 03:30:14 UTC (rev 214731)
+++ trunk/Source/JavaScriptCore/runtime/JSRunLoopTimer.cpp 2017-04-03 05:41:30 UTC (rev 214732)
</span><span class="lines">@@ -41,6 +41,25 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><ins>+void JSRunLoopTimer::timerDidFire()
+{
+ m_apiLock->lock();
+
+ RefPtr<VM> vm = m_apiLock->vm();
+ if (!vm) {
+ // The VM has been destroyed, so we should just give up.
+ m_apiLock->unlock();
+ return;
+ }
+
+ {
+ JSLockHolder locker(vm.get());
+ doWork();
+ }
+
+ m_apiLock->unlock();
+}
+
</ins><span class="cx"> #if USE(CF)
</span><span class="cx">
</span><span class="cx"> const CFTimeInterval JSRunLoopTimer::s_decade = 60 * 60 * 24 * 365 * 10;
</span><span class="lines">@@ -65,7 +84,7 @@
</span><span class="cx"> m_runLoop = runLoop;
</span><span class="cx"> memset(&m_context, 0, sizeof(CFRunLoopTimerContext));
</span><span class="cx"> m_context.info = this;
</span><del>- m_timer = adoptCF(CFRunLoopTimerCreate(kCFAllocatorDefault, CFAbsoluteTimeGetCurrent() + s_decade, s_decade, 0, 0, JSRunLoopTimer::timerDidFire, &m_context));
</del><ins>+ m_timer = adoptCF(CFRunLoopTimerCreate(kCFAllocatorDefault, CFAbsoluteTimeGetCurrent() + s_decade, s_decade, 0, 0, JSRunLoopTimer::timerDidFireCallback, &m_context));
</ins><span class="cx"> CFRunLoopAddTimer(m_runLoop.get(), m_timer.get(), kCFRunLoopCommonModes);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -75,24 +94,9 @@
</span><span class="cx"> setRunLoop(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JSRunLoopTimer::timerDidFire(CFRunLoopTimerRef, void* contextPtr)
</del><ins>+void JSRunLoopTimer::timerDidFireCallback(CFRunLoopTimerRef, void* contextPtr)
</ins><span class="cx"> {
</span><del>- JSRunLoopTimer* timer = static_cast<JSRunLoopTimer*>(contextPtr);
- timer->m_apiLock->lock();
-
- RefPtr<VM> vm = timer->m_apiLock->vm();
- if (!vm) {
- // The VM has been destroyed, so we should just give up.
- timer->m_apiLock->unlock();
- return;
- }
-
- {
- JSLockHolder locker(vm.get());
- timer->doWork();
- }
-
- timer->m_apiLock->unlock();
</del><ins>+ static_cast<JSRunLoopTimer*>(contextPtr)->timerDidFire();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSRunLoopTimer::scheduleTimer(double intervalInSeconds)
</span><span class="lines">@@ -144,24 +148,6 @@
</span><span class="cx"> g_source_destroy(m_timer.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JSRunLoopTimer::timerDidFire()
-{
- m_apiLock->lock();
-
- if (!m_apiLock->vm()) {
- // The VM has been destroyed, so we should just give up.
- m_apiLock->unlock();
- return;
- }
-
- {
- JSLockHolder locker(m_vm);
- doWork();
- }
-
- m_apiLock->unlock();
-}
-
</del><span class="cx"> void JSRunLoopTimer::scheduleTimer(double intervalInSeconds)
</span><span class="cx"> {
</span><span class="cx"> g_source_set_ready_time(m_timer.get(), g_get_monotonic_time() + intervalInSeconds * G_USEC_PER_SEC);
</span><span class="lines">@@ -183,10 +169,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JSRunLoopTimer::invalidate()
-{
-}
-
</del><span class="cx"> void JSRunLoopTimer::scheduleTimer(double)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSRunLoopTimerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSRunLoopTimer.h (214731 => 214732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSRunLoopTimer.h 2017-04-03 03:30:14 UTC (rev 214731)
+++ trunk/Source/JavaScriptCore/runtime/JSRunLoopTimer.h 2017-04-03 05:41:30 UTC (rev 214732)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> public:
</span><span class="cx"> JSRunLoopTimer(VM*);
</span><span class="cx"> #if USE(CF)
</span><del>- static void timerDidFire(CFRunLoopTimerRef, void*);
</del><ins>+ static void timerDidFireCallback(CFRunLoopTimerRef, void*);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE virtual ~JSRunLoopTimer();
</span><span class="lines">@@ -78,12 +78,11 @@
</span><span class="cx"> Lock m_shutdownMutex;
</span><span class="cx"> #elif USE(GLIB)
</span><span class="cx"> static const long s_decade;
</span><del>- void timerDidFire();
</del><span class="cx"> GRefPtr<GSource> m_timer;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void invalidate();
</del><ins>+ void timerDidFire();
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre>
</div>
</div>
</body>
</html>