CTTE Timer and DeferrableOneShotTimer
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 11 Jan 2014 18:19:04 +0000 (18:19 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 11 Jan 2014 18:19:04 +0000 (18:19 +0000)
https://bugs.webkit.org/show_bug.cgi?id=126814

Reviewed by Antti Koivisto.

Add new Timer and DeferrableOneShotTimer constructors whose member function pointers
take a reference instead of a pointer.
Also, convert a bunch of classes over to using these new constructors.

* Modules/encryptedmedia/MediaKeySession.cpp:
(WebCore::MediaKeySession::keyRequestTimerFired):
(WebCore::MediaKeySession::addKeyTimerFired):
* Modules/encryptedmedia/MediaKeySession.h:
* Modules/geolocation/Geolocation.cpp:
(WebCore::Geolocation::GeoNotifier::timerFired):
(WebCore::Geolocation::resumeTimerFired):
* Modules/geolocation/Geolocation.h:
* Modules/indexeddb/IDBTransactionBackend.cpp:
(WebCore::IDBTransactionBackend::taskTimerFired):
* Modules/indexeddb/IDBTransactionBackend.h:
* Modules/mediasource/SourceBuffer.cpp:
(WebCore::SourceBuffer::appendBufferTimerFired):
* Modules/mediasource/SourceBuffer.h:
* Modules/notifications/Notification.cpp:
(WebCore::Notification::taskTimerFired):
* Modules/notifications/Notification.h:
* Modules/notifications/NotificationCenter.cpp:
(WebCore::NotificationCenter::NotificationRequestCallback::timerFired):
* Modules/notifications/NotificationCenter.h:
* accessibility/AXObjectCache.cpp:
(WebCore::AXObjectCache::notificationPostTimerFired):
* accessibility/AXObjectCache.h:
* css/CSSFontSelector.cpp:
(WebCore::CSSFontSelector::beginLoadTimerFired):
* css/CSSFontSelector.h:
* css/CSSImageGeneratorValue.cpp:
(WebCore::CSSImageGeneratorValue::CachedGeneratedImage::evictionTimerFired):
* css/CSSImageGeneratorValue.h:
* dom/Document.cpp:
(WebCore::Document::visualUpdatesSuppressionTimerFired):
(WebCore::Document::styleRecalcTimerFired):
(WebCore::Document::optimizedStyleSheetUpdateTimerFired):
(WebCore::Document::sharedObjectPoolClearTimerFired):
(WebCore::Document::styleResolverThrowawayTimerFired):
(WebCore::Document::updateFocusAppearanceTimerFired):
(WebCore::Document::resetHiddenFocusElementTimer):
(WebCore::Document::pendingTasksTimerFired):
(WebCore::Document::fullScreenChangeDelayTimerFired):
(WebCore::Document::loadEventDelayTimerFired):
(WebCore::Document::didAssociateFormControlsTimerFired):
* dom/Document.h:
* dom/EventSender.h:
(WebCore::EventSender::timerFired):
* dom/GenericEventQueue.cpp:
(WebCore::GenericEventQueue::timerFired):
* dom/GenericEventQueue.h:
* dom/ScriptRunner.cpp:
(WebCore::ScriptRunner::timerFired):
* dom/ScriptRunner.h:
* dom/ScriptedAnimationController.cpp:
(WebCore::ScriptedAnimationController::animationTimerFired):
* dom/ScriptedAnimationController.h:
* editing/AlternativeTextController.cpp:
(WebCore::AlternativeTextController::timerFired):
* editing/AlternativeTextController.h:
* editing/FrameSelection.cpp:
(WebCore::FrameSelection::caretBlinkTimerFired):
* editing/FrameSelection.h:
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::parseAttribute):
* html/HTMLMediaElement.h:
* html/HTMLPlugInElement.cpp:
(WebCore::HTMLPlugInElement::swapRendererTimerFired):
* html/HTMLPlugInElement.h:
* html/HTMLPlugInImageElement.cpp:
(WebCore::HTMLPlugInImageElement::removeSnapshotTimerFired):
(WebCore::HTMLPlugInImageElement::simulatedMouseClickTimerFired):
* html/HTMLPlugInImageElement.h:
* html/HTMLSourceElement.cpp:
(WebCore::HTMLSourceElement::errorEventTimerFired):
* html/HTMLSourceElement.h:
* html/HTMLTrackElement.cpp:
(WebCore::HTMLTrackElement::loadTimerFired):
* html/HTMLTrackElement.h:
* html/MediaController.cpp:
(MediaController::asyncEventTimerFired):
(MediaController::clearPositionTimerFired):
(MediaController::timeupdateTimerFired):
* html/MediaController.h:
* html/MediaDocument.cpp:
(WebCore::MediaDocument::replaceMediaElementTimerFired):
* html/MediaDocument.h:
* html/parser/HTMLParserScheduler.cpp:
(WebCore::HTMLParserScheduler::continueNextChunkTimerFired):
* html/parser/HTMLParserScheduler.h:
* html/shadow/MediaControlElementTypes.cpp:
(WebCore::MediaControlSeekButtonElement::seekTimerFired):
* html/shadow/MediaControlElementTypes.h:
* html/shadow/MediaControlElements.cpp:
(WebCore::MediaControlPanelElement::transitionTimerFired):
(WebCore::MediaControlTextTrackContainerElement::updateTimerFired):
* html/shadow/MediaControlElements.h:
* html/shadow/MediaControls.cpp:
(WebCore::MediaControls::hideFullscreenControlsTimerFired):
* html/shadow/MediaControls.h:
* html/track/LoadableTextTrack.cpp:
(WebCore::LoadableTextTrack::loadTimerFired):
* html/track/LoadableTextTrack.h:
* inspector/InspectorCSSAgent.cpp:
(WebCore::UpdateRegionLayoutTask::UpdateRegionLayoutTask):
(WebCore::UpdateRegionLayoutTask::timerFired):
(WebCore::ChangeRegionOversetTask::ChangeRegionOversetTask):
(WebCore::ChangeRegionOversetTask::timerFired):
* inspector/InspectorDOMAgent.cpp:
(WebCore::RevalidateStyleAttributeTask::RevalidateStyleAttributeTask):
(WebCore::RevalidateStyleAttributeTask::timerFired):
* inspector/InspectorFrontendClientLocal.cpp:
(WebCore::InspectorBackendDispatchTask::InspectorBackendDispatchTask):
(WebCore::InspectorBackendDispatchTask::timerFired):
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::substituteResourceDeliveryTimerFired):
* loader/DocumentLoader.h:
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::checkTimerFired):
* loader/FrameLoader.h:
* loader/ImageLoader.cpp:
(WebCore::ImageLoader::timerFired):
* loader/ImageLoader.h:
* loader/LinkLoader.cpp:
(WebCore::LinkLoader::linkLoadTimerFired):
(WebCore::LinkLoader::linkLoadingErrorTimerFired):
* loader/LinkLoader.h:
* loader/NavigationScheduler.cpp:
(WebCore::NavigationScheduler::timerFired):
* loader/NavigationScheduler.h:
* loader/PingLoader.cpp:
(WebCore::PingLoader::PingLoader):
* loader/PingLoader.h:
(WebCore::PingLoader::timeoutTimerFired):
* loader/ProgressTracker.cpp:
(WebCore::ProgressTracker::progressHeartbeatTimerFired):
* loader/ProgressTracker.h:
* loader/ResourceLoadScheduler.cpp:
(WebCore::ResourceLoadScheduler::requestTimerFired):
* loader/ResourceLoadScheduler.h:
* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::decodedDataDeletionTimerFired):
(WebCore::CachedResource::CachedResourceCallback::timerFired):
* loader/cache/CachedResource.h:
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::garbageCollectDocumentResourcesTimerFired):
* loader/cache/CachedResourceLoader.h:
* loader/icon/IconDatabase.cpp:
(WebCore::IconDatabase::syncTimerFired):
* loader/icon/IconDatabase.h:
* page/AutoscrollController.cpp:
(WebCore::AutoscrollController::autoscrollTimerFired):
* page/AutoscrollController.h:
* page/CaptionUserPreferences.cpp:
(WebCore::CaptionUserPreferences::timerFired):
* page/CaptionUserPreferences.h:
* page/DeviceController.cpp:
(WebCore::DeviceController::fireDeviceEvent):
* page/DeviceController.h:
* page/EventHandler.cpp:
(WebCore::EventHandler::cursorUpdateTimerFired):
(WebCore::EventHandler::autoHideCursorTimerFired):
(WebCore::EventHandler::fakeMouseMoveEventTimerFired):
(WebCore::EventHandler::hoverTimerFired):
* page/EventHandler.h:
* page/EventSource.cpp:
(WebCore::EventSource::connectTimerFired):
* page/EventSource.h:
* page/FrameView.cpp:
(WebCore::FrameView::deferredRepaintTimerFired):
(WebCore::FrameView::layoutTimerFired):
(WebCore::FrameView::postLayoutTimerFired):
* page/FrameView.h:
* page/PageThrottler.cpp:
(WebCore::PageThrottler::throttleHysteresisTimerFired):
* page/PageThrottler.h:
* page/animation/AnimationController.cpp:
(WebCore::AnimationControllerPrivate::updateStyleIfNeededDispatcherFired):
(WebCore::AnimationControllerPrivate::animationTimerFired):
* page/animation/AnimationControllerPrivate.h:
* platform/Scrollbar.cpp:
(WebCore::Scrollbar::autoscrollTimerFired):
* platform/Scrollbar.h:
* platform/Timer.h:
(WebCore::Timer::Timer):
(WebCore::DeferrableOneShotTimer::DeferrableOneShotTimer):
* platform/graphics/BitmapImage.cpp:
(WebCore::BitmapImage::advanceAnimation):
* platform/graphics/BitmapImage.h:
* platform/graphics/MediaPlayer.cpp:
(WebCore::MediaPlayer::reloadTimerFired):
* platform/graphics/MediaPlayer.h:
* platform/graphics/ca/mac/LayerPool.h:
* platform/graphics/ca/mac/LayerPool.mm:
(WebCore::LayerPool::pruneTimerFired):
* platform/graphics/cg/ImageBufferBackingStoreCache.cpp:
(WebCore::ImageBufferBackingStoreCache::timerFired):
* platform/graphics/cg/ImageBufferBackingStoreCache.h:
* platform/graphics/cg/SubimageCacheWithTimer.cpp:
(WebCore::SubimageCacheWithTimer::invalidateCacheTimerFired):
* platform/graphics/cg/SubimageCacheWithTimer.h:
* platform/graphics/mac/MediaPlayerPrivateQTKit.h:
* platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
(WebCore::MediaPlayerPrivateQTKit::seekTimerFired):
* platform/mac/ScrollAnimatorMac.h:
* platform/mac/ScrollAnimatorMac.mm:
(WebCore::ScrollAnimatorMac::snapRubberBandTimerFired):
(WebCore::ScrollAnimatorMac::initialScrollbarPaintTimerFired):
(WebCore::ScrollAnimatorMac::sendContentAreaScrolledTimerFired):
* platform/mock/DeviceOrientationClientMock.cpp:
(WebCore::DeviceOrientationClientMock::timerFired):
* platform/mock/DeviceOrientationClientMock.h:
* platform/network/NetworkStateNotifier.h:
* platform/network/ResourceHandle.cpp:
(WebCore::ResourceHandle::failureTimerFired):
* platform/network/ResourceHandle.h:
* platform/network/ResourceHandleInternal.h:
(WebCore::ResourceHandleInternal::ResourceHandleInternal):
* platform/network/mac/NetworkStateNotifierMac.cpp:
(WebCore::NetworkStateNotifier::networkStateChangeTimerFired):
* rendering/ImageQualityController.cpp:
(WebCore::ImageQualityController::highQualityRepaintTimerFired):
* rendering/ImageQualityController.h:
* rendering/RenderButton.cpp:
(WebCore::RenderButton::timerFired):
* rendering/RenderButton.h:
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::updateCompositingLayersTimerFired):
(WebCore::RenderLayerCompositor::layerFlushTimerFired):
(WebCore::RenderLayerCompositor::paintRelatedMilestonesTimerFired):
* rendering/RenderLayerCompositor.h:
* rendering/RenderMarquee.cpp:
(WebCore::RenderMarquee::timerFired):
* rendering/RenderMarquee.h:
* rendering/RenderNamedFlowThread.cpp:
(WebCore::RenderNamedFlowThread::regionLayoutUpdateEventTimerFired):
(WebCore::RenderNamedFlowThread::regionOversetChangeEventTimerFired):
* rendering/RenderNamedFlowThread.h:
* rendering/RenderProgress.cpp:
(WebCore::RenderProgress::animationTimerFired):
* rendering/RenderProgress.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@161768 268f45cc-cd09-0410-ab3c-d52691b4dbfc

133 files changed:
Source/WebCore/ChangeLog
Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp
Source/WebCore/Modules/encryptedmedia/MediaKeySession.h
Source/WebCore/Modules/geolocation/Geolocation.cpp
Source/WebCore/Modules/geolocation/Geolocation.h
Source/WebCore/Modules/indexeddb/IDBTransactionBackend.cpp
Source/WebCore/Modules/indexeddb/IDBTransactionBackend.h
Source/WebCore/Modules/mediasource/SourceBuffer.cpp
Source/WebCore/Modules/mediasource/SourceBuffer.h
Source/WebCore/Modules/notifications/Notification.cpp
Source/WebCore/Modules/notifications/Notification.h
Source/WebCore/Modules/notifications/NotificationCenter.cpp
Source/WebCore/Modules/notifications/NotificationCenter.h
Source/WebCore/accessibility/AXObjectCache.cpp
Source/WebCore/accessibility/AXObjectCache.h
Source/WebCore/css/CSSFontSelector.cpp
Source/WebCore/css/CSSFontSelector.h
Source/WebCore/css/CSSImageGeneratorValue.cpp
Source/WebCore/css/CSSImageGeneratorValue.h
Source/WebCore/dom/Document.cpp
Source/WebCore/dom/Document.h
Source/WebCore/dom/EventSender.h
Source/WebCore/dom/GenericEventQueue.cpp
Source/WebCore/dom/GenericEventQueue.h
Source/WebCore/dom/ScriptRunner.cpp
Source/WebCore/dom/ScriptRunner.h
Source/WebCore/dom/ScriptedAnimationController.cpp
Source/WebCore/dom/ScriptedAnimationController.h
Source/WebCore/editing/AlternativeTextController.cpp
Source/WebCore/editing/AlternativeTextController.h
Source/WebCore/editing/FrameSelection.cpp
Source/WebCore/editing/FrameSelection.h
Source/WebCore/html/HTMLMediaElement.cpp
Source/WebCore/html/HTMLMediaElement.h
Source/WebCore/html/HTMLPlugInElement.cpp
Source/WebCore/html/HTMLPlugInElement.h
Source/WebCore/html/HTMLPlugInImageElement.cpp
Source/WebCore/html/HTMLPlugInImageElement.h
Source/WebCore/html/HTMLSourceElement.cpp
Source/WebCore/html/HTMLSourceElement.h
Source/WebCore/html/HTMLTrackElement.cpp
Source/WebCore/html/HTMLTrackElement.h
Source/WebCore/html/MediaController.cpp
Source/WebCore/html/MediaController.h
Source/WebCore/html/MediaDocument.cpp
Source/WebCore/html/MediaDocument.h
Source/WebCore/html/parser/HTMLParserScheduler.cpp
Source/WebCore/html/parser/HTMLParserScheduler.h
Source/WebCore/html/shadow/MediaControlElementTypes.cpp
Source/WebCore/html/shadow/MediaControlElementTypes.h
Source/WebCore/html/shadow/MediaControlElements.cpp
Source/WebCore/html/shadow/MediaControlElements.h
Source/WebCore/html/shadow/MediaControls.cpp
Source/WebCore/html/shadow/MediaControls.h
Source/WebCore/html/track/LoadableTextTrack.cpp
Source/WebCore/html/track/LoadableTextTrack.h
Source/WebCore/inspector/InspectorCSSAgent.cpp
Source/WebCore/inspector/InspectorDOMAgent.cpp
Source/WebCore/inspector/InspectorFrontendClientLocal.cpp
Source/WebCore/loader/DocumentLoader.cpp
Source/WebCore/loader/DocumentLoader.h
Source/WebCore/loader/FrameLoader.cpp
Source/WebCore/loader/FrameLoader.h
Source/WebCore/loader/ImageLoader.cpp
Source/WebCore/loader/ImageLoader.h
Source/WebCore/loader/LinkLoader.cpp
Source/WebCore/loader/LinkLoader.h
Source/WebCore/loader/NavigationScheduler.cpp
Source/WebCore/loader/NavigationScheduler.h
Source/WebCore/loader/PingLoader.cpp
Source/WebCore/loader/PingLoader.h
Source/WebCore/loader/ProgressTracker.cpp
Source/WebCore/loader/ProgressTracker.h
Source/WebCore/loader/ResourceLoadScheduler.cpp
Source/WebCore/loader/ResourceLoadScheduler.h
Source/WebCore/loader/cache/CachedResource.cpp
Source/WebCore/loader/cache/CachedResource.h
Source/WebCore/loader/cache/CachedResourceLoader.cpp
Source/WebCore/loader/cache/CachedResourceLoader.h
Source/WebCore/loader/icon/IconDatabase.cpp
Source/WebCore/loader/icon/IconDatabase.h
Source/WebCore/page/AutoscrollController.cpp
Source/WebCore/page/AutoscrollController.h
Source/WebCore/page/CaptionUserPreferences.cpp
Source/WebCore/page/CaptionUserPreferences.h
Source/WebCore/page/DeviceController.cpp
Source/WebCore/page/DeviceController.h
Source/WebCore/page/EventHandler.cpp
Source/WebCore/page/EventHandler.h
Source/WebCore/page/EventSource.cpp
Source/WebCore/page/EventSource.h
Source/WebCore/page/FrameView.cpp
Source/WebCore/page/FrameView.h
Source/WebCore/page/PageThrottler.cpp
Source/WebCore/page/PageThrottler.h
Source/WebCore/page/animation/AnimationController.cpp
Source/WebCore/page/animation/AnimationControllerPrivate.h
Source/WebCore/platform/Scrollbar.cpp
Source/WebCore/platform/Scrollbar.h
Source/WebCore/platform/Timer.h
Source/WebCore/platform/graphics/BitmapImage.cpp
Source/WebCore/platform/graphics/BitmapImage.h
Source/WebCore/platform/graphics/MediaPlayer.cpp
Source/WebCore/platform/graphics/MediaPlayer.h
Source/WebCore/platform/graphics/ca/mac/LayerPool.h
Source/WebCore/platform/graphics/ca/mac/LayerPool.mm
Source/WebCore/platform/graphics/cg/ImageBufferBackingStoreCache.cpp
Source/WebCore/platform/graphics/cg/ImageBufferBackingStoreCache.h
Source/WebCore/platform/graphics/cg/SubimageCacheWithTimer.cpp
Source/WebCore/platform/graphics/cg/SubimageCacheWithTimer.h
Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h
Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm
Source/WebCore/platform/mac/ScrollAnimatorMac.h
Source/WebCore/platform/mac/ScrollAnimatorMac.mm
Source/WebCore/platform/mock/DeviceOrientationClientMock.cpp
Source/WebCore/platform/mock/DeviceOrientationClientMock.h
Source/WebCore/platform/network/NetworkStateNotifier.h
Source/WebCore/platform/network/ResourceHandle.cpp
Source/WebCore/platform/network/ResourceHandle.h
Source/WebCore/platform/network/ResourceHandleInternal.h
Source/WebCore/platform/network/mac/NetworkStateNotifierMac.cpp
Source/WebCore/rendering/ImageQualityController.cpp
Source/WebCore/rendering/ImageQualityController.h
Source/WebCore/rendering/RenderButton.cpp
Source/WebCore/rendering/RenderButton.h
Source/WebCore/rendering/RenderLayerCompositor.cpp
Source/WebCore/rendering/RenderLayerCompositor.h
Source/WebCore/rendering/RenderMarquee.cpp
Source/WebCore/rendering/RenderMarquee.h
Source/WebCore/rendering/RenderNamedFlowThread.cpp
Source/WebCore/rendering/RenderNamedFlowThread.h
Source/WebCore/rendering/RenderProgress.cpp
Source/WebCore/rendering/RenderProgress.h

index 774e2ec..9e6c2ce 100644 (file)
@@ -1,3 +1,252 @@
+2014-01-11  Anders Carlsson  <andersca@apple.com>
+
+        CTTE Timer and DeferrableOneShotTimer
+        https://bugs.webkit.org/show_bug.cgi?id=126814
+
+        Reviewed by Antti Koivisto.
+
+        Add new Timer and DeferrableOneShotTimer constructors whose member function pointers
+        take a reference instead of a pointer.
+        Also, convert a bunch of classes over to using these new constructors.
+
+        * Modules/encryptedmedia/MediaKeySession.cpp:
+        (WebCore::MediaKeySession::keyRequestTimerFired):
+        (WebCore::MediaKeySession::addKeyTimerFired):
+        * Modules/encryptedmedia/MediaKeySession.h:
+        * Modules/geolocation/Geolocation.cpp:
+        (WebCore::Geolocation::GeoNotifier::timerFired):
+        (WebCore::Geolocation::resumeTimerFired):
+        * Modules/geolocation/Geolocation.h:
+        * Modules/indexeddb/IDBTransactionBackend.cpp:
+        (WebCore::IDBTransactionBackend::taskTimerFired):
+        * Modules/indexeddb/IDBTransactionBackend.h:
+        * Modules/mediasource/SourceBuffer.cpp:
+        (WebCore::SourceBuffer::appendBufferTimerFired):
+        * Modules/mediasource/SourceBuffer.h:
+        * Modules/notifications/Notification.cpp:
+        (WebCore::Notification::taskTimerFired):
+        * Modules/notifications/Notification.h:
+        * Modules/notifications/NotificationCenter.cpp:
+        (WebCore::NotificationCenter::NotificationRequestCallback::timerFired):
+        * Modules/notifications/NotificationCenter.h:
+        * accessibility/AXObjectCache.cpp:
+        (WebCore::AXObjectCache::notificationPostTimerFired):
+        * accessibility/AXObjectCache.h:
+        * css/CSSFontSelector.cpp:
+        (WebCore::CSSFontSelector::beginLoadTimerFired):
+        * css/CSSFontSelector.h:
+        * css/CSSImageGeneratorValue.cpp:
+        (WebCore::CSSImageGeneratorValue::CachedGeneratedImage::evictionTimerFired):
+        * css/CSSImageGeneratorValue.h:
+        * dom/Document.cpp:
+        (WebCore::Document::visualUpdatesSuppressionTimerFired):
+        (WebCore::Document::styleRecalcTimerFired):
+        (WebCore::Document::optimizedStyleSheetUpdateTimerFired):
+        (WebCore::Document::sharedObjectPoolClearTimerFired):
+        (WebCore::Document::styleResolverThrowawayTimerFired):
+        (WebCore::Document::updateFocusAppearanceTimerFired):
+        (WebCore::Document::resetHiddenFocusElementTimer):
+        (WebCore::Document::pendingTasksTimerFired):
+        (WebCore::Document::fullScreenChangeDelayTimerFired):
+        (WebCore::Document::loadEventDelayTimerFired):
+        (WebCore::Document::didAssociateFormControlsTimerFired):
+        * dom/Document.h:
+        * dom/EventSender.h:
+        (WebCore::EventSender::timerFired):
+        * dom/GenericEventQueue.cpp:
+        (WebCore::GenericEventQueue::timerFired):
+        * dom/GenericEventQueue.h:
+        * dom/ScriptRunner.cpp:
+        (WebCore::ScriptRunner::timerFired):
+        * dom/ScriptRunner.h:
+        * dom/ScriptedAnimationController.cpp:
+        (WebCore::ScriptedAnimationController::animationTimerFired):
+        * dom/ScriptedAnimationController.h:
+        * editing/AlternativeTextController.cpp:
+        (WebCore::AlternativeTextController::timerFired):
+        * editing/AlternativeTextController.h:
+        * editing/FrameSelection.cpp:
+        (WebCore::FrameSelection::caretBlinkTimerFired):
+        * editing/FrameSelection.h:
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::parseAttribute):
+        * html/HTMLMediaElement.h:
+        * html/HTMLPlugInElement.cpp:
+        (WebCore::HTMLPlugInElement::swapRendererTimerFired):
+        * html/HTMLPlugInElement.h:
+        * html/HTMLPlugInImageElement.cpp:
+        (WebCore::HTMLPlugInImageElement::removeSnapshotTimerFired):
+        (WebCore::HTMLPlugInImageElement::simulatedMouseClickTimerFired):
+        * html/HTMLPlugInImageElement.h:
+        * html/HTMLSourceElement.cpp:
+        (WebCore::HTMLSourceElement::errorEventTimerFired):
+        * html/HTMLSourceElement.h:
+        * html/HTMLTrackElement.cpp:
+        (WebCore::HTMLTrackElement::loadTimerFired):
+        * html/HTMLTrackElement.h:
+        * html/MediaController.cpp:
+        (MediaController::asyncEventTimerFired):
+        (MediaController::clearPositionTimerFired):
+        (MediaController::timeupdateTimerFired):
+        * html/MediaController.h:
+        * html/MediaDocument.cpp:
+        (WebCore::MediaDocument::replaceMediaElementTimerFired):
+        * html/MediaDocument.h:
+        * html/parser/HTMLParserScheduler.cpp:
+        (WebCore::HTMLParserScheduler::continueNextChunkTimerFired):
+        * html/parser/HTMLParserScheduler.h:
+        * html/shadow/MediaControlElementTypes.cpp:
+        (WebCore::MediaControlSeekButtonElement::seekTimerFired):
+        * html/shadow/MediaControlElementTypes.h:
+        * html/shadow/MediaControlElements.cpp:
+        (WebCore::MediaControlPanelElement::transitionTimerFired):
+        (WebCore::MediaControlTextTrackContainerElement::updateTimerFired):
+        * html/shadow/MediaControlElements.h:
+        * html/shadow/MediaControls.cpp:
+        (WebCore::MediaControls::hideFullscreenControlsTimerFired):
+        * html/shadow/MediaControls.h:
+        * html/track/LoadableTextTrack.cpp:
+        (WebCore::LoadableTextTrack::loadTimerFired):
+        * html/track/LoadableTextTrack.h:
+        * inspector/InspectorCSSAgent.cpp:
+        (WebCore::UpdateRegionLayoutTask::UpdateRegionLayoutTask):
+        (WebCore::UpdateRegionLayoutTask::timerFired):
+        (WebCore::ChangeRegionOversetTask::ChangeRegionOversetTask):
+        (WebCore::ChangeRegionOversetTask::timerFired):
+        * inspector/InspectorDOMAgent.cpp:
+        (WebCore::RevalidateStyleAttributeTask::RevalidateStyleAttributeTask):
+        (WebCore::RevalidateStyleAttributeTask::timerFired):
+        * inspector/InspectorFrontendClientLocal.cpp:
+        (WebCore::InspectorBackendDispatchTask::InspectorBackendDispatchTask):
+        (WebCore::InspectorBackendDispatchTask::timerFired):
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::substituteResourceDeliveryTimerFired):
+        * loader/DocumentLoader.h:
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::checkTimerFired):
+        * loader/FrameLoader.h:
+        * loader/ImageLoader.cpp:
+        (WebCore::ImageLoader::timerFired):
+        * loader/ImageLoader.h:
+        * loader/LinkLoader.cpp:
+        (WebCore::LinkLoader::linkLoadTimerFired):
+        (WebCore::LinkLoader::linkLoadingErrorTimerFired):
+        * loader/LinkLoader.h:
+        * loader/NavigationScheduler.cpp:
+        (WebCore::NavigationScheduler::timerFired):
+        * loader/NavigationScheduler.h:
+        * loader/PingLoader.cpp:
+        (WebCore::PingLoader::PingLoader):
+        * loader/PingLoader.h:
+        (WebCore::PingLoader::timeoutTimerFired):
+        * loader/ProgressTracker.cpp:
+        (WebCore::ProgressTracker::progressHeartbeatTimerFired):
+        * loader/ProgressTracker.h:
+        * loader/ResourceLoadScheduler.cpp:
+        (WebCore::ResourceLoadScheduler::requestTimerFired):
+        * loader/ResourceLoadScheduler.h:
+        * loader/cache/CachedResource.cpp:
+        (WebCore::CachedResource::decodedDataDeletionTimerFired):
+        (WebCore::CachedResource::CachedResourceCallback::timerFired):
+        * loader/cache/CachedResource.h:
+        * loader/cache/CachedResourceLoader.cpp:
+        (WebCore::CachedResourceLoader::garbageCollectDocumentResourcesTimerFired):
+        * loader/cache/CachedResourceLoader.h:
+        * loader/icon/IconDatabase.cpp:
+        (WebCore::IconDatabase::syncTimerFired):
+        * loader/icon/IconDatabase.h:
+        * page/AutoscrollController.cpp:
+        (WebCore::AutoscrollController::autoscrollTimerFired):
+        * page/AutoscrollController.h:
+        * page/CaptionUserPreferences.cpp:
+        (WebCore::CaptionUserPreferences::timerFired):
+        * page/CaptionUserPreferences.h:
+        * page/DeviceController.cpp:
+        (WebCore::DeviceController::fireDeviceEvent):
+        * page/DeviceController.h:
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::cursorUpdateTimerFired):
+        (WebCore::EventHandler::autoHideCursorTimerFired):
+        (WebCore::EventHandler::fakeMouseMoveEventTimerFired):
+        (WebCore::EventHandler::hoverTimerFired):
+        * page/EventHandler.h:
+        * page/EventSource.cpp:
+        (WebCore::EventSource::connectTimerFired):
+        * page/EventSource.h:
+        * page/FrameView.cpp:
+        (WebCore::FrameView::deferredRepaintTimerFired):
+        (WebCore::FrameView::layoutTimerFired):
+        (WebCore::FrameView::postLayoutTimerFired):
+        * page/FrameView.h:
+        * page/PageThrottler.cpp:
+        (WebCore::PageThrottler::throttleHysteresisTimerFired):
+        * page/PageThrottler.h:
+        * page/animation/AnimationController.cpp:
+        (WebCore::AnimationControllerPrivate::updateStyleIfNeededDispatcherFired):
+        (WebCore::AnimationControllerPrivate::animationTimerFired):
+        * page/animation/AnimationControllerPrivate.h:
+        * platform/Scrollbar.cpp:
+        (WebCore::Scrollbar::autoscrollTimerFired):
+        * platform/Scrollbar.h:
+        * platform/Timer.h:
+        (WebCore::Timer::Timer):
+        (WebCore::DeferrableOneShotTimer::DeferrableOneShotTimer):
+        * platform/graphics/BitmapImage.cpp:
+        (WebCore::BitmapImage::advanceAnimation):
+        * platform/graphics/BitmapImage.h:
+        * platform/graphics/MediaPlayer.cpp:
+        (WebCore::MediaPlayer::reloadTimerFired):
+        * platform/graphics/MediaPlayer.h:
+        * platform/graphics/ca/mac/LayerPool.h:
+        * platform/graphics/ca/mac/LayerPool.mm:
+        (WebCore::LayerPool::pruneTimerFired):
+        * platform/graphics/cg/ImageBufferBackingStoreCache.cpp:
+        (WebCore::ImageBufferBackingStoreCache::timerFired):
+        * platform/graphics/cg/ImageBufferBackingStoreCache.h:
+        * platform/graphics/cg/SubimageCacheWithTimer.cpp:
+        (WebCore::SubimageCacheWithTimer::invalidateCacheTimerFired):
+        * platform/graphics/cg/SubimageCacheWithTimer.h:
+        * platform/graphics/mac/MediaPlayerPrivateQTKit.h:
+        * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+        (WebCore::MediaPlayerPrivateQTKit::seekTimerFired):
+        * platform/mac/ScrollAnimatorMac.h:
+        * platform/mac/ScrollAnimatorMac.mm:
+        (WebCore::ScrollAnimatorMac::snapRubberBandTimerFired):
+        (WebCore::ScrollAnimatorMac::initialScrollbarPaintTimerFired):
+        (WebCore::ScrollAnimatorMac::sendContentAreaScrolledTimerFired):
+        * platform/mock/DeviceOrientationClientMock.cpp:
+        (WebCore::DeviceOrientationClientMock::timerFired):
+        * platform/mock/DeviceOrientationClientMock.h:
+        * platform/network/NetworkStateNotifier.h:
+        * platform/network/ResourceHandle.cpp:
+        (WebCore::ResourceHandle::failureTimerFired):
+        * platform/network/ResourceHandle.h:
+        * platform/network/ResourceHandleInternal.h:
+        (WebCore::ResourceHandleInternal::ResourceHandleInternal):
+        * platform/network/mac/NetworkStateNotifierMac.cpp:
+        (WebCore::NetworkStateNotifier::networkStateChangeTimerFired):
+        * rendering/ImageQualityController.cpp:
+        (WebCore::ImageQualityController::highQualityRepaintTimerFired):
+        * rendering/ImageQualityController.h:
+        * rendering/RenderButton.cpp:
+        (WebCore::RenderButton::timerFired):
+        * rendering/RenderButton.h:
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::updateCompositingLayersTimerFired):
+        (WebCore::RenderLayerCompositor::layerFlushTimerFired):
+        (WebCore::RenderLayerCompositor::paintRelatedMilestonesTimerFired):
+        * rendering/RenderLayerCompositor.h:
+        * rendering/RenderMarquee.cpp:
+        (WebCore::RenderMarquee::timerFired):
+        * rendering/RenderMarquee.h:
+        * rendering/RenderNamedFlowThread.cpp:
+        (WebCore::RenderNamedFlowThread::regionLayoutUpdateEventTimerFired):
+        (WebCore::RenderNamedFlowThread::regionOversetChangeEventTimerFired):
+        * rendering/RenderNamedFlowThread.h:
+        * rendering/RenderProgress.cpp:
+        (WebCore::RenderProgress::animationTimerFired):
+        * rendering/RenderProgress.h:
+
 2014-01-11  Simon Fraser  <simon.fraser@apple.com>
 
         #ifdef out the contents of Touch* files for iOS.
index a4b6235..c542a0c 100644 (file)
@@ -82,7 +82,7 @@ void MediaKeySession::generateKeyRequest(const String& mimeType, Uint8Array* ini
     m_keyRequestTimer.startOneShot(0);
 }
 
-void MediaKeySession::keyRequestTimerFired(Timer<MediaKeySession>*)
+void MediaKeySession::keyRequestTimerFired(Timer<MediaKeySession>&)
 {
     ASSERT(m_pendingKeyRequests.size());
     if (!m_session)
@@ -154,7 +154,7 @@ void MediaKeySession::update(Uint8Array* key, ExceptionCode& ec)
     m_addKeyTimer.startOneShot(0);
 }
 
-void MediaKeySession::addKeyTimerFired(Timer<MediaKeySession>*)
+void MediaKeySession::addKeyTimerFired(Timer<MediaKeySession>&)
 {
     ASSERT(m_pendingKeys.size());
     if (!m_session)
index dbe2080..4a9d4f3 100644 (file)
@@ -77,8 +77,8 @@ public:
 
 protected:
     MediaKeySession(ScriptExecutionContext*, MediaKeys*, const String& keySystem);
-    void keyRequestTimerFired(Timer<MediaKeySession>*);
-    void addKeyTimerFired(Timer<MediaKeySession>*);
+    void keyRequestTimerFired(Timer<MediaKeySession>&);
+    void addKeyTimerFired(Timer<MediaKeySession>&);
 
     MediaKeys* m_keys;
     String m_keySystem;
index 04712c1..15cd1b8 100644 (file)
@@ -142,7 +142,7 @@ void Geolocation::GeoNotifier::stopTimer()
     m_timer.stop();
 }
 
-void Geolocation::GeoNotifier::timerFired(Timer<GeoNotifier>*)
+void Geolocation::GeoNotifier::timerFired(Timer<GeoNotifier>&)
 {
     m_timer.stop();
 
@@ -297,7 +297,7 @@ void Geolocation::resume()
         m_resumeTimer.startOneShot(0);
 }
 
-void Geolocation::resumeTimerFired(Timer<Geolocation>*)
+void Geolocation::resumeTimerFired(Timer<Geolocation>&)
 {
     m_isSuspended = false;
 
index 461b413..28ca285 100644 (file)
@@ -100,7 +100,7 @@ private:
 
         void startTimerIfNeeded();
         void stopTimer();
-        void timerFired(Timer<GeoNotifier>*);
+        void timerFired(Timer<GeoNotifier>&);
         bool hasZeroTimeout() const;
 
     private:
@@ -186,7 +186,7 @@ private:
     bool m_hasChangedPosition;
     RefPtr<PositionError> m_errorWaitingForResume;
 
-    void resumeTimerFired(Timer<Geolocation>*);
+    void resumeTimerFired(Timer<Geolocation>&);
     Timer<Geolocation> m_resumeTimer;
 #endif // PLATFORM(IOS)
 
index 4cc2da7..bfb8088 100644 (file)
@@ -256,7 +256,7 @@ void IDBTransactionBackend::commit()
     });
 }
 
-void IDBTransactionBackend::taskTimerFired(Timer<IDBTransactionBackend>*)
+void IDBTransactionBackend::taskTimerFired(Timer<IDBTransactionBackend>&)
 {
     LOG(StorageAPI, "IDBTransactionBackend::taskTimerFired");
 
index 7244965..bb200dd 100644 (file)
@@ -96,7 +96,7 @@ private:
     bool isTaskQueueEmpty() const;
     bool hasPendingTasks() const;
 
-    void taskTimerFired(Timer<IDBTransactionBackend>*);
+    void taskTimerFired(Timer<IDBTransactionBackend>&);
     void closeOpenCursors();
 
     const HashSet<int64_t> m_objectStoreIds;
index e5049ed..e642179 100644 (file)
@@ -397,7 +397,7 @@ void SourceBuffer::appendBufferInternal(unsigned char* data, unsigned size, Exce
     m_appendBufferTimer.startOneShot(0);
 }
 
-void SourceBuffer::appendBufferTimerFired(Timer<SourceBuffer>*)
+void SourceBuffer::appendBufferTimerFired(Timer<SourceBuffer>&)
 {
     ASSERT(m_updating);
 
index b85351e..47d7e2f 100644 (file)
@@ -134,7 +134,7 @@ private:
     void scheduleEvent(const AtomicString& eventName);
 
     void appendBufferInternal(unsigned char*, unsigned, ExceptionCode&);
-    void appendBufferTimerFired(Timer<SourceBuffer>*);
+    void appendBufferTimerFired(Timer<SourceBuffer>&);
 
     void setActive(bool);
 
index dee967e..20cc0c3 100644 (file)
@@ -201,10 +201,10 @@ void Notification::dispatchErrorEvent()
 }
 
 #if ENABLE(NOTIFICATIONS)
-void Notification::taskTimerFired(Timer<Notification>* timer)
+void Notification::taskTimerFired(Timer<Notification>& timer)
 {
     ASSERT(scriptExecutionContext()->isDocument());
-    ASSERT_UNUSED(timer, timer == m_taskTimer.get());
+    ASSERT_UNUSED(timer, &timer == m_taskTimer.get());
     show();
 }
 #endif
index 90bbcd3..a3d40e7 100644 (file)
@@ -159,7 +159,7 @@ private:
     void finishLoadingIcon();
 
 #if ENABLE(NOTIFICATIONS)
-    void taskTimerFired(Timer<Notification>*);
+    void taskTimerFired(Timer<Notification>&);
 #endif
 
     // Text notifications.
index 8ca115b..13f77de 100644 (file)
@@ -129,7 +129,7 @@ void NotificationCenter::NotificationRequestCallback::startTimer()
     m_timer.startOneShot(0);
 }
 
-void NotificationCenter::NotificationRequestCallback::timerFired(Timer<NotificationCenter::NotificationRequestCallback>*)
+void NotificationCenter::NotificationRequestCallback::timerFired(Timer<NotificationCenter::NotificationRequestCallback>&)
 {
     if (m_callback)
         m_callback->handleEvent();
index e7cd26c..5715ae9 100644 (file)
@@ -81,7 +81,7 @@ private:
     public:
         static PassRefPtr<NotificationRequestCallback> createAndStartTimer(NotificationCenter*, PassRefPtr<VoidCallback>);
         void startTimer();
-        void timerFired(Timer<NotificationRequestCallback>*);
+        void timerFired(Timer<NotificationRequestCallback>&);
     private:
         NotificationRequestCallback(NotificationCenter*, PassRefPtr<VoidCallback>);
 
index ea6416c..3b700fc 100644 (file)
@@ -638,7 +638,7 @@ void AXObjectCache::childrenChanged(AccessibilityObject* obj)
     obj->childrenChanged();
 }
     
-void AXObjectCache::notificationPostTimerFired(Timer<AXObjectCache>*)
+void AXObjectCache::notificationPostTimerFired(Timer<AXObjectCache>&)
 {
     Ref<Document> protectorForCacheOwner(m_document);
 
index 96b0f85..01c27d0 100644 (file)
@@ -236,7 +236,7 @@ private:
     
     Timer<AXObjectCache> m_notificationPostTimer;
     Vector<std::pair<RefPtr<AccessibilityObject>, AXNotification>> m_notificationsToPost;
-    void notificationPostTimerFired(Timer<AXObjectCache>*);
+    void notificationPostTimerFired(Timer<AXObjectCache>&);
     
     static AccessibilityObject* focusedImageMapUIElement(HTMLAreaElement*);
     
index 85d607a..667e067 100644 (file)
@@ -590,7 +590,7 @@ void CSSFontSelector::beginLoadingFontSoon(CachedFont* font)
     m_beginLoadingTimer.startOneShot(0);
 }
 
-void CSSFontSelector::beginLoadTimerFired(Timer<WebCore::CSSFontSelector>*)
+void CSSFontSelector::beginLoadTimerFired(Timer<WebCore::CSSFontSelector>&)
 {
     Vector<CachedResourceHandle<CachedFont>> fontsToBeginLoading;
     fontsToBeginLoading.swap(m_fontsToBeginLoading);
index 2fb09bc..ac32318 100644 (file)
@@ -85,7 +85,7 @@ private:
 
     void dispatchInvalidationCallbacks();
 
-    void beginLoadTimerFired(Timer<CSSFontSelector>*);
+    void beginLoadTimerFired(Timer<CSSFontSelector>&);
 
     Document* m_document;
     HashMap<String, OwnPtr<Vector<RefPtr<CSSFontFace>>>, CaseFoldingHash> m_fontFaces;
index a8297c5..30ca59c 100644 (file)
@@ -99,7 +99,7 @@ CSSImageGeneratorValue::CachedGeneratedImage::CachedGeneratedImage(CSSImageGener
     m_evictionTimer.restart();
 }
 
-void CSSImageGeneratorValue::CachedGeneratedImage::evictionTimerFired(DeferrableOneShotTimer<CachedGeneratedImage>*)
+void CSSImageGeneratorValue::CachedGeneratedImage::evictionTimerFired(DeferrableOneShotTimer<CachedGeneratedImage>&)
 {
     // NOTE: This is essentially a "delete this", the object is no longer valid after this line.
     m_owner.evictCachedGeneratedImage(m_size);
index 461f3f4..0a6a1b6 100644 (file)
@@ -76,7 +76,7 @@ private:
         void puntEvictionTimer() { m_evictionTimer.restart(); }
 
     private:
-        void evictionTimerFired(DeferrableOneShotTimer<CachedGeneratedImage>*);
+        void evictionTimerFired(DeferrableOneShotTimer<CachedGeneratedImage>&);
 
         CSSImageGeneratorValue& m_owner;
         IntSize m_size;
index 3185e74..6c574b2 100644 (file)
@@ -1251,7 +1251,7 @@ void Document::setVisualUpdatesAllowed(bool visualUpdatesAllowed)
         frame->loader().forcePageTransitionIfNeeded();
 }
 
-void Document::visualUpdatesSuppressionTimerFired(Timer<Document>*)
+void Document::visualUpdatesSuppressionTimerFired(Timer<Document>&)
 {
     ASSERT(!m_visualUpdatesAllowed);
 
@@ -1698,7 +1698,7 @@ bool Document::hasPendingForcedStyleRecalc() const
     return m_styleRecalcTimer.isActive() && m_pendingStyleRecalcShouldForce;
 }
 
-void Document::styleRecalcTimerFired(Timer<Document>*)
+void Document::styleRecalcTimerFired(Timer<Document>&)
 {
     updateStyleIfNeeded();
 }
@@ -3178,7 +3178,7 @@ void Document::evaluateMediaQueryList()
         m_mediaQueryMatcher->styleResolverChanged();
 }
 
-void Document::optimizedStyleSheetUpdateTimerFired(Timer<Document>*)
+void Document::optimizedStyleSheetUpdateTimerFired(Timer<Document>&)
 {
     styleResolverChanged(RecalcStyleIfNeeded);
 }
@@ -4462,7 +4462,7 @@ void Document::finishedParsing()
     m_cachedResourceLoader->clearPreloads();
 }
 
-void Document::sharedObjectPoolClearTimerFired(Timer<Document>*)
+void Document::sharedObjectPoolClearTimerFired(Timer<Document>&)
 {
     m_sharedObjectPool.clear();
 }
@@ -4472,7 +4472,7 @@ void Document::didAccessStyleResolver()
     m_styleResolverThrowawayTimer.restart();
 }
 
-void Document::styleResolverThrowawayTimerFired(DeferrableOneShotTimer<Document>*)
+void Document::styleResolverThrowawayTimerFired(DeferrableOneShotTimer<Document>&)
 {
     ASSERT(!m_inStyleRecalc);
     clearStyleResolver();
@@ -4736,7 +4736,7 @@ void Document::resetHiddenFocusElementSoon()
         m_resetHiddenFocusElementTimer.startOneShot(0);
 }
 
-void Document::updateFocusAppearanceTimerFired(Timer<Document>*)
+void Document::updateFocusAppearanceTimerFired(Timer<Document>&)
 {
     Element* element = focusedElement();
     if (!element)
@@ -4747,7 +4747,7 @@ void Document::updateFocusAppearanceTimerFired(Timer<Document>*)
         element->updateFocusAppearance(m_updateFocusAppearanceRestoresSelection);
 }
 
-void Document::resetHiddenFocusElementTimer(Timer<Document>*)
+void Document::resetHiddenFocusElementTimer(Timer<Document>&)
 {
     if (view() && view()->needsLayout())
         return;
@@ -4917,7 +4917,7 @@ void Document::postTask(PassOwnPtr<Task> task)
     callOnMainThread(didReceiveTask, new PerformTaskContext(m_weakFactory.createWeakPtr(), task));
 }
 
-void Document::pendingTasksTimerFired(Timer<Document>*)
+void Document::pendingTasksTimerFired(Timer<Document>&)
 {
     while (!m_pendingTasks.isEmpty()) {
         OwnPtr<Task> task = m_pendingTasks[0].release();
@@ -5435,7 +5435,7 @@ void Document::fullScreenRendererDestroyed()
     m_fullScreenRenderer = nullptr;
 }
 
-void Document::fullScreenChangeDelayTimerFired(Timer<Document>*)
+void Document::fullScreenChangeDelayTimerFired(Timer<Document>&)
 {
     // Since we dispatch events in this function, it's possible that the
     // document will be detached and GC'd. We protect it here to make sure we
@@ -5573,7 +5573,7 @@ void Document::decrementLoadEventDelayCount()
         m_loadEventDelayTimer.startOneShot(0);
 }
 
-void Document::loadEventDelayTimerFired(Timer<Document>*)
+void Document::loadEventDelayTimerFired(Timer<Document>&)
 {
     if (frame())
         frame()->loader().checkCompleted();
@@ -6081,9 +6081,10 @@ void Document::didAssociateFormControl(Element* element)
         m_didAssociateFormControlsTimer.startOneShot(0);
 }
 
-void Document::didAssociateFormControlsTimerFired(Timer<Document>* timer)
+void Document::didAssociateFormControlsTimerFired(Timer<Document>& timer)
 {
-    ASSERT_UNUSED(timer, timer == &m_didAssociateFormControlsTimer);
+    ASSERT_UNUSED(timer, &timer == &m_didAssociateFormControlsTimer);
+
     if (!frame() || !frame()->page())
         return;
 
index 30d42dc..908bd31 100644 (file)
@@ -716,8 +716,8 @@ public:
     void unscheduleStyleRecalc();
     bool hasPendingStyleRecalc() const;
     bool hasPendingForcedStyleRecalc() const;
-    void styleRecalcTimerFired(Timer<Document>*);
-    void optimizedStyleSheetUpdateTimerFired(Timer<Document>*);
+    void styleRecalcTimerFired(Timer<Document>&);
+    void optimizedStyleSheetUpdateTimerFired(Timer<Document>&);
 
     void registerNodeList(LiveNodeList&);
     void unregisterNodeList(LiveNodeList&);
@@ -1089,7 +1089,7 @@ public:
     RenderFullScreen* fullScreenRenderer() const { return m_fullScreenRenderer; }
     void fullScreenRendererDestroyed();
     
-    void fullScreenChangeDelayTimerFired(Timer<Document>*);
+    void fullScreenChangeDelayTimerFired(Timer<Document>&);
     bool fullScreenIsAllowedForElement(Element*) const;
     void fullScreenElementRemoved();
     void removeFullScreenElementOfSubtree(Node*, bool amongChildrenOnly = false);
@@ -1266,10 +1266,10 @@ private:
     virtual double timerAlignmentInterval() const OVERRIDE;
 
     void updateTitle(const StringWithDirection&);
-    void updateFocusAppearanceTimerFired(Timer<Document>*);
+    void updateFocusAppearanceTimerFired(Timer<Document>&);
     void updateBaseURL();
 
-    void resetHiddenFocusElementTimer(Timer<Document>*);
+    void resetHiddenFocusElementTimer(Timer<Document>&);
 
     void buildAccessKeyMap(TreeScope* root);
 
@@ -1277,9 +1277,9 @@ private:
 
     void seamlessParentUpdatedStylesheets();
 
-    void loadEventDelayTimerFired(Timer<Document>*);
+    void loadEventDelayTimerFired(Timer<Document>&);
 
-    void pendingTasksTimerFired(Timer<Document>*);
+    void pendingTasksTimerFired(Timer<Document>&);
 
     static void didReceiveTask(void*);
     
@@ -1302,13 +1302,13 @@ private:
 
     void setVisualUpdatesAllowed(ReadyState);
     void setVisualUpdatesAllowed(bool);
-    void visualUpdatesSuppressionTimerFired(Timer<Document>*);
+    void visualUpdatesSuppressionTimerFired(Timer<Document>&);
 
     void addListenerType(ListenerType listenerType) { m_listenerTypes |= listenerType; }
 
-    void didAssociateFormControlsTimerFired(Timer<Document>*);
+    void didAssociateFormControlsTimerFired(Timer<Document>&);
 
-    void styleResolverThrowawayTimerFired(DeferrableOneShotTimer<Document>*);
+    void styleResolverThrowawayTimerFired(DeferrableOneShotTimer<Document>&);
     DeferrableOneShotTimer<Document> m_styleResolverThrowawayTimer;
 
     OwnPtr<StyleResolver> m_styleResolver;
@@ -1617,7 +1617,7 @@ private:
     RefPtr<DOMSecurityPolicy> m_domSecurityPolicy;
 #endif
 
-    void sharedObjectPoolClearTimerFired(Timer<Document>*);
+    void sharedObjectPoolClearTimerFired(Timer<Document>&);
     Timer<Document> m_sharedObjectPoolClearTimer;
 
     OwnPtr<DocumentSharedObjectPool> m_sharedObjectPool;
index 829250b..2cb5aaf 100644 (file)
@@ -49,7 +49,7 @@ public:
 #endif
 
 private:
-    void timerFired(Timer<EventSender<T>>*) { dispatchPendingEvents(); }
+    void timerFired(Timer<EventSender<T>>&) { dispatchPendingEvents(); }
 
     AtomicString m_eventType;
     Timer<EventSender<T>> m_timer;
index 92d7fa8..f278856 100644 (file)
@@ -58,7 +58,7 @@ bool GenericEventQueue::enqueueEvent(PassRefPtr<Event> event)
     return true;
 }
 
-void GenericEventQueue::timerFired(Timer<GenericEventQueue>*)
+void GenericEventQueue::timerFired(Timer<GenericEventQueue>&)
 {
     ASSERT(!m_timer.isActive());
     ASSERT(!m_pendingEvents.isEmpty());
index ad76f02..ea68a5a 100644 (file)
@@ -48,7 +48,7 @@ public:
     bool hasPendingEvents() const;
 
 private:
-    void timerFired(Timer<GenericEventQueue>*);
+    void timerFired(Timer<GenericEventQueue>&);
 
     EventTarget& m_owner;
     Vector<RefPtr<Event>> m_pendingEvents;
index 67f6f77..f48913d 100644 (file)
@@ -97,9 +97,9 @@ void ScriptRunner::notifyScriptReady(ScriptElement* scriptElement, ExecutionType
     m_timer.startOneShot(0);
 }
 
-void ScriptRunner::timerFired(Timer<ScriptRunner>* timer)
+void ScriptRunner::timerFired(Timer<ScriptRunner>& timer)
 {
-    ASSERT_UNUSED(timer, timer == &m_timer);
+    ASSERT_UNUSED(timer, &timer == &m_timer);
 
     Ref<Document> protect(m_document);
 
index c26d18a..f23e6da 100644 (file)
@@ -55,7 +55,7 @@ public:
     void notifyScriptReady(ScriptElement*, ExecutionType);
 
 private:
-    void timerFired(Timer<ScriptRunner>*);
+    void timerFired(Timer<ScriptRunner>&);
 
     Document& m_document;
     Vector<PendingScript> m_scriptsToExecuteInOrder;
index 65b95cb..ca582ad 100644 (file)
@@ -209,7 +209,7 @@ void ScriptedAnimationController::scheduleAnimation()
 }
 
 #if USE(REQUEST_ANIMATION_FRAME_TIMER)
-void ScriptedAnimationController::animationTimerFired(Timer<ScriptedAnimationController>*)
+void ScriptedAnimationController::animationTimerFired(Timer<ScriptedAnimationController>&)
 {
     m_lastAnimationFrameTimeMonotonic = monotonicallyIncreasingTime();
     serviceScriptedAnimations(m_lastAnimationFrameTimeMonotonic);
index c2e3d72..6f5ac77 100644 (file)
@@ -82,7 +82,7 @@ private:
     void scheduleAnimation();
 
 #if USE(REQUEST_ANIMATION_FRAME_TIMER)
-    void animationTimerFired(Timer<ScriptedAnimationController>*);
+    void animationTimerFired(Timer<ScriptedAnimationController>&);
     Timer<ScriptedAnimationController> m_animationTimer;
     double m_lastAnimationFrameTimeMonotonic;
 
index 37fa779..9ae06ea 100644 (file)
@@ -323,7 +323,7 @@ void AlternativeTextController::respondToUnappliedSpellCorrection(const VisibleS
     markers.addMarker(range.get(), DocumentMarker::SpellCheckingExemption);
 }
 
-void AlternativeTextController::timerFired(Timer<AlternativeTextController>*)
+void AlternativeTextController::timerFired(Timer<AlternativeTextController>&)
 {
     m_isDismissedByEditing = false;
     switch (m_alternativeTextInfo.type) {
index 8be78c0..c843f60 100644 (file)
@@ -138,7 +138,7 @@ private:
 #if USE(AUTOCORRECTION_PANEL)
     String dismissSoon(ReasonForDismissingAlternativeText);
     void applyAlternativeTextToRange(const Range*, const String& alternative, AlternativeTextType, const Vector<DocumentMarker::MarkerType>&);
-    void timerFired(Timer<AlternativeTextController>*);
+    void timerFired(Timer<AlternativeTextController>&);
     void recordAutocorrectionResponseReversed(const String& replacedString, const String& replacementString);
     void recordSpellcheckerResponseForModifiedCorrection(Range* rangeOfCorrection, const String& corrected, const String& correction);
     String markerDescriptionForAppliedAlternativeText(AlternativeTextType, DocumentMarker::MarkerType);
index d669dec..d59e7e9 100644 (file)
@@ -1901,7 +1901,7 @@ void FrameSelection::setCaretVisibility(CaretVisibility visibility)
     updateAppearance();
 }
 
-void FrameSelection::caretBlinkTimerFired(Timer<FrameSelection>*)
+void FrameSelection::caretBlinkTimerFired(Timer<FrameSelection>&)
 {
 #if ENABLE(TEXT_CARET)
     ASSERT(caretIsVisible());
index ea7d902..5a23dee 100644 (file)
@@ -324,7 +324,7 @@ private:
     void setFocusedElementIfNeeded();
     void focusedOrActiveStateChanged();
 
-    void caretBlinkTimerFired(Timer<FrameSelection>*);
+    void caretBlinkTimerFired(Timer<FrameSelection>&);
 
     void setCaretVisibility(CaretVisibility);
 
index 174eb6f..10bc952 100644 (file)
@@ -800,7 +800,7 @@ void HTMLMediaElement::scheduleEvent(const AtomicString& eventName)
     m_asyncEventQueue.enqueueEvent(event.release());
 }
 
-void HTMLMediaElement::loadTimerFired(Timer<HTMLMediaElement>*)
+void HTMLMediaElement::loadTimerFired(Timer<HTMLMediaElement>&)
 {
     Ref<HTMLMediaElement> protect(*this); // loadNextSourceChild may fire 'beforeload', which can make arbitrary DOM mutations.
 
@@ -2195,7 +2195,7 @@ void HTMLMediaElement::setMediaKeys(MediaKeys* mediaKeys)
 }
 #endif
 
-void HTMLMediaElement::progressEventTimerFired(Timer<HTMLMediaElement>*)
+void HTMLMediaElement::progressEventTimerFired(Timer<HTMLMediaElement>&)
 {
     ASSERT(m_player);
     if (m_networkState != NETWORK_LOADING)
@@ -2973,7 +2973,7 @@ void HTMLMediaElement::startPlaybackProgressTimer()
     m_playbackProgressTimer.startRepeating(maxTimeupdateEventFrequency);
 }
 
-void HTMLMediaElement::playbackProgressTimerFired(Timer<HTMLMediaElement>*)
+void HTMLMediaElement::playbackProgressTimerFired(Timer<HTMLMediaElement>&)
 {
     ASSERT(m_player);
 
index 642be84..39b2b9b 100644 (file)
@@ -583,9 +583,9 @@ private:
 
     virtual bool mediaPlayerShouldWaitForResponseToAuthenticationChallenge(const AuthenticationChallenge&) OVERRIDE;
 
-    void loadTimerFired(Timer<HTMLMediaElement>*);
-    void progressEventTimerFired(Timer<HTMLMediaElement>*);
-    void playbackProgressTimerFired(Timer<HTMLMediaElement>*);
+    void loadTimerFired(Timer<HTMLMediaElement>&);
+    void progressEventTimerFired(Timer<HTMLMediaElement>&);
+    void playbackProgressTimerFired(Timer<HTMLMediaElement>&);
     void startPlaybackProgressTimer();
     void startProgressEventTimer();
     void stopPeriodicTimers();
index 577d4f5..93643c7 100644 (file)
@@ -282,7 +282,7 @@ RenderPtr<RenderElement> HTMLPlugInElement::createElementRenderer(PassRef<Render
     return createRenderer<RenderEmbeddedObject>(*this, std::move(style));
 }
 
-void HTMLPlugInElement::swapRendererTimerFired(Timer<HTMLPlugInElement>*)
+void HTMLPlugInElement::swapRendererTimerFired(Timer<HTMLPlugInElement>&)
 {
     ASSERT(displayState() == PreparingPluginReplacement || displayState() == DisplayingSnapshot);
     if (userAgentShadowRoot())
index 10d637a..af83983 100644 (file)
@@ -109,7 +109,7 @@ protected:
     bool m_inBeforeLoadEventHandler;
 
 private:
-    void swapRendererTimerFired(Timer<HTMLPlugInElement>*);
+    void swapRendererTimerFired(Timer<HTMLPlugInElement>&);
     bool shouldOverridePlugin(const String& url, const String& mimeType);
 
     bool dispatchBeforeLoadEvent(const String& sourceURL); // Not implemented, generates a compile error if subclasses call this by mistake.
index e6dbc5f..580810a 100644 (file)
@@ -456,7 +456,7 @@ void HTMLPlugInImageElement::createShadowIFrameSubtree(const String& src)
 }
 #endif
 
-void HTMLPlugInImageElement::removeSnapshotTimerFired(Timer<HTMLPlugInImageElement>*)
+void HTMLPlugInImageElement::removeSnapshotTimerFired(Timer<HTMLPlugInImageElement>&)
 {
     m_snapshotImage = nullptr;
     m_isRestartedPlugin = false;
@@ -568,7 +568,7 @@ void HTMLPlugInImageElement::dispatchPendingMouseClick()
     m_simulatedMouseClickTimer.restart();
 }
 
-void HTMLPlugInImageElement::simulatedMouseClickTimerFired(DeferrableOneShotTimer<HTMLPlugInImageElement>*)
+void HTMLPlugInImageElement::simulatedMouseClickTimerFired(DeferrableOneShotTimer<HTMLPlugInImageElement>&)
 {
     ASSERT(displayState() == RestartingWithPendingMouseClick);
     ASSERT(m_pendingClickEventFromSnapshot);
index d44a07c..25d2066 100644 (file)
@@ -143,13 +143,13 @@ private:
 
     virtual void updateSnapshot(PassRefPtr<Image>) OVERRIDE;
     virtual void dispatchPendingMouseClick() OVERRIDE;
-    void simulatedMouseClickTimerFired(DeferrableOneShotTimer<HTMLPlugInImageElement>*);
+    void simulatedMouseClickTimerFired(DeferrableOneShotTimer<HTMLPlugInImageElement>&);
 
     void restartSimilarPlugIns();
 
     virtual bool isPlugInImageElement() const OVERRIDE { return true; }
 
-    void removeSnapshotTimerFired(Timer<HTMLPlugInImageElement>*);
+    void removeSnapshotTimerFired(Timer<HTMLPlugInImageElement>&);
 
     virtual void defaultEventHandler(Event*) OVERRIDE;
 
index fa0d24d..4e0b4da 100644 (file)
@@ -110,7 +110,7 @@ void HTMLSourceElement::cancelPendingErrorEvent()
     m_errorEventTimer.stop();
 }
 
-void HTMLSourceElement::errorEventTimerFired(Timer<HTMLSourceElement>*)
+void HTMLSourceElement::errorEventTimerFired(Timer<HTMLSourceElement>&)
 {
     LOG(Media, "HTMLSourceElement::errorEventTimerFired - %p", this);
     dispatchEvent(Event::create(eventNames().errorEvent, false, true));
index ae9eae2..a65a0bf 100644 (file)
@@ -52,7 +52,7 @@ private:
     virtual void removedFrom(ContainerNode&) OVERRIDE;
     virtual bool isURLAttribute(const Attribute&) const OVERRIDE;
 
-    void errorEventTimerFired(Timer<HTMLSourceElement>*);
+    void errorEventTimerFired(Timer<HTMLSourceElement>&);
 
     Timer<HTMLSourceElement> m_errorEventTimer;
 };
index 1542a58..15b7999 100644 (file)
@@ -200,7 +200,7 @@ void HTMLTrackElement::scheduleLoad()
     m_loadTimer.startOneShot(0);
 }
 
-void HTMLTrackElement::loadTimerFired(Timer<HTMLTrackElement>*)
+void HTMLTrackElement::loadTimerFired(Timer<HTMLTrackElement>&)
 {
     if (!fastHasAttribute(srcAttr))
         return;
index bc9e05a..2aeeec5 100644 (file)
@@ -75,7 +75,7 @@ private:
 
     virtual bool isURLAttribute(const Attribute&) const OVERRIDE;
 
-    void loadTimerFired(Timer<HTMLTrackElement>*);
+    void loadTimerFired(Timer<HTMLTrackElement>&);
 
     HTMLMediaElement* mediaElement() const;
 
index b05cadf..eb7498c 100644 (file)
@@ -537,7 +537,7 @@ void MediaController::scheduleEvent(const AtomicString& eventName)
         m_asyncEventTimer.startOneShot(0);
 }
 
-void MediaController::asyncEventTimerFired(Timer<MediaController>*)
+void MediaController::asyncEventTimerFired(Timer<MediaController>&)
 {
     Vector<RefPtr<Event>> pendingEvents;
 
@@ -547,7 +547,7 @@ void MediaController::asyncEventTimerFired(Timer<MediaController>*)
         dispatchEvent(pendingEvents[index].release(), IGNORE_EXCEPTION);
 }
 
-void MediaController::clearPositionTimerFired(Timer<MediaController>*)
+void MediaController::clearPositionTimerFired(Timer<MediaController>&)
 {
     m_position = MediaPlayer::invalidTime();
 }
@@ -659,7 +659,7 @@ void MediaController::startTimeupdateTimer()
     m_timeupdateTimer.startRepeating(maxTimeupdateEventFrequency);
 }
 
-void MediaController::timeupdateTimerFired(Timer<MediaController>*)
+void MediaController::timeupdateTimerFired(Timer<MediaController>&)
 {
     scheduleTimeupdateEvent();
 }
index d47dd71..862322e 100644 (file)
@@ -121,11 +121,11 @@ private:
     void updateMediaElements();
     void bringElementUpToSpeed(HTMLMediaElement*);
     void scheduleEvent(const AtomicString& eventName);
-    void asyncEventTimerFired(Timer<MediaController>*);
-    void clearPositionTimerFired(Timer<MediaController>*);
+    void asyncEventTimerFired(Timer<MediaController>&);
+    void clearPositionTimerFired(Timer<MediaController>&);
     bool hasEnded() const;
     void scheduleTimeupdateEvent();
-    void timeupdateTimerFired(Timer<MediaController>*);
+    void timeupdateTimerFired(Timer<MediaController>&);
     void startTimeupdateTimer();
 
     // EventTarget
index 678cf41..5ce385d 100644 (file)
@@ -209,7 +209,7 @@ void MediaDocument::mediaElementSawUnsupportedTracks()
     m_replaceMediaElementTimer.startOneShot(0);
 }
 
-void MediaDocument::replaceMediaElementTimerFired(Timer<MediaDocument>*)
+void MediaDocument::replaceMediaElementTimerFired(Timer<MediaDocument>&)
 {
     HTMLElement* htmlBody = body();
     if (!htmlBody)
index 9b972df..c2004b9 100644 (file)
@@ -49,7 +49,7 @@ private:
 
     virtual void defaultEventHandler(Event*);
 
-    void replaceMediaElementTimerFired(Timer<MediaDocument>*);
+    void replaceMediaElementTimerFired(Timer<MediaDocument>&);
 
     Timer<MediaDocument> m_replaceMediaElementTimer;
 };
index a90dbbb..974fcbe 100644 (file)
@@ -111,10 +111,11 @@ HTMLParserScheduler::~HTMLParserScheduler()
     m_continueNextChunkTimer.stop();
 }
 
-void HTMLParserScheduler::continueNextChunkTimerFired(Timer<HTMLParserScheduler>* timer)
+void HTMLParserScheduler::continueNextChunkTimerFired(Timer<HTMLParserScheduler>& timer)
 {
     ASSERT(!m_suspended);
-    ASSERT_UNUSED(timer, timer == &m_continueNextChunkTimer);
+    ASSERT_UNUSED(timer, &timer == &m_continueNextChunkTimer);
+
     // FIXME: The timer class should handle timer priorities instead of this code.
     // If a layout is scheduled, wait again to let the layout timer run first.
     if (m_parser.document()->isLayoutTimerActive()) {
index 82c97c3..a93596b 100644 (file)
@@ -103,7 +103,7 @@ public:
 private:
     HTMLParserScheduler(HTMLDocumentParser&);
 
-    void continueNextChunkTimerFired(Timer<HTMLParserScheduler>*);
+    void continueNextChunkTimerFired(Timer<HTMLParserScheduler>&);
 
     HTMLDocumentParser& m_parser;
 
index 5912ec3..d6049a5 100644 (file)
@@ -235,7 +235,7 @@ double MediaControlSeekButtonElement::nextRate() const
     return rate;
 }
 
-void MediaControlSeekButtonElement::seekTimerFired(Timer<MediaControlSeekButtonElement>*)
+void MediaControlSeekButtonElement::seekTimerFired(Timer<MediaControlSeekButtonElement>&)
 {
     if (m_seekType == Skip) {
         double skipTime = isForwardButton() ? cSkipTime : -cSkipTime;
index 9b4b5f8..65c0d70 100644 (file)
@@ -174,7 +174,7 @@ private:
     void startTimer();
     void stopTimer();
     double nextRate() const;
-    void seekTimerFired(Timer<MediaControlSeekButtonElement>*);
+    void seekTimerFired(Timer<MediaControlSeekButtonElement>&);
 
     enum ActionType { Nothing, Play, Pause };
     ActionType m_actionOnStop;
index 420fcf4..91df2d9 100644 (file)
@@ -152,7 +152,7 @@ void MediaControlPanelElement::stopTimer()
         m_transitionTimer.stop();
 }
 
-void MediaControlPanelElement::transitionTimerFired(Timer<MediaControlPanelElement>*)
+void MediaControlPanelElement::transitionTimerFired(Timer<MediaControlPanelElement>&)
 {
     if (!m_opaque)
         hide();
@@ -1316,7 +1316,7 @@ void MediaControlTextTrackContainerElement::updateDisplay()
     }
 }
 
-void MediaControlTextTrackContainerElement::updateTimerFired(Timer<MediaControlTextTrackContainerElement>*)
+void MediaControlTextTrackContainerElement::updateTimerFired(Timer<MediaControlTextTrackContainerElement>&)
 {
     if (!document().page())
         return;
index de855da..e07f662 100644 (file)
@@ -66,7 +66,7 @@ private:
 
     void startTimer();
     void stopTimer();
-    void transitionTimerFired(Timer<MediaControlPanelElement>*);
+    void transitionTimerFired(Timer<MediaControlPanelElement>&);
 
     void setPosition(const LayoutPoint&);
 
@@ -477,7 +477,7 @@ public:
     static const AtomicString& textTrackContainerElementShadowPseudoId();
 
 private:
-    void updateTimerFired(Timer<MediaControlTextTrackContainerElement>*);
+    void updateTimerFired(Timer<MediaControlTextTrackContainerElement>&);
 
     explicit MediaControlTextTrackContainerElement(Document&);
     virtual const AtomicString& shadowPseudoId() const OVERRIDE;
index bed69c3..7bfaf43 100644 (file)
@@ -329,7 +329,7 @@ void MediaControls::defaultEventHandler(Event* event)
     }
 }
 
-void MediaControls::hideFullscreenControlsTimerFired(Timer<MediaControls>*)
+void MediaControls::hideFullscreenControlsTimerFired(Timer<MediaControls>&)
 {
     if (m_mediaController->paused())
         return;
index 3a03a7d..c95f691 100644 (file)
@@ -97,7 +97,7 @@ class MediaControls : public HTMLDivElement {
     virtual bool willRespondToMouseMoveEvents() OVERRIDE { return true; }
 #endif
 
-    virtual void hideFullscreenControlsTimerFired(Timer<MediaControls>*);
+    virtual void hideFullscreenControlsTimerFired(Timer<MediaControls>&);
     virtual void startHideFullscreenControlsTimer();
     virtual void stopHideFullscreenControlsTimer();
 
index 4967d25..0c04231 100644 (file)
@@ -81,7 +81,7 @@ void LoadableTextTrack::setTrackElement(HTMLTrackElement* element)
     m_trackElement = element;
 }
 
-void LoadableTextTrack::loadTimerFired(Timer<LoadableTextTrack>*)
+void LoadableTextTrack::loadTimerFired(Timer<LoadableTextTrack>&)
 {
     if (m_loader)
         m_loader->cancelLoad();
index 8ca24bb..7f23760 100644 (file)
@@ -79,7 +79,7 @@ private:
 
     LoadableTextTrack(HTMLTrackElement*, const String& kind, const String& label, const String& language);
 
-    void loadTimerFired(Timer<LoadableTextTrack>*);
+    void loadTimerFired(Timer<LoadableTextTrack>&);
 
     HTMLTrackElement* m_trackElement;
     Timer<LoadableTextTrack> m_loadTimer;
index 83c4237..b395d14 100644 (file)
@@ -232,7 +232,7 @@ public:
     void scheduleFor(WebKitNamedFlow*, int documentNodeId);
     void unschedule(WebKitNamedFlow*);
     void reset();
-    void onTimer(Timer<UpdateRegionLayoutTask>*);
+    void timerFired(Timer<UpdateRegionLayoutTask>&);
 
 private:
     InspectorCSSAgent* m_cssAgent;
@@ -242,7 +242,7 @@ private:
 
 UpdateRegionLayoutTask::UpdateRegionLayoutTask(InspectorCSSAgent* cssAgent)
     : m_cssAgent(cssAgent)
-    , m_timer(this, &UpdateRegionLayoutTask::onTimer)
+    , m_timer(this, &UpdateRegionLayoutTask::timerFired)
 {
 }
 
@@ -265,7 +265,7 @@ void UpdateRegionLayoutTask::reset()
     m_namedFlows.clear();
 }
 
-void UpdateRegionLayoutTask::onTimer(Timer<UpdateRegionLayoutTask>*)
+void UpdateRegionLayoutTask::timerFired(Timer<UpdateRegionLayoutTask>&)
 {
     // The timer is stopped on m_cssAgent destruction, so this method will never be called after m_cssAgent has been destroyed.
     Vector<std::pair<WebKitNamedFlow*, int>> namedFlows;
@@ -293,7 +293,7 @@ public:
     void scheduleFor(WebKitNamedFlow*, int documentNodeId);
     void unschedule(WebKitNamedFlow*);
     void reset();
-    void onTimer(Timer<ChangeRegionOversetTask>*);
+    void timerFired(Timer<ChangeRegionOversetTask>&);
     
 private:
     InspectorCSSAgent* m_cssAgent;
@@ -303,7 +303,7 @@ private:
 
 ChangeRegionOversetTask::ChangeRegionOversetTask(InspectorCSSAgent* cssAgent)
     : m_cssAgent(cssAgent)
-    , m_timer(this, &ChangeRegionOversetTask::onTimer)
+    , m_timer(this, &ChangeRegionOversetTask::timerFired)
 {
 }
 
@@ -326,7 +326,7 @@ void ChangeRegionOversetTask::reset()
     m_namedFlows.clear();
 }
 
-void ChangeRegionOversetTask::onTimer(Timer<ChangeRegionOversetTask>*)
+void ChangeRegionOversetTask::timerFired(Timer<ChangeRegionOversetTask>&)
 {
     // The timer is stopped on m_cssAgent destruction, so this method will never be called after m_cssAgent has been destroyed.
     for (HashMap<WebKitNamedFlow*, int>::iterator it = m_namedFlows.begin(), end = m_namedFlows.end(); it != end; ++it)
index de79d2a..a50d674 100644 (file)
@@ -168,7 +168,7 @@ public:
     RevalidateStyleAttributeTask(InspectorDOMAgent*);
     void scheduleFor(Element*);
     void reset() { m_timer.stop(); }
-    void onTimer(Timer<RevalidateStyleAttributeTask>*);
+    void timerFired(Timer<RevalidateStyleAttributeTask>&);
 
 private:
     InspectorDOMAgent* m_domAgent;
@@ -178,7 +178,7 @@ private:
 
 RevalidateStyleAttributeTask::RevalidateStyleAttributeTask(InspectorDOMAgent* domAgent)
     : m_domAgent(domAgent)
-    , m_timer(this, &RevalidateStyleAttributeTask::onTimer)
+    , m_timer(this, &RevalidateStyleAttributeTask::timerFired)
 {
 }
 
@@ -189,7 +189,7 @@ void RevalidateStyleAttributeTask::scheduleFor(Element* element)
         m_timer.startOneShot(0);
 }
 
-void RevalidateStyleAttributeTask::onTimer(Timer<RevalidateStyleAttributeTask>*)
+void RevalidateStyleAttributeTask::timerFired(Timer<RevalidateStyleAttributeTask>&)
 {
     // The timer is stopped on m_domAgent destruction, so this method will never be called after m_domAgent has been destroyed.
     Vector<Element*> elements;
index 2373e82..a6cf027 100644 (file)
@@ -75,7 +75,7 @@ class InspectorBackendDispatchTask {
 public:
     InspectorBackendDispatchTask(InspectorController* inspectorController)
         : m_inspectorController(inspectorController)
-        , m_timer(this, &InspectorBackendDispatchTask::onTimer)
+        , m_timer(this, &InspectorBackendDispatchTask::timerFired)
     {
     }
 
@@ -92,7 +92,7 @@ public:
         m_timer.stop();
     }
 
-    void onTimer(Timer<InspectorBackendDispatchTask>*)
+    void timerFired(Timer<InspectorBackendDispatchTask>&)
     {
         if (!m_messages.isEmpty()) {
             // Dispatch can lead to the timer destruction -> schedule the next shot first.
index ba9cb0a..06bd759 100644 (file)
@@ -1140,7 +1140,7 @@ void DocumentLoader::deliverSubstituteResourcesAfterDelay()
         m_substituteResourceDeliveryTimer.startOneShot(0);
 }
 
-void DocumentLoader::substituteResourceDeliveryTimerFired(Timer<DocumentLoader>*)
+void DocumentLoader::substituteResourceDeliveryTimerFired(Timer<DocumentLoader>&)
 {
     if (m_pendingSubstituteResources.isEmpty())
         return;
index 151d369..c4ff073 100644 (file)
@@ -323,7 +323,7 @@ namespace WebCore {
         void startDataLoadTimer();
 
         void deliverSubstituteResourcesAfterDelay();
-        void substituteResourceDeliveryTimerFired(Timer<DocumentLoader>*);
+        void substituteResourceDeliveryTimerFired(Timer<DocumentLoader>&);
 
         void clearMainResource();
 
index faa6120..a5b57d9 100644 (file)
@@ -851,7 +851,7 @@ void FrameLoader::checkCompleted()
         m_frame.view()->handleLoadCompleted();
 }
 
-void FrameLoader::checkTimerFired(Timer<FrameLoader>*)
+void FrameLoader::checkTimerFired(Timer<FrameLoader>&)
 {
     Ref<Frame> protect(m_frame);
 
index b9f99d1..998f8c5 100644 (file)
@@ -303,7 +303,7 @@ private:
 
     bool allChildrenAreComplete() const; // immediate children, not all descendants
 
-    void checkTimerFired(Timer<FrameLoader>*);
+    void checkTimerFired(Timer<FrameLoader>&);
     
     void loadSameDocumentItem(HistoryItem*);
     void loadDifferentDocumentItem(HistoryItem*, FrameLoadType, FormSubmissionCacheLoadPolicy);
index 85f6b22..60eb946 100644 (file)
@@ -378,7 +378,7 @@ void ImageLoader::updatedHasPendingEvent()
     }   
 }
 
-void ImageLoader::timerFired(Timer<ImageLoader>*)
+void ImageLoader::timerFired(Timer<ImageLoader>&)
 {
     m_element->deref();
 }
index 271e982..5cf7d12 100644 (file)
@@ -88,7 +88,7 @@ private:
     void setImageWithoutConsideringPendingLoadEvent(CachedImage*);
     void clearFailedLoadURL();
 
-    void timerFired(Timer<ImageLoader>*);
+    void timerFired(Timer<ImageLoader>&);
 
     Element* m_element;
     CachedResourceHandle<CachedImage> m_image;
index 17c733d..e63bbf0 100644 (file)
@@ -60,15 +60,15 @@ LinkLoader::~LinkLoader()
         m_cachedLinkResource->removeClient(this);
 }
 
-void LinkLoader::linkLoadTimerFired(Timer<LinkLoader>* timer)
+void LinkLoader::linkLoadTimerFired(Timer<LinkLoader>& timer)
 {
-    ASSERT_UNUSED(timer, timer == &m_linkLoadTimer);
+    ASSERT_UNUSED(timer, &timer == &m_linkLoadTimer);
     m_client->linkLoaded();
 }
 
-void LinkLoader::linkLoadingErrorTimerFired(Timer<LinkLoader>* timer)
+void LinkLoader::linkLoadingErrorTimerFired(Timer<LinkLoader>& timer)
 {
-    ASSERT_UNUSED(timer, timer == &m_linkLoadingErrorTimer);
+    ASSERT_UNUSED(timer, &timer == &m_linkLoadingErrorTimer);
     m_client->linkLoadingErrored();
 }
 
index 277ec43..9b5d8cb 100644 (file)
@@ -59,8 +59,8 @@ public:
     bool loadLink(const LinkRelAttribute&, const String& type, const String& sizes, const URL&, Document*);
 
 private:
-    void linkLoadTimerFired(Timer<LinkLoader>*);
-    void linkLoadingErrorTimerFired(Timer<LinkLoader>*);
+    void linkLoadTimerFired(Timer<LinkLoader>&);
+    void linkLoadingErrorTimerFired(Timer<LinkLoader>&);
 
     LinkLoaderClient* m_client;
 
index bdbad24..e251e07 100644 (file)
@@ -416,7 +416,7 @@ void NavigationScheduler::scheduleHistoryNavigation(int steps)
     schedule(std::make_unique<ScheduledHistoryNavigation>(steps));
 }
 
-void NavigationScheduler::timerFired(Timer<NavigationScheduler>*)
+void NavigationScheduler::timerFired(Timer<NavigationScheduler>&)
 {
     if (!m_frame.page())
         return;
index 65aaede..78756d6 100644 (file)
@@ -87,7 +87,7 @@ private:
     bool shouldScheduleNavigation() const;
     bool shouldScheduleNavigation(const String& url) const;
 
-    void timerFired(Timer<NavigationScheduler>*);
+    void timerFired(Timer<NavigationScheduler>&);
     void schedule(std::unique_ptr<ScheduledNavigation>);
 
     static bool mustLockBackForwardList(Frame& targetFrame);
index a613ed1..70f2b25 100644 (file)
@@ -114,7 +114,7 @@ void PingLoader::createPingLoader(Frame* frame, ResourceRequest& request)
 }
 
 PingLoader::PingLoader(Frame* frame, ResourceRequest& request)
-    : m_timeout(this, &PingLoader::timeout)
+    : m_timeout(this, &PingLoader::timeoutTimerFired)
 {
     unsigned long identifier = frame->page()->progress().createUniqueIdentifier();
     // FIXME: Why activeDocumentLoader? I would have expected documentLoader().
index 358d635..3d31127 100644 (file)
@@ -69,7 +69,7 @@ private:
     virtual void didFinishLoading(ResourceHandle*, double) OVERRIDE { delete this; }
     virtual void didFail(ResourceHandle*, const ResourceError&) OVERRIDE { delete this; }
     virtual bool shouldUseCredentialStorage(ResourceHandle*)  OVERRIDE { return m_shouldUseCredentialStorage; }
-    void timeout(Timer<PingLoader>*) { delete this; }
+    void timeoutTimerFired(Timer<PingLoader>&) { delete this; }
 
     RefPtr<ResourceHandle> m_handle;
     Timer<PingLoader> m_timeout;
index 00f7be6..501e1f4 100644 (file)
@@ -298,7 +298,7 @@ bool ProgressTracker::isMainLoadProgressing() const
     return m_progressValue && m_progressValue < finalProgressValue && m_heartbeatsWithNoProgress < loadStalledHeartbeatCount;
 }
 
-void ProgressTracker::progressHeartbeatTimerFired(Timer<ProgressTracker>*)
+void ProgressTracker::progressHeartbeatTimerFired(Timer<ProgressTracker>&)
 {
     if (m_totalBytesReceived < m_totalBytesReceivedBeforePreviousHeartbeat + minumumBytesPerHeartbeatForProgress)
         ++m_heartbeatsWithNoProgress;
index 24e9377..43d2b83 100644 (file)
@@ -66,7 +66,7 @@ private:
     void reset();
     void finalProgressComplete();
 
-    void progressHeartbeatTimerFired(Timer<ProgressTracker>*);
+    void progressHeartbeatTimerFired(Timer<ProgressTracker>&);
     
     static unsigned long s_uniqueIdentifier;
     
index f59d311..a56f922 100644 (file)
@@ -310,7 +310,7 @@ void ResourceLoadScheduler::scheduleServePendingRequests()
         m_requestTimer.startOneShot(0);
 }
 
-void ResourceLoadScheduler::requestTimerFired(Timer<ResourceLoadScheduler>*) 
+void ResourceLoadScheduler::requestTimerFired(Timer<ResourceLoadScheduler>&)
 {
     LOG(ResourceLoading, "ResourceLoadScheduler::requestTimerFired\n");
     servePendingRequests();
index 605f34c..9654ae8 100644 (file)
@@ -71,7 +71,7 @@ protected:
 private:
     void scheduleLoad(ResourceLoader*, ResourceLoadPriority);
     void scheduleServePendingRequests();
-    void requestTimerFired(Timer<ResourceLoadScheduler>*);
+    void requestTimerFired(Timer<ResourceLoadScheduler>&);
 
     bool isSuspendingPendingRequests() const { return !!m_suspendPendingRequestsCount; }
 
index 39dd839..563d506 100644 (file)
@@ -539,7 +539,7 @@ void CachedResource::destroyDecodedDataIfNeeded()
     m_decodedDataDeletionTimer.restart();
 }
 
-void CachedResource::decodedDataDeletionTimerFired(DeferrableOneShotTimer<CachedResource>*)
+void CachedResource::decodedDataDeletionTimerFired(DeferrableOneShotTimer<CachedResource>&)
 {
     destroyDecodedData();
 }
@@ -884,7 +884,7 @@ void CachedResource::CachedResourceCallback::cancel()
         m_callbackTimer.stop();
 }
 
-void CachedResource::CachedResourceCallback::timerFired(Timer<CachedResourceCallback>*)
+void CachedResource::CachedResourceCallback::timerFired(Timer<CachedResourceCallback>&)
 {
     m_resource->didAddClient(m_client);
 }
index 78f6a51..91794f2 100644 (file)
@@ -284,7 +284,7 @@ protected:
         void cancel();
     private:
         CachedResourceCallback(CachedResource*, CachedResourceClient*);
-        void timerFired(Timer<CachedResourceCallback>*);
+        void timerFired(Timer<CachedResourceCallback>&);
 
         CachedResource* m_resource;
         CachedResourceClient* m_client;
@@ -308,7 +308,7 @@ protected:
 private:
     bool addClientToSet(CachedResourceClient*);
 
-    void decodedDataDeletionTimerFired(DeferrableOneShotTimer<CachedResource>*);
+    void decodedDataDeletionTimerFired(DeferrableOneShotTimer<CachedResource>&);
 
     virtual PurgePriority purgePriority() const { return PurgeDefault; }
     virtual bool mayTryReplaceEncodedData() const { return false; }
index df996ad..566a073 100644 (file)
@@ -780,9 +780,9 @@ void CachedResourceLoader::loadDone(CachedResource* resource, bool shouldPerform
 // bookkeeping on CachedResources, so instead pseudo-GC them -- when the
 // reference count reaches 1, m_documentResources is the only reference, so
 // remove it from the map.
-void CachedResourceLoader::garbageCollectDocumentResourcesTimerFired(Timer<CachedResourceLoader>* timer)
+void CachedResourceLoader::garbageCollectDocumentResourcesTimerFired(Timer<CachedResourceLoader>& timer)
 {
-    ASSERT_UNUSED(timer, timer == &m_garbageCollectDocumentResourcesTimer);
+    ASSERT_UNUSED(timer, &timer == &m_garbageCollectDocumentResourcesTimer);
     garbageCollectDocumentResources();
 }
 
index 39a0a25..597d610 100644 (file)
@@ -156,7 +156,7 @@ private:
     bool shouldContinueAfterNotifyingLoadedFromMemoryCache(CachedResource*);
     bool checkInsecureContent(CachedResource::Type, const URL&) const;
 
-    void garbageCollectDocumentResourcesTimerFired(Timer<CachedResourceLoader>*);
+    void garbageCollectDocumentResourcesTimerFired(Timer<CachedResourceLoader>&);
     void performPostLoadActions();
 
     bool clientDefersImage(const URL&) const;
index fed4a28..5222288 100644 (file)
@@ -877,7 +877,7 @@ void IconDatabase::scheduleOrDeferSyncTimer()
     callOnMainThread(performScheduleOrDeferSyncTimerOnMainThread, this);
 }
 
-void IconDatabase::syncTimerFired(Timer<IconDatabase>*)
+void IconDatabase::syncTimerFired(Timer<IconDatabase>&)
 {
     ASSERT_NOT_SYNC_THREAD();
     wakeSyncThread();
index 3fede30..1c38bd0 100644 (file)
@@ -127,7 +127,7 @@ private:
 
     void wakeSyncThread();
     void scheduleOrDeferSyncTimer();
-    void syncTimerFired(Timer<IconDatabase>*);
+    void syncTimerFired(Timer<IconDatabase>&);
     
     Timer<IconDatabase> m_syncTimer;
     ThreadIdentifier m_syncThread;
index cc23dd2..aec9aff 100644 (file)
@@ -231,7 +231,7 @@ bool AutoscrollController::panScrollInProgress() const
 }
 #endif
 
-void AutoscrollController::autoscrollTimerFired(Timer<AutoscrollController>*)
+void AutoscrollController::autoscrollTimerFired(Timer<AutoscrollController>&)
 {
     if (!m_autoscrollRenderer) {
         stopAutoscrollTimer();
index f5d4bf0..2c34cb6 100644 (file)
@@ -69,7 +69,7 @@ public:
 #endif
 
 private:
-    void autoscrollTimerFired(Timer<AutoscrollController>*);
+    void autoscrollTimerFired(Timer<AutoscrollController>&);
     void startAutoscrollTimer();
 #if ENABLE(PAN_SCROLLING)
     void updatePanScrollState(FrameView*, const IntPoint&);
index 7e2876f..adb570e 100644 (file)
@@ -50,7 +50,7 @@ CaptionUserPreferences::~CaptionUserPreferences()
 {
 }
 
-void CaptionUserPreferences::timerFired(Timer<CaptionUserPreferences>*)
+void CaptionUserPreferences::timerFired(Timer<CaptionUserPreferences>&)
 {
     captionPreferencesChanged();
 }
index ab04030..3e5a3b9 100644 (file)
@@ -93,7 +93,7 @@ protected:
     void updateCaptionStyleSheetOveride();
 
 private:
-    void timerFired(Timer<CaptionUserPreferences>*);
+    void timerFired(Timer<CaptionUserPreferences>&);
     void notify();
 
     PageGroup& m_pageGroup;
index 293d2d0..a2baa23 100644 (file)
@@ -84,9 +84,9 @@ void DeviceController::dispatchDeviceEvent(PassRefPtr<Event> prpEvent)
     }
 }
 
-void DeviceController::fireDeviceEvent(Timer<DeviceController>* timer)
+void DeviceController::fireDeviceEvent(Timer<DeviceController>& timer)
 {
-    ASSERT_UNUSED(timer, timer == &m_timer);
+    ASSERT_UNUSED(timer, &timer == &m_timer);
     ASSERT(hasLastData());
 
     m_timer.stop();
index 555b630..6a5c242 100644 (file)
@@ -55,7 +55,7 @@ public:
     virtual PassRefPtr<Event> getLastEvent() { return 0; }
 
 protected:
-    void fireDeviceEvent(Timer<DeviceController>*);
+    void fireDeviceEvent(Timer<DeviceController>&);
 
     HashCountedSet<RefPtr<DOMWindow>> m_listeners;
     HashCountedSet<RefPtr<DOMWindow>> m_lastEventListeners;
index affc7d0..2517d02 100644 (file)
@@ -1266,7 +1266,7 @@ bool EventHandler::useHandCursor(Node* node, bool isOverLink, bool shiftKey)
     return ((isOverLink || isSubmitImage(node)) && (!editable || editableLinkEnabled));
 }
 
-void EventHandler::cursorUpdateTimerFired(Timer<EventHandler>*)
+void EventHandler::cursorUpdateTimerFired(Timer<EventHandler>&)
 {
     ASSERT(m_frame.document());
     updateCursor();
@@ -1510,9 +1510,9 @@ void EventHandler::cancelAutoHideCursorTimer()
         m_autoHideCursorTimer.stop();
 }
 
-void EventHandler::autoHideCursorTimerFired(Timer<EventHandler>* timer)
+void EventHandler::autoHideCursorTimerFired(Timer<EventHandler>& timer)
 {
-    ASSERT_UNUSED(timer, timer == &m_autoHideCursorTimer);
+    ASSERT_UNUSED(timer, &timer == &m_autoHideCursorTimer);
     m_currentMouseCursor = noneCursor();
     FrameView* view = m_frame.view();
     if (view && view->isActive())
@@ -2824,9 +2824,9 @@ void EventHandler::cancelFakeMouseMoveEvent()
     m_fakeMouseMoveEventTimer.stop();
 }
 
-void EventHandler::fakeMouseMoveEventTimerFired(Timer<EventHandler>* timer)
+void EventHandler::fakeMouseMoveEventTimerFired(Timer<EventHandler>& timer)
 {
-    ASSERT_UNUSED(timer, timer == &m_fakeMouseMoveEventTimer);
+    ASSERT_UNUSED(timer, &timer == &m_fakeMouseMoveEventTimer);
     ASSERT(!m_mousePressed);
 
     if (!m_frame.settings().deviceSupportsMouse())
@@ -2859,7 +2859,7 @@ void EventHandler::resizeLayerDestroyed()
     m_resizeLayer = 0;
 }
 
-void EventHandler::hoverTimerFired(Timer<EventHandler>*)
+void EventHandler::hoverTimerFired(Timer<EventHandler>&)
 {
     m_hoverTimer.stop();
 
index 8ed5d96..0cf893d 100644 (file)
@@ -327,9 +327,9 @@ private:
 
     OptionalCursor selectCursor(const HitTestResult&, bool shiftKey);
 
-    void hoverTimerFired(Timer<EventHandler>*);
+    void hoverTimerFired(Timer<EventHandler>&);
 #if ENABLE(CURSOR_SUPPORT)
-    void cursorUpdateTimerFired(Timer<EventHandler>*);
+    void cursorUpdateTimerFired(Timer<EventHandler>&);
 #endif
 
     bool logicalScrollOverflow(ScrollLogicalDirection, ScrollGranularity, Node* startingNode = 0);
@@ -348,7 +348,7 @@ private:
     static bool isKeyboardOptionTab(KeyboardEvent*);
     static bool eventInvertsTabsToLinksClientCallResult(KeyboardEvent*);
 
-    void fakeMouseMoveEventTimerFired(Timer<EventHandler>*);
+    void fakeMouseMoveEventTimerFired(Timer<EventHandler>&);
     void cancelFakeMouseMoveEvent();
 
     bool isInsideScrollbar(const IntPoint&) const;
@@ -441,7 +441,7 @@ private:
 #if ENABLE(CURSOR_VISIBILITY)
     void startAutoHideCursorTimer();
     void cancelAutoHideCursorTimer();
-    void autoHideCursorTimerFired(Timer<EventHandler>*);
+    void autoHideCursorTimerFired(Timer<EventHandler>&);
 #endif
 
     Frame& m_frame;
index 3ffc12b..68c0e6e 100644 (file)
@@ -170,7 +170,7 @@ void EventSource::scheduleReconnect()
     dispatchEvent(Event::create(eventNames().errorEvent, false, false));
 }
 
-void EventSource::connectTimerFired(Timer<EventSource>*)
+void EventSource::connectTimerFired(Timer<EventSource>&)
 {
     connect();
 }
index cebc73a..3f002eb 100644 (file)
@@ -97,7 +97,7 @@ private:
     void networkRequestEnded();
     void scheduleInitialConnect();
     void scheduleReconnect();
-    void connectTimerFired(Timer<EventSource>*);
+    void connectTimerFired(Timer<EventSource>&);
     void abortConnectionAttempt();
     void parseEventStream();
     void parseEventStreamLine(unsigned pos, int fieldLength, int lineLength);
index e7bbedf..8c064fb 100644 (file)
@@ -2404,7 +2404,7 @@ double FrameView::adjustedDeferredRepaintDelay() const
     return std::max<double>(0, m_deferredRepaintDelay - timeSinceLastPaint);
 }
     
-void FrameView::deferredRepaintTimerFired(Timer<FrameView>*)
+void FrameView::deferredRepaintTimerFired(Timer<FrameView>&)
 {
     doDeferredRepaints();
 }
@@ -2433,7 +2433,7 @@ void FrameView::adjustTiledBackingCoverage()
 #endif
 }
 
-void FrameView::layoutTimerFired(Timer<FrameView>*)
+void FrameView::layoutTimerFired(Timer<FrameView>&)
 {
 #ifdef INSTRUMENT_LAYOUT_SCHEDULING
     if (!frame().document()->ownerElement())
@@ -2908,7 +2908,7 @@ void FrameView::willEndLiveResize()
     adjustTiledBackingCoverage();
 }
 
-void FrameView::postLayoutTimerFired(Timer<FrameView>*)
+void FrameView::postLayoutTimerFired(Timer<FrameView>&)
 {
     performPostLayoutTasks();
 }
index 1cf8a91..667d5e6 100644 (file)
@@ -104,7 +104,7 @@ public:
 
     void layout(bool allowSubtree = true);
     bool didFirstLayout() const;
-    void layoutTimerFired(Timer<FrameView>*);
+    void layoutTimerFired(Timer<FrameView>&);
     void scheduleRelayout();
     void scheduleRelayoutOfSubtree(RenderElement&);
     void unscheduleRelayout();
@@ -269,7 +269,7 @@ public:
 
     void restoreScrollbar();
 
-    void postLayoutTimerFired(Timer<FrameView>*);
+    void postLayoutTimerFired(Timer<FrameView>&);
 
     bool wasScrolledByUser() const;
     void setWasScrolledByUser(bool);
@@ -544,7 +544,7 @@ private:
     virtual void notifyPageThatContentAreaWillPaint() const OVERRIDE;
 
     bool shouldUseLoadTimeDeferredRepaintDelay() const;
-    void deferredRepaintTimerFired(Timer<FrameView>*);
+    void deferredRepaintTimerFired(Timer<FrameView>&);
     void doDeferredRepaints();
     void updateDeferredRepaintDelayAfterRepaint();
     double adjustedDeferredRepaintDelay() const;
index dc5bc2e..28c63f1 100644 (file)
@@ -133,7 +133,7 @@ void PageThrottler::startThrottleHysteresisTimer()
         m_throttleHysteresisTimer.startOneShot(kThrottleHysteresisSeconds);
 }
 
-void PageThrottler::throttleHysteresisTimerFired(Timer<PageThrottler>*)
+void PageThrottler::throttleHysteresisTimerFired(Timer<PageThrottler>&)
 {
     ASSERT(!m_activityTokens.size());
     throttlePage();
index c1fa676..dc57f12 100644 (file)
@@ -65,7 +65,7 @@ private:
 
     void startThrottleHysteresisTimer();
     void stopThrottleHysteresisTimer();
-    void throttleHysteresisTimerFired(Timer<PageThrottler>*);
+    void throttleHysteresisTimerFired(Timer<PageThrottler>&);
 
     void throttlePage();
     void unthrottlePage();
index 831c862..5b8c90b 100644 (file)
@@ -154,7 +154,7 @@ void AnimationControllerPrivate::updateAnimationTimer(SetChanged callSetChanged/
     m_animationTimer.startOneShot(timeToNextService);
 }
 
-void AnimationControllerPrivate::updateStyleIfNeededDispatcherFired(Timer<AnimationControllerPrivate>*)
+void AnimationControllerPrivate::updateStyleIfNeededDispatcherFired(Timer<AnimationControllerPrivate>&)
 {
     fireEventsAndUpdateStyle();
 }
@@ -221,7 +221,7 @@ void AnimationControllerPrivate::animationFrameCallbackFired()
 }
 #endif
 
-void AnimationControllerPrivate::animationTimerFired(Timer<AnimationControllerPrivate>*)
+void AnimationControllerPrivate::animationTimerFired(Timer<AnimationControllerPrivate>&)
 {
     // Make sure animationUpdateTime is updated, so that it is current even if no
     // styleChange has happened (e.g. accelerated animations)
index 5e8312f..f030922 100644 (file)
@@ -67,7 +67,7 @@ public:
     CompositeAnimation& ensureCompositeAnimation(RenderElement*);
     bool clear(RenderElement*);
 
-    void updateStyleIfNeededDispatcherFired(Timer<AnimationControllerPrivate>*);
+    void updateStyleIfNeededDispatcherFired(Timer<AnimationControllerPrivate>&);
     void startUpdateStyleIfNeededDispatcher();
     void addEventToDispatch(PassRefPtr<Element> element, const AtomicString& eventType, const String& name, double elapsedTime);
     void addElementChangeToDispatch(PassRef<Element>);
@@ -113,7 +113,7 @@ public:
     void setAllowsNewAnimationsWhileSuspended(bool);
 
 private:
-    void animationTimerFired(Timer<AnimationControllerPrivate>*);
+    void animationTimerFired(Timer<AnimationControllerPrivate>&);
 
     void styleAvailable();
     void fireEventsAndUpdateStyle();
index ed05b90..da3cd03 100644 (file)
@@ -183,7 +183,7 @@ void Scrollbar::paint(GraphicsContext* context, const IntRect& damageRect)
         Widget::paint(context, damageRect);
 }
 
-void Scrollbar::autoscrollTimerFired(Timer<Scrollbar>*)
+void Scrollbar::autoscrollTimerFired(Timer<Scrollbar>&)
 {
     autoscrollPressedPart(theme()->autoscrollTimerDelay());
 }
index cd1e897..340cfd1 100644 (file)
@@ -163,7 +163,7 @@ protected:
     virtual void updateThumbPosition();
     virtual void updateThumbProportion();
 
-    void autoscrollTimerFired(Timer<Scrollbar>*);
+    void autoscrollTimerFired(Timer<Scrollbar>&);
     void startTimerIfNeeded(double delay);
     void stopTimerIfNeeded();
     void autoscrollPressedPart(double delay);
index 1614bd1..cd31ea1 100644 (file)
@@ -110,15 +110,36 @@ private:
 
 template <typename TimerFiredClass> class Timer : public TimerBase {
 public:
-    typedef void (TimerFiredClass::*TimerFiredFunction)(Timer*);
+    typedef void (TimerFiredClass::*TimerFiredFunction)(Timer&);
+    typedef void (TimerFiredClass::*DeprecatedTimerFiredFunction)(Timer*);
 
-    Timer(TimerFiredClass* o, TimerFiredFunction f)
-        : m_object(o), m_function(f) { }
+    Timer(TimerFiredClass* object, TimerFiredFunction function)
+        : m_object(object)
+        , m_deprecatedFunction(nullptr)
+        , m_function(function)
+    {
+    }
+
+    Timer(TimerFiredClass* object, DeprecatedTimerFiredFunction function)
+        : m_object(object)
+        , m_deprecatedFunction(function)
+        , m_function(nullptr)
+    {
+    }
 
 private:
-    virtual void fired() OVERRIDE { (m_object->*m_function)(this); }
+    virtual void fired() OVERRIDE
+    {
+        if (m_deprecatedFunction) {
+            (m_object->*m_deprecatedFunction)(this);
+            return;
+        }
+
+        (m_object->*m_function)(*this);
+    }
 
     TimerFiredClass* m_object;
+    DeprecatedTimerFiredFunction m_deprecatedFunction;
     TimerFiredFunction m_function;
 };
 
@@ -141,11 +162,22 @@ inline bool TimerBase::isActive() const
 
 template <typename TimerFiredClass> class DeferrableOneShotTimer : protected TimerBase {
 public:
-    typedef void (TimerFiredClass::*TimerFiredFunction)(DeferrableOneShotTimer*);
+    typedef void (TimerFiredClass::*TimerFiredFunction)(DeferrableOneShotTimer&);
+    typedef void (TimerFiredClass::*DeprecatedTimerFiredFunction)(DeferrableOneShotTimer*);
 
-    DeferrableOneShotTimer(TimerFiredClass* o, TimerFiredFunction f, double delay)
-        : m_object(o)
-        , m_function(f)
+    DeferrableOneShotTimer(TimerFiredClass* object, TimerFiredFunction function, double delay)
+        : m_object(object)
+        , m_function(function)
+        , m_deprecatedFunction(nullptr)
+        , m_delay(delay)
+        , m_shouldRestartWhenTimerFires(false)
+    {
+    }
+
+    DeferrableOneShotTimer(TimerFiredClass* object, DeprecatedTimerFiredFunction function, double delay)
+        : m_object(object)
+        , m_function(nullptr)
+        , m_deprecatedFunction(function)
         , m_delay(delay)
         , m_shouldRestartWhenTimerFires(false)
     {
@@ -181,11 +213,17 @@ private:
             return;
         }
 
-        (m_object->*m_function)(this);
+        if (m_deprecatedFunction) {
+            (m_object->*m_deprecatedFunction)(this);
+            return;
+        }
+
+        (m_object->*m_function)(*this);
     }
 
     TimerFiredClass* m_object;
     TimerFiredFunction m_function;
+    DeprecatedTimerFiredFunction m_deprecatedFunction;
 
     double m_delay;
     bool m_shouldRestartWhenTimerFires;
index 470082e..29f9d5c 100644 (file)
@@ -696,7 +696,7 @@ void BitmapImage::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRect,
 }
 
 
-void BitmapImage::advanceAnimation(Timer<BitmapImage>*)
+void BitmapImage::advanceAnimation(Timer<BitmapImage>&)
 {
     internalAdvanceAnimation(false);
     // At this point the image region has been marked dirty, and if it's
index 87d8b8c..16daf47 100644 (file)
@@ -269,7 +269,7 @@ protected:
     int repetitionCount(bool imageKnownToBeComplete);  // |imageKnownToBeComplete| should be set if the caller knows the entire image has been decoded.
     bool shouldAnimate();
     virtual void startAnimation(bool catchUpIfNecessary = true) OVERRIDE;
-    void advanceAnimation(Timer<BitmapImage>*);
+    void advanceAnimation(Timer<BitmapImage>&);
 
     // Function that does the real work of advancing the animation.  When
     // skippingFrames is true, we're in the middle of a loop trying to skip over
index 8495315..7161d9c 100644 (file)
@@ -959,7 +959,7 @@ unsigned MediaPlayer::videoDecodedByteCount() const
     return m_private->videoDecodedByteCount();
 }
 
-void MediaPlayer::reloadTimerFired(Timer<MediaPlayer>*)
+void MediaPlayer::reloadTimerFired(Timer<MediaPlayer>&)
 {
     m_private->cancelLoad();
     loadWithNextMediaEngine(m_currentMediaEngine);
index 227e9e7..c6480e4 100644 (file)
@@ -555,7 +555,7 @@ private:
     MediaPlayer(MediaPlayerClient*);
     MediaPlayerFactory* nextBestMediaEngine(MediaPlayerFactory*) const;
     void loadWithNextMediaEngine(MediaPlayerFactory*);
-    void reloadTimerFired(Timer<MediaPlayer>*);
+    void reloadTimerFired(Timer<MediaPlayer>&);
 
     static void initializeMediaEngines();
 
index 8088610..2ffb485 100644 (file)
@@ -60,7 +60,7 @@ private:
 
     bool canReuseLayerWithSize(const IntSize& size) const { return m_maxBytesForPool && !size.isEmpty(); }
     void schedulePrune();
-    void pruneTimerFired(Timer<LayerPool>*);
+    void pruneTimerFired(Timer<LayerPool>&);
 
     typedef enum { LeaveUnchanged, MarkAsUsed } AccessType;
     LayerList& listOfLayersWithSize(const IntSize&, AccessType = LeaveUnchanged);
index 0b42747..dcf8ddf 100644 (file)
@@ -106,7 +106,7 @@ void LayerPool::schedulePrune()
     m_pruneTimer.startOneShot(1);
 }
 
-void LayerPool::pruneTimerFired(Timer<LayerPool>*)
+void LayerPool::pruneTimerFired(Timer<LayerPool>&)
 {
     unsigned shrinkTo = decayedCapacity();
     while (m_totalBytes > shrinkTo) {
index 07459c1..6abd4a4 100644 (file)
@@ -209,7 +209,7 @@ void ImageBufferBackingStoreCache::deallocate(IOSurfaceRef surface)
     schedulePurgeTimer();
 }
 
-void ImageBufferBackingStoreCache::timerFired(DeferrableOneShotTimer<ImageBufferBackingStoreCache>*)
+void ImageBufferBackingStoreCache::timerFired(DeferrableOneShotTimer<ImageBufferBackingStoreCache>&)
 {
     while (!m_cachedSurfaces.isEmpty()) {
         CachedSurfaceMap::iterator iter = m_cachedSurfaces.begin();
index d3fa07a..1da30de 100644 (file)
@@ -97,7 +97,7 @@ private:
     bool tryTakeFromCache(const IntSize&, CGColorSpaceRef, bool needExactSize, IOSurfaceAndContextWithCreationParams& outInfo);
     bool isAcceptableSurface(const IOSurfaceAndContextWithCreationParams&, const IntSize&, CGColorSpaceRef, bool needExactSize) const;
 
-    void timerFired(DeferrableOneShotTimer<ImageBufferBackingStoreCache>*);
+    void timerFired(DeferrableOneShotTimer<ImageBufferBackingStoreCache>&);
     void schedulePurgeTimer();
 
     DeferrableOneShotTimer<ImageBufferBackingStoreCache> m_purgeTimer;
index ee79205..be30403 100644 (file)
@@ -65,7 +65,7 @@ SubimageCacheWithTimer::SubimageCacheWithTimer()
 {
 }
 
-void SubimageCacheWithTimer::invalidateCacheTimerFired(DeferrableOneShotTimer<SubimageCacheWithTimer>*)
+void SubimageCacheWithTimer::invalidateCacheTimerFired(DeferrableOneShotTimer<SubimageCacheWithTimer>&)
 {
     m_images.clear();
     m_cache.clear();
index 563dee8..b54cd42 100644 (file)
@@ -88,7 +88,7 @@ public:
     void clearImage(CGImageRef);
 
 private:
-    void invalidateCacheTimerFired(DeferrableOneShotTimer<SubimageCacheWithTimer>*);
+    void invalidateCacheTimerFired(DeferrableOneShotTimer<SubimageCacheWithTimer>&);
 
     HashCountedSet<CGImageRef> m_images;
     SubimageCache m_cache;
index 282bea6..9ea438c 100644 (file)
@@ -173,7 +173,7 @@ private:
     void updateStates();
     void doSeek();
     void cancelSeek();
-    void seekTimerFired(Timer<MediaPlayerPrivateQTKit>*);
+    void seekTimerFired(Timer<MediaPlayerPrivateQTKit>&);
     float maxTimeLoaded() const;
     void disableUnsupportedTracks();
     
index df5f7b2..d922ced 100644 (file)
@@ -797,7 +797,7 @@ void MediaPlayerPrivateQTKit::cancelSeek()
     m_seekTimer.stop();
 }
 
-void MediaPlayerPrivateQTKit::seekTimerFired(Timer<MediaPlayerPrivateQTKit>*)
+void MediaPlayerPrivateQTKit::seekTimerFired(Timer<MediaPlayerPrivateQTKit>&)
 {        
     if (!metaDataAvailable()|| !seeking() || currentTime() == m_seekTo) {
         cancelSeek();
index 711843c..33c9f14 100644 (file)
@@ -78,10 +78,10 @@ private:
     RetainPtr<WebScrollbarPainterDelegate> m_horizontalScrollbarPainterDelegate;
     RetainPtr<WebScrollbarPainterDelegate> m_verticalScrollbarPainterDelegate;
 
-    void initialScrollbarPaintTimerFired(Timer<ScrollAnimatorMac>*);
+    void initialScrollbarPaintTimerFired(Timer<ScrollAnimatorMac>&);
     Timer<ScrollAnimatorMac> m_initialScrollbarPaintTimer;
 
-    void sendContentAreaScrolledTimerFired(Timer<ScrollAnimatorMac>*);
+    void sendContentAreaScrolledTimerFired(Timer<ScrollAnimatorMac>&);
     Timer<ScrollAnimatorMac> m_sendContentAreaScrolledTimer;
     FloatSize m_contentAreaScrolledTimerScrollDelta;
 
@@ -155,7 +155,7 @@ private:
     virtual void adjustScrollPositionToBoundsIfNecessary() OVERRIDE;
 
     bool pinnedInDirection(float deltaX, float deltaY);
-    void snapRubberBandTimerFired(Timer<ScrollAnimatorMac>*);
+    void snapRubberBandTimerFired(Timer<ScrollAnimatorMac>&);
 
     ScrollElasticityController m_scrollElasticityController;
     Timer<ScrollAnimatorMac> m_snapRubberBandTimer;
index d8d03eb..6061dad 100644 (file)
@@ -1229,7 +1229,7 @@ void ScrollAnimatorMac::stopSnapRubberbandTimer()
     m_snapRubberBandTimer.stop();
 }
 
-void ScrollAnimatorMac::snapRubberBandTimerFired(Timer<ScrollAnimatorMac>*)
+void ScrollAnimatorMac::snapRubberBandTimerFired(Timer<ScrollAnimatorMac>&)
 {
     m_scrollElasticityController.snapRubberBandTimerFired();
 }
@@ -1310,7 +1310,7 @@ void ScrollAnimatorMac::stopScrollbarPaintTimer()
     m_initialScrollbarPaintTimer.stop();
 }
 
-void ScrollAnimatorMac::initialScrollbarPaintTimerFired(Timer<ScrollAnimatorMac>*)
+void ScrollAnimatorMac::initialScrollbarPaintTimerFired(Timer<ScrollAnimatorMac>&)
 {
     // To force the scrollbars to flash, we have to call hide first. Otherwise, the ScrollbarPainterController
     // might think that the scrollbars are already showing and bail early.
@@ -1334,7 +1334,7 @@ void ScrollAnimatorMac::sendContentAreaScrolled(const FloatSize& delta)
         [m_scrollbarPainterController contentAreaScrolled];
 }
 
-void ScrollAnimatorMac::sendContentAreaScrolledTimerFired(Timer<ScrollAnimatorMac>*)
+void ScrollAnimatorMac::sendContentAreaScrolledTimerFired(Timer<ScrollAnimatorMac>&)
 {
     sendContentAreaScrolled(m_contentAreaScrolledTimerScrollDelta);
     m_contentAreaScrolledTimerScrollDelta = FloatSize();
index c7db909..9716a7e 100644 (file)
@@ -62,9 +62,9 @@ void DeviceOrientationClientMock::setOrientation(PassRefPtr<DeviceOrientationDat
         m_timer.startOneShot(0);
 }
 
-void DeviceOrientationClientMock::timerFired(Timer<DeviceOrientationClientMock>* timer)
+void DeviceOrientationClientMock::timerFired(Timer<DeviceOrientationClientMock>& timer)
 {
-    ASSERT_UNUSED(timer, timer == &m_timer);
+    ASSERT_UNUSED(timer, &timer == &m_timer);
     m_timer.stop();
     m_controller->didChangeDeviceOrientation(m_orientation.get());
 }
index 4d55d20..fa6f5b6 100644 (file)
@@ -54,7 +54,7 @@ public:
     void setOrientation(PassRefPtr<DeviceOrientationData>);
 
 private:
-    void timerFired(Timer<DeviceOrientationClientMock>*);
+    void timerFired(Timer<DeviceOrientationClientMock>&);
 
     RefPtr<DeviceOrientationData> m_orientation;
     DeviceOrientationController* m_controller;
index 73116d4..c974ace 100644 (file)
@@ -75,7 +75,7 @@ private:
     void updateState();
 
 #if PLATFORM(MAC) && !PLATFORM(IOS)
-    void networkStateChangeTimerFired(Timer<NetworkStateNotifier>*);
+    void networkStateChangeTimerFired(Timer<NetworkStateNotifier>&);
 
     static void dynamicStoreCallback(SCDynamicStoreRef, CFArrayRef changedKeys, void *info); 
 
index 0613398..1a3994e 100644 (file)
@@ -108,7 +108,7 @@ void ResourceHandle::scheduleFailure(FailureType type)
     d->m_failureTimer.startOneShot(0);
 }
 
-void ResourceHandle::fireFailure(Timer<ResourceHandle>*)
+void ResourceHandle::failureTimerFired(Timer<ResourceHandle>&)
 {
     if (!client())
         return;
index 5b61cad..a2a56b2 100644 (file)
@@ -228,7 +228,7 @@ public:
     ResourceRequest& firstRequest();
     const String& lastHTTPMethod() const;
 
-    void fireFailure(Timer<ResourceHandle>*);
+    void failureTimerFired(Timer<ResourceHandle>&);
 
     NetworkingContext* context() const;
 
index 7671a1e..f19d04d 100644 (file)
@@ -118,7 +118,7 @@ namespace WebCore {
             , m_currentMacChallenge(nil)
 #endif
             , m_scheduledFailureType(ResourceHandle::NoFailure)
-            , m_failureTimer(loader, &ResourceHandle::fireFailure)
+            , m_failureTimer(loader, &ResourceHandle::failureTimerFired)
         {
             const URL& url = m_firstRequest.url();
             m_user = url.user();
index 384d4f2..cef6fea 100644 (file)
@@ -81,7 +81,7 @@ void NetworkStateNotifier::dynamicStoreCallback(SCDynamicStoreRef, CFArrayRef, v
     notifier->m_networkStateChangeTimer.startOneShot(StateChangeTimerInterval);
 }
 
-void NetworkStateNotifier::networkStateChangeTimerFired(Timer<NetworkStateNotifier>*)
+void NetworkStateNotifier::networkStateChangeTimerFired(Timer<NetworkStateNotifier>&)
 {
     bool oldOnLine = m_isOnLine;
     
index fd6c5dd..e82eed6 100644 (file)
@@ -74,7 +74,7 @@ void ImageQualityController::removeObject(RenderBoxModelObject* object)
     }
 }
 
-void ImageQualityController::highQualityRepaintTimerFired(Timer<ImageQualityController>*)
+void ImageQualityController::highQualityRepaintTimerFired(Timer<ImageQualityController>&)
 {
     if (m_renderView.documentBeingDestroyed())
         return;
index 74648de..a06df2b 100644 (file)
@@ -55,7 +55,7 @@ private:
 
     void removeLayer(RenderBoxModelObject*, LayerSizeMap* innerMap, const void* layer);
     void set(RenderBoxModelObject*, LayerSizeMap* innerMap, const void* layer, const LayoutSize&);
-    void highQualityRepaintTimerFired(Timer<ImageQualityController>*);
+    void highQualityRepaintTimerFired(Timer<ImageQualityController>&);
     void restartTimer();
     void removeObject(RenderBoxModelObject*);
 
index 8cf73f6..7756a41 100644 (file)
@@ -184,7 +184,7 @@ LayoutRect RenderButton::controlClipRect(const LayoutPoint& additionalOffset) co
     return LayoutRect(additionalOffset.x() + borderLeft(), additionalOffset.y() + borderTop(), width() - borderLeft() - borderRight(), height() - borderTop() - borderBottom());
 }
 
-void RenderButton::timerFired(Timer<RenderButton>*)
+void RenderButton::timerFired(Timer<RenderButton>&)
 {
     // FIXME Bug 25110: Ideally we would stop our timer when our Document
     // enters the page cache. But we currently have no way of being notified
index 835790a..ffea653 100644 (file)
@@ -74,7 +74,7 @@ private:
 
     virtual bool requiresForcedStyleRecalcPropagation() const OVERRIDE { return true; }
 
-    void timerFired(Timer<RenderButton>*);
+    void timerFired(Timer<RenderButton>&);
 
     RenderTextFragment* m_buttonText;
     RenderBlock* m_inner;
index 3c4490d..5391ba4 100644 (file)
@@ -572,7 +572,7 @@ void RenderLayerCompositor::scheduleCompositingLayerUpdate()
         m_updateCompositingLayersTimer.startOneShot(0);
 }
 
-void RenderLayerCompositor::updateCompositingLayersTimerFired(Timer<RenderLayerCompositor>*)
+void RenderLayerCompositor::updateCompositingLayersTimerFired(Timer<RenderLayerCompositor>&)
 {
     updateCompositingLayers(CompositingUpdateAfterLayout);
 }
@@ -3649,14 +3649,14 @@ void RenderLayerCompositor::startInitialLayerFlushTimerIfNeeded()
 }
 #endif
 
-void RenderLayerCompositor::layerFlushTimerFired(Timer<RenderLayerCompositor>*)
+void RenderLayerCompositor::layerFlushTimerFired(Timer<RenderLayerCompositor>&)
 {
     if (!m_hasPendingLayerFlush)
         return;
     scheduleLayerFlushNow();
 }
 
-void RenderLayerCompositor::paintRelatedMilestonesTimerFired(Timer<RenderLayerCompositor>*)
+void RenderLayerCompositor::paintRelatedMilestonesTimerFired(Timer<RenderLayerCompositor>&)
 {
     Frame& frame = m_renderView.frameView().frame();
     Page* page = frame.page();
index dac546e..d98615c 100644 (file)
@@ -335,7 +335,7 @@ private:
     void addToOverlapMap(OverlapMap&, RenderLayer&, IntRect& layerBounds, bool& boundsComputed);
     void addToOverlapMapRecursive(OverlapMap&, RenderLayer&, RenderLayer* ancestorLayer = nullptr);
 
-    void updateCompositingLayersTimerFired(Timer<RenderLayerCompositor>*);
+    void updateCompositingLayersTimerFired(Timer<RenderLayerCompositor>&);
 
     // Returns true if any layer's compositing changed
     void computeCompositingRequirements(RenderLayer* ancestorLayer, RenderLayer&, OverlapMap*, struct CompositingState&, bool& layersChanged, bool& descendantHas3DTransform);
@@ -427,9 +427,9 @@ private:
     void scheduleLayerFlushNow();
     bool isThrottlingLayerFlushes() const;
     void startLayerFlushTimerIfNeeded();
-    void layerFlushTimerFired(Timer<RenderLayerCompositor>*);
+    void layerFlushTimerFired(Timer<RenderLayerCompositor>&);
 
-    void paintRelatedMilestonesTimerFired(Timer<RenderLayerCompositor>*);
+    void paintRelatedMilestonesTimerFired(Timer<RenderLayerCompositor>&);
 
 #if !LOG_DISABLED
     const char* logReasonsForCompositing(const RenderLayer&);
index 6d3003b..bdea979 100644 (file)
@@ -240,7 +240,7 @@ void RenderMarquee::updateMarqueeStyle()
         m_timer.stop();
 }
 
-void RenderMarquee::timerFired(Timer<RenderMarquee>*)
+void RenderMarquee::timerFired(Timer<RenderMarquee>&)
 {
     if (m_layer->renderer().view().needsLayout())
         return;
index 98fddb9..252f9cc 100644 (file)
@@ -79,7 +79,7 @@ public:
     void updateMarqueePosition();
 
 private:
-    void timerFired(Timer<RenderMarquee>*);
+    void timerFired(Timer<RenderMarquee>&);
 
     RenderLayer* m_layer;
     int m_currentLoop;
index f0a2815..cec5163 100644 (file)
@@ -510,14 +510,14 @@ void RenderNamedFlowThread::dispatchRegionOversetChangeEvent()
         m_regionOversetChangeEventTimer.startOneShot(0);
 }
 
-void RenderNamedFlowThread::regionLayoutUpdateEventTimerFired(Timer<RenderNamedFlowThread>*)
+void RenderNamedFlowThread::regionLayoutUpdateEventTimerFired(Timer<RenderNamedFlowThread>&)
 {
     ASSERT(m_namedFlow);
 
     m_namedFlow->dispatchRegionLayoutUpdateEvent();
 }
 
-void RenderNamedFlowThread::regionOversetChangeEventTimerFired(Timer<RenderNamedFlowThread>*)
+void RenderNamedFlowThread::regionOversetChangeEventTimerFired(Timer<RenderNamedFlowThread>&)
 {
     ASSERT(m_namedFlow);
     
index 8e00fed..ec4f842 100644 (file)
@@ -113,8 +113,8 @@ private:
     void checkInvalidRegions();
 
     bool canBeDestroyed() const { return m_invalidRegionList.isEmpty() && m_regionList.isEmpty() && m_contentElements.isEmpty(); }
-    void regionLayoutUpdateEventTimerFired(Timer<RenderNamedFlowThread>*);
-    void regionOversetChangeEventTimerFired(Timer<RenderNamedFlowThread>*);
+    void regionLayoutUpdateEventTimerFired(Timer<RenderNamedFlowThread>&);
+    void regionOversetChangeEventTimerFired(Timer<RenderNamedFlowThread>&);
     void clearContentElements();
     void updateWritingMode();
 
index f34e0a4..6a4197a 100644 (file)
@@ -87,7 +87,7 @@ bool RenderProgress::isDeterminate() const
             && HTMLProgressElement::InvalidPosition != position());
 }
 
-void RenderProgress::animationTimerFired(Timer<RenderProgress>*)
+void RenderProgress::animationTimerFired(Timer<RenderProgress>&)
 {
     repaint();
     if (!m_animationTimer.isActive() && m_animating)
index 74e4912..9a153bb 100644 (file)
@@ -49,7 +49,7 @@ private:
     virtual bool canBeReplacedWithInlineRunIn() const OVERRIDE;
     virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const OVERRIDE;
 
-    void animationTimerFired(Timer<RenderProgress>*);
+    void animationTimerFired(Timer<RenderProgress>&);
     void updateAnimationState();
 
     double m_position;