Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (212463 => 212464)
--- trunk/Source/_javascript_Core/ChangeLog 2017-02-16 22:04:32 UTC (rev 212463)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-02-16 22:28:54 UTC (rev 212464)
@@ -1,3 +1,28 @@
+2017-02-16 Anders Carlsson <ander...@apple.com>
+
+ Remove EFL from _javascript_Core
+ 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):
+
2017-02-15 Brian Burg <bb...@apple.com>
[Cocoa] Web Inspector: Inspector::fromProtocolString<T> should return std::optional<T>
Modified: trunk/Source/_javascript_Core/heap/GCActivityCallback.cpp (212463 => 212464)
--- trunk/Source/_javascript_Core/heap/GCActivityCallback.cpp 2017-02-16 22:04:32 UTC (rev 212463)
+++ trunk/Source/_javascript_Core/heap/GCActivityCallback.cpp 2017-02-16 22:28:54 UTC (rev 212464)
@@ -34,9 +34,7 @@
#include "JSObject.h"
#include "VM.h"
-#if PLATFORM(EFL)
-#include <wtf/MainThread.h>
-#elif USE(GLIB)
+#if USE(GLIB)
#include <glib.h>
#endif
@@ -53,11 +51,6 @@
: GCActivityCallback(heap->vm())
{
}
-#elif PLATFORM(EFL)
-GCActivityCallback::GCActivityCallback(Heap* heap)
- : GCActivityCallback(heap->vm(), WTF::isMainThread())
-{
-}
#elif USE(GLIB)
GCActivityCallback::GCActivityCallback(Heap* heap)
: GCActivityCallback(heap->vm())
@@ -97,24 +90,6 @@
m_nextFireTime = 0;
CFRunLoopTimerSetNextFireDate(m_timer.get(), CFAbsoluteTimeGetCurrent() + s_decade);
}
-#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();
-}
#elif USE(GLIB)
void GCActivityCallback::scheduleTimer(double newDelay)
{
@@ -149,13 +124,6 @@
void GCActivityCallback::didAllocate(size_t bytes)
{
-#if PLATFORM(EFL)
- if (!isEnabled())
- return;
-
- ASSERT(WTF::isMainThread());
-#endif
-
// The first byte allocated in an allocation cycle will report 0 bytes to didAllocate.
// We pretend it's one byte so that we don't ignore this allocation entirely.
if (!bytes)
Modified: trunk/Source/_javascript_Core/heap/GCActivityCallback.h (212463 => 212464)
--- trunk/Source/_javascript_Core/heap/GCActivityCallback.h 2017-02-16 22:04:32 UTC (rev 212463)
+++ trunk/Source/_javascript_Core/heap/GCActivityCallback.h 2017-02-16 22:28:54 UTC (rev 212464)
@@ -75,14 +75,6 @@
, m_delay(s_decade)
{
}
-#elif PLATFORM(EFL)
- static constexpr double s_hour = 3600;
- GCActivityCallback(VM* vm, bool flag)
- : HeapTimer(vm)
- , m_enabled(flag)
- , m_delay(s_hour)
- {
- }
#elif USE(GLIB)
GCActivityCallback(VM* vm)
: HeapTimer(vm)
Modified: trunk/Source/_javascript_Core/heap/HeapTimer.cpp (212463 => 212464)
--- trunk/Source/_javascript_Core/heap/HeapTimer.cpp 2017-02-16 22:04:32 UTC (rev 212463)
+++ trunk/Source/_javascript_Core/heap/HeapTimer.cpp 2017-02-16 22:28:54 UTC (rev 212464)
@@ -34,9 +34,7 @@
#include <wtf/MainThread.h>
#include <wtf/Threading.h>
-#if PLATFORM(EFL)
-#include <Ecore.h>
-#elif USE(GLIB)
+#if USE(GLIB)
#include <glib.h>
#endif
@@ -108,60 +106,6 @@
m_isScheduled = false;
}
-#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;
-}
#elif USE(GLIB)
static GSourceFuncs heapTimerSourceFunctions = {
Modified: trunk/Source/_javascript_Core/heap/HeapTimer.h (212463 => 212464)
--- trunk/Source/_javascript_Core/heap/HeapTimer.h 2017-02-16 22:04:32 UTC (rev 212463)
+++ trunk/Source/_javascript_Core/heap/HeapTimer.h 2017-02-16 22:28:54 UTC (rev 212464)
@@ -35,7 +35,7 @@
#include <CoreFoundation/CoreFoundation.h>
#endif
-#if USE(GLIB) && !PLATFORM(EFL)
+#if USE(GLIB)
#include <wtf/glib/GRefPtr.h>
#endif
@@ -76,11 +76,6 @@
CFRunLoopTimerContext m_context;
Lock m_shutdownMutex;
-#elif PLATFORM(EFL)
- static bool timerEvent(void*);
- Ecore_Timer* add(double delay, void* agent);
- void stop();
- Ecore_Timer* m_timer;
#elif USE(GLIB)
void timerDidFire();
GRefPtr<GSource> m_timer;
Modified: trunk/Source/_javascript_Core/inspector/EventLoop.cpp (212463 => 212464)
--- trunk/Source/_javascript_Core/inspector/EventLoop.cpp 2017-02-16 22:04:32 UTC (rev 212463)
+++ trunk/Source/_javascript_Core/inspector/EventLoop.cpp 2017-02-16 22:28:54 UTC (rev 212464)
@@ -28,8 +28,6 @@
#if OS(WINDOWS)
#include <windows.h>
-#elif PLATFORM(EFL)
-#include <Ecore.h>
#elif PLATFORM(GTK)
#include <glib.h>
#endif
@@ -67,8 +65,6 @@
// paused and can still access and evalute script in the JSContext.
CFTimeInterval timeInterval = 0.05;
CFRunLoopRunInMode(remoteInspectorRunLoopMode(), timeInterval, true);
-#elif PLATFORM(EFL)
- ecore_main_loop_iterate();
#elif PLATFORM(GTK)
g_main_context_iteration(NULL, FALSE);
#endif
Modified: trunk/Source/_javascript_Core/jsc.cpp (212463 => 212464)
--- trunk/Source/_javascript_Core/jsc.cpp 2017-02-16 22:04:32 UTC (rev 212463)
+++ trunk/Source/_javascript_Core/jsc.cpp 2017-02-16 22:28:54 UTC (rev 212464)
@@ -122,10 +122,6 @@
#include <arm/arch.h>
#endif
-#if PLATFORM(EFL)
-#include <Ecore.h>
-#endif
-
#if !defined(PATH_MAX)
#define PATH_MAX 4096
#endif
@@ -3232,10 +3228,6 @@
timeBeginPeriod(1);
#endif
-#if PLATFORM(EFL)
- ecore_init();
-#endif
-
#if PLATFORM(GTK)
if (!setlocale(LC_ALL, ""))
WTFLogAlways("Locale not supported by C library.\n\tUsing the fallback 'C' locale.");
@@ -3258,10 +3250,6 @@
EXCEPT(res = 3)
finalizeStatsAtEndOfTesting();
-#if PLATFORM(EFL)
- ecore_shutdown();
-#endif
-
jscExit(res);
}
Modified: trunk/Source/_javascript_Core/tools/CodeProfiling.cpp (212463 => 212464)
--- trunk/Source/_javascript_Core/tools/CodeProfiling.cpp 2017-02-16 22:04:32 UTC (rev 212463)
+++ trunk/Source/_javascript_Core/tools/CodeProfiling.cpp 2017-02-16 22:28:54 UTC (rev 212464)
@@ -48,7 +48,7 @@
#pragma clang diagnostic ignored "-Wmissing-noreturn"
#endif
-#if (OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) && CPU(X86_64)) || (OS(LINUX) && CPU(X86))
+#if (OS(DARWIN) && !PLATFORM(GTK) && CPU(X86_64)) || (OS(LINUX) && CPU(X86))
// Helper function to start & stop the timer.
// Presently we're using the wall-clock timer, since this seems to give the best results.
static void setProfileTimer(unsigned usec)
@@ -66,7 +66,7 @@
#pragma clang diagnostic pop
#endif
-#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) && CPU(X86_64)
+#if OS(DARWIN) && !PLATFORM(GTK) && CPU(X86_64)
static void profilingTimer(int, siginfo_t*, void* uap)
{
mcontext_t context = static_cast<ucontext_t*>(uap)->uc_mcontext;
@@ -141,7 +141,7 @@
if (alreadyProfiling)
return;
-#if (OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) && CPU(X86_64)) || (OS(LINUX) && CPU(X86))
+#if (OS(DARWIN) && !PLATFORM(GTK) && CPU(X86_64)) || (OS(LINUX) && CPU(X86))
// Regsiter a signal handler & itimer.
struct sigaction action;
action.sa_sigaction = reinterpret_cast<void (*)(int, siginfo_t *, void *)>(profilingTimer);
@@ -165,7 +165,7 @@
if (s_profileStack)
return;
-#if (OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) && CPU(X86_64)) || (OS(LINUX) && CPU(X86))
+#if (OS(DARWIN) && !PLATFORM(GTK) && CPU(X86_64)) || (OS(LINUX) && CPU(X86))
// Stop profiling
setProfileTimer(0);
#endif
