<!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>[212464] 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/212464">212464</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2017-02-16 14:28:54 -0800 (Thu, 16 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove EFL from JavaScriptCore
https://bugs.webkit.org/show_bug.cgi?id=168459
Reviewed by Geoffrey Garen.
* heap/GCActivityCallback.cpp:
(JSC::GCActivityCallback::GCActivityCallback):
(JSC::GCActivityCallback::cancelTimer):
(JSC::GCActivityCallback::didAllocate):
* heap/GCActivityCallback.h:
* heap/HeapTimer.cpp:
(JSC::HeapTimer::add): Deleted.
(JSC::HeapTimer::stop): Deleted.
(JSC::HeapTimer::timerEvent): Deleted.
* heap/HeapTimer.h:
* inspector/EventLoop.cpp:
(Inspector::EventLoop::cycle):
* jsc.cpp:
(main):
* tools/CodeProfiling.cpp:
(JSC::CodeProfiling::begin):
(JSC::CodeProfiling::end):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapGCActivityCallbackcpp">trunk/Source/JavaScriptCore/heap/GCActivityCallback.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapGCActivityCallbackh">trunk/Source/JavaScriptCore/heap/GCActivityCallback.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapTimercpp">trunk/Source/JavaScriptCore/heap/HeapTimer.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapTimerh">trunk/Source/JavaScriptCore/heap/HeapTimer.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorEventLoopcpp">trunk/Source/JavaScriptCore/inspector/EventLoop.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejsccpp">trunk/Source/JavaScriptCore/jsc.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoretoolsCodeProfilingcpp">trunk/Source/JavaScriptCore/tools/CodeProfiling.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (212463 => 212464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-02-16 22:04:32 UTC (rev 212463)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-02-16 22:28:54 UTC (rev 212464)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2017-02-16 Anders Carlsson <andersca@apple.com>
+
+ Remove EFL from JavaScriptCore
+ https://bugs.webkit.org/show_bug.cgi?id=168459
+
+ Reviewed by Geoffrey Garen.
+
+ * heap/GCActivityCallback.cpp:
+ (JSC::GCActivityCallback::GCActivityCallback):
+ (JSC::GCActivityCallback::cancelTimer):
+ (JSC::GCActivityCallback::didAllocate):
+ * heap/GCActivityCallback.h:
+ * heap/HeapTimer.cpp:
+ (JSC::HeapTimer::add): Deleted.
+ (JSC::HeapTimer::stop): Deleted.
+ (JSC::HeapTimer::timerEvent): Deleted.
+ * heap/HeapTimer.h:
+ * inspector/EventLoop.cpp:
+ (Inspector::EventLoop::cycle):
+ * jsc.cpp:
+ (main):
+ * tools/CodeProfiling.cpp:
+ (JSC::CodeProfiling::begin):
+ (JSC::CodeProfiling::end):
+
</ins><span class="cx"> 2017-02-15 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Web Inspector: Inspector::fromProtocolString<T> should return std::optional<T>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapGCActivityCallbackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/GCActivityCallback.cpp (212463 => 212464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/GCActivityCallback.cpp 2017-02-16 22:04:32 UTC (rev 212463)
+++ trunk/Source/JavaScriptCore/heap/GCActivityCallback.cpp 2017-02-16 22:28:54 UTC (rev 212464)
</span><span class="lines">@@ -34,9 +34,7 @@
</span><span class="cx"> #include "JSObject.h"
</span><span class="cx"> #include "VM.h"
</span><span class="cx">
</span><del>-#if PLATFORM(EFL)
-#include <wtf/MainThread.h>
-#elif USE(GLIB)
</del><ins>+#if USE(GLIB)
</ins><span class="cx"> #include <glib.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -53,11 +51,6 @@
</span><span class="cx"> : GCActivityCallback(heap->vm())
</span><span class="cx"> {
</span><span class="cx"> }
</span><del>-#elif PLATFORM(EFL)
-GCActivityCallback::GCActivityCallback(Heap* heap)
- : GCActivityCallback(heap->vm(), WTF::isMainThread())
-{
-}
</del><span class="cx"> #elif USE(GLIB)
</span><span class="cx"> GCActivityCallback::GCActivityCallback(Heap* heap)
</span><span class="cx"> : GCActivityCallback(heap->vm())
</span><span class="lines">@@ -97,24 +90,6 @@
</span><span class="cx"> m_nextFireTime = 0;
</span><span class="cx"> CFRunLoopTimerSetNextFireDate(m_timer.get(), CFAbsoluteTimeGetCurrent() + s_decade);
</span><span class="cx"> }
</span><del>-#elif PLATFORM(EFL)
-void GCActivityCallback::scheduleTimer(double newDelay)
-{
- if (newDelay * timerSlop > m_delay)
- return;
-
- stop();
- m_delay = newDelay;
-
- ASSERT(!m_timer);
- m_timer = add(newDelay, this);
-}
-
-void GCActivityCallback::cancelTimer()
-{
- m_delay = s_hour;
- stop();
-}
</del><span class="cx"> #elif USE(GLIB)
</span><span class="cx"> void GCActivityCallback::scheduleTimer(double newDelay)
</span><span class="cx"> {
</span><span class="lines">@@ -149,13 +124,6 @@
</span><span class="cx">
</span><span class="cx"> void GCActivityCallback::didAllocate(size_t bytes)
</span><span class="cx"> {
</span><del>-#if PLATFORM(EFL)
- if (!isEnabled())
- return;
-
- ASSERT(WTF::isMainThread());
-#endif
-
</del><span class="cx"> // The first byte allocated in an allocation cycle will report 0 bytes to didAllocate.
</span><span class="cx"> // We pretend it's one byte so that we don't ignore this allocation entirely.
</span><span class="cx"> if (!bytes)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapGCActivityCallbackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/GCActivityCallback.h (212463 => 212464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/GCActivityCallback.h 2017-02-16 22:04:32 UTC (rev 212463)
+++ trunk/Source/JavaScriptCore/heap/GCActivityCallback.h 2017-02-16 22:28:54 UTC (rev 212464)
</span><span class="lines">@@ -75,14 +75,6 @@
</span><span class="cx"> , m_delay(s_decade)
</span><span class="cx"> {
</span><span class="cx"> }
</span><del>-#elif PLATFORM(EFL)
- static constexpr double s_hour = 3600;
- GCActivityCallback(VM* vm, bool flag)
- : HeapTimer(vm)
- , m_enabled(flag)
- , m_delay(s_hour)
- {
- }
</del><span class="cx"> #elif USE(GLIB)
</span><span class="cx"> GCActivityCallback(VM* vm)
</span><span class="cx"> : HeapTimer(vm)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapTimercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/HeapTimer.cpp (212463 => 212464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/HeapTimer.cpp 2017-02-16 22:04:32 UTC (rev 212463)
+++ trunk/Source/JavaScriptCore/heap/HeapTimer.cpp 2017-02-16 22:28:54 UTC (rev 212464)
</span><span class="lines">@@ -34,9 +34,7 @@
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/Threading.h>
</span><span class="cx">
</span><del>-#if PLATFORM(EFL)
-#include <Ecore.h>
-#elif USE(GLIB)
</del><ins>+#if USE(GLIB)
</ins><span class="cx"> #include <glib.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -108,60 +106,6 @@
</span><span class="cx"> m_isScheduled = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#elif PLATFORM(EFL)
-
-HeapTimer::HeapTimer(VM* vm)
- : m_vm(vm)
- , m_apiLock(&vm->apiLock())
- , m_timer(0)
-{
-}
-
-HeapTimer::~HeapTimer()
-{
- stop();
-}
-
-Ecore_Timer* HeapTimer::add(double delay, void* agent)
-{
- return ecore_timer_add(delay, reinterpret_cast<Ecore_Task_Cb>(timerEvent), agent);
-}
-
-void HeapTimer::stop()
-{
- if (!m_timer)
- return;
-
- ecore_timer_del(m_timer);
- m_timer = 0;
-}
-
-bool HeapTimer::timerEvent(void* info)
-{
- HeapTimer* agent = static_cast<HeapTimer*>(info);
-
- JSLockHolder locker(agent->m_vm);
- agent->doWork();
- agent->m_timer = 0;
-
- return ECORE_CALLBACK_CANCEL;
-}
-
-void HeapTimer::scheduleTimer(double intervalInSeconds)
-{
- if (ecore_timer_freeze_get(m_timer))
- ecore_timer_thaw(m_timer);
-
- double targetTime = currentTime() + intervalInSeconds;
- ecore_timer_interval_set(m_timer, targetTime);
- m_isScheduled = true;
-}
-
-void HeapTimer::cancelTimer()
-{
- ecore_timer_freeze(m_timer);
- m_isScheduled = false;
-}
</del><span class="cx"> #elif USE(GLIB)
</span><span class="cx">
</span><span class="cx"> static GSourceFuncs heapTimerSourceFunctions = {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapTimerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/HeapTimer.h (212463 => 212464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/HeapTimer.h 2017-02-16 22:04:32 UTC (rev 212463)
+++ trunk/Source/JavaScriptCore/heap/HeapTimer.h 2017-02-16 22:28:54 UTC (rev 212464)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #include <CoreFoundation/CoreFoundation.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(GLIB) && !PLATFORM(EFL)
</del><ins>+#if USE(GLIB)
</ins><span class="cx"> #include <wtf/glib/GRefPtr.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -76,11 +76,6 @@
</span><span class="cx"> CFRunLoopTimerContext m_context;
</span><span class="cx">
</span><span class="cx"> Lock m_shutdownMutex;
</span><del>-#elif PLATFORM(EFL)
- static bool timerEvent(void*);
- Ecore_Timer* add(double delay, void* agent);
- void stop();
- Ecore_Timer* m_timer;
</del><span class="cx"> #elif USE(GLIB)
</span><span class="cx"> void timerDidFire();
</span><span class="cx"> GRefPtr<GSource> m_timer;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorEventLoopcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/EventLoop.cpp (212463 => 212464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/EventLoop.cpp 2017-02-16 22:04:32 UTC (rev 212463)
+++ trunk/Source/JavaScriptCore/inspector/EventLoop.cpp 2017-02-16 22:28:54 UTC (rev 212464)
</span><span class="lines">@@ -28,8 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #if OS(WINDOWS)
</span><span class="cx"> #include <windows.h>
</span><del>-#elif PLATFORM(EFL)
-#include <Ecore.h>
</del><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> #include <glib.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -67,8 +65,6 @@
</span><span class="cx"> // paused and can still access and evalute script in the JSContext.
</span><span class="cx"> CFTimeInterval timeInterval = 0.05;
</span><span class="cx"> CFRunLoopRunInMode(remoteInspectorRunLoopMode(), timeInterval, true);
</span><del>-#elif PLATFORM(EFL)
- ecore_main_loop_iterate();
</del><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> g_main_context_iteration(NULL, FALSE);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejsccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jsc.cpp (212463 => 212464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jsc.cpp 2017-02-16 22:04:32 UTC (rev 212463)
+++ trunk/Source/JavaScriptCore/jsc.cpp 2017-02-16 22:28:54 UTC (rev 212464)
</span><span class="lines">@@ -122,10 +122,6 @@
</span><span class="cx"> #include <arm/arch.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(EFL)
-#include <Ecore.h>
-#endif
-
</del><span class="cx"> #if !defined(PATH_MAX)
</span><span class="cx"> #define PATH_MAX 4096
</span><span class="cx"> #endif
</span><span class="lines">@@ -3232,10 +3228,6 @@
</span><span class="cx"> timeBeginPeriod(1);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(EFL)
- ecore_init();
-#endif
-
</del><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> if (!setlocale(LC_ALL, ""))
</span><span class="cx"> WTFLogAlways("Locale not supported by C library.\n\tUsing the fallback 'C' locale.");
</span><span class="lines">@@ -3258,10 +3250,6 @@
</span><span class="cx"> EXCEPT(res = 3)
</span><span class="cx"> finalizeStatsAtEndOfTesting();
</span><span class="cx">
</span><del>-#if PLATFORM(EFL)
- ecore_shutdown();
-#endif
-
</del><span class="cx"> jscExit(res);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretoolsCodeProfilingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tools/CodeProfiling.cpp (212463 => 212464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tools/CodeProfiling.cpp 2017-02-16 22:04:32 UTC (rev 212463)
+++ trunk/Source/JavaScriptCore/tools/CodeProfiling.cpp 2017-02-16 22:28:54 UTC (rev 212464)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> #pragma clang diagnostic ignored "-Wmissing-noreturn"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if (OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) && CPU(X86_64)) || (OS(LINUX) && CPU(X86))
</del><ins>+#if (OS(DARWIN) && !PLATFORM(GTK) && CPU(X86_64)) || (OS(LINUX) && CPU(X86))
</ins><span class="cx"> // Helper function to start & stop the timer.
</span><span class="cx"> // Presently we're using the wall-clock timer, since this seems to give the best results.
</span><span class="cx"> static void setProfileTimer(unsigned usec)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> #pragma clang diagnostic pop
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) && CPU(X86_64)
</del><ins>+#if OS(DARWIN) && !PLATFORM(GTK) && CPU(X86_64)
</ins><span class="cx"> static void profilingTimer(int, siginfo_t*, void* uap)
</span><span class="cx"> {
</span><span class="cx"> mcontext_t context = static_cast<ucontext_t*>(uap)->uc_mcontext;
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> if (alreadyProfiling)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if (OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) && CPU(X86_64)) || (OS(LINUX) && CPU(X86))
</del><ins>+#if (OS(DARWIN) && !PLATFORM(GTK) && CPU(X86_64)) || (OS(LINUX) && CPU(X86))
</ins><span class="cx"> // Regsiter a signal handler & itimer.
</span><span class="cx"> struct sigaction action;
</span><span class="cx"> action.sa_sigaction = reinterpret_cast<void (*)(int, siginfo_t *, void *)>(profilingTimer);
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> if (s_profileStack)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if (OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) && CPU(X86_64)) || (OS(LINUX) && CPU(X86))
</del><ins>+#if (OS(DARWIN) && !PLATFORM(GTK) && CPU(X86_64)) || (OS(LINUX) && CPU(X86))
</ins><span class="cx"> // Stop profiling
</span><span class="cx"> setProfileTimer(0);
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>