Changeset 161650 in webkit


Ignore:
Timestamp:
Jan 10, 2014 10:38:41 AM (10 years ago)
Author:
ggaren@apple.com
Message:

Removed Blackberry #ifdefs and platform code from JavaScriptCore
​https://bugs.webkit.org/show_bug.cgi?id=126757

Reviewed by Sam Weinig.

  • PlatformBlackBerry.cmake: Removed.
  • heap/HeapTimer.cpp:
  • heap/HeapTimer.h:
  • heap/IncrementalSweeper.cpp:
  • heap/IncrementalSweeper.h:
  • jsc.cpp:

(main):

  • runtime/GCActivityCallbackBlackBerry.cpp: Removed.
  • runtime/MemoryStatistics.cpp:

(JSC::globalMemoryStatistics):

Location:
trunk/Source/JavaScriptCore
Files:
2 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r161615 r161650  
     12014-01-10  Geoffrey Garen  <ggaren@apple.com>
     2
     3        Removed Blackberry #ifdefs and platform code from JavaScriptCore
     4        https://bugs.webkit.org/show_bug.cgi?id=126757
     5
     6        Reviewed by Sam Weinig.
     7
     8        * PlatformBlackBerry.cmake: Removed.
     9        * heap/HeapTimer.cpp:
     10        * heap/HeapTimer.h:
     11        * heap/IncrementalSweeper.cpp:
     12        * heap/IncrementalSweeper.h:
     13        * jsc.cpp:
     14        (main):
     15        * runtime/GCActivityCallbackBlackBerry.cpp: Removed.
     16        * runtime/MemoryStatistics.cpp:
     17        (JSC::globalMemoryStatistics):
     18
    1192014-01-07  Mark Hahnenberg  <mhahnenberg@apple.com>
    220

  • trunk/Source/JavaScriptCore/heap/HeapTimer.cpp

    r157537 r161650  
    101101}
    102102
    103 #elif PLATFORM(BLACKBERRY)
    104 
    105 HeapTimer::HeapTimer(VM* vm)
    106     : m_vm(vm)
    107     , m_timer(this, &HeapTimer::timerDidFire)
    108 {
    109     // FIXME: Implement HeapTimer for other threads.
    110     if (WTF::isMainThread() && !m_timer.tryCreateClient())
    111         CRASH();
    112 }
    113 
    114 HeapTimer::~HeapTimer()
    115 {
    116 }
    117 
    118 void HeapTimer::timerDidFire()
    119 {
    120     doWork();
    121 }
    122 
    123 void HeapTimer::invalidate()
    124 {
    125 }
    126 
    127103#elif PLATFORM(EFL)
    128104

  • trunk/Source/JavaScriptCore/heap/HeapTimer.h

    r157920 r161650  
    3232#if USE(CF)
    3333#include <CoreFoundation/CoreFoundation.h>
    34 #elif PLATFORM(BLACKBERRY)
    35 #include <BlackBerryPlatformTimer.h>
    3634#elif PLATFORM(EFL)
    3735#if USE(EO)
    … …  
    6967
    7068    Mutex m_shutdownMutex;
    71 #elif PLATFORM(BLACKBERRY)
    72     void timerDidFire();
    73 
    74     BlackBerry::Platform::Timer<HeapTimer> m_timer;
    7569#elif PLATFORM(EFL)
    7670    static bool timerEvent(void*);

  • trunk/Source/JavaScriptCore/heap/IncrementalSweeper.cpp

    r159508 r161650  
    3939namespace JSC {
    4040
    41 #if USE(CF) || PLATFORM(BLACKBERRY)
     41#if USE(CF)
    4242
    4343static const double sweepTimeSlice = .01; // seconds
    … …  
    4545static const double sweepTimeMultiplier = 1.0 / sweepTimeTotal;
    4646
    47 #if USE(CF)
    48    
    4947IncrementalSweeper::IncrementalSweeper(Heap* heap, CFRunLoopRef runLoop)
    5048    : HeapTimer(heap->vm(), runLoop)
    … …  
    6866    CFRunLoopTimerSetNextFireDate(m_timer.get(), CFAbsoluteTimeGetCurrent() + s_decade);
    6967}
    70 
    71 #elif PLATFORM(BLACKBERRY)
    72    
    73 IncrementalSweeper::IncrementalSweeper(Heap* heap)
    74     : HeapTimer(heap->vm())
    75     , m_currentBlockToSweepIndex(0)
    76     , m_blocksToSweep(heap->m_blockSnapshot)
    77 {
    78 }
    79 
    80 PassOwnPtr<IncrementalSweeper> IncrementalSweeper::create(Heap* heap)
    81 {
    82     return adoptPtr(new IncrementalSweeper(heap));
    83 }
    84 
    85 void IncrementalSweeper::scheduleTimer()
    86 {
    87     m_timer.start(sweepTimeSlice * sweepTimeMultiplier);
    88 }
    89 
    90 void IncrementalSweeper::cancelTimer()
    91 {
    92     m_timer.stop();
    93 }
    94 
    95 #endif
    9668
    9769void IncrementalSweeper::doWork()

  • trunk/Source/JavaScriptCore/heap/IncrementalSweeper.h

    r157654 r161650  
    4747#if USE(CF)
    4848    JS_EXPORT_PRIVATE IncrementalSweeper(Heap*, CFRunLoopRef);
    49 #elif PLATFORM(BLACKBERRY)
    50     IncrementalSweeper(Heap*);
    5149#else
    5250    IncrementalSweeper(VM*);
    5351#endif
    5452
    55 #if USE(CF) || PLATFORM(BLACKBERRY)
     53#if USE(CF)
    5654private:
    5755    void doSweep(double startTime);

  • trunk/Source/JavaScriptCore/jsc.cpp

    r161159 r161650  
    8686#endif
    8787
    88 #if PLATFORM(BLACKBERRY)
    89 #include <BlackBerryPlatformLog.h>
    90 #endif
    91 
    9288#if PLATFORM(EFL)
    9389#include <Ecore.h>
    … …  
    589585
    590586    timeBeginPeriod(1);
    591 #endif
    592 
    593 #if PLATFORM(BLACKBERRY)
    594     // Write all WTF logs to the system log
    595     BlackBerry::Platform::setupApplicationLogging("jsc");
    596587#endif
    597588

  • trunk/Source/JavaScriptCore/runtime/MemoryStatistics.cpp

    r148696 r161650  
    3838
    3939    stats.stackBytes = JSStack::committedByteCount();
    40 #if ENABLE(EXECUTABLE_ALLOCATOR_FIXED) || ((PLATFORM(BLACKBERRY) || PLATFORM(EFL)) && ENABLE(JIT))
     40#if ENABLE(EXECUTABLE_ALLOCATOR_FIXED) || (PLATFORM(EFL) && ENABLE(JIT))
    4141    stats.JITBytes = ExecutableAllocator::committedByteCount();
    4242#else
Note: See TracChangeset for help on using the changeset viewer.