Changeset 166692 in webkit


Ignore:
Timestamp:
Apr 2, 2014 9:57:29 PM (10 years ago)
Author:
jinwoo7.song@samsung.com
Message:

[WK2][EFL] Remove unnecessary reinterpret_cast<> in unit testcase
​https://bugs.webkit.org/show_bug.cgi?id=131143

Reviewed by Gyuyoung Kim.

Ecore_Timer callback requires *Eina_Bool* return type instead of *bool*.
Also, WebKit/EFL port coding style recommends to use *Eina_Bool* in the
callback function for EFL event handler. Additionally, replaced 0 to nullptr.

  • UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp:

(EWK2UnitTest::CallbackDataTimer::CallbackDataTimer):
(EWK2UnitTest::CallbackDataTimer::setDone):
(EWK2UnitTest::CallbackDataTimer::timeOutCallback):
(EWK2UnitTest::CallbackDataTimer::setTimedOut):

  • UIProcess/API/efl/tests/test_ewk2_storage_manager.cpp:

(EWK2StorageManagerTest::timerCallback):
(TEST_F):

Location:
trunk/Source/WebKit2
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r166690 r166692  
     12014-04-02  Jinwoo Song  <jinwoo7.song@samsung.com>
     2
     3        [WK2][EFL] Remove unnecessary reinterpret_cast<> in unit testcase
     4        https://bugs.webkit.org/show_bug.cgi?id=131143
     5
     6        Reviewed by Gyuyoung Kim.
     7
     8        Ecore_Timer callback requires *Eina_Bool* return type instead of *bool*.
     9        Also, WebKit/EFL port coding style recommends to use *Eina_Bool* in the
     10        callback function for EFL event handler. Additionally, replaced 0 to nullptr.
     11
     12        * UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp:
     13        (EWK2UnitTest::CallbackDataTimer::CallbackDataTimer):
     14        (EWK2UnitTest::CallbackDataTimer::setDone):
     15        (EWK2UnitTest::CallbackDataTimer::timeOutCallback):
     16        (EWK2UnitTest::CallbackDataTimer::setTimedOut):
     17        * UIProcess/API/efl/tests/test_ewk2_storage_manager.cpp:
     18        (EWK2StorageManagerTest::timerCallback):
     19        (TEST_F):
     20
    1212014-04-02  Tim Horton  <timothy_horton@apple.com>
    222

  • trunk/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestBase.cpp

    r166355 r166692  
    9898    explicit CallbackDataTimer(double timeoutSeconds)
    9999        : m_done(false)
    100         , m_timer(timeoutSeconds >= 0 ? ecore_timer_add(timeoutSeconds, reinterpret_cast<Ecore_Task_Cb>(timeOutCallback), this) : 0)
     100        , m_timer(timeoutSeconds >= 0 ? ecore_timer_add(timeoutSeconds, timeOutCallback, this) : nullptr)
    101101        , m_didTimeOut(false)
    102102    {
    … …  
    115115        if (m_timer) {
    116116            ecore_timer_del(m_timer);
    117             m_timer = 0;
     117            m_timer = nullptr;
    118118        }
    119119        m_done = true;
    … …  
    128128
    129129private:
    130     static bool timeOutCallback(void* userData)
     130    static Eina_Bool timeOutCallback(void* userData)
    131131    {
    132132        CallbackDataTimer* data = static_cast<CallbackDataTimer*>(userData);
    … …  
    138138    {
    139139        m_done = true;
    140         m_timer = 0;
     140        m_timer = nullptr;
    141141        m_didTimeOut = true;
    142142    }

  • trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_storage_manager.cpp

    r166565 r166692  
    7878    }
    7979
    80     static bool timerCallback(void* userData)
     80    static Eina_Bool timerCallback(void* userData)
    8181    {
    8282        OriginData* originData = static_cast<OriginData*>(userData);
    … …  
    140140
    141141    ASSERT_TRUE(ewk_storage_manager_origins_async_get(originData.manager, getStorageOriginsCallback, &originData));
    142     Ecore_Timer* storageTimer = ecore_timer_add(1, reinterpret_cast<Ecore_Task_Cb>(timerCallback), &originData);
     142    Ecore_Timer* storageTimer = ecore_timer_add(1, timerCallback, &originData);
    143143
    144144    ecore_main_loop_begin();
    … …  
    169169
    170170    ASSERT_TRUE(ewk_storage_manager_origins_async_get(originData.manager, getStorageOriginsCallback, &originData));
    171     Ecore_Timer* storageTimer = ecore_timer_add(1, reinterpret_cast<Ecore_Task_Cb>(timerCallback), &originData);
     171    Ecore_Timer* storageTimer = ecore_timer_add(1, timerCallback, &originData);
    172172
    173173    ecore_main_loop_begin();
    … …  
    187187    ASSERT_TRUE(ewk_storage_manager_origins_async_get(originData.manager, getStorageOriginsCallback, &originData));
    188188
    189     storageTimer = ecore_timer_add(1, reinterpret_cast<Ecore_Task_Cb>(timerCallback), &originData);
     189    storageTimer = ecore_timer_add(1, timerCallback, &originData);
    190190
    191191    ecore_main_loop_begin();
Note: See TracChangeset for help on using the changeset viewer.