Changeset 176495 in webkit


Ignore:
Timestamp:
Nov 21, 2014, 7:27:53 PM (11 years ago)
Author:
gyuyoung.kim@samsung.com
Message:

Unreviewed, EFL build fix since r176459.

r176459 removed Timer parameter in timer callbacks only for Mac port.
So this patch applies it to remaining classes for EFL port.

Source/WebCore:

No new tests, fix build break.

  • Modules/mediastream/RTCDTMFSender.cpp:

(WebCore::RTCDTMFSender::RTCDTMFSender):

  • Modules/mediastream/RTCDataChannel.cpp:

(WebCore::RTCDataChannel::RTCDataChannel):

  • Modules/mediastream/RTCPeerConnection.cpp:

(WebCore::RTCPeerConnection::RTCPeerConnection):

  • Modules/vibration/Vibration.cpp:

(WebCore::Vibration::Vibration):
(WebCore::Vibration::timerFired):

  • Modules/vibration/Vibration.h:
  • bindings/js/GCController.cpp:

(WebCore::GCController::GCController):

  • platform/efl/BatteryProviderEfl.cpp:

(WebCore::BatteryProviderEfl::BatteryProviderEfl):
(WebCore::BatteryProviderEfl::timerFired):

  • platform/efl/BatteryProviderEfl.h:
  • platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:

(WebCore::MediaPlayerPrivateGStreamer::MediaPlayerPrivateGStreamer):
(WebCore::MediaPlayerPrivateGStreamer::fillTimerFired):

  • platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
  • platform/graphics/texmap/TextureMapper.cpp:

(WebCore::BitmapTexturePool::BitmapTexturePool):
(WebCore::BitmapTexturePool::releaseUnusedTexturesTimerFired):

  • platform/graphics/texmap/coordinated/CompositingCoordinator.cpp:

(WebCore::CompositingCoordinator::CompositingCoordinator):
(WebCore::CompositingCoordinator::releaseInactiveAtlasesTimerFired):

  • platform/graphics/texmap/coordinated/CompositingCoordinator.h:
  • platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:

(WebCore::CoordinatedGraphicsLayer::CoordinatedGraphicsLayer):
(WebCore::CoordinatedGraphicsLayer::animationStartedTimerFired):

  • platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h:
  • platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp:

(WebCore::CoordinatedImageBacking::CoordinatedImageBacking):
(WebCore::CoordinatedImageBacking::clearContentsTimerFired):

  • platform/graphics/texmap/coordinated/CoordinatedImageBacking.h:
  • platform/mock/DeviceMotionClientMock.cpp:

(WebCore::DeviceMotionClientMock::DeviceMotionClientMock):
(WebCore::DeviceMotionClientMock::timerFired):

  • platform/mock/DeviceMotionClientMock.h:
  • platform/mock/TimerEventBasedMock.h:

(WebCore::TimerEvent::TimerEvent):
(WebCore::TimerEvent::timerFired):

Source/WebKit2:

  • UIProcess/API/efl/EwkView.cpp:

(EwkView::EwkView):
(EwkView::displayTimerFired):

  • UIProcess/API/efl/EwkView.h:
  • UIProcess/efl/TextCheckerClientEfl.cpp:

(TextCheckerClientEfl::TextCheckerClientEfl):
(TextCheckerClientEfl::languagesUpdateTimerFired):
(TextCheckerClientEfl::spellCheckingSettingChangeTimerFired):

  • UIProcess/efl/TextCheckerClientEfl.h:
  • WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:

(WebKit::CoordinatedLayerTreeHost::CoordinatedLayerTreeHost):
(WebKit::CoordinatedLayerTreeHost::layerFlushTimerFired):

  • WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h:
Location:
trunk/Source
Files:
28 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r176494 r176495  
     12014-11-21  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
     2
     3        Unreviewed, EFL build fix since r176459.
     4
     5        r176459 removed Timer parameter in timer callbacks only for Mac port.
     6        So this patch applies it to remaining classes for EFL port.
     7
     8        No new tests, fix build break.
     9
     10        * Modules/mediastream/RTCDTMFSender.cpp:
     11        (WebCore::RTCDTMFSender::RTCDTMFSender):
     12        * Modules/mediastream/RTCDataChannel.cpp:
     13        (WebCore::RTCDataChannel::RTCDataChannel):
     14        * Modules/mediastream/RTCPeerConnection.cpp:
     15        (WebCore::RTCPeerConnection::RTCPeerConnection):
     16        * Modules/vibration/Vibration.cpp:
     17        (WebCore::Vibration::Vibration):
     18        (WebCore::Vibration::timerFired):
     19        * Modules/vibration/Vibration.h:
     20        * bindings/js/GCController.cpp:
     21        (WebCore::GCController::GCController):
     22        * platform/efl/BatteryProviderEfl.cpp:
     23        (WebCore::BatteryProviderEfl::BatteryProviderEfl):
     24        (WebCore::BatteryProviderEfl::timerFired):
     25        * platform/efl/BatteryProviderEfl.h:
     26        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
     27        (WebCore::MediaPlayerPrivateGStreamer::MediaPlayerPrivateGStreamer):
     28        (WebCore::MediaPlayerPrivateGStreamer::fillTimerFired):
     29        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
     30        * platform/graphics/texmap/TextureMapper.cpp:
     31        (WebCore::BitmapTexturePool::BitmapTexturePool):
     32        (WebCore::BitmapTexturePool::releaseUnusedTexturesTimerFired):
     33        * platform/graphics/texmap/coordinated/CompositingCoordinator.cpp:
     34        (WebCore::CompositingCoordinator::CompositingCoordinator):
     35        (WebCore::CompositingCoordinator::releaseInactiveAtlasesTimerFired):
     36        * platform/graphics/texmap/coordinated/CompositingCoordinator.h:
     37        * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
     38        (WebCore::CoordinatedGraphicsLayer::CoordinatedGraphicsLayer):
     39        (WebCore::CoordinatedGraphicsLayer::animationStartedTimerFired):
     40        * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h:
     41        * platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp:
     42        (WebCore::CoordinatedImageBacking::CoordinatedImageBacking):
     43        (WebCore::CoordinatedImageBacking::clearContentsTimerFired):
     44        * platform/graphics/texmap/coordinated/CoordinatedImageBacking.h:
     45        * platform/mock/DeviceMotionClientMock.cpp:
     46        (WebCore::DeviceMotionClientMock::DeviceMotionClientMock):
     47        (WebCore::DeviceMotionClientMock::timerFired):
     48        * platform/mock/DeviceMotionClientMock.h:
     49        * platform/mock/TimerEventBasedMock.h:
     50        (WebCore::TimerEvent::TimerEvent):
     51        (WebCore::TimerEvent::timerFired):
     52
    1532014-11-21  Benjamin Poulain  <bpoulain@apple.com>
    254

  • trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp

    r176459 r176495  
    6666    , m_handler(WTF::move(handler))
    6767    , m_stopped(false)
    68     , m_scheduledEventtimer(*this, &RTCDTMFSender::scheduledEventTimerFired)
     68    , m_scheduledEventTimer(*this, &RTCDTMFSender::scheduledEventTimerFired)
    6969{
    7070    m_handler->setClient(this);

  • trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp

    r176459 r176495  
    9696    , m_readyState(ReadyStateConnecting)
    9797    , m_binaryType(BinaryTypeArrayBuffer)
    98     , m_scheduledEventtimer(*this, &RTCDataChannel::scheduledEventTimerFired)
     98    , m_scheduledEventTimer(*this, &RTCDataChannel::scheduledEventTimerFired)
    9999{
    100100    m_handler->setClient(this);

  • trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp

    r176459 r176495  
    175175    , m_iceGatheringState(IceGatheringStateNew)
    176176    , m_iceConnectionState(IceConnectionStateNew)
    177     , m_scheduledEventtimer(*this, &RTCPeerConnection::scheduledEventTimerFired)
     177    , m_scheduledEventTimer(*this, &RTCPeerConnection::scheduledEventTimerFired)
    178178    , m_configuration(configuration)
    179179    , m_stopped(false)

  • trunk/Source/WebCore/Modules/vibration/Vibration.cpp

    r175719 r176495  
    3434Vibration::Vibration(VibrationClient* client)
    3535    : m_vibrationClient(client)
    36     , m_timer(this, &Vibration::timerFired)
     36    , m_timer(*this, &Vibration::timerFired)
    3737    , m_state(State::Idle)
    3838{
    … …  
    9292}
    9393
    94 void Vibration::timerFired(Timer* timer)
     94void Vibration::timerFired()
    9595{
    96     ASSERT_UNUSED(timer, timer == &m_timer);
    97 
    9896    m_timer.stop();
    9997

  • trunk/Source/WebCore/Modules/vibration/Vibration.h

    r175719 r176495  
    4141    void cancelVibration();
    4242
    43     void timerFired(Timer*);
     43    void timerFired();
    4444
    4545    static const char* supplementName();

  • trunk/Source/WebCore/bindings/js/GCController.cpp

    r176459 r176495  
    5252GCController::GCController()
    5353#if !USE(CF)
    54     : m_GCtimer(*this, &GCController::gcTimerFired)
     54    : m_GCTimer(*this, &GCController::gcTimerFired)
    5555#endif
    5656{

  • trunk/Source/WebCore/platform/efl/BatteryProviderEfl.cpp

    r175719 r176495  
    3232BatteryProviderEfl::BatteryProviderEfl(BatteryProviderEflClient* client)
    3333    : m_client(client)
    34     , m_timer(this, &BatteryProviderEfl::timerFired)
     34    , m_timer(*this, &BatteryProviderEfl::timerFired)
    3535    , m_batteryStatusRefreshInterval(1.0)
    3636{
    … …  
    7474}
    7575
    76 void BatteryProviderEfl::timerFired(Timer* timer)
     76void BatteryProviderEfl::timerFired()
    7777{
    78     ASSERT_UNUSED(timer, timer == &m_timer);
    7978    E_DBus_Connection* edbusConnection = e_dbus_bus_get(DBUS_BUS_SYSTEM);
    8079    if (edbusConnection)

  • trunk/Source/WebCore/platform/efl/BatteryProviderEfl.h

    r175719 r176495  
    4646
    4747private:
    48     void timerFired(Timer*);
     48    void timerFired();
    4949    static void getBatteryStatus(void* data, void* replyData, DBusError*);
    5050    static void setBatteryClient(void* data, void* replyData, DBusError*);

  • trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp

    r176108 r176495  
    201201    , m_mediaDuration(0)
    202202    , m_downloadFinished(false)
    203     , m_fillTimer(this, &MediaPlayerPrivateGStreamer::fillTimerFired)
     203    , m_fillTimer(*this, &MediaPlayerPrivateGStreamer::fillTimerFired)
    204204    , m_maxTimeLoaded(0)
    205205    , m_bufferingPercentage(0)
    … …  
    11461146#endif
    11471147
    1148 void MediaPlayerPrivateGStreamer::fillTimerFired(Timer*)
     1148void MediaPlayerPrivateGStreamer::fillTimerFired()
    11491149{
    11501150    GstQuery* query = gst_query_new_buffering(GST_FORMAT_PERCENT);

  • trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h

    r176108 r176495  
    8888
    8989    void setPreload(MediaPlayer::Preload);
    90     void fillTimerFired(Timer*);
     90    void fillTimerFired();
    9191
    9292    std::unique_ptr<PlatformTimeRanges> buffered() const;

  • trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp

    r175719 r176495  
    5555private:
    5656    void scheduleReleaseUnusedTextures();
    57     void releaseUnusedTexturesTimerFired(Timer*);
     57    void releaseUnusedTexturesTimerFired();
    5858
    5959    Vector<BitmapTexturePoolEntry> m_textures;
    … …  
    6868
    6969BitmapTexturePool::BitmapTexturePool()
    70     : m_releaseUnusedTexturesTimer(this, &BitmapTexturePool::releaseUnusedTexturesTimerFired)
     70    : m_releaseUnusedTexturesTimer(*this, &BitmapTexturePool::releaseUnusedTexturesTimerFired)
    7171{ }
    7272
    … …  
    7979}
    8080
    81 void BitmapTexturePool::releaseUnusedTexturesTimerFired(Timer*)
     81void BitmapTexturePool::releaseUnusedTexturesTimerFired()
    8282{
    8383    if (m_textures.isEmpty())

  • trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp

    r175719 r176495  
    6060    , m_shouldSyncFrame(false)
    6161    , m_didInitializeRootCompositingLayer(false)
    62     , m_releaseInactiveAtlasesTimer(this, &CompositingCoordinator::releaseInactiveAtlasesTimerFired)
     62    , m_releaseInactiveAtlasesTimer(*this, &CompositingCoordinator::releaseInactiveAtlasesTimerFired)
    6363#if ENABLE(REQUEST_ANIMATION_FRAME)
    6464    , m_lastAnimationServiceTime(0)
    … …  
    397397}
    398398
    399 void CompositingCoordinator::releaseInactiveAtlasesTimerFired(Timer*)
     399void CompositingCoordinator::releaseInactiveAtlasesTimerFired()
    400400{
    401401    // We always want to keep one atlas for root contents layer.

  • trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.h

    r175719 r176495  
    123123    void scheduleReleaseInactiveAtlases();
    124124
    125     void releaseInactiveAtlasesTimerFired(Timer*);
     125    void releaseInactiveAtlasesTimerFired();
    126126
    127127    Page* m_page;

  • trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp

    r175719 r176495  
    126126    , m_compositedNativeImagePtr(0)
    127127    , m_platformLayer(0)
    128     , m_animationStartedTimer(this, &CoordinatedGraphicsLayer::animationStartedTimerFired)
     128    , m_animationStartedTimer(*this, &CoordinatedGraphicsLayer::animationStartedTimerFired)
    129129    , m_scrollableArea(0)
    130130{
    … …  
    12211221}
    12221222
    1223 void CoordinatedGraphicsLayer::animationStartedTimerFired(Timer*)
     1223void CoordinatedGraphicsLayer::animationStartedTimerFired()
    12241224{
    12251225    client().notifyAnimationStarted(this, "", m_lastAnimationStartTime);

  • trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h

    r175719 r176495  
    202202    float effectiveContentsScale();
    203203
    204     void animationStartedTimerFired(Timer*);
     204    void animationStartedTimerFired();
    205205
    206206    CoordinatedLayerID m_id;

  • trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp

    r175719 r176495  
    6767    , m_image(image)
    6868    , m_id(getCoordinatedImageBackingID(m_image.get()))
    69     , m_clearContentsTimer(this, &CoordinatedImageBacking::clearContentsTimerFired)
     69    , m_clearContentsTimer(*this, &CoordinatedImageBacking::clearContentsTimerFired)
    7070    , m_isDirty(false)
    7171    , m_isVisible(false)
    … …  
    174174}
    175175
    176 void CoordinatedImageBacking::clearContentsTimerFired(Timer*)
     176void CoordinatedImageBacking::clearContentsTimerFired()
    177177{
    178178    m_client->clearImageBackingContents(id());

  • trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.h

    r175719 r176495  
    7373    void releaseSurfaceIfNeeded();
    7474    void updateVisibilityIfNeeded(bool& changedToVisible);
    75     void clearContentsTimerFired(Timer*);
     75    void clearContentsTimerFired();
    7676
    7777    Client* m_client;

  • trunk/Source/WebCore/platform/mock/DeviceMotionClientMock.cpp

    r175719 r176495  
    3333DeviceMotionClientMock::DeviceMotionClientMock()
    3434    : m_controller(0)
    35     , m_timer(this, &DeviceMotionClientMock::timerFired)
     35    , m_timer(*this, &DeviceMotionClientMock::timerFired)
    3636    , m_isUpdating(false)
    3737{
    … …  
    6363}
    6464
    65 void DeviceMotionClientMock::timerFired(Timer* timer)
     65void DeviceMotionClientMock::timerFired()
    6666{
    67     ASSERT_UNUSED(timer, timer == &m_timer);
    6867    m_timer.stop();
    6968    m_controller->didChangeDeviceMotion(m_motion.get());

  • trunk/Source/WebCore/platform/mock/DeviceMotionClientMock.h

    r175719 r176495  
    5656
    5757private:
    58     void timerFired(Timer*);
     58    void timerFired();
    5959
    6060    RefPtr<DeviceMotionData> m_motion;

  • trunk/Source/WebCore/platform/mock/TimerEventBasedMock.h

    r175719 r176495  
    6161    TimerEvent(TimerEventBasedMock* mock, PassRefPtr<MockNotifier> notifier)
    6262        : m_mock(mock)
    63         , m_timer(this, &TimerEvent::timerFired)
     63        , m_timer(*this, &TimerEvent::timerFired)
    6464        , m_notifier(notifier)
    6565    {
    … …  
    6969    virtual ~TimerEvent() { }
    7070
    71     void timerFired(Timer*)
     71    void timerFired()
    7272    {
    7373        m_notifier->fire();

  • trunk/Source/WebKit2/ChangeLog

    r176492 r176495  
     12014-11-21  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
     2
     3        Unreviewed, EFL build fix since r176459.
     4
     5        r176459 removed Timer parameter in timer callbacks only for Mac port.
     6        So this patch applies it to remaining classes for EFL port.
     7
     8        * UIProcess/API/efl/EwkView.cpp:
     9        (EwkView::EwkView):
     10        (EwkView::displayTimerFired):
     11        * UIProcess/API/efl/EwkView.h:
     12        * UIProcess/efl/TextCheckerClientEfl.cpp:
     13        (TextCheckerClientEfl::TextCheckerClientEfl):
     14        (TextCheckerClientEfl::languagesUpdateTimerFired):
     15        (TextCheckerClientEfl::spellCheckingSettingChangeTimerFired):
     16        * UIProcess/efl/TextCheckerClientEfl.h:
     17        * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
     18        (WebKit::CoordinatedLayerTreeHost::CoordinatedLayerTreeHost):
     19        (WebKit::CoordinatedLayerTreeHost::layerFlushTimerFired):
     20        * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h:
     21
    1222014-11-21  Chris Dumez  <cdumez@apple.com>
    223

  • trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp

    r176066 r176495  
    300300    , m_gestureRecognizer(std::make_unique<GestureRecognizer>(this))
    301301#endif
    302     , m_displayTimer(this, &EwkView::displayTimerFired)
     302    , m_displayTimer(*this, &EwkView::displayTimerFired)
    303303    , m_inputMethodContext(InputMethodContextEfl::create(this, smartData()->base.evas))
    304304#if HAVE(ACCESSIBILITY) && defined(HAVE_ECORE_X)
    … …  
    545545}
    546546
    547 void EwkView::displayTimerFired(Timer*)
     547void EwkView::displayTimerFired()
    548548{
    549549    Ewk_View_Smart_Data* sd = smartData();

  • trunk/Source/WebKit2/UIProcess/API/efl/EwkView.h

    r176066 r176495  
    217217    WebCore::IntSize deviceSize() const;
    218218
    219     void displayTimerFired(WebCore::Timer*);
     219    void displayTimerFired();
    220220
    221221    // Evas_Smart_Class callback interface:

  • trunk/Source/WebKit2/UIProcess/efl/TextCheckerClientEfl.cpp

    r175719 r176495  
    5151
    5252TextCheckerClientEfl::TextCheckerClientEfl()
    53     : m_languagesUpdateTimer(this, &TextCheckerClientEfl::languagesUpdateTimerFired)
    54     , m_spellCheckingSettingChangeTimer(this, &TextCheckerClientEfl::spellCheckingSettingChangeTimerFired)
     53    : m_languagesUpdateTimer(*this, &TextCheckerClientEfl::languagesUpdateTimerFired)
     54    , m_spellCheckingSettingChangeTimer(*this, &TextCheckerClientEfl::spellCheckingSettingChangeTimerFired)
    5555    , m_textCheckerEnchant(std::make_unique<TextCheckerEnchant>())
    5656{
    … …  
    105105}
    106106
    107 void TextCheckerClientEfl::languagesUpdateTimerFired(Timer*)
     107void TextCheckerClientEfl::languagesUpdateTimerFired()
    108108{
    109109    m_textCheckerEnchant->updateSpellCheckingLanguages(m_spellCheckingLanguages);
    110110}
    111111
    112 void TextCheckerClientEfl::spellCheckingSettingChangeTimerFired(Timer*)
     112void TextCheckerClientEfl::spellCheckingSettingChangeTimerFired()
    113113{
    114114    m_clientCallbacks.continuous_spell_checking_change(

  • trunk/Source/WebKit2/UIProcess/efl/TextCheckerClientEfl.h

    r175719 r176495  
    5656
    5757    // To set languages on timer.
    58     void languagesUpdateTimerFired(WebCore::Timer*);
     58    void languagesUpdateTimerFired();
    5959    WebCore::Timer m_languagesUpdateTimer;
    6060    Vector<String> m_spellCheckingLanguages;
    6161
    6262    // To notify the client about the setting change on timer.
    63     void spellCheckingSettingChangeTimerFired(WebCore::Timer*);
     63    void spellCheckingSettingChangeTimerFired();
    6464    void callContinuousSpellCheckingChangeCallbackAsync();
    6565    WebCore::Timer m_spellCheckingSettingChangeTimer;

  • trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp

    r175719 r176495  
    6565    , m_isSuspended(false)
    6666    , m_isWaitingForRenderer(true)
    67     , m_layerFlushTimer(this, &CoordinatedLayerTreeHost::layerFlushTimerFired)
     67    , m_layerFlushTimer(*this, &CoordinatedLayerTreeHost::layerFlushTimerFired)
    6868    , m_layerFlushSchedulingEnabled(true)
    6969    , m_forceRepaintAsyncCallbackID(0)
    … …  
    223223}
    224224
    225 void CoordinatedLayerTreeHost::layerFlushTimerFired(Timer*)
     225void CoordinatedLayerTreeHost::layerFlushTimerFired()
    226226{
    227227    performScheduledLayerFlush();

  • trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h

    r175719 r176495  
    8787    void commitScrollOffset(uint32_t layerID, const WebCore::IntSize& offset);
    8888
    89     void layerFlushTimerFired(WebCore::Timer*);
     89    void layerFlushTimerFired();
    9090
    9191    void updateRootLayers();
Note: See TracChangeset for help on using the changeset viewer.