<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[175719] trunk/Source</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/175719">175719</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2014-11-06 15:06:03 -0800 (Thu, 06 Nov 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>De-templatize Timer
https://bugs.webkit.org/show_bug.cgi?id=138450

Reviewed by Anders Carlsson.

Source/WebCore:

Timer does not need to be a templated class; only it's constructors need to be templated.
Remove the template specifier from Timer and add same to its two class method
constructors. Replace the function pointer typedefs with using statements. Add a
helper typedef which allows invalid combinations of TimerFiredClass and
TimerFiredFunction to be caught early by the compiler, while still allowing
valid combinations (such as when the caller specifies a function on a subclass of
TimerFiredClass).

* 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):
(WebCore::SourceBuffer::removeTimerFired):
* Modules/mediasource/SourceBuffer.h:
* Modules/mediastream/MediaStream.cpp:
(WebCore::MediaStream::scheduledEventTimerFired):
* Modules/mediastream/MediaStream.h:
* Modules/mediastream/RTCDTMFSender.cpp:
(WebCore::RTCDTMFSender::scheduledEventTimerFired):
* Modules/mediastream/RTCDTMFSender.h:
* Modules/mediastream/RTCDataChannel.cpp:
(WebCore::RTCDataChannel::scheduledEventTimerFired):
* Modules/mediastream/RTCDataChannel.h:
* Modules/mediastream/RTCPeerConnection.cpp:
(WebCore::RTCPeerConnection::scheduledEventTimerFired):
* Modules/mediastream/RTCPeerConnection.h:
* Modules/notifications/Notification.cpp:
(WebCore::Notification::Notification):
(WebCore::Notification::taskTimerFired):
* Modules/notifications/Notification.h:
* Modules/notifications/NotificationCenter.cpp:
(WebCore::NotificationCenter::NotificationRequestCallback::timerFired):
* Modules/notifications/NotificationCenter.h:
* Modules/vibration/Vibration.cpp:
(WebCore::Vibration::timerFired):
* Modules/vibration/Vibration.h:
* Modules/websockets/WebSocketChannel.cpp:
(WebCore::WebSocketChannel::resumeTimerFired):
(WebCore::WebSocketChannel::closingTimerFired):
* Modules/websockets/WebSocketChannel.h:
* accessibility/AXObjectCache.cpp:
(WebCore::AXObjectCache::notificationPostTimerFired):
* accessibility/AXObjectCache.h:
(WebCore::AXObjectCache::AXObjectCache):
* bindings/js/GCController.cpp:
(WebCore::GCController::gcTimerFired):
* bindings/js/GCController.h:
* css/CSSFontFaceSource.h:
* css/CSSFontSelector.cpp:
(WebCore::CSSFontSelector::beginLoadTimerFired):
* css/CSSFontSelector.h:
* css/StyleResolver.cpp:
(WebCore::StyleResolver::sweepMatchedPropertiesCache):
* css/StyleResolver.h:
* dom/Document.cpp:
(WebCore::Document::visualUpdatesSuppressionTimerFired):
(WebCore::Document::styleRecalcTimerFired):
(WebCore::Document::optimizedStyleSheetUpdateTimerFired):
(WebCore::Document::sharedObjectPoolClearTimerFired):
(WebCore::Document::updateFocusAppearanceTimerFired):
(WebCore::Document::pendingTasksTimerFired):
(WebCore::Document::fullScreenChangeDelayTimerFired):
(WebCore::Document::loadEventDelayTimerFired):
(WebCore::Document::didAssociateFormControlsTimerFired):
(WebCore::Document::domCookieCacheExpiryTimerFired):
* 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:
* dom/StyledElement.cpp:
(WebCore::PresentationAttributeCacheCleaner::cleanCache):
* editing/AlternativeTextController.cpp:
(WebCore::AlternativeTextController::timerFired):
* editing/AlternativeTextController.h:
* editing/Editor.cpp:
(WebCore::Editor::scanSelectionForTelephoneNumbers):
(WebCore::Editor::editorUIUpdateTimerFired):
* editing/Editor.h:
* editing/FrameSelection.cpp:
(WebCore::FrameSelection::caretBlinkTimerFired):
* editing/FrameSelection.h:
* editing/SpellChecker.cpp:
(WebCore::SpellChecker::timerFiredToProcessQueuedRequest):
* editing/SpellChecker.h:
* html/HTMLFormElement.cpp:
(WebCore::HTMLFormElement::requestAutocompleteTimerFired):
* html/HTMLFormElement.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):
* 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/SearchInputType.cpp:
(WebCore::SearchInputType::searchEventTimerFired):
* html/SearchInputType.h:
* html/ValidationMessage.cpp:
(WebCore::ValidationMessage::setMessage):
(WebCore::ValidationMessage::setMessageDOMAndStartTimer):
(WebCore::ValidationMessage::buildBubbleTree):
(WebCore::ValidationMessage::requestToHideMessage):
(WebCore::ValidationMessage::deleteBubbleTree):
* html/ValidationMessage.h:
* html/canvas/WebGLRenderingContext.cpp:
(WebCore::WebGLRenderingContext::dispatchContextLostEvent):
(WebCore::WebGLRenderingContext::maybeRestoreContext):
* html/canvas/WebGLRenderingContext.h:
* html/parser/HTMLParserScheduler.cpp:
(WebCore::HTMLParserScheduler::continueNextChunkTimerFired):
* html/parser/HTMLParserScheduler.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/shadow/SpinButtonElement.cpp:
(WebCore::SpinButtonElement::repeatingTimerFired):
* html/shadow/SpinButtonElement.h:
* html/track/LoadableTextTrack.cpp:
(WebCore::LoadableTextTrack::loadTimerFired):
* html/track/LoadableTextTrack.h:
* html/track/VTTRegion.cpp:
(WebCore::VTTRegion::scrollTimerFired):
* html/track/VTTRegion.h:
* inspector/InspectorCSSAgent.cpp:
(WebCore::ChangeRegionOversetTask::timerFired):
* inspector/InspectorDOMAgent.cpp:
(WebCore::RevalidateStyleAttributeTask::timerFired):
* inspector/InspectorFrontendClientLocal.cpp:
(WebCore::InspectorBackendDispatchTask::timerFired):
* inspector/InspectorOverlay.cpp:
(WebCore::InspectorOverlay::updatePaintRectsTimerFired):
* inspector/InspectorOverlay.h:
* 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::ScheduledNavigation::didStartTimer):
(WebCore::NavigationScheduler::timerFired):
* loader/NavigationScheduler.h:
* 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/TextTrackLoader.cpp:
(WebCore::TextTrackLoader::cueLoadTimerFired):
* loader/TextTrackLoader.h:
* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::Callback::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/CaptionUserPreferencesMediaAF.cpp:
(WebCore::CaptionUserPreferencesMediaAF::updateTimerFired):
* page/CaptionUserPreferencesMediaAF.h:
* page/DeviceController.cpp:
(WebCore::DeviceController::fireDeviceEvent):
* page/DeviceController.h:
* page/EventHandler.cpp:
(WebCore::EventHandler::cursorUpdateTimerFired):
(WebCore::EventHandler::autoHideCursorTimerFired):
(WebCore::EventHandler::recognizeLongMousePress):
(WebCore::EventHandler::fakeMouseMoveEventTimerFired):
(WebCore::EventHandler::hoverTimerFired):
* page/EventHandler.h:
* page/EventSource.cpp:
(WebCore::EventSource::connectTimerFired):
* page/EventSource.h:
* page/FocusController.cpp:
(WebCore::FocusController::focusRepaintTimerFired):
* page/FocusController.h:
* page/Frame.cpp:
(WebCore::Frame::overflowAutoScrollTimerFired):
* page/Frame.h:
* page/FrameView.cpp:
(WebCore::FrameView::delayedScrollEventTimerFired):
(WebCore::FrameView::speculativeTilingEnableTimerFired):
(WebCore::FrameView::layoutTimerFired):
(WebCore::FrameView::updateEmbeddedObjectsTimerFired):
(WebCore::FrameView::postLayoutTimerFired):
* page/FrameView.h:
* page/PageOverlay.cpp:
(WebCore::PageOverlay::fadeAnimationTimerFired):
* page/PageOverlay.h:
* page/Settings.cpp:
(WebCore::Settings::imageLoadingSettingsTimerFired):
* page/Settings.h:
* page/animation/AnimationController.cpp:
(WebCore::AnimationControllerPrivate::updateStyleIfNeededDispatcherFired):
(WebCore::AnimationControllerPrivate::animationTimerFired):
* page/animation/AnimationControllerPrivate.h:
* page/mac/ServicesOverlayController.h:
* page/mac/ServicesOverlayController.mm:
(WebCore::ServicesOverlayController::determineActiveHighlightTimerFired):
* page/scrolling/AsyncScrollingCoordinator.cpp:
(WebCore::AsyncScrollingCoordinator::updateScrollPositionAfterAsyncScrollTimerFired):
* page/scrolling/AsyncScrollingCoordinator.h:
* page/scrolling/ios/ScrollingCoordinatorIOS.h:
* page/scrolling/ios/ScrollingCoordinatorIOS.mm:
(WebCore::ScrollingCoordinatorIOS::scrollingStateTreeCommitterTimerFired):
* page/scrolling/mac/ScrollingCoordinatorMac.h:
* page/scrolling/mac/ScrollingCoordinatorMac.mm:
(WebCore::ScrollingCoordinatorMac::scrollingStateTreeCommitterTimerFired):
* platform/HysteresisActivity.h:
(WebCore::HysteresisActivity::hysteresisTimerFired):
* platform/ScrollAnimator.cpp:
(WebCore::ScrollAnimator::updateScrollAnimatorsAndTimers):
(WebCore::ScrollAnimator::startScrollSnapTimer):
(WebCore::ScrollAnimator::stopScrollSnapTimer):
(WebCore::ScrollAnimator::horizontalScrollSnapTimerFired):
(WebCore::ScrollAnimator::verticalScrollSnapTimerFired):
* platform/ScrollAnimator.h:
* platform/ScrollAnimatorNone.cpp:
(WebCore::ScrollAnimatorNone::animationTimerFired):
* platform/ScrollAnimatorNone.h:
* platform/Scrollbar.cpp:
(WebCore::Scrollbar::autoscrollTimerFired):
* platform/Scrollbar.h:
* platform/Timer.h:
(WebCore::Timer::Timer):
* platform/audio/MediaSession.cpp:
(WebCore::MediaSession::clientDataBufferingTimerFired):
* platform/audio/MediaSession.h:
* platform/efl/BatteryProviderEfl.cpp:
(WebCore::BatteryProviderEfl::timerFired):
* platform/efl/BatteryProviderEfl.h:
* platform/graphics/BitmapImage.cpp:
(WebCore::BitmapImage::startAnimation):
(WebCore::BitmapImage::advanceAnimation):
* platform/graphics/BitmapImage.h:
* platform/graphics/MediaPlayer.cpp:
(WebCore::MediaPlayer::reloadTimerFired):
* platform/graphics/MediaPlayer.h:
* platform/graphics/ShadowBlur.cpp:
(WebCore::ScratchBuffer::timerFired):
* platform/graphics/TiledBackingStore.cpp:
(WebCore::TiledBackingStore::tileBufferUpdateTimerFired):
(WebCore::TiledBackingStore::backingStoreUpdateTimerFired):
* platform/graphics/TiledBackingStore.h:
* platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h:
* platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm:
(WebCore::MediaSelectionGroupAVFObjC::selectionTimerFired):
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::seekTimerFired):
* platform/graphics/ca/LayerPool.cpp:
(WebCore::LayerPool::pruneTimerFired):
* platform/graphics/ca/LayerPool.h:
* platform/graphics/ca/TileController.cpp:
(WebCore::TileController::tileRevalidationTimerFired):
* platform/graphics/ca/TileController.h:
* platform/graphics/ca/TileGrid.cpp:
(WebCore::TileGrid::cohortRemovalTimerFired):
* platform/graphics/ca/TileGrid.h:
* platform/graphics/ca/win/LegacyCACFLayerTreeHost.cpp:
(WebCore::LegacyCACFLayerTreeHost::renderTimerFired):
* platform/graphics/ca/win/LegacyCACFLayerTreeHost.h:
* platform/graphics/cg/IOSurfacePool.cpp:
(WebCore::IOSurfacePool::collectionTimerFired):
* platform/graphics/cg/IOSurfacePool.h:
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::fillTimerFired):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
* platform/graphics/mac/MediaPlayerPrivateQTKit.h:
* platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
(WebCore::MediaPlayerPrivateQTKit::seekTimerFired):
* platform/graphics/texmap/TextureMapper.cpp:
(WebCore::BitmapTexturePool::releaseUnusedTexturesTimerFired):
* platform/graphics/texmap/coordinated/CompositingCoordinator.cpp:
(WebCore::CompositingCoordinator::releaseInactiveAtlasesTimerFired):
* platform/graphics/texmap/coordinated/CompositingCoordinator.h:
* platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
(WebCore::CoordinatedGraphicsLayer::animationStartedTimerFired):
* platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h:
* platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp:
(WebCore::CoordinatedImageBacking::clearContentsTimerFired):
* platform/graphics/texmap/coordinated/CoordinatedImageBacking.h:
* platform/ios/LegacyTileCache.h:
* platform/ios/LegacyTileCache.mm:
(WebCore::LegacyTileCache::tileCreationTimerFired):
* platform/mac/HIDGamepadProvider.cpp:
(WebCore::HIDGamepadProvider::connectionDelayTimerFired):
(WebCore::HIDGamepadProvider::inputNotificationTimerFired):
* platform/mac/HIDGamepadProvider.h:
* platform/mac/ScrollAnimatorMac.h:
* platform/mac/ScrollAnimatorMac.mm:
(WebCore::ScrollAnimatorMac::snapRubberBandTimerFired):
(WebCore::ScrollAnimatorMac::initialScrollbarPaintTimerFired):
(WebCore::ScrollAnimatorMac::sendContentAreaScrolledTimerFired):
* platform/mock/DeviceMotionClientMock.cpp:
(WebCore::DeviceMotionClientMock::timerFired):
* platform/mock/DeviceMotionClientMock.h:
* platform/mock/DeviceOrientationClientMock.cpp:
(WebCore::DeviceOrientationClientMock::timerFired):
* platform/mock/DeviceOrientationClientMock.h:
* platform/mock/GeolocationClientMock.cpp:
(WebCore::GeolocationClientMock::permissionTimerFired):
(WebCore::GeolocationClientMock::controllerTimerFired):
* platform/mock/GeolocationClientMock.h:
* platform/mock/PlatformSpeechSynthesizerMock.cpp:
(WebCore::PlatformSpeechSynthesizerMock::speakingFinished):
* platform/mock/PlatformSpeechSynthesizerMock.h:
* platform/mock/TimerEventBasedMock.h:
(WebCore::TimerEvent::timerFired):
* platform/network/DNSResolveQueue.cpp:
(WebCore::DNSResolveQueue::timerFired):
* platform/network/DNSResolveQueue.h:
* platform/network/NetworkStateNotifier.h:
* platform/network/ResourceHandle.cpp:
(WebCore::ResourceHandle::failureTimerFired):
* platform/network/ResourceHandle.h:
* platform/network/ResourceHandleInternal.h:
* platform/network/curl/ResourceHandleManager.cpp:
(WebCore::ResourceHandleManager::downloadTimerCallback):
* platform/network/curl/ResourceHandleManager.h:
* platform/network/mac/NetworkStateNotifierMac.cpp:
(WebCore::NetworkStateNotifier::networkStateChangeTimerFired):
* platform/network/win/ResourceHandleWin.cpp:
(WebCore::ResourceHandle::fileLoadTimer):
* plugins/PluginPackage.cpp:
(WebCore::PluginPackage::freeLibraryTimerFired):
* plugins/PluginPackage.h:
* plugins/PluginStream.cpp:
(WebCore::PluginStream::delayDeliveryTimerFired):
* plugins/PluginStream.h:
* plugins/PluginView.cpp:
(WebCore::PluginView::popPopupsStateTimerFired):
(WebCore::PluginView::requestTimerFired):
(WebCore::PluginView::invalidateTimerFired):
(WebCore::PluginView::lifeSupportTimerFired):
* plugins/PluginView.h:
* plugins/win/PluginMessageThrottlerWin.cpp:
(WebCore::PluginMessageThrottlerWin::messageThrottleTimerFired):
* plugins/win/PluginMessageThrottlerWin.h:
* rendering/ImageQualityController.cpp:
(WebCore::ImageQualityController::highQualityRepaintTimerFired):
* rendering/ImageQualityController.h:
* rendering/RenderButton.cpp:
(WebCore::RenderButton::styleDidChange):
(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::regionOversetChangeEventTimerFired):
* rendering/RenderNamedFlowThread.h:
* rendering/RenderProgress.cpp:
(WebCore::RenderProgress::animationTimerFired):
* rendering/RenderProgress.h:
* rendering/RenderView.cpp:
(WebCore::RenderView::lazyRepaintTimerFired):
* rendering/RenderView.h:
* replay/EventLoopInputDispatcher.cpp:
(WebCore::EventLoopInputDispatcher::timerFired):
* replay/EventLoopInputDispatcher.h:
* storage/StorageAreaImpl.cpp:
(WebCore::StorageAreaImpl::closeDatabaseTimerFired):
* storage/StorageAreaImpl.h:
* storage/StorageAreaSync.cpp:
(WebCore::StorageAreaSync::syncTimerFired):
* storage/StorageAreaSync.h:
* svg/SVGElement.cpp:
(WebCore::SVGElement::svgLoadEventTimerFired):
(WebCore::SVGElement::svgLoadEventTimer):
* svg/SVGElement.h:
* svg/SVGScriptElement.h:
* svg/SVGStyleElement.h:
* svg/SVGUseElement.h:
* svg/animation/SMILTimeContainer.cpp:
(WebCore::SMILTimeContainer::timerFired):
* svg/animation/SMILTimeContainer.h:
* xml/XMLHttpRequestProgressEventThrottle.cpp:
(WebCore::XMLHttpRequestProgressEventThrottle::dispatchDeferredEvents):
* xml/XMLHttpRequestProgressEventThrottle.h:

Source/WebKit/mac:

Remove template specifiers from Timer.

* Plugins/Hosted/NetscapePluginInstanceProxy.h:
* Plugins/Hosted/NetscapePluginInstanceProxy.mm:
(WebKit::NetscapePluginInstanceProxy::requestTimerFired):
* Plugins/WebNetscapePluginStream.h:
* Plugins/WebNetscapePluginStream.mm:
(WebNetscapePluginStream::deliverDataTimerFired):

Source/WebKit/win:

* FullscreenVideoController.cpp:
(FullscreenVideoController::timerFired):
* FullscreenVideoController.h:

Source/WebKit2:

Remove template specifiers from Timer.

* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::bufferingTimerFired):
* NetworkProcess/NetworkResourceLoader.h:
* Shared/WebMemorySampler.cpp:
(WebKit::WebMemorySampler::sampleTimerFired):
(WebKit::WebMemorySampler::stopTimerFired):
* Shared/WebMemorySampler.h:
* Shared/mac/RemoteLayerBackingStoreCollection.h:
* Shared/mac/RemoteLayerBackingStoreCollection.mm:
(WebKit::RemoteLayerBackingStoreCollection::volatilityTimerFired):
* UIProcess/API/efl/EwkView.cpp:
(EwkView::displayTimerFired):
* UIProcess/API/efl/EwkView.h:
* UIProcess/efl/TextCheckerClientEfl.cpp:
(TextCheckerClientEfl::languagesUpdateTimerFired):
(TextCheckerClientEfl::spellCheckingSettingChangeTimerFired):
* UIProcess/efl/TextCheckerClientEfl.h:
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
(WebKit::CoordinatedLayerTreeHost::layerFlushTimerFired):
* WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h:
* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:
* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
(WebKit::RemoteLayerTreeDrawingArea::layerFlushTimerFired):
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::processSuspensionCleanupTimerFired):
(WebKit::WebProcess::nonVisibleProcessCleanupTimerFired):
* WebProcess/WebProcess.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaMediaKeySessioncpp">trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaMediaKeySessionh">trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h</a></li>
<li><a href="#trunkSourceWebCoreModulesgeolocationGeolocationcpp">trunk/Source/WebCore/Modules/geolocation/Geolocation.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesgeolocationGeolocationh">trunk/Source/WebCore/Modules/geolocation/Geolocation.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBTransactionBackendcpp">trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackend.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBTransactionBackendh">trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackend.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasourceSourceBuffercpp">trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasourceSourceBufferh">trunk/Source/WebCore/Modules/mediasource/SourceBuffer.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamcpp">trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamh">trunk/Source/WebCore/Modules/mediastream/MediaStream.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCDTMFSendercpp">trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCDTMFSenderh">trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCDataChannelcpp">trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCDataChannelh">trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectionh">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h</a></li>
<li><a href="#trunkSourceWebCoreModulesnotificationsNotificationcpp">trunk/Source/WebCore/Modules/notifications/Notification.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesnotificationsNotificationh">trunk/Source/WebCore/Modules/notifications/Notification.h</a></li>
<li><a href="#trunkSourceWebCoreModulesnotificationsNotificationCentercpp">trunk/Source/WebCore/Modules/notifications/NotificationCenter.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesnotificationsNotificationCenterh">trunk/Source/WebCore/Modules/notifications/NotificationCenter.h</a></li>
<li><a href="#trunkSourceWebCoreModulesvibrationVibrationcpp">trunk/Source/WebCore/Modules/vibration/Vibration.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesvibrationVibrationh">trunk/Source/WebCore/Modules/vibration/Vibration.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketChannelcpp">trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketChannelh">trunk/Source/WebCore/Modules/websockets/WebSocketChannel.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAXObjectCachecpp">trunk/Source/WebCore/accessibility/AXObjectCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAXObjectCacheh">trunk/Source/WebCore/accessibility/AXObjectCache.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsGCControllercpp">trunk/Source/WebCore/bindings/js/GCController.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsGCControllerh">trunk/Source/WebCore/bindings/js/GCController.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontFaceSourceh">trunk/Source/WebCore/css/CSSFontFaceSource.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontSelectorcpp">trunk/Source/WebCore/css/CSSFontSelector.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontSelectorh">trunk/Source/WebCore/css/CSSFontSelector.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolverh">trunk/Source/WebCore/css/StyleResolver.h</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomEventSenderh">trunk/Source/WebCore/dom/EventSender.h</a></li>
<li><a href="#trunkSourceWebCoredomGenericEventQueuecpp">trunk/Source/WebCore/dom/GenericEventQueue.cpp</a></li>
<li><a href="#trunkSourceWebCoredomGenericEventQueueh">trunk/Source/WebCore/dom/GenericEventQueue.h</a></li>
<li><a href="#trunkSourceWebCoredomScriptRunnercpp">trunk/Source/WebCore/dom/ScriptRunner.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScriptRunnerh">trunk/Source/WebCore/dom/ScriptRunner.h</a></li>
<li><a href="#trunkSourceWebCoredomScriptedAnimationControllercpp">trunk/Source/WebCore/dom/ScriptedAnimationController.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScriptedAnimationControllerh">trunk/Source/WebCore/dom/ScriptedAnimationController.h</a></li>
<li><a href="#trunkSourceWebCoredomStyledElementcpp">trunk/Source/WebCore/dom/StyledElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingAlternativeTextControllercpp">trunk/Source/WebCore/editing/AlternativeTextController.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingAlternativeTextControllerh">trunk/Source/WebCore/editing/AlternativeTextController.h</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorcpp">trunk/Source/WebCore/editing/Editor.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorh">trunk/Source/WebCore/editing/Editor.h</a></li>
<li><a href="#trunkSourceWebCoreeditingFrameSelectioncpp">trunk/Source/WebCore/editing/FrameSelection.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingFrameSelectionh">trunk/Source/WebCore/editing/FrameSelection.h</a></li>
<li><a href="#trunkSourceWebCoreeditingSpellCheckercpp">trunk/Source/WebCore/editing/SpellChecker.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingSpellCheckerh">trunk/Source/WebCore/editing/SpellChecker.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormElementcpp">trunk/Source/WebCore/html/HTMLFormElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormElementh">trunk/Source/WebCore/html/HTMLFormElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInElementcpp">trunk/Source/WebCore/html/HTMLPlugInElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInElementh">trunk/Source/WebCore/html/HTMLPlugInElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInImageElementcpp">trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInImageElementh">trunk/Source/WebCore/html/HTMLPlugInImageElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSourceElementcpp">trunk/Source/WebCore/html/HTMLSourceElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSourceElementh">trunk/Source/WebCore/html/HTMLSourceElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTrackElementcpp">trunk/Source/WebCore/html/HTMLTrackElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTrackElementh">trunk/Source/WebCore/html/HTMLTrackElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaControllercpp">trunk/Source/WebCore/html/MediaController.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaControllerh">trunk/Source/WebCore/html/MediaController.h</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaDocumentcpp">trunk/Source/WebCore/html/MediaDocument.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaDocumenth">trunk/Source/WebCore/html/MediaDocument.h</a></li>
<li><a href="#trunkSourceWebCorehtmlSearchInputTypecpp">trunk/Source/WebCore/html/SearchInputType.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlSearchInputTypeh">trunk/Source/WebCore/html/SearchInputType.h</a></li>
<li><a href="#trunkSourceWebCorehtmlValidationMessagecpp">trunk/Source/WebCore/html/ValidationMessage.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlValidationMessageh">trunk/Source/WebCore/html/ValidationMessage.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextcpp">trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContexth">trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLParserSchedulercpp">trunk/Source/WebCore/html/parser/HTMLParserScheduler.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLParserSchedulerh">trunk/Source/WebCore/html/parser/HTMLParserScheduler.h</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlElementscpp">trunk/Source/WebCore/html/shadow/MediaControlElements.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlElementsh">trunk/Source/WebCore/html/shadow/MediaControlElements.h</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlscpp">trunk/Source/WebCore/html/shadow/MediaControls.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowMediaControlsh">trunk/Source/WebCore/html/shadow/MediaControls.h</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowSpinButtonElementcpp">trunk/Source/WebCore/html/shadow/SpinButtonElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowSpinButtonElementh">trunk/Source/WebCore/html/shadow/SpinButtonElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmltrackLoadableTextTrackcpp">trunk/Source/WebCore/html/track/LoadableTextTrack.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackLoadableTextTrackh">trunk/Source/WebCore/html/track/LoadableTextTrack.h</a></li>
<li><a href="#trunkSourceWebCorehtmltrackVTTRegioncpp">trunk/Source/WebCore/html/track/VTTRegion.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackVTTRegionh">trunk/Source/WebCore/html/track/VTTRegion.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorCSSAgentcpp">trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMAgentcpp">trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorFrontendClientLocalcpp">trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorOverlaycpp">trunk/Source/WebCore/inspector/InspectorOverlay.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorOverlayh">trunk/Source/WebCore/inspector/InspectorOverlay.h</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoaderh">trunk/Source/WebCore/loader/DocumentLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoaderh">trunk/Source/WebCore/loader/FrameLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderImageLoadercpp">trunk/Source/WebCore/loader/ImageLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderImageLoaderh">trunk/Source/WebCore/loader/ImageLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderLinkLoadercpp">trunk/Source/WebCore/loader/LinkLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderLinkLoaderh">trunk/Source/WebCore/loader/LinkLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderNavigationSchedulercpp">trunk/Source/WebCore/loader/NavigationScheduler.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderNavigationSchedulerh">trunk/Source/WebCore/loader/NavigationScheduler.h</a></li>
<li><a href="#trunkSourceWebCoreloaderPingLoaderh">trunk/Source/WebCore/loader/PingLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderProgressTrackercpp">trunk/Source/WebCore/loader/ProgressTracker.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderProgressTrackerh">trunk/Source/WebCore/loader/ProgressTracker.h</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadSchedulercpp">trunk/Source/WebCore/loader/ResourceLoadScheduler.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadSchedulerh">trunk/Source/WebCore/loader/ResourceLoadScheduler.h</a></li>
<li><a href="#trunkSourceWebCoreloaderTextTrackLoadercpp">trunk/Source/WebCore/loader/TextTrackLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderTextTrackLoaderh">trunk/Source/WebCore/loader/TextTrackLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourcecpp">trunk/Source/WebCore/loader/cache/CachedResource.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceh">trunk/Source/WebCore/loader/cache/CachedResource.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoadercpp">trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoaderh">trunk/Source/WebCore/loader/cache/CachedResourceLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloadericonIconDatabasecpp">trunk/Source/WebCore/loader/icon/IconDatabase.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadericonIconDatabaseh">trunk/Source/WebCore/loader/icon/IconDatabase.h</a></li>
<li><a href="#trunkSourceWebCorepageAutoscrollControllercpp">trunk/Source/WebCore/page/AutoscrollController.cpp</a></li>
<li><a href="#trunkSourceWebCorepageAutoscrollControllerh">trunk/Source/WebCore/page/AutoscrollController.h</a></li>
<li><a href="#trunkSourceWebCorepageCaptionUserPreferencescpp">trunk/Source/WebCore/page/CaptionUserPreferences.cpp</a></li>
<li><a href="#trunkSourceWebCorepageCaptionUserPreferencesh">trunk/Source/WebCore/page/CaptionUserPreferences.h</a></li>
<li><a href="#trunkSourceWebCorepageCaptionUserPreferencesMediaAFcpp">trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp</a></li>
<li><a href="#trunkSourceWebCorepageCaptionUserPreferencesMediaAFh">trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.h</a></li>
<li><a href="#trunkSourceWebCorepageDeviceControllercpp">trunk/Source/WebCore/page/DeviceController.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDeviceControllerh">trunk/Source/WebCore/page/DeviceController.h</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlerh">trunk/Source/WebCore/page/EventHandler.h</a></li>
<li><a href="#trunkSourceWebCorepageEventSourcecpp">trunk/Source/WebCore/page/EventSource.cpp</a></li>
<li><a href="#trunkSourceWebCorepageEventSourceh">trunk/Source/WebCore/page/EventSource.h</a></li>
<li><a href="#trunkSourceWebCorepageFocusControllercpp">trunk/Source/WebCore/page/FocusController.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFocusControllerh">trunk/Source/WebCore/page/FocusController.h</a></li>
<li><a href="#trunkSourceWebCorepageFramecpp">trunk/Source/WebCore/page/Frame.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameh">trunk/Source/WebCore/page/Frame.h</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewh">trunk/Source/WebCore/page/FrameView.h</a></li>
<li><a href="#trunkSourceWebCorepagePageOverlaycpp">trunk/Source/WebCore/page/PageOverlay.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageOverlayh">trunk/Source/WebCore/page/PageOverlay.h</a></li>
<li><a href="#trunkSourceWebCorepageSettingscpp">trunk/Source/WebCore/page/Settings.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingsh">trunk/Source/WebCore/page/Settings.h</a></li>
<li><a href="#trunkSourceWebCorepageanimationAnimationControllercpp">trunk/Source/WebCore/page/animation/AnimationController.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationAnimationControllerPrivateh">trunk/Source/WebCore/page/animation/AnimationControllerPrivate.h</a></li>
<li><a href="#trunkSourceWebCorepagemacServicesOverlayControllerh">trunk/Source/WebCore/page/mac/ServicesOverlayController.h</a></li>
<li><a href="#trunkSourceWebCorepagemacServicesOverlayControllermm">trunk/Source/WebCore/page/mac/ServicesOverlayController.mm</a></li>
<li><a href="#trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorcpp">trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorh">trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingiosScrollingCoordinatorIOSh">trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingiosScrollingCoordinatorIOSmm">trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.mm</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingCoordinatorMach">trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingCoordinatorMacmm">trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformHysteresisActivityh">trunk/Source/WebCore/platform/HysteresisActivity.h</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollAnimatorcpp">trunk/Source/WebCore/platform/ScrollAnimator.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollAnimatorh">trunk/Source/WebCore/platform/ScrollAnimator.h</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollAnimatorNonecpp">trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollAnimatorNoneh">trunk/Source/WebCore/platform/ScrollAnimatorNone.h</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollbarcpp">trunk/Source/WebCore/platform/Scrollbar.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollbarh">trunk/Source/WebCore/platform/Scrollbar.h</a></li>
<li><a href="#trunkSourceWebCoreplatformTimerh">trunk/Source/WebCore/platform/Timer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioMediaSessioncpp">trunk/Source/WebCore/platform/audio/MediaSession.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformaudioMediaSessionh">trunk/Source/WebCore/platform/audio/MediaSession.h</a></li>
<li><a href="#trunkSourceWebCoreplatformeflBatteryProviderEflcpp">trunk/Source/WebCore/platform/efl/BatteryProviderEfl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformeflBatteryProviderEflh">trunk/Source/WebCore/platform/efl/BatteryProviderEfl.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsBitmapImagecpp">trunk/Source/WebCore/platform/graphics/BitmapImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsBitmapImageh">trunk/Source/WebCore/platform/graphics/BitmapImage.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayercpp">trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMediaPlayerh">trunk/Source/WebCore/platform/graphics/MediaPlayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsShadowBlurcpp">trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsTiledBackingStorecpp">trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsTiledBackingStoreh">trunk/Source/WebCore/platform/graphics/TiledBackingStore.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationMediaSelectionGroupAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationMediaSelectionGroupAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaLayerPoolcpp">trunk/Source/WebCore/platform/graphics/ca/LayerPool.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaLayerPoolh">trunk/Source/WebCore/platform/graphics/ca/LayerPool.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaTileControllercpp">trunk/Source/WebCore/platform/graphics/ca/TileController.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaTileControllerh">trunk/Source/WebCore/platform/graphics/ca/TileController.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaTileGridcpp">trunk/Source/WebCore/platform/graphics/ca/TileGrid.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaTileGridh">trunk/Source/WebCore/platform/graphics/ca/TileGrid.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscawinLegacyCACFLayerTreeHostcpp">trunk/Source/WebCore/platform/graphics/ca/win/LegacyCACFLayerTreeHost.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscawinLegacyCACFLayerTreeHosth">trunk/Source/WebCore/platform/graphics/ca/win/LegacyCACFLayerTreeHost.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgIOSurfacePoolcpp">trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgIOSurfacePoolh">trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerh">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKith">trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm">trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMappercpp">trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCompositingCoordinatorcpp">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCompositingCoordinatorh">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayercpp">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayerh">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedImageBackingcpp">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedImageBackingh">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosLegacyTileCacheh">trunk/Source/WebCore/platform/ios/LegacyTileCache.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosLegacyTileCachemm">trunk/Source/WebCore/platform/ios/LegacyTileCache.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacHIDGamepadProvidercpp">trunk/Source/WebCore/platform/mac/HIDGamepadProvider.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmacHIDGamepadProviderh">trunk/Source/WebCore/platform/mac/HIDGamepadProvider.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacScrollAnimatorMach">trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacScrollAnimatorMacmm">trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmockDeviceMotionClientMockcpp">trunk/Source/WebCore/platform/mock/DeviceMotionClientMock.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockDeviceMotionClientMockh">trunk/Source/WebCore/platform/mock/DeviceMotionClientMock.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmockDeviceOrientationClientMockcpp">trunk/Source/WebCore/platform/mock/DeviceOrientationClientMock.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockDeviceOrientationClientMockh">trunk/Source/WebCore/platform/mock/DeviceOrientationClientMock.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmockGeolocationClientMockcpp">trunk/Source/WebCore/platform/mock/GeolocationClientMock.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockGeolocationClientMockh">trunk/Source/WebCore/platform/mock/GeolocationClientMock.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmockPlatformSpeechSynthesizerMockcpp">trunk/Source/WebCore/platform/mock/PlatformSpeechSynthesizerMock.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockPlatformSpeechSynthesizerMockh">trunk/Source/WebCore/platform/mock/PlatformSpeechSynthesizerMock.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmockTimerEventBasedMockh">trunk/Source/WebCore/platform/mock/TimerEventBasedMock.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkDNSResolveQueuecpp">trunk/Source/WebCore/platform/network/DNSResolveQueue.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkDNSResolveQueueh">trunk/Source/WebCore/platform/network/DNSResolveQueue.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkNetworkStateNotifierh">trunk/Source/WebCore/platform/network/NetworkStateNotifier.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandlecpp">trunk/Source/WebCore/platform/network/ResourceHandle.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandleh">trunk/Source/WebCore/platform/network/ResourceHandle.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandleInternalh">trunk/Source/WebCore/platform/network/ResourceHandleInternal.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlResourceHandleManagercpp">trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlResourceHandleManagerh">trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacNetworkStateNotifierMaccpp">trunk/Source/WebCore/platform/network/mac/NetworkStateNotifierMac.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkwinResourceHandleWincpp">trunk/Source/WebCore/platform/network/win/ResourceHandleWin.cpp</a></li>
<li><a href="#trunkSourceWebCorepluginsPluginPackagecpp">trunk/Source/WebCore/plugins/PluginPackage.cpp</a></li>
<li><a href="#trunkSourceWebCorepluginsPluginPackageh">trunk/Source/WebCore/plugins/PluginPackage.h</a></li>
<li><a href="#trunkSourceWebCorepluginsPluginStreamcpp">trunk/Source/WebCore/plugins/PluginStream.cpp</a></li>
<li><a href="#trunkSourceWebCorepluginsPluginStreamh">trunk/Source/WebCore/plugins/PluginStream.h</a></li>
<li><a href="#trunkSourceWebCorepluginsPluginViewcpp">trunk/Source/WebCore/plugins/PluginView.cpp</a></li>
<li><a href="#trunkSourceWebCorepluginsPluginViewh">trunk/Source/WebCore/plugins/PluginView.h</a></li>
<li><a href="#trunkSourceWebCorepluginswinPluginMessageThrottlerWincpp">trunk/Source/WebCore/plugins/win/PluginMessageThrottlerWin.cpp</a></li>
<li><a href="#trunkSourceWebCorepluginswinPluginMessageThrottlerWinh">trunk/Source/WebCore/plugins/win/PluginMessageThrottlerWin.h</a></li>
<li><a href="#trunkSourceWebCorerenderingImageQualityControllercpp">trunk/Source/WebCore/rendering/ImageQualityController.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingImageQualityControllerh">trunk/Source/WebCore/rendering/ImageQualityController.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderButtoncpp">trunk/Source/WebCore/rendering/RenderButton.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderButtonh">trunk/Source/WebCore/rendering/RenderButton.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorh">trunk/Source/WebCore/rendering/RenderLayerCompositor.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMarqueecpp">trunk/Source/WebCore/rendering/RenderMarquee.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMarqueeh">trunk/Source/WebCore/rendering/RenderMarquee.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderNamedFlowThreadcpp">trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderNamedFlowThreadh">trunk/Source/WebCore/rendering/RenderNamedFlowThread.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderProgresscpp">trunk/Source/WebCore/rendering/RenderProgress.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderProgressh">trunk/Source/WebCore/rendering/RenderProgress.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewcpp">trunk/Source/WebCore/rendering/RenderView.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewh">trunk/Source/WebCore/rendering/RenderView.h</a></li>
<li><a href="#trunkSourceWebCorereplayEventLoopInputDispatchercpp">trunk/Source/WebCore/replay/EventLoopInputDispatcher.cpp</a></li>
<li><a href="#trunkSourceWebCorereplayEventLoopInputDispatcherh">trunk/Source/WebCore/replay/EventLoopInputDispatcher.h</a></li>
<li><a href="#trunkSourceWebCorestorageStorageAreaImplcpp">trunk/Source/WebCore/storage/StorageAreaImpl.cpp</a></li>
<li><a href="#trunkSourceWebCorestorageStorageAreaImplh">trunk/Source/WebCore/storage/StorageAreaImpl.h</a></li>
<li><a href="#trunkSourceWebCorestorageStorageAreaSynccpp">trunk/Source/WebCore/storage/StorageAreaSync.cpp</a></li>
<li><a href="#trunkSourceWebCorestorageStorageAreaSynch">trunk/Source/WebCore/storage/StorageAreaSync.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGElementcpp">trunk/Source/WebCore/svg/SVGElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGElementh">trunk/Source/WebCore/svg/SVGElement.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGScriptElementh">trunk/Source/WebCore/svg/SVGScriptElement.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGStyleElementh">trunk/Source/WebCore/svg/SVGStyleElement.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGUseElementh">trunk/Source/WebCore/svg/SVGUseElement.h</a></li>
<li><a href="#trunkSourceWebCoresvganimationSMILTimeContainercpp">trunk/Source/WebCore/svg/animation/SMILTimeContainer.cpp</a></li>
<li><a href="#trunkSourceWebCoresvganimationSMILTimeContainerh">trunk/Source/WebCore/svg/animation/SMILTimeContainer.h</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequestProgressEventThrottlecpp">trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequestProgressEventThrottleh">trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacPluginsHostedNetscapePluginInstanceProxyh">trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h</a></li>
<li><a href="#trunkSourceWebKitmacPluginsHostedNetscapePluginInstanceProxymm">trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebNetscapePluginStreamh">trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.h</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebNetscapePluginStreammm">trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinFullscreenVideoControllercpp">trunk/Source/WebKit/win/FullscreenVideoController.cpp</a></li>
<li><a href="#trunkSourceWebKitwinFullscreenVideoControllerh">trunk/Source/WebKit/win/FullscreenVideoController.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebMemorySamplercpp">trunk/Source/WebKit2/Shared/WebMemorySampler.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebMemorySamplerh">trunk/Source/WebKit2/Shared/WebMemorySampler.h</a></li>
<li><a href="#trunkSourceWebKit2SharedmacRemoteLayerBackingStoreCollectionh">trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStoreCollection.h</a></li>
<li><a href="#trunkSourceWebKit2SharedmacRemoteLayerBackingStoreCollectionmm">trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStoreCollection.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflEwkViewcpp">trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflEwkViewh">trunk/Source/WebKit2/UIProcess/API/efl/EwkView.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflTextCheckerClientEflcpp">trunk/Source/WebKit2/UIProcess/efl/TextCheckerClientEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcesseflTextCheckerClientEflh">trunk/Source/WebKit2/UIProcess/efl/TextCheckerClientEfl.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHostcpp">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHosth">trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessh">trunk/Source/WebKit2/WebProcess/WebProcess.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/ChangeLog        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -1,3 +1,451 @@
</span><ins>+2014-11-05  Jer Noble  &lt;jer.noble@apple.com&gt;
+
+        De-templatize Timer
+        https://bugs.webkit.org/show_bug.cgi?id=138450
+
+        Reviewed by Anders Carlsson.
+
+        Timer does not need to be a templated class; only it's constructors need to be templated.
+        Remove the template specifier from Timer and add same to its two class method
+        constructors. Replace the function pointer typedefs with using statements. Add a
+        helper typedef which allows invalid combinations of TimerFiredClass and
+        TimerFiredFunction to be caught early by the compiler, while still allowing
+        valid combinations (such as when the caller specifies a function on a subclass of
+        TimerFiredClass).
+
+        * 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):
+        (WebCore::SourceBuffer::removeTimerFired):
+        * Modules/mediasource/SourceBuffer.h:
+        * Modules/mediastream/MediaStream.cpp:
+        (WebCore::MediaStream::scheduledEventTimerFired):
+        * Modules/mediastream/MediaStream.h:
+        * Modules/mediastream/RTCDTMFSender.cpp:
+        (WebCore::RTCDTMFSender::scheduledEventTimerFired):
+        * Modules/mediastream/RTCDTMFSender.h:
+        * Modules/mediastream/RTCDataChannel.cpp:
+        (WebCore::RTCDataChannel::scheduledEventTimerFired):
+        * Modules/mediastream/RTCDataChannel.h:
+        * Modules/mediastream/RTCPeerConnection.cpp:
+        (WebCore::RTCPeerConnection::scheduledEventTimerFired):
+        * Modules/mediastream/RTCPeerConnection.h:
+        * Modules/notifications/Notification.cpp:
+        (WebCore::Notification::Notification):
+        (WebCore::Notification::taskTimerFired):
+        * Modules/notifications/Notification.h:
+        * Modules/notifications/NotificationCenter.cpp:
+        (WebCore::NotificationCenter::NotificationRequestCallback::timerFired):
+        * Modules/notifications/NotificationCenter.h:
+        * Modules/vibration/Vibration.cpp:
+        (WebCore::Vibration::timerFired):
+        * Modules/vibration/Vibration.h:
+        * Modules/websockets/WebSocketChannel.cpp:
+        (WebCore::WebSocketChannel::resumeTimerFired):
+        (WebCore::WebSocketChannel::closingTimerFired):
+        * Modules/websockets/WebSocketChannel.h:
+        * accessibility/AXObjectCache.cpp:
+        (WebCore::AXObjectCache::notificationPostTimerFired):
+        * accessibility/AXObjectCache.h:
+        (WebCore::AXObjectCache::AXObjectCache):
+        * bindings/js/GCController.cpp:
+        (WebCore::GCController::gcTimerFired):
+        * bindings/js/GCController.h:
+        * css/CSSFontFaceSource.h:
+        * css/CSSFontSelector.cpp:
+        (WebCore::CSSFontSelector::beginLoadTimerFired):
+        * css/CSSFontSelector.h:
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::sweepMatchedPropertiesCache):
+        * css/StyleResolver.h:
+        * dom/Document.cpp:
+        (WebCore::Document::visualUpdatesSuppressionTimerFired):
+        (WebCore::Document::styleRecalcTimerFired):
+        (WebCore::Document::optimizedStyleSheetUpdateTimerFired):
+        (WebCore::Document::sharedObjectPoolClearTimerFired):
+        (WebCore::Document::updateFocusAppearanceTimerFired):
+        (WebCore::Document::pendingTasksTimerFired):
+        (WebCore::Document::fullScreenChangeDelayTimerFired):
+        (WebCore::Document::loadEventDelayTimerFired):
+        (WebCore::Document::didAssociateFormControlsTimerFired):
+        (WebCore::Document::domCookieCacheExpiryTimerFired):
+        * 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:
+        * dom/StyledElement.cpp:
+        (WebCore::PresentationAttributeCacheCleaner::cleanCache):
+        * editing/AlternativeTextController.cpp:
+        (WebCore::AlternativeTextController::timerFired):
+        * editing/AlternativeTextController.h:
+        * editing/Editor.cpp:
+        (WebCore::Editor::scanSelectionForTelephoneNumbers):
+        (WebCore::Editor::editorUIUpdateTimerFired):
+        * editing/Editor.h:
+        * editing/FrameSelection.cpp:
+        (WebCore::FrameSelection::caretBlinkTimerFired):
+        * editing/FrameSelection.h:
+        * editing/SpellChecker.cpp:
+        (WebCore::SpellChecker::timerFiredToProcessQueuedRequest):
+        * editing/SpellChecker.h:
+        * html/HTMLFormElement.cpp:
+        (WebCore::HTMLFormElement::requestAutocompleteTimerFired):
+        * html/HTMLFormElement.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):
+        * 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/SearchInputType.cpp:
+        (WebCore::SearchInputType::searchEventTimerFired):
+        * html/SearchInputType.h:
+        * html/ValidationMessage.cpp:
+        (WebCore::ValidationMessage::setMessage):
+        (WebCore::ValidationMessage::setMessageDOMAndStartTimer):
+        (WebCore::ValidationMessage::buildBubbleTree):
+        (WebCore::ValidationMessage::requestToHideMessage):
+        (WebCore::ValidationMessage::deleteBubbleTree):
+        * html/ValidationMessage.h:
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore::WebGLRenderingContext::dispatchContextLostEvent):
+        (WebCore::WebGLRenderingContext::maybeRestoreContext):
+        * html/canvas/WebGLRenderingContext.h:
+        * html/parser/HTMLParserScheduler.cpp:
+        (WebCore::HTMLParserScheduler::continueNextChunkTimerFired):
+        * html/parser/HTMLParserScheduler.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/shadow/SpinButtonElement.cpp:
+        (WebCore::SpinButtonElement::repeatingTimerFired):
+        * html/shadow/SpinButtonElement.h:
+        * html/track/LoadableTextTrack.cpp:
+        (WebCore::LoadableTextTrack::loadTimerFired):
+        * html/track/LoadableTextTrack.h:
+        * html/track/VTTRegion.cpp:
+        (WebCore::VTTRegion::scrollTimerFired):
+        * html/track/VTTRegion.h:
+        * inspector/InspectorCSSAgent.cpp:
+        (WebCore::ChangeRegionOversetTask::timerFired):
+        * inspector/InspectorDOMAgent.cpp:
+        (WebCore::RevalidateStyleAttributeTask::timerFired):
+        * inspector/InspectorFrontendClientLocal.cpp:
+        (WebCore::InspectorBackendDispatchTask::timerFired):
+        * inspector/InspectorOverlay.cpp:
+        (WebCore::InspectorOverlay::updatePaintRectsTimerFired):
+        * inspector/InspectorOverlay.h:
+        * 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::ScheduledNavigation::didStartTimer):
+        (WebCore::NavigationScheduler::timerFired):
+        * loader/NavigationScheduler.h:
+        * 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/TextTrackLoader.cpp:
+        (WebCore::TextTrackLoader::cueLoadTimerFired):
+        * loader/TextTrackLoader.h:
+        * loader/cache/CachedResource.cpp:
+        (WebCore::CachedResource::Callback::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/CaptionUserPreferencesMediaAF.cpp:
+        (WebCore::CaptionUserPreferencesMediaAF::updateTimerFired):
+        * page/CaptionUserPreferencesMediaAF.h:
+        * page/DeviceController.cpp:
+        (WebCore::DeviceController::fireDeviceEvent):
+        * page/DeviceController.h:
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::cursorUpdateTimerFired):
+        (WebCore::EventHandler::autoHideCursorTimerFired):
+        (WebCore::EventHandler::recognizeLongMousePress):
+        (WebCore::EventHandler::fakeMouseMoveEventTimerFired):
+        (WebCore::EventHandler::hoverTimerFired):
+        * page/EventHandler.h:
+        * page/EventSource.cpp:
+        (WebCore::EventSource::connectTimerFired):
+        * page/EventSource.h:
+        * page/FocusController.cpp:
+        (WebCore::FocusController::focusRepaintTimerFired):
+        * page/FocusController.h:
+        * page/Frame.cpp:
+        (WebCore::Frame::overflowAutoScrollTimerFired):
+        * page/Frame.h:
+        * page/FrameView.cpp:
+        (WebCore::FrameView::delayedScrollEventTimerFired):
+        (WebCore::FrameView::speculativeTilingEnableTimerFired):
+        (WebCore::FrameView::layoutTimerFired):
+        (WebCore::FrameView::updateEmbeddedObjectsTimerFired):
+        (WebCore::FrameView::postLayoutTimerFired):
+        * page/FrameView.h:
+        * page/PageOverlay.cpp:
+        (WebCore::PageOverlay::fadeAnimationTimerFired):
+        * page/PageOverlay.h:
+        * page/Settings.cpp:
+        (WebCore::Settings::imageLoadingSettingsTimerFired):
+        * page/Settings.h:
+        * page/animation/AnimationController.cpp:
+        (WebCore::AnimationControllerPrivate::updateStyleIfNeededDispatcherFired):
+        (WebCore::AnimationControllerPrivate::animationTimerFired):
+        * page/animation/AnimationControllerPrivate.h:
+        * page/mac/ServicesOverlayController.h:
+        * page/mac/ServicesOverlayController.mm:
+        (WebCore::ServicesOverlayController::determineActiveHighlightTimerFired):
+        * page/scrolling/AsyncScrollingCoordinator.cpp:
+        (WebCore::AsyncScrollingCoordinator::updateScrollPositionAfterAsyncScrollTimerFired):
+        * page/scrolling/AsyncScrollingCoordinator.h:
+        * page/scrolling/ios/ScrollingCoordinatorIOS.h:
+        * page/scrolling/ios/ScrollingCoordinatorIOS.mm:
+        (WebCore::ScrollingCoordinatorIOS::scrollingStateTreeCommitterTimerFired):
+        * page/scrolling/mac/ScrollingCoordinatorMac.h:
+        * page/scrolling/mac/ScrollingCoordinatorMac.mm:
+        (WebCore::ScrollingCoordinatorMac::scrollingStateTreeCommitterTimerFired):
+        * platform/HysteresisActivity.h:
+        (WebCore::HysteresisActivity::hysteresisTimerFired):
+        * platform/ScrollAnimator.cpp:
+        (WebCore::ScrollAnimator::updateScrollAnimatorsAndTimers):
+        (WebCore::ScrollAnimator::startScrollSnapTimer):
+        (WebCore::ScrollAnimator::stopScrollSnapTimer):
+        (WebCore::ScrollAnimator::horizontalScrollSnapTimerFired):
+        (WebCore::ScrollAnimator::verticalScrollSnapTimerFired):
+        * platform/ScrollAnimator.h:
+        * platform/ScrollAnimatorNone.cpp:
+        (WebCore::ScrollAnimatorNone::animationTimerFired):
+        * platform/ScrollAnimatorNone.h:
+        * platform/Scrollbar.cpp:
+        (WebCore::Scrollbar::autoscrollTimerFired):
+        * platform/Scrollbar.h:
+        * platform/Timer.h:
+        (WebCore::Timer::Timer):
+        * platform/audio/MediaSession.cpp:
+        (WebCore::MediaSession::clientDataBufferingTimerFired):
+        * platform/audio/MediaSession.h:
+        * platform/efl/BatteryProviderEfl.cpp:
+        (WebCore::BatteryProviderEfl::timerFired):
+        * platform/efl/BatteryProviderEfl.h:
+        * platform/graphics/BitmapImage.cpp:
+        (WebCore::BitmapImage::startAnimation):
+        (WebCore::BitmapImage::advanceAnimation):
+        * platform/graphics/BitmapImage.h:
+        * platform/graphics/MediaPlayer.cpp:
+        (WebCore::MediaPlayer::reloadTimerFired):
+        * platform/graphics/MediaPlayer.h:
+        * platform/graphics/ShadowBlur.cpp:
+        (WebCore::ScratchBuffer::timerFired):
+        * platform/graphics/TiledBackingStore.cpp:
+        (WebCore::TiledBackingStore::tileBufferUpdateTimerFired):
+        (WebCore::TiledBackingStore::backingStoreUpdateTimerFired):
+        * platform/graphics/TiledBackingStore.h:
+        * platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h:
+        * platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm:
+        (WebCore::MediaSelectionGroupAVFObjC::selectionTimerFired):
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+        (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::seekTimerFired):
+        * platform/graphics/ca/LayerPool.cpp:
+        (WebCore::LayerPool::pruneTimerFired):
+        * platform/graphics/ca/LayerPool.h:
+        * platform/graphics/ca/TileController.cpp:
+        (WebCore::TileController::tileRevalidationTimerFired):
+        * platform/graphics/ca/TileController.h:
+        * platform/graphics/ca/TileGrid.cpp:
+        (WebCore::TileGrid::cohortRemovalTimerFired):
+        * platform/graphics/ca/TileGrid.h:
+        * platform/graphics/ca/win/LegacyCACFLayerTreeHost.cpp:
+        (WebCore::LegacyCACFLayerTreeHost::renderTimerFired):
+        * platform/graphics/ca/win/LegacyCACFLayerTreeHost.h:
+        * platform/graphics/cg/IOSurfacePool.cpp:
+        (WebCore::IOSurfacePool::collectionTimerFired):
+        * platform/graphics/cg/IOSurfacePool.h:
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivateGStreamer::fillTimerFired):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
+        * platform/graphics/mac/MediaPlayerPrivateQTKit.h:
+        * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+        (WebCore::MediaPlayerPrivateQTKit::seekTimerFired):
+        * platform/graphics/texmap/TextureMapper.cpp:
+        (WebCore::BitmapTexturePool::releaseUnusedTexturesTimerFired):
+        * platform/graphics/texmap/coordinated/CompositingCoordinator.cpp:
+        (WebCore::CompositingCoordinator::releaseInactiveAtlasesTimerFired):
+        * platform/graphics/texmap/coordinated/CompositingCoordinator.h:
+        * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
+        (WebCore::CoordinatedGraphicsLayer::animationStartedTimerFired):
+        * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h:
+        * platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp:
+        (WebCore::CoordinatedImageBacking::clearContentsTimerFired):
+        * platform/graphics/texmap/coordinated/CoordinatedImageBacking.h:
+        * platform/ios/LegacyTileCache.h:
+        * platform/ios/LegacyTileCache.mm:
+        (WebCore::LegacyTileCache::tileCreationTimerFired):
+        * platform/mac/HIDGamepadProvider.cpp:
+        (WebCore::HIDGamepadProvider::connectionDelayTimerFired):
+        (WebCore::HIDGamepadProvider::inputNotificationTimerFired):
+        * platform/mac/HIDGamepadProvider.h:
+        * platform/mac/ScrollAnimatorMac.h:
+        * platform/mac/ScrollAnimatorMac.mm:
+        (WebCore::ScrollAnimatorMac::snapRubberBandTimerFired):
+        (WebCore::ScrollAnimatorMac::initialScrollbarPaintTimerFired):
+        (WebCore::ScrollAnimatorMac::sendContentAreaScrolledTimerFired):
+        * platform/mock/DeviceMotionClientMock.cpp:
+        (WebCore::DeviceMotionClientMock::timerFired):
+        * platform/mock/DeviceMotionClientMock.h:
+        * platform/mock/DeviceOrientationClientMock.cpp:
+        (WebCore::DeviceOrientationClientMock::timerFired):
+        * platform/mock/DeviceOrientationClientMock.h:
+        * platform/mock/GeolocationClientMock.cpp:
+        (WebCore::GeolocationClientMock::permissionTimerFired):
+        (WebCore::GeolocationClientMock::controllerTimerFired):
+        * platform/mock/GeolocationClientMock.h:
+        * platform/mock/PlatformSpeechSynthesizerMock.cpp:
+        (WebCore::PlatformSpeechSynthesizerMock::speakingFinished):
+        * platform/mock/PlatformSpeechSynthesizerMock.h:
+        * platform/mock/TimerEventBasedMock.h:
+        (WebCore::TimerEvent::timerFired):
+        * platform/network/DNSResolveQueue.cpp:
+        (WebCore::DNSResolveQueue::timerFired):
+        * platform/network/DNSResolveQueue.h:
+        * platform/network/NetworkStateNotifier.h:
+        * platform/network/ResourceHandle.cpp:
+        (WebCore::ResourceHandle::failureTimerFired):
+        * platform/network/ResourceHandle.h:
+        * platform/network/ResourceHandleInternal.h:
+        * platform/network/curl/ResourceHandleManager.cpp:
+        (WebCore::ResourceHandleManager::downloadTimerCallback):
+        * platform/network/curl/ResourceHandleManager.h:
+        * platform/network/mac/NetworkStateNotifierMac.cpp:
+        (WebCore::NetworkStateNotifier::networkStateChangeTimerFired):
+        * platform/network/win/ResourceHandleWin.cpp:
+        (WebCore::ResourceHandle::fileLoadTimer):
+        * plugins/PluginPackage.cpp:
+        (WebCore::PluginPackage::freeLibraryTimerFired):
+        * plugins/PluginPackage.h:
+        * plugins/PluginStream.cpp:
+        (WebCore::PluginStream::delayDeliveryTimerFired):
+        * plugins/PluginStream.h:
+        * plugins/PluginView.cpp:
+        (WebCore::PluginView::popPopupsStateTimerFired):
+        (WebCore::PluginView::requestTimerFired):
+        (WebCore::PluginView::invalidateTimerFired):
+        (WebCore::PluginView::lifeSupportTimerFired):
+        * plugins/PluginView.h:
+        * plugins/win/PluginMessageThrottlerWin.cpp:
+        (WebCore::PluginMessageThrottlerWin::messageThrottleTimerFired):
+        * plugins/win/PluginMessageThrottlerWin.h:
+        * rendering/ImageQualityController.cpp:
+        (WebCore::ImageQualityController::highQualityRepaintTimerFired):
+        * rendering/ImageQualityController.h:
+        * rendering/RenderButton.cpp:
+        (WebCore::RenderButton::styleDidChange):
+        (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::regionOversetChangeEventTimerFired):
+        * rendering/RenderNamedFlowThread.h:
+        * rendering/RenderProgress.cpp:
+        (WebCore::RenderProgress::animationTimerFired):
+        * rendering/RenderProgress.h:
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::lazyRepaintTimerFired):
+        * rendering/RenderView.h:
+        * replay/EventLoopInputDispatcher.cpp:
+        (WebCore::EventLoopInputDispatcher::timerFired):
+        * replay/EventLoopInputDispatcher.h:
+        * storage/StorageAreaImpl.cpp:
+        (WebCore::StorageAreaImpl::closeDatabaseTimerFired):
+        * storage/StorageAreaImpl.h:
+        * storage/StorageAreaSync.cpp:
+        (WebCore::StorageAreaSync::syncTimerFired):
+        * storage/StorageAreaSync.h:
+        * svg/SVGElement.cpp:
+        (WebCore::SVGElement::svgLoadEventTimerFired):
+        (WebCore::SVGElement::svgLoadEventTimer):
+        * svg/SVGElement.h:
+        * svg/SVGScriptElement.h:
+        * svg/SVGStyleElement.h:
+        * svg/SVGUseElement.h:
+        * svg/animation/SMILTimeContainer.cpp:
+        (WebCore::SMILTimeContainer::timerFired):
+        * svg/animation/SMILTimeContainer.h:
+        * xml/XMLHttpRequestProgressEventThrottle.cpp:
+        (WebCore::XMLHttpRequestProgressEventThrottle::dispatchDeferredEvents):
+        * xml/XMLHttpRequestProgressEventThrottle.h:
+
</ins><span class="cx"> 2014-11-06  Yongjun Zhang  &lt;yongjun_zhang@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Don't send identifierForInitialRequest callback method for request with DoNotSendCallbacks option.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaMediaKeySessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx">     m_keyRequestTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaKeySession::keyRequestTimerFired(Timer&lt;MediaKeySession&gt;&amp;)
</del><ins>+void MediaKeySession::keyRequestTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(m_pendingKeyRequests.size());
</span><span class="cx">     if (!m_session)
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx">     m_addKeyTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaKeySession::addKeyTimerFired(Timer&lt;MediaKeySession&gt;&amp;)
</del><ins>+void MediaKeySession::addKeyTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(m_pendingKeys.size());
</span><span class="cx">     if (!m_session)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaMediaKeySessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -84,8 +84,8 @@
</span><span class="cx"> 
</span><span class="cx"> protected:
</span><span class="cx">     MediaKeySession(ScriptExecutionContext*, MediaKeys*, const String&amp; keySystem);
</span><del>-    void keyRequestTimerFired(Timer&lt;MediaKeySession&gt;&amp;);
-    void addKeyTimerFired(Timer&lt;MediaKeySession&gt;&amp;);
</del><ins>+    void keyRequestTimerFired(Timer&amp;);
+    void addKeyTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     // CDMSessionClient
</span><span class="cx">     virtual void sendMessage(Uint8Array*, String destinationURL);
</span><span class="lines">@@ -104,10 +104,10 @@
</span><span class="cx">         RefPtr&lt;Uint8Array&gt; initData;
</span><span class="cx">     };
</span><span class="cx">     Deque&lt;PendingKeyRequest&gt; m_pendingKeyRequests;
</span><del>-    Timer&lt;MediaKeySession&gt; m_keyRequestTimer;
</del><ins>+    Timer m_keyRequestTimer;
</ins><span class="cx"> 
</span><span class="cx">     Deque&lt;RefPtr&lt;Uint8Array&gt;&gt; m_pendingKeys;
</span><del>-    Timer&lt;MediaKeySession&gt; m_addKeyTimer;
</del><ins>+    Timer m_addKeyTimer;
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     virtual void refEventTarget() override { ref(); }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgeolocationGeolocationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/geolocation/Geolocation.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/geolocation/Geolocation.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/Modules/geolocation/Geolocation.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx">     m_timer.stop();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Geolocation::GeoNotifier::timerFired(Timer&lt;GeoNotifier&gt;&amp;)
</del><ins>+void Geolocation::GeoNotifier::timerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     m_timer.stop();
</span><span class="cx"> 
</span><span class="lines">@@ -297,7 +297,7 @@
</span><span class="cx">         m_resumeTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Geolocation::resumeTimerFired(Timer&lt;Geolocation&gt;&amp;)
</del><ins>+void Geolocation::resumeTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     m_isSuspended = false;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgeolocationGeolocationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/geolocation/Geolocation.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/geolocation/Geolocation.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/Modules/geolocation/Geolocation.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> 
</span><span class="cx">         void startTimerIfNeeded();
</span><span class="cx">         void stopTimer();
</span><del>-        void timerFired(Timer&lt;GeoNotifier&gt;&amp;);
</del><ins>+        void timerFired(Timer&amp;);
</ins><span class="cx">         bool hasZeroTimeout() const;
</span><span class="cx"> 
</span><span class="cx">     private:
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx">         RefPtr&lt;PositionCallback&gt; m_successCallback;
</span><span class="cx">         RefPtr&lt;PositionErrorCallback&gt; m_errorCallback;
</span><span class="cx">         RefPtr&lt;PositionOptions&gt; m_options;
</span><del>-        Timer&lt;GeoNotifier&gt; m_timer;
</del><ins>+        Timer m_timer;
</ins><span class="cx">         RefPtr&lt;PositionError&gt; m_fatalError;
</span><span class="cx">         bool m_useCachedPosition;
</span><span class="cx">     };
</span><span class="lines">@@ -186,8 +186,8 @@
</span><span class="cx">     bool m_hasChangedPosition;
</span><span class="cx">     RefPtr&lt;PositionError&gt; m_errorWaitingForResume;
</span><span class="cx"> 
</span><del>-    void resumeTimerFired(Timer&lt;Geolocation&gt;&amp;);
-    Timer&lt;Geolocation&gt; m_resumeTimer;
</del><ins>+    void resumeTimerFired(Timer&amp;);
+    Timer m_resumeTimer;
</ins><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx"> 
</span><span class="cx">     GeoNotifierSet m_requestsAwaitingCachedPosition;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBTransactionBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackend.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackend.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackend.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -270,7 +270,7 @@
</span><span class="cx">     });
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void IDBTransactionBackend::taskTimerFired(Timer&lt;IDBTransactionBackend&gt;&amp;)
</del><ins>+void IDBTransactionBackend::taskTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     LOG(StorageAPI, &quot;IDBTransactionBackend::taskTimerFired&quot;);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBTransactionBackendh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackend.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackend.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackend.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx">     bool isTaskQueueEmpty() const;
</span><span class="cx">     bool hasPendingTasks() const;
</span><span class="cx"> 
</span><del>-    void taskTimerFired(Timer&lt;IDBTransactionBackend&gt;&amp;);
</del><ins>+    void taskTimerFired(Timer&amp;);
</ins><span class="cx">     void closeOpenCursors();
</span><span class="cx"> 
</span><span class="cx">     const HashSet&lt;int64_t&gt; m_objectStoreIds;
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx">     Deque&lt;RefPtr&lt;IDBSynchronousOperation&gt;&gt; m_abortTaskQueue;
</span><span class="cx"> 
</span><span class="cx">     // FIXME: delete the timer once we have threads instead.
</span><del>-    Timer&lt;IDBTransactionBackend&gt; m_taskTimer;
</del><ins>+    Timer m_taskTimer;
</ins><span class="cx">     int m_pendingPreemptiveEvents;
</span><span class="cx"> 
</span><span class="cx">     HashSet&lt;IDBCursorBackend*&gt; m_openCursors;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasourceSourceBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -447,7 +447,7 @@
</span><span class="cx">     reportExtraMemoryCost();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void SourceBuffer::appendBufferTimerFired(Timer&lt;SourceBuffer&gt;&amp;)
</del><ins>+void SourceBuffer::appendBufferTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     if (isRemoved())
</span><span class="cx">         return;
</span><span class="lines">@@ -672,7 +672,7 @@
</span><span class="cx">     LOG(Media, &quot;SourceBuffer::removeCodedFrames(%p) - buffered = %s&quot;, this, toString(m_buffered-&gt;ranges()).utf8().data());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void SourceBuffer::removeTimerFired(Timer&lt;SourceBuffer&gt;*)
</del><ins>+void SourceBuffer::removeTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(m_updating);
</span><span class="cx">     ASSERT(m_pendingRemoveStart.isValid());
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasourceSourceBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasource/SourceBuffer.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasource/SourceBuffer.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/Modules/mediasource/SourceBuffer.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx">     void scheduleEvent(const AtomicString&amp; eventName);
</span><span class="cx"> 
</span><span class="cx">     void appendBufferInternal(unsigned char*, unsigned, ExceptionCode&amp;);
</span><del>-    void appendBufferTimerFired(Timer&lt;SourceBuffer&gt;&amp;);
</del><ins>+    void appendBufferTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     void setActive(bool);
</span><span class="cx"> 
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> 
</span><span class="cx">     void monitorBufferingRate();
</span><span class="cx"> 
</span><del>-    void removeTimerFired(Timer&lt;SourceBuffer&gt;*);
</del><ins>+    void removeTimerFired(Timer*);
</ins><span class="cx">     void removeCodedFrames(const MediaTime&amp; start, const MediaTime&amp; end);
</span><span class="cx"> 
</span><span class="cx">     size_t extraMemoryCost() const;
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx">     GenericEventQueue m_asyncEventQueue;
</span><span class="cx"> 
</span><span class="cx">     Vector&lt;unsigned char&gt; m_pendingAppendData;
</span><del>-    Timer&lt;SourceBuffer&gt; m_appendBufferTimer;
</del><ins>+    Timer m_appendBufferTimer;
</ins><span class="cx"> 
</span><span class="cx">     RefPtr&lt;VideoTrackList&gt; m_videoTracks;
</span><span class="cx">     RefPtr&lt;AudioTrackList&gt; m_audioTracks;
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx"> 
</span><span class="cx">     MediaTime m_pendingRemoveStart;
</span><span class="cx">     MediaTime m_pendingRemoveEnd;
</span><del>-    Timer&lt;SourceBuffer&gt; m_removeTimer;
</del><ins>+    Timer m_removeTimer;
</ins><span class="cx"> 
</span><span class="cx">     bool m_updating;
</span><span class="cx">     bool m_receivedFirstInitializationSegment;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -361,7 +361,7 @@
</span><span class="cx">         m_scheduledEventTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaStream::scheduledEventTimerFired(Timer&lt;MediaStream&gt;*)
</del><ins>+void MediaStream::scheduledEventTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     Vector&lt;RefPtr&lt;Event&gt;&gt; events;
</span><span class="cx">     events.swap(m_scheduledEvents);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx">     bool haveTrackWithSource(PassRefPtr&lt;MediaStreamSource&gt;);
</span><span class="cx"> 
</span><span class="cx">     void scheduleDispatchEvent(PassRefPtr&lt;Event&gt;);
</span><del>-    void scheduledEventTimerFired(Timer&lt;MediaStream&gt;*);
</del><ins>+    void scheduledEventTimerFired(Timer*);
</ins><span class="cx"> 
</span><span class="cx">     void cloneMediaStreamTrackVector(Vector&lt;RefPtr&lt;MediaStreamTrack&gt;&gt;&amp;, const Vector&lt;RefPtr&lt;MediaStreamTrack&gt;&gt;&amp;);
</span><span class="cx"> 
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx">     Vector&lt;RefPtr&lt;MediaStreamTrack&gt;&gt; m_audioTracks;
</span><span class="cx">     Vector&lt;RefPtr&lt;MediaStreamTrack&gt;&gt; m_videoTracks;
</span><span class="cx"> 
</span><del>-    Timer&lt;MediaStream&gt; m_scheduledEventTimer;
</del><ins>+    Timer m_scheduledEventTimer;
</ins><span class="cx">     Vector&lt;RefPtr&lt;Event&gt;&gt; m_scheduledEvents;
</span><span class="cx"> 
</span><span class="cx">     Vector&lt;Observer*&gt; m_observers;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDTMFSendercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx">         m_scheduledEventTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RTCDTMFSender::scheduledEventTimerFired(Timer&lt;RTCDTMFSender&gt;*)
</del><ins>+void RTCDTMFSender::scheduledEventTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     if (m_stopped)
</span><span class="cx">         return;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDTMFSenderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx">     RTCDTMFSender(ScriptExecutionContext*, PassRefPtr&lt;MediaStreamTrack&gt;, std::unique_ptr&lt;RTCDTMFSenderHandler&gt;);
</span><span class="cx"> 
</span><span class="cx">     void scheduleDispatchEvent(PassRefPtr&lt;Event&gt;);
</span><del>-    void scheduledEventTimerFired(Timer&lt;RTCDTMFSender&gt;*);
</del><ins>+    void scheduledEventTimerFired(Timer*);
</ins><span class="cx"> 
</span><span class="cx">     // EventTarget
</span><span class="cx">     virtual void refEventTarget() override { ref(); }
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> 
</span><span class="cx">     bool m_stopped;
</span><span class="cx"> 
</span><del>-    Timer&lt;RTCDTMFSender&gt; m_scheduledEventTimer;
</del><ins>+    Timer m_scheduledEventTimer;
</ins><span class="cx">     Vector&lt;RefPtr&lt;Event&gt;&gt; m_scheduledEvents;
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDataChannelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -312,7 +312,7 @@
</span><span class="cx">         m_scheduledEventTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RTCDataChannel::scheduledEventTimerFired(Timer&lt;RTCDataChannel&gt;*)
</del><ins>+void RTCDataChannel::scheduledEventTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     if (m_stopped)
</span><span class="cx">         return;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDataChannelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx">     RTCDataChannel(ScriptExecutionContext*, std::unique_ptr&lt;RTCDataChannelHandler&gt;);
</span><span class="cx"> 
</span><span class="cx">     void scheduleDispatchEvent(PassRefPtr&lt;Event&gt;);
</span><del>-    void scheduledEventTimerFired(Timer&lt;RTCDataChannel&gt;*);
</del><ins>+    void scheduledEventTimerFired(Timer*);
</ins><span class="cx"> 
</span><span class="cx">     // EventTarget
</span><span class="cx">     virtual void refEventTarget() override { ref(); }
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx">     };
</span><span class="cx">     BinaryType m_binaryType;
</span><span class="cx"> 
</span><del>-    Timer&lt;RTCDataChannel&gt; m_scheduledEventTimer;
</del><ins>+    Timer m_scheduledEventTimer;
</ins><span class="cx">     Vector&lt;RefPtr&lt;Event&gt;&gt; m_scheduledEvents;
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -724,7 +724,7 @@
</span><span class="cx">         m_scheduledEventTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RTCPeerConnection::scheduledEventTimerFired(Timer&lt;RTCPeerConnection&gt;*)
</del><ins>+void RTCPeerConnection::scheduledEventTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     if (m_stopped)
</span><span class="cx">         return;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> 
</span><span class="cx">     static PassRefPtr&lt;RTCConfiguration&gt; parseConfiguration(const Dictionary&amp; configuration, ExceptionCode&amp;);
</span><span class="cx">     void scheduleDispatchEvent(PassRefPtr&lt;Event&gt;);
</span><del>-    void scheduledEventTimerFired(Timer&lt;RTCPeerConnection&gt;*);
</del><ins>+    void scheduledEventTimerFired(Timer*);
</ins><span class="cx">     bool hasLocalStreamWithTrackId(const String&amp; trackId);
</span><span class="cx"> 
</span><span class="cx">     // EventTarget implementation.
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> 
</span><span class="cx">     std::unique_ptr&lt;RTCPeerConnectionHandler&gt; m_peerHandler;
</span><span class="cx"> 
</span><del>-    Timer&lt;RTCPeerConnection&gt; m_scheduledEventTimer;
</del><ins>+    Timer m_scheduledEventTimer;
</ins><span class="cx">     Vector&lt;RefPtr&lt;Event&gt;&gt; m_scheduledEvents;
</span><span class="cx"> 
</span><span class="cx">     RefPtr&lt;RTCConfiguration&gt; m_configuration;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesnotificationsNotificationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/notifications/Notification.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/notifications/Notification.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/Modules/notifications/Notification.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx">     : ActiveDOMObject(&amp;context)
</span><span class="cx">     , m_title(title)
</span><span class="cx">     , m_state(Idle)
</span><del>-    , m_taskTimer(std::make_unique&lt;Timer&lt;Notification&gt;&gt;(this, &amp;Notification::taskTimerFired))
</del><ins>+    , m_taskTimer(std::make_unique&lt;Timer&gt;(this, &amp;Notification::taskTimerFired))
</ins><span class="cx"> {
</span><span class="cx">     m_notificationCenter = DOMWindowNotifications::webkitNotifications(downcast&lt;Document&gt;(context).domWindow());
</span><span class="cx">     
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(NOTIFICATIONS)
</span><del>-void Notification::taskTimerFired(Timer&lt;Notification&gt;&amp; timer)
</del><ins>+void Notification::taskTimerFired(Timer&amp; timer)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(scriptExecutionContext()-&gt;isDocument());
</span><span class="cx">     ASSERT_UNUSED(timer, &amp;timer == m_taskTimer.get());
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesnotificationsNotificationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/notifications/Notification.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/notifications/Notification.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/Modules/notifications/Notification.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx">     void finishLoadingIcon();
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(NOTIFICATIONS)
</span><del>-    void taskTimerFired(Timer&lt;Notification&gt;&amp;);
</del><ins>+    void taskTimerFired(Timer&amp;);
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     // Text notifications.
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx">     RefPtr&lt;NotificationCenter&gt; m_notificationCenter;
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(NOTIFICATIONS)
</span><del>-    std::unique_ptr&lt;Timer&lt;Notification&gt;&gt; m_taskTimer;
</del><ins>+    std::unique_ptr&lt;Timer&gt; m_taskTimer;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesnotificationsNotificationCentercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/notifications/NotificationCenter.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/notifications/NotificationCenter.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/Modules/notifications/NotificationCenter.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx">     m_timer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void NotificationCenter::NotificationRequestCallback::timerFired(Timer&lt;NotificationCenter::NotificationRequestCallback&gt;&amp;)
</del><ins>+void NotificationCenter::NotificationRequestCallback::timerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     if (m_callback)
</span><span class="cx">         m_callback-&gt;handleEvent();
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesnotificationsNotificationCenterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/notifications/NotificationCenter.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/notifications/NotificationCenter.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/Modules/notifications/NotificationCenter.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -80,12 +80,12 @@
</span><span class="cx">     public:
</span><span class="cx">         static PassRefPtr&lt;NotificationRequestCallback&gt; createAndStartTimer(NotificationCenter*, PassRefPtr&lt;VoidCallback&gt;);
</span><span class="cx">         void startTimer();
</span><del>-        void timerFired(Timer&lt;NotificationRequestCallback&gt;&amp;);
</del><ins>+        void timerFired(Timer&amp;);
</ins><span class="cx">     private:
</span><span class="cx">         NotificationRequestCallback(NotificationCenter*, PassRefPtr&lt;VoidCallback&gt;);
</span><span class="cx"> 
</span><span class="cx">         RefPtr&lt;NotificationCenter&gt; m_notificationCenter;
</span><del>-        Timer&lt;NotificationRequestCallback&gt; m_timer;
</del><ins>+        Timer m_timer;
</ins><span class="cx">         RefPtr&lt;VoidCallback&gt; m_callback;
</span><span class="cx">     };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesvibrationVibrationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/vibration/Vibration.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/vibration/Vibration.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/Modules/vibration/Vibration.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Vibration::timerFired(Timer&lt;Vibration&gt;* timer)
</del><ins>+void Vibration::timerFired(Timer* timer)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT_UNUSED(timer, timer == &amp;m_timer);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesvibrationVibrationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/vibration/Vibration.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/vibration/Vibration.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/Modules/vibration/Vibration.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">     // FIXME: When a visibilitychange event is dispatched while vibrating, the vibration should be canceled.
</span><span class="cx">     void cancelVibration();
</span><span class="cx"> 
</span><del>-    void timerFired(Timer&lt;Vibration&gt;*);
</del><ins>+    void timerFired(Timer*);
</ins><span class="cx"> 
</span><span class="cx">     static const char* supplementName();
</span><span class="cx">     static Vibration* from(Page* page) { return static_cast&lt;Vibration*&gt;(Supplement&lt;Page&gt;::from(page, supplementName())); }
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx">     enum class State { Idle, Vibrating, Waiting };
</span><span class="cx"> 
</span><span class="cx">     VibrationClient* m_vibrationClient;
</span><del>-    Timer&lt;Vibration&gt; m_timer;
</del><ins>+    Timer m_timer;
</ins><span class="cx">     State m_state;
</span><span class="cx">     VibrationPattern m_pattern;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketChannelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -449,7 +449,7 @@
</span><span class="cx">     return processFrame();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebSocketChannel::resumeTimerFired(Timer&lt;WebSocketChannel&gt;* timer)
</del><ins>+void WebSocketChannel::resumeTimerFired(Timer* timer)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT_UNUSED(timer, timer == &amp;m_resumeTimer);
</span><span class="cx"> 
</span><span class="lines">@@ -491,7 +491,7 @@
</span><span class="cx">         m_client-&gt;didStartClosingHandshake();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebSocketChannel::closingTimerFired(Timer&lt;WebSocketChannel&gt;* timer)
</del><ins>+void WebSocketChannel::closingTimerFired(Timer* timer)
</ins><span class="cx"> {
</span><span class="cx">     LOG(Network, &quot;WebSocketChannel %p closingTimerFired()&quot;, this);
</span><span class="cx">     ASSERT_UNUSED(timer, &amp;m_closingTimer == timer);
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketChannelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocketChannel.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocketChannel.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketChannel.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -127,9 +127,9 @@
</span><span class="cx">     bool appendToBuffer(const char* data, size_t len);
</span><span class="cx">     void skipBuffer(size_t len);
</span><span class="cx">     bool processBuffer();
</span><del>-    void resumeTimerFired(Timer&lt;WebSocketChannel&gt;*);
</del><ins>+    void resumeTimerFired(Timer*);
</ins><span class="cx">     void startClosingHandshake(int code, const String&amp; reason);
</span><del>-    void closingTimerFired(Timer&lt;WebSocketChannel&gt;*);
</del><ins>+    void closingTimerFired(Timer*);
</ins><span class="cx"> 
</span><span class="cx">     bool processFrame();
</span><span class="cx"> 
</span><span class="lines">@@ -190,11 +190,11 @@
</span><span class="cx">     RefPtr&lt;SocketStreamHandle&gt; m_handle;
</span><span class="cx">     Vector&lt;char&gt; m_buffer;
</span><span class="cx"> 
</span><del>-    Timer&lt;WebSocketChannel&gt; m_resumeTimer;
</del><ins>+    Timer m_resumeTimer;
</ins><span class="cx">     bool m_suspended;
</span><span class="cx">     bool m_closing;
</span><span class="cx">     bool m_receivedClosingHandshake;
</span><del>-    Timer&lt;WebSocketChannel&gt; m_closingTimer;
</del><ins>+    Timer m_closingTimer;
</ins><span class="cx">     bool m_closed;
</span><span class="cx">     bool m_shouldDiscardReceivedData;
</span><span class="cx">     unsigned long m_unhandledBufferedAmount;
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAXObjectCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AXObjectCache.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AXObjectCache.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -700,7 +700,7 @@
</span><span class="cx">     obj-&gt;childrenChanged();
</span><span class="cx"> }
</span><span class="cx">     
</span><del>-void AXObjectCache::notificationPostTimerFired(Timer&lt;AXObjectCache&gt;&amp;)
</del><ins>+void AXObjectCache::notificationPostTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     Ref&lt;Document&gt; protectorForCacheOwner(m_document);
</span><span class="cx">     m_notificationPostTimer.stop();
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAXObjectCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AXObjectCache.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AXObjectCache.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -242,9 +242,9 @@
</span><span class="cx">     
</span><span class="cx">     HashSet&lt;AXID&gt; m_idsInUse;
</span><span class="cx">     
</span><del>-    Timer&lt;AXObjectCache&gt; m_notificationPostTimer;
</del><ins>+    Timer m_notificationPostTimer;
</ins><span class="cx">     Vector&lt;std::pair&lt;RefPtr&lt;AccessibilityObject&gt;, AXNotification&gt;&gt; m_notificationsToPost;
</span><del>-    void notificationPostTimerFired(Timer&lt;AXObjectCache&gt;&amp;);
</del><ins>+    void notificationPostTimerFired(Timer&amp;);
</ins><span class="cx">     void handleMenuOpened(Node*);
</span><span class="cx">     void handleLiveRegionCreated(Node*);
</span><span class="cx">     void handleMenuItemSelected(Node*);
</span><span class="lines">@@ -271,7 +271,7 @@
</span><span class="cx"> #if !HAVE(ACCESSIBILITY)
</span><span class="cx"> inline AccessibilityObjectInclusion AXComputedObjectAttributeCache::getIgnored(AXID) const { return DefaultBehavior; }
</span><span class="cx"> inline void AXComputedObjectAttributeCache::setIgnored(AXID, AccessibilityObjectInclusion) { }
</span><del>-inline AXObjectCache::AXObjectCache(Document&amp; document) : m_document(document), m_notificationPostTimer(this, (Timer&lt;AXObjectCache&gt;::TimerFiredFunction) nullptr) { }
</del><ins>+inline AXObjectCache::AXObjectCache(Document&amp; document) : m_document(document), m_notificationPostTimer(this, (Timer::TimerFiredFunction) nullptr) { }
</ins><span class="cx"> inline AXObjectCache::~AXObjectCache() { }
</span><span class="cx"> inline AccessibilityObject* AXObjectCache::focusedUIElementForPage(const Page*) { return nullptr; }
</span><span class="cx"> inline AccessibilityObject* AXObjectCache::get(RenderObject*) { return nullptr; }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsGCControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/GCController.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/GCController.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/bindings/js/GCController.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #if !USE(CF)
</span><del>-void GCController::gcTimerFired(Timer&lt;GCController&gt;*)
</del><ins>+void GCController::gcTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     collect(nullptr);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsGCControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/GCController.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/GCController.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/bindings/js/GCController.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -52,8 +52,8 @@
</span><span class="cx">         GCController(); // Use gcController() instead
</span><span class="cx"> 
</span><span class="cx"> #if !USE(CF)
</span><del>-        void gcTimerFired(Timer&lt;GCController&gt;*);
-        Timer&lt;GCController&gt; m_GCTimer;
</del><ins>+        void gcTimerFired(Timer*);
+        Timer m_GCTimer;
</ins><span class="cx"> #endif
</span><span class="cx">     };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFaceSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFaceSource.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFaceSource.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/css/CSSFontFaceSource.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    void startLoadingTimerFired(Timer&lt;CSSFontFaceSource&gt;*);
</del><ins>+    void startLoadingTimerFired(Timer*);
</ins><span class="cx"> 
</span><span class="cx">     AtomicString m_string; // URI for remote, built-in font name for local.
</span><span class="cx">     CachedResourceHandle&lt;CachedFont&gt; m_font; // For remote fonts, a pointer to our cached resource.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontSelector.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontSelector.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/css/CSSFontSelector.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -587,7 +587,7 @@
</span><span class="cx">     m_beginLoadingTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void CSSFontSelector::beginLoadTimerFired(Timer&lt;WebCore::CSSFontSelector&gt;&amp;)
</del><ins>+void CSSFontSelector::beginLoadTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     Vector&lt;CachedResourceHandle&lt;CachedFont&gt;&gt; fontsToBeginLoading;
</span><span class="cx">     fontsToBeginLoading.swap(m_fontsToBeginLoading);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontSelectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontSelector.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontSelector.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/css/CSSFontSelector.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> 
</span><span class="cx">     void dispatchInvalidationCallbacks();
</span><span class="cx"> 
</span><del>-    void beginLoadTimerFired(Timer&lt;CSSFontSelector&gt;&amp;);
</del><ins>+    void beginLoadTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     Document* m_document;
</span><span class="cx">     HashMap&lt;String, std::unique_ptr&lt;Vector&lt;RefPtr&lt;CSSFontFace&gt;&gt;&gt;, CaseFoldingHash&gt; m_fontFaces;
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx">     HashSet&lt;FontSelectorClient*&gt; m_clients;
</span><span class="cx"> 
</span><span class="cx">     Vector&lt;CachedResourceHandle&lt;CachedFont&gt;&gt; m_fontsToBeginLoading;
</span><del>-    Timer&lt;CSSFontSelector&gt; m_beginLoadingTimer;
</del><ins>+    Timer m_beginLoadingTimer;
</ins><span class="cx"> 
</span><span class="cx">     unsigned m_uniqueId;
</span><span class="cx">     unsigned m_version;
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/css/StyleResolver.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -349,7 +349,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void StyleResolver::sweepMatchedPropertiesCache(Timer&lt;StyleResolver&gt;*)
</del><ins>+void StyleResolver::sweepMatchedPropertiesCache(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     // Look for cache entries containing a style declaration with a single ref and remove them.
</span><span class="cx">     // This may happen when an element attribute mutation causes it to generate a new inlineStyle()
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/css/StyleResolver.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -498,7 +498,7 @@
</span><span class="cx"> 
</span><span class="cx">     // Every N additions to the matched declaration cache trigger a sweep where entries holding
</span><span class="cx">     // the last reference to a style declaration are garbage collected.
</span><del>-    void sweepMatchedPropertiesCache(Timer&lt;StyleResolver&gt;*);
</del><ins>+    void sweepMatchedPropertiesCache(Timer*);
</ins><span class="cx"> 
</span><span class="cx">     bool classNamesAffectedByRules(const SpaceSplitString&amp;) const;
</span><span class="cx">     bool sharingCandidateHasIdenticalStyleAffectingAttributes(StyledElement*) const;
</span><span class="lines">@@ -513,7 +513,7 @@
</span><span class="cx">     typedef HashMap&lt;unsigned, MatchedPropertiesCacheItem&gt; MatchedPropertiesCache;
</span><span class="cx">     MatchedPropertiesCache m_matchedPropertiesCache;
</span><span class="cx"> 
</span><del>-    Timer&lt;StyleResolver&gt; m_matchedPropertiesCacheSweepTimer;
</del><ins>+    Timer m_matchedPropertiesCacheSweepTimer;
</ins><span class="cx"> 
</span><span class="cx">     std::unique_ptr&lt;MediaQueryEvaluator&gt; m_medium;
</span><span class="cx">     RefPtr&lt;RenderStyle&gt; m_rootDefaultStyle;
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/dom/Document.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -1265,7 +1265,7 @@
</span><span class="cx">         frame-&gt;loader().forcePageTransitionIfNeeded();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Document::visualUpdatesSuppressionTimerFired(Timer&lt;Document&gt;&amp;)
</del><ins>+void Document::visualUpdatesSuppressionTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(!m_visualUpdatesAllowed);
</span><span class="cx"> 
</span><span class="lines">@@ -1746,7 +1746,7 @@
</span><span class="cx">     return m_styleRecalcTimer.isActive() &amp;&amp; m_pendingStyleRecalcShouldForce;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Document::styleRecalcTimerFired(Timer&lt;Document&gt;&amp;)
</del><ins>+void Document::styleRecalcTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     updateStyleIfNeeded();
</span><span class="cx"> }
</span><span class="lines">@@ -3245,7 +3245,7 @@
</span><span class="cx">         m_mediaQueryMatcher-&gt;styleResolverChanged();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Document::optimizedStyleSheetUpdateTimerFired(Timer&lt;Document&gt;&amp;)
</del><ins>+void Document::optimizedStyleSheetUpdateTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     styleResolverChanged(RecalcStyleIfNeeded);
</span><span class="cx"> }
</span><span class="lines">@@ -4630,7 +4630,7 @@
</span><span class="cx">     m_cachedResourceLoader-&gt;clearPreloads();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Document::sharedObjectPoolClearTimerFired(Timer&lt;Document&gt;&amp;)
</del><ins>+void Document::sharedObjectPoolClearTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     m_sharedObjectPool = nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -4869,7 +4869,7 @@
</span><span class="cx">     m_updateFocusAppearanceTimer.stop();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Document::updateFocusAppearanceTimerFired(Timer&lt;Document&gt;&amp;)
</del><ins>+void Document::updateFocusAppearanceTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     Element* element = focusedElement();
</span><span class="cx">     if (!element)
</span><span class="lines">@@ -5024,7 +5024,7 @@
</span><span class="cx">     });
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Document::pendingTasksTimerFired(Timer&lt;Document&gt;&amp;)
</del><ins>+void Document::pendingTasksTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     Vector&lt;Task&gt; pendingTasks = WTF::move(m_pendingTasks);
</span><span class="cx">     for (auto&amp; task : pendingTasks)
</span><span class="lines">@@ -5559,7 +5559,7 @@
</span><span class="cx">     m_fullScreenRenderer = nullptr;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Document::fullScreenChangeDelayTimerFired(Timer&lt;Document&gt;&amp;)
</del><ins>+void Document::fullScreenChangeDelayTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     // Since we dispatch events in this function, it's possible that the
</span><span class="cx">     // document will be detached and GC'd. We protect it here to make sure we
</span><span class="lines">@@ -5697,7 +5697,7 @@
</span><span class="cx">         m_loadEventDelayTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Document::loadEventDelayTimerFired(Timer&lt;Document&gt;&amp;)
</del><ins>+void Document::loadEventDelayTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     if (frame())
</span><span class="cx">         frame()-&gt;loader().checkCompleted();
</span><span class="lines">@@ -6213,7 +6213,7 @@
</span><span class="cx">         m_didAssociateFormControlsTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Document::didAssociateFormControlsTimerFired(Timer&lt;Document&gt;&amp; timer)
</del><ins>+void Document::didAssociateFormControlsTimerFired(Timer&amp; timer)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT_UNUSED(timer, &amp;timer == &amp;m_didAssociateFormControlsTimer);
</span><span class="cx"> 
</span><span class="lines">@@ -6241,7 +6241,7 @@
</span><span class="cx">     m_cachedDOMCookies = String();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Document::domCookieCacheExpiryTimerFired(Timer&lt;Document&gt;&amp;)
</del><ins>+void Document::domCookieCacheExpiryTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     invalidateDOMCookieCache();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/dom/Document.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -773,8 +773,8 @@
</span><span class="cx">     void unscheduleStyleRecalc();
</span><span class="cx">     bool hasPendingStyleRecalc() const;
</span><span class="cx">     bool hasPendingForcedStyleRecalc() const;
</span><del>-    void styleRecalcTimerFired(Timer&lt;Document&gt;&amp;);
-    void optimizedStyleSheetUpdateTimerFired(Timer&lt;Document&gt;&amp;);
</del><ins>+    void styleRecalcTimerFired(Timer&amp;);
+    void optimizedStyleSheetUpdateTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     void registerNodeListForInvalidation(LiveNodeList&amp;);
</span><span class="cx">     void unregisterNodeListForInvalidation(LiveNodeList&amp;);
</span><span class="lines">@@ -1145,7 +1145,7 @@
</span><span class="cx">     RenderFullScreen* fullScreenRenderer() const { return m_fullScreenRenderer; }
</span><span class="cx">     void fullScreenRendererDestroyed();
</span><span class="cx">     
</span><del>-    void fullScreenChangeDelayTimerFired(Timer&lt;Document&gt;&amp;);
</del><ins>+    void fullScreenChangeDelayTimerFired(Timer&amp;);
</ins><span class="cx">     bool fullScreenIsAllowedForElement(Element*) const;
</span><span class="cx">     void fullScreenElementRemoved();
</span><span class="cx">     void removeFullScreenElementOfSubtree(Node*, bool amongChildrenOnly = false);
</span><span class="lines">@@ -1337,16 +1337,16 @@
</span><span class="cx">     virtual double timerAlignmentInterval() const override final;
</span><span class="cx"> 
</span><span class="cx">     void updateTitle(const StringWithDirection&amp;);
</span><del>-    void updateFocusAppearanceTimerFired(Timer&lt;Document&gt;&amp;);
</del><ins>+    void updateFocusAppearanceTimerFired(Timer&amp;);
</ins><span class="cx">     void updateBaseURL();
</span><span class="cx"> 
</span><span class="cx">     void buildAccessKeyMap(TreeScope* root);
</span><span class="cx"> 
</span><span class="cx">     void createStyleResolver();
</span><span class="cx"> 
</span><del>-    void loadEventDelayTimerFired(Timer&lt;Document&gt;&amp;);
</del><ins>+    void loadEventDelayTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><del>-    void pendingTasksTimerFired(Timer&lt;Document&gt;&amp;);
</del><ins>+    void pendingTasksTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     template &lt;typename CharacterType&gt;
</span><span class="cx">     void displayBufferModifiedByEncodingInternal(CharacterType*, unsigned) const;
</span><span class="lines">@@ -1367,18 +1367,18 @@
</span><span class="cx"> 
</span><span class="cx">     void setVisualUpdatesAllowed(ReadyState);
</span><span class="cx">     void setVisualUpdatesAllowed(bool);
</span><del>-    void visualUpdatesSuppressionTimerFired(Timer&lt;Document&gt;&amp;);
</del><ins>+    void visualUpdatesSuppressionTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     void addListenerType(ListenerType listenerType) { m_listenerTypes |= listenerType; }
</span><span class="cx"> 
</span><del>-    void didAssociateFormControlsTimerFired(Timer&lt;Document&gt;&amp;);
</del><ins>+    void didAssociateFormControlsTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     // DOM Cookies caching.
</span><span class="cx">     const String&amp; cachedDOMCookies() const { return m_cachedDOMCookies; }
</span><span class="cx">     void setCachedDOMCookies(const String&amp;);
</span><span class="cx">     bool isDOMCookieCacheValid() const { return m_cookieCacheExpiryTimer.isActive(); }
</span><span class="cx">     void invalidateDOMCookieCache();
</span><del>-    void domCookieCacheExpiryTimerFired(Timer&lt;Document&gt;&amp;);
</del><ins>+    void domCookieCacheExpiryTimerFired(Timer&amp;);
</ins><span class="cx">     virtual void didLoadResourceSynchronously(const ResourceRequest&amp;) override final;
</span><span class="cx"> 
</span><span class="cx">     unsigned m_referencingNodeCount;
</span><span class="lines">@@ -1468,8 +1468,8 @@
</span><span class="cx">     ReadyState m_readyState;
</span><span class="cx">     bool m_bParsing;
</span><span class="cx"> 
</span><del>-    Timer&lt;Document&gt; m_optimizedStyleSheetUpdateTimer;
-    Timer&lt;Document&gt; m_styleRecalcTimer;
</del><ins>+    Timer m_optimizedStyleSheetUpdateTimer;
+    Timer m_styleRecalcTimer;
</ins><span class="cx">     bool m_pendingStyleRecalcShouldForce;
</span><span class="cx">     bool m_inStyleRecalc;
</span><span class="cx">     bool m_closeAfterStyleRecalc;
</span><span class="lines">@@ -1492,7 +1492,7 @@
</span><span class="cx">     std::unique_ptr&lt;AXObjectCache&gt; m_axObjectCache;
</span><span class="cx">     const std::unique_ptr&lt;DocumentMarkerController&gt; m_markers;
</span><span class="cx">     
</span><del>-    Timer&lt;Document&gt; m_updateFocusAppearanceTimer;
</del><ins>+    Timer m_updateFocusAppearanceTimer;
</ins><span class="cx"> 
</span><span class="cx">     Element* m_cssTarget;
</span><span class="cx"> 
</span><span class="lines">@@ -1591,7 +1591,7 @@
</span><span class="cx">     RefPtr&lt;Element&gt; m_fullScreenElement;
</span><span class="cx">     Vector&lt;RefPtr&lt;Element&gt;&gt; m_fullScreenElementStack;
</span><span class="cx">     RenderFullScreen* m_fullScreenRenderer;
</span><del>-    Timer&lt;Document&gt; m_fullScreenChangeDelayTimer;
</del><ins>+    Timer m_fullScreenChangeDelayTimer;
</ins><span class="cx">     Deque&lt;RefPtr&lt;Node&gt;&gt; m_fullScreenChangeEventTargetQueue;
</span><span class="cx">     Deque&lt;RefPtr&lt;Node&gt;&gt; m_fullScreenErrorEventTargetQueue;
</span><span class="cx">     bool m_isAnimatingFullScreen;
</span><span class="lines">@@ -1600,7 +1600,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     int m_loadEventDelayCount;
</span><del>-    Timer&lt;Document&gt; m_loadEventDelayTimer;
</del><ins>+    Timer m_loadEventDelayTimer;
</ins><span class="cx"> 
</span><span class="cx">     ViewportArguments m_viewportArguments;
</span><span class="cx"> 
</span><span class="lines">@@ -1656,7 +1656,7 @@
</span><span class="cx">     bool m_isTelephoneNumberParsingAllowed;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    Timer&lt;Document&gt; m_pendingTasksTimer;
</del><ins>+    Timer m_pendingTasksTimer;
</ins><span class="cx">     Vector&lt;Task&gt; m_pendingTasks;
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="lines">@@ -1679,7 +1679,7 @@
</span><span class="cx">     bool m_scheduledTasksAreSuspended;
</span><span class="cx">     
</span><span class="cx">     bool m_visualUpdatesAllowed;
</span><del>-    Timer&lt;Document&gt; m_visualUpdatesSuppressionTimer;
</del><ins>+    Timer m_visualUpdatesSuppressionTimer;
</ins><span class="cx"> 
</span><span class="cx">     RefPtr&lt;NamedFlowCollection&gt; m_namedFlows;
</span><span class="cx"> 
</span><span class="lines">@@ -1687,8 +1687,8 @@
</span><span class="cx">     RefPtr&lt;DOMSecurityPolicy&gt; m_domSecurityPolicy;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    void sharedObjectPoolClearTimerFired(Timer&lt;Document&gt;&amp;);
-    Timer&lt;Document&gt; m_sharedObjectPoolClearTimer;
</del><ins>+    void sharedObjectPoolClearTimerFired(Timer&amp;);
+    Timer m_sharedObjectPoolClearTimer;
</ins><span class="cx"> 
</span><span class="cx">     std::unique_ptr&lt;DocumentSharedObjectPool&gt; m_sharedObjectPool;
</span><span class="cx"> 
</span><span class="lines">@@ -1712,8 +1712,8 @@
</span><span class="cx">     RefPtr&lt;JSC::InputCursor&gt; m_inputCursor;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    Timer&lt;Document&gt; m_didAssociateFormControlsTimer;
-    Timer&lt;Document&gt; m_cookieCacheExpiryTimer;
</del><ins>+    Timer m_didAssociateFormControlsTimer;
+    Timer m_cookieCacheExpiryTimer;
</ins><span class="cx">     String m_cachedDOMCookies;
</span><span class="cx">     HashSet&lt;RefPtr&lt;Element&gt;&gt; m_associatedFormControls;
</span><span class="cx">     unsigned m_disabledFieldsetElementsCount;
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventSenderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventSender.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventSender.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/dom/EventSender.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -49,10 +49,10 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    void timerFired(Timer&lt;EventSender&lt;T&gt;&gt;&amp;) { dispatchPendingEvents(); }
</del><ins>+    void timerFired(Timer&amp;) { dispatchPendingEvents(); }
</ins><span class="cx"> 
</span><span class="cx">     AtomicString m_eventType;
</span><del>-    Timer&lt;EventSender&lt;T&gt;&gt; m_timer;
</del><ins>+    Timer m_timer;
</ins><span class="cx">     Vector&lt;T*&gt; m_dispatchSoonList;
</span><span class="cx">     Vector&lt;T*&gt; m_dispatchingList;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoredomGenericEventQueuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/GenericEventQueue.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/GenericEventQueue.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/dom/GenericEventQueue.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void GenericEventQueue::timerFired(Timer&lt;GenericEventQueue&gt;&amp;)
</del><ins>+void GenericEventQueue::timerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(!m_timer.isActive());
</span><span class="cx">     ASSERT(!m_pendingEvents.isEmpty());
</span></span></pre></div>
<a id="trunkSourceWebCoredomGenericEventQueueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/GenericEventQueue.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/GenericEventQueue.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/dom/GenericEventQueue.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -48,11 +48,11 @@
</span><span class="cx">     bool hasPendingEvents() const;
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    void timerFired(Timer&lt;GenericEventQueue&gt;&amp;);
</del><ins>+    void timerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     EventTarget&amp; m_owner;
</span><span class="cx">     Vector&lt;RefPtr&lt;Event&gt;&gt; m_pendingEvents;
</span><del>-    Timer&lt;GenericEventQueue&gt; m_timer;
</del><ins>+    Timer m_timer;
</ins><span class="cx">     bool m_isClosed;
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptRunnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptRunner.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptRunner.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/dom/ScriptRunner.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx">     m_timer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void ScriptRunner::timerFired(Timer&lt;ScriptRunner&gt;&amp; timer)
</del><ins>+void ScriptRunner::timerFired(Timer&amp; timer)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT_UNUSED(timer, &amp;timer == &amp;m_timer);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptRunnerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptRunner.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptRunner.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/dom/ScriptRunner.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -54,13 +54,13 @@
</span><span class="cx">     void notifyScriptReady(ScriptElement*, ExecutionType);
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    void timerFired(Timer&lt;ScriptRunner&gt;&amp;);
</del><ins>+    void timerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     Document&amp; m_document;
</span><span class="cx">     Vector&lt;PendingScript&gt; m_scriptsToExecuteInOrder;
</span><span class="cx">     Vector&lt;PendingScript&gt; m_scriptsToExecuteSoon; // http://www.whatwg.org/specs/web-apps/current-work/#set-of-scripts-that-will-execute-as-soon-as-possible
</span><span class="cx">     HashMap&lt;ScriptElement*, PendingScript&gt; m_pendingAsyncScripts;
</span><del>-    Timer&lt;ScriptRunner&gt; m_timer;
</del><ins>+    Timer m_timer;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptedAnimationControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptedAnimationController.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptedAnimationController.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/dom/ScriptedAnimationController.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #if USE(REQUEST_ANIMATION_FRAME_TIMER)
</span><del>-void ScriptedAnimationController::animationTimerFired(Timer&lt;ScriptedAnimationController&gt;&amp;)
</del><ins>+void ScriptedAnimationController::animationTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     m_lastAnimationFrameTimeMonotonic = monotonicallyIncreasingTime();
</span><span class="cx">     serviceScriptedAnimations(m_lastAnimationFrameTimeMonotonic);
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptedAnimationControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptedAnimationController.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptedAnimationController.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/dom/ScriptedAnimationController.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -84,8 +84,8 @@
</span><span class="cx">     void scheduleAnimation();
</span><span class="cx"> 
</span><span class="cx"> #if USE(REQUEST_ANIMATION_FRAME_TIMER)
</span><del>-    void animationTimerFired(Timer&lt;ScriptedAnimationController&gt;&amp;);
-    Timer&lt;ScriptedAnimationController&gt; m_animationTimer;
</del><ins>+    void animationTimerFired(Timer&amp;);
+    Timer m_animationTimer;
</ins><span class="cx">     double m_lastAnimationFrameTimeMonotonic;
</span><span class="cx"> 
</span><span class="cx"> #if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</span></span></pre></div>
<a id="trunkSourceWebCoredomStyledElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/StyledElement.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/StyledElement.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/dom/StyledElement.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx">     static const int minimumPresentationAttributeCacheSizeForCleaning = 100;
</span><span class="cx">     static const unsigned minimumPresentationAttributeCacheHitCountPerMinute = (100 * presentationAttributeCacheCleanTimeInSeconds) / 60;
</span><span class="cx"> 
</span><del>-    void cleanCache(Timer&lt;PresentationAttributeCacheCleaner&gt;* timer)
</del><ins>+    void cleanCache(Timer* timer)
</ins><span class="cx">     {
</span><span class="cx">         ASSERT_UNUSED(timer, timer == &amp;m_cleanTimer);
</span><span class="cx">         unsigned hitCount = m_hitCount;
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     unsigned m_hitCount;
</span><del>-    Timer&lt;PresentationAttributeCacheCleaner&gt; m_cleanTimer;
</del><ins>+    Timer m_cleanTimer;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> static PresentationAttributeCacheCleaner&amp; presentationAttributeCacheCleaner()
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingAlternativeTextControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/AlternativeTextController.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/AlternativeTextController.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/editing/AlternativeTextController.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -327,7 +327,7 @@
</span><span class="cx">     markers.addMarker(range.get(), DocumentMarker::SpellCheckingExemption);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void AlternativeTextController::timerFired(Timer&lt;AlternativeTextController&gt;&amp;)
</del><ins>+void AlternativeTextController::timerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     m_isDismissedByEditing = false;
</span><span class="cx">     switch (m_alternativeTextInfo.type) {
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingAlternativeTextControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/AlternativeTextController.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/AlternativeTextController.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/editing/AlternativeTextController.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> #if USE(AUTOCORRECTION_PANEL)
</span><span class="cx">     String dismissSoon(ReasonForDismissingAlternativeText);
</span><span class="cx">     void applyAlternativeTextToRange(const Range*, const String&amp; alternative, AlternativeTextType, const Vector&lt;DocumentMarker::MarkerType&gt;&amp;);
</span><del>-    void timerFired(Timer&lt;AlternativeTextController&gt;&amp;);
</del><ins>+    void timerFired(Timer&amp;);
</ins><span class="cx">     void recordAutocorrectionResponseReversed(const String&amp; replacedString, const String&amp; replacementString);
</span><span class="cx">     void recordSpellcheckerResponseForModifiedCorrection(Range* rangeOfCorrection, const String&amp; corrected, const String&amp; correction);
</span><span class="cx">     String markerDescriptionForAppliedAlternativeText(AlternativeTextType, DocumentMarker::MarkerType);
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx">     FloatRect rootViewRectForRange(const Range*) const;
</span><span class="cx">     void markPrecedingWhitespaceForDeletedAutocorrectionAfterCommand(EditCommand*);
</span><span class="cx"> 
</span><del>-    Timer&lt;AlternativeTextController&gt; m_timer;
</del><ins>+    Timer m_timer;
</ins><span class="cx">     AlternativeTextInfo m_alternativeTextInfo;
</span><span class="cx">     bool m_isDismissedByEditing;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/editing/Editor.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -3270,7 +3270,7 @@
</span><span class="cx">     return document().isTelephoneNumberParsingEnabled() &amp;&amp; TelephoneNumberDetector::isSupported();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Editor::scanSelectionForTelephoneNumbers(Timer&lt;Editor&gt;&amp;)
</del><ins>+void Editor::scanSelectionForTelephoneNumbers(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     scanSelectionForTelephoneNumbers();
</span><span class="cx"> }
</span><span class="lines">@@ -3377,7 +3377,7 @@
</span><span class="cx">     editorUIUpdateTimerFired(m_editorUIUpdateTimer);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Editor::editorUIUpdateTimerFired(Timer&lt;Editor&gt;&amp;)
</del><ins>+void Editor::editorUIUpdateTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     VisibleSelection oldSelection = m_oldSelectionForEditorUIUpdate;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/editing/Editor.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -472,7 +472,7 @@
</span><span class="cx">     enum EditorActionSpecifier { CutAction, CopyAction };
</span><span class="cx">     void performCutOrCopy(EditorActionSpecifier);
</span><span class="cx"> 
</span><del>-    void editorUIUpdateTimerFired(Timer&lt;Editor&gt;&amp;);
</del><ins>+    void editorUIUpdateTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     Node* findEventTargetFromSelection() const;
</span><span class="cx"> 
</span><span class="lines">@@ -504,16 +504,16 @@
</span><span class="cx">     bool m_overwriteModeEnabled;
</span><span class="cx"> 
</span><span class="cx">     VisibleSelection m_oldSelectionForEditorUIUpdate;
</span><del>-    Timer&lt;Editor&gt; m_editorUIUpdateTimer;
</del><ins>+    Timer m_editorUIUpdateTimer;
</ins><span class="cx">     bool m_editorUIUpdateTimerShouldCheckSpellingAndGrammar;
</span><span class="cx">     bool m_editorUIUpdateTimerWasTriggeredByDictation;
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(TELEPHONE_NUMBER_DETECTION) &amp;&amp; !PLATFORM(IOS)
</span><span class="cx">     bool shouldDetectTelephoneNumbers();
</span><del>-    void scanSelectionForTelephoneNumbers(Timer&lt;Editor&gt;&amp;);
</del><ins>+    void scanSelectionForTelephoneNumbers(Timer&amp;);
</ins><span class="cx">     void scanRangeForTelephoneNumbers(Range&amp;, const StringView&amp;, Vector&lt;RefPtr&lt;Range&gt;&gt;&amp; markedRanges);
</span><span class="cx"> 
</span><del>-    Timer&lt;Editor&gt; m_telephoneNumberDetectionUpdateTimer;
</del><ins>+    Timer m_telephoneNumberDetectionUpdateTimer;
</ins><span class="cx">     Vector&lt;RefPtr&lt;Range&gt;&gt; m_detectedTelephoneNumberRanges;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -1901,7 +1901,7 @@
</span><span class="cx">     updateAppearance();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void FrameSelection::caretBlinkTimerFired(Timer&lt;FrameSelection&gt;&amp;)
</del><ins>+void FrameSelection::caretBlinkTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(TEXT_CARET)
</span><span class="cx">     ASSERT(caretIsVisible());
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/editing/FrameSelection.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -309,7 +309,7 @@
</span><span class="cx">     void setFocusedElementIfNeeded();
</span><span class="cx">     void focusedOrActiveStateChanged();
</span><span class="cx"> 
</span><del>-    void caretBlinkTimerFired(Timer&lt;FrameSelection&gt;&amp;);
</del><ins>+    void caretBlinkTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     void setCaretVisibility(CaretVisibility);
</span><span class="cx">     bool recomputeCaretRect();
</span><span class="lines">@@ -329,7 +329,7 @@
</span><span class="cx"> 
</span><span class="cx">     RefPtr&lt;EditingStyle&gt; m_typingStyle;
</span><span class="cx"> 
</span><del>-    Timer&lt;FrameSelection&gt; m_caretBlinkTimer;
</del><ins>+    Timer m_caretBlinkTimer;
</ins><span class="cx">     // The painted bounds of the caret in absolute coordinates
</span><span class="cx">     IntRect m_absCaretBounds;
</span><span class="cx">     bool m_absCaretBoundsDirty : 1;
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingSpellCheckercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/SpellChecker.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/SpellChecker.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/editing/SpellChecker.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx">     return page-&gt;editorClient()-&gt;textChecker();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void SpellChecker::timerFiredToProcessQueuedRequest(Timer&lt;SpellChecker&gt;*)
</del><ins>+void SpellChecker::timerFiredToProcessQueuedRequest(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(!m_requestQueue.isEmpty());
</span><span class="cx">     if (m_requestQueue.isEmpty())
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingSpellCheckerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/SpellChecker.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/SpellChecker.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/editing/SpellChecker.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> 
</span><span class="cx">     bool canCheckAsynchronously(Range*) const;
</span><span class="cx">     TextCheckerClient* client() const;
</span><del>-    void timerFiredToProcessQueuedRequest(Timer&lt;SpellChecker&gt;*);
</del><ins>+    void timerFiredToProcessQueuedRequest(Timer*);
</ins><span class="cx">     void invokeRequest(PassRefPtr&lt;SpellCheckRequest&gt;);
</span><span class="cx">     void enqueueRequest(PassRefPtr&lt;SpellCheckRequest&gt;);
</span><span class="cx">     void didCheckSucceed(int sequence, const Vector&lt;TextCheckingResult&gt;&amp;);
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx">     int m_lastRequestSequence;
</span><span class="cx">     int m_lastProcessedSequence;
</span><span class="cx"> 
</span><del>-    Timer&lt;SpellChecker&gt; m_timerToProcessQueuedRequest;
</del><ins>+    Timer m_timerToProcessQueuedRequest;
</ins><span class="cx"> 
</span><span class="cx">     RefPtr&lt;SpellCheckRequest&gt; m_processingRequest;
</span><span class="cx">     RequestQueue m_requestQueue;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormElement.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormElement.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/HTMLFormElement.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -472,7 +472,7 @@
</span><span class="cx">         m_requestAutocompleteTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void HTMLFormElement::requestAutocompleteTimerFired(Timer&lt;HTMLFormElement&gt;*)
</del><ins>+void HTMLFormElement::requestAutocompleteTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     Vector&lt;RefPtr&lt;Event&gt;&gt; pendingEvents;
</span><span class="cx">     m_pendingAutocompleteEvents.swap(pendingEvents);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormElement.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormElement.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/HTMLFormElement.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -194,10 +194,10 @@
</span><span class="cx">     bool m_wasDemoted;
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(REQUEST_AUTOCOMPLETE)
</span><del>-    void requestAutocompleteTimerFired(Timer&lt;HTMLFormElement&gt;*);
</del><ins>+    void requestAutocompleteTimerFired(Timer*);
</ins><span class="cx"> 
</span><span class="cx">     Vector&lt;RefPtr&lt;Event&gt;&gt; m_pendingAutocompleteEvents;
</span><del>-    Timer&lt;HTMLFormElement&gt; m_requestAutocompleteTimer;
</del><ins>+    Timer m_requestAutocompleteTimer;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -757,7 +757,7 @@
</span><span class="cx">     m_asyncEventQueue.enqueueEvent(event.release());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void HTMLMediaElement::loadTimerFired(Timer&lt;HTMLMediaElement&gt;&amp;)
</del><ins>+void HTMLMediaElement::loadTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     Ref&lt;HTMLMediaElement&gt; protect(*this); // loadNextSourceChild may fire 'beforeload', which can make arbitrary DOM mutations.
</span><span class="cx"> 
</span><span class="lines">@@ -2225,7 +2225,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-void HTMLMediaElement::progressEventTimerFired(Timer&lt;HTMLMediaElement&gt;&amp;)
</del><ins>+void HTMLMediaElement::progressEventTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(m_player);
</span><span class="cx">     if (m_networkState != NETWORK_LOADING)
</span><span class="lines">@@ -2368,7 +2368,7 @@
</span><span class="cx">         seekTimerFired(m_seekTimer);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void HTMLMediaElement::seekTimerFired(Timer&lt;HTMLMediaElement&gt;&amp;)
</del><ins>+void HTMLMediaElement::seekTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     if (!m_player) {
</span><span class="cx">         m_seeking = false;
</span><span class="lines">@@ -3112,7 +3112,7 @@
</span><span class="cx">     return rate;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void HTMLMediaElement::scanTimerFired(Timer&lt;HTMLMediaElement&gt;&amp;)
</del><ins>+void HTMLMediaElement::scanTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     if (m_scanType == Seek) {
</span><span class="cx">         double seekTime = m_scanDirection == Forward ? SeekTime : -SeekTime;
</span><span class="lines">@@ -3134,7 +3134,7 @@
</span><span class="cx">     m_playbackProgressTimer.startRepeating(maxTimeupdateEventFrequency);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void HTMLMediaElement::playbackProgressTimerFired(Timer&lt;HTMLMediaElement&gt;&amp;)
</del><ins>+void HTMLMediaElement::playbackProgressTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(m_player);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -591,11 +591,11 @@
</span><span class="cx"> 
</span><span class="cx">     virtual bool mediaPlayerIsInMediaDocument() const override final;
</span><span class="cx"> 
</span><del>-    void loadTimerFired(Timer&lt;HTMLMediaElement&gt;&amp;);
-    void progressEventTimerFired(Timer&lt;HTMLMediaElement&gt;&amp;);
-    void playbackProgressTimerFired(Timer&lt;HTMLMediaElement&gt;&amp;);
-    void scanTimerFired(Timer&lt;HTMLMediaElement&gt;&amp;);
-    void seekTimerFired(Timer&lt;HTMLMediaElement&gt;&amp;);
</del><ins>+    void loadTimerFired(Timer&amp;);
+    void progressEventTimerFired(Timer&amp;);
+    void playbackProgressTimerFired(Timer&amp;);
+    void scanTimerFired(Timer&amp;);
+    void seekTimerFired(Timer&amp;);
</ins><span class="cx">     void startPlaybackProgressTimer();
</span><span class="cx">     void startProgressEventTimer();
</span><span class="cx">     void stopPeriodicTimers();
</span><span class="lines">@@ -722,11 +722,11 @@
</span><span class="cx"> 
</span><span class="cx">     void updateCaptionContainer();
</span><span class="cx"> 
</span><del>-    Timer&lt;HTMLMediaElement&gt; m_loadTimer;
-    Timer&lt;HTMLMediaElement&gt; m_progressEventTimer;
-    Timer&lt;HTMLMediaElement&gt; m_playbackProgressTimer;
-    Timer&lt;HTMLMediaElement&gt; m_scanTimer;
-    Timer&lt;HTMLMediaElement&gt; m_seekTimer;
</del><ins>+    Timer m_loadTimer;
+    Timer m_progressEventTimer;
+    Timer m_playbackProgressTimer;
+    Timer m_scanTimer;
+    Timer m_seekTimer;
</ins><span class="cx">     RefPtr&lt;TimeRanges&gt; m_playedTimeRanges;
</span><span class="cx">     GenericEventQueue m_asyncEventQueue;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInElement.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInElement.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/HTMLPlugInElement.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx">     return createRenderer&lt;RenderEmbeddedObject&gt;(*this, WTF::move(style));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void HTMLPlugInElement::swapRendererTimerFired(Timer&lt;HTMLPlugInElement&gt;&amp;)
</del><ins>+void HTMLPlugInElement::swapRendererTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(displayState() == PreparingPluginReplacement || displayState() == DisplayingSnapshot);
</span><span class="cx">     if (userAgentShadowRoot())
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInElement.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInElement.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/HTMLPlugInElement.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx">     bool m_inBeforeLoadEventHandler;
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    void swapRendererTimerFired(Timer&lt;HTMLPlugInElement&gt;&amp;);
</del><ins>+    void swapRendererTimerFired(Timer&amp;);
</ins><span class="cx">     bool shouldOverridePlugin(const String&amp; url, const String&amp; mimeType);
</span><span class="cx"> 
</span><span class="cx">     bool dispatchBeforeLoadEvent(const String&amp; sourceURL); // Not implemented, generates a compile error if subclasses call this by mistake.
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx">     virtual bool isPluginElement() const override final;
</span><span class="cx"> 
</span><span class="cx">     RefPtr&lt;JSC::Bindings::Instance&gt; m_instance;
</span><del>-    Timer&lt;HTMLPlugInElement&gt; m_swapRendererTimer;
</del><ins>+    Timer m_swapRendererTimer;
</ins><span class="cx">     RefPtr&lt;PluginReplacement&gt; m_pluginReplacement;
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx">     NPObject* m_NPObject;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -399,7 +399,7 @@
</span><span class="cx">     return node &amp;&amp; snapshotLabel &amp;&amp; (node == snapshotLabel.get() || node-&gt;isDescendantOf(snapshotLabel.get()));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void HTMLPlugInImageElement::removeSnapshotTimerFired(Timer&lt;HTMLPlugInImageElement&gt;&amp;)
</del><ins>+void HTMLPlugInImageElement::removeSnapshotTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     m_snapshotImage = nullptr;
</span><span class="cx">     m_isRestartedPlugin = false;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInImageElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInImageElement.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx">     void simulatedMouseClickTimerFired();
</span><span class="cx"> 
</span><span class="cx">     void restartSimilarPlugIns();
</span><del>-    void removeSnapshotTimerFired(Timer&lt;HTMLPlugInImageElement&gt;&amp;);
</del><ins>+    void removeSnapshotTimerFired(Timer&amp;);
</ins><span class="cx">     bool isTopLevelFullPagePlugin(const RenderEmbeddedObject&amp;) const;
</span><span class="cx"> 
</span><span class="cx">     URL m_loadedUrl;
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx">     bool m_needsDocumentActivationCallbacks;
</span><span class="cx">     RefPtr&lt;MouseEvent&gt; m_pendingClickEventFromSnapshot;
</span><span class="cx">     DeferrableOneShotTimer m_simulatedMouseClickTimer;
</span><del>-    Timer&lt;HTMLPlugInImageElement&gt; m_removeSnapshotTimer;
</del><ins>+    Timer m_removeSnapshotTimer;
</ins><span class="cx">     RefPtr&lt;Image&gt; m_snapshotImage;
</span><span class="cx">     bool m_createdDuringUserGesture;
</span><span class="cx">     bool m_isRestartedPlugin;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSourceElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSourceElement.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSourceElement.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/HTMLSourceElement.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx">     m_errorEventTimer.stop();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void HTMLSourceElement::errorEventTimerFired(Timer&lt;HTMLSourceElement&gt;&amp;)
</del><ins>+void HTMLSourceElement::errorEventTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     LOG(Media, &quot;HTMLSourceElement::errorEventTimerFired - %p&quot;, this);
</span><span class="cx">     dispatchEvent(Event::create(eventNames().errorEvent, false, true));
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSourceElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSourceElement.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSourceElement.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/HTMLSourceElement.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -52,9 +52,9 @@
</span><span class="cx">     virtual void removedFrom(ContainerNode&amp;) override;
</span><span class="cx">     virtual bool isURLAttribute(const Attribute&amp;) const override;
</span><span class="cx"> 
</span><del>-    void errorEventTimerFired(Timer&lt;HTMLSourceElement&gt;&amp;);
</del><ins>+    void errorEventTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><del>-    Timer&lt;HTMLSourceElement&gt; m_errorEventTimer;
</del><ins>+    Timer m_errorEventTimer;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } //namespace
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTrackElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTrackElement.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTrackElement.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/HTMLTrackElement.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx">     m_loadTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void HTMLTrackElement::loadTimerFired(Timer&lt;HTMLTrackElement&gt;&amp;)
</del><ins>+void HTMLTrackElement::loadTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     if (!fastHasAttribute(srcAttr))
</span><span class="cx">         return;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTrackElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTrackElement.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTrackElement.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/HTMLTrackElement.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> 
</span><span class="cx">     virtual bool isURLAttribute(const Attribute&amp;) const override;
</span><span class="cx"> 
</span><del>-    void loadTimerFired(Timer&lt;HTMLTrackElement&gt;&amp;);
</del><ins>+    void loadTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     HTMLMediaElement* mediaElement() const;
</span><span class="cx"> 
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx">     bool canLoadURL(const URL&amp;);
</span><span class="cx"> 
</span><span class="cx">     RefPtr&lt;LoadableTextTrack&gt; m_track;
</span><del>-    Timer&lt;HTMLTrackElement&gt; m_loadTimer;
</del><ins>+    Timer m_loadTimer;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaController.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaController.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/MediaController.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -538,7 +538,7 @@
</span><span class="cx">         m_asyncEventTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaController::asyncEventTimerFired(Timer&lt;MediaController&gt;&amp;)
</del><ins>+void MediaController::asyncEventTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     Vector&lt;RefPtr&lt;Event&gt;&gt; pendingEvents;
</span><span class="cx"> 
</span><span class="lines">@@ -548,7 +548,7 @@
</span><span class="cx">         dispatchEvent(pendingEvents[index].release(), IGNORE_EXCEPTION);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaController::clearPositionTimerFired(Timer&lt;MediaController&gt;&amp;)
</del><ins>+void MediaController::clearPositionTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     m_position = MediaPlayer::invalidTime();
</span><span class="cx"> }
</span><span class="lines">@@ -672,7 +672,7 @@
</span><span class="cx">     m_timeupdateTimer.startRepeating(maxTimeupdateEventFrequency);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaController::timeupdateTimerFired(Timer&lt;MediaController&gt;&amp;)
</del><ins>+void MediaController::timeupdateTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     scheduleTimeupdateEvent();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaController.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaController.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/MediaController.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -123,11 +123,11 @@
</span><span class="cx">     void updateMediaElements();
</span><span class="cx">     void bringElementUpToSpeed(HTMLMediaElement*);
</span><span class="cx">     void scheduleEvent(const AtomicString&amp; eventName);
</span><del>-    void asyncEventTimerFired(Timer&lt;MediaController&gt;&amp;);
-    void clearPositionTimerFired(Timer&lt;MediaController&gt;&amp;);
</del><ins>+    void asyncEventTimerFired(Timer&amp;);
+    void clearPositionTimerFired(Timer&amp;);
</ins><span class="cx">     bool hasEnded() const;
</span><span class="cx">     void scheduleTimeupdateEvent();
</span><del>-    void timeupdateTimerFired(Timer&lt;MediaController&gt;&amp;);
</del><ins>+    void timeupdateTimerFired(Timer&amp;);
</ins><span class="cx">     void startTimeupdateTimer();
</span><span class="cx"> 
</span><span class="cx">     // EventTarget
</span><span class="lines">@@ -147,13 +147,13 @@
</span><span class="cx">     ReadyState m_readyState;
</span><span class="cx">     PlaybackState m_playbackState;
</span><span class="cx">     Vector&lt;RefPtr&lt;Event&gt;&gt; m_pendingEvents;
</span><del>-    Timer&lt;MediaController&gt; m_asyncEventTimer;
-    mutable Timer&lt;MediaController&gt; m_clearPositionTimer;
</del><ins>+    Timer m_asyncEventTimer;
+    mutable Timer m_clearPositionTimer;
</ins><span class="cx">     String m_mediaGroup;
</span><span class="cx">     bool m_closedCaptionsVisible;
</span><span class="cx">     std::unique_ptr&lt;Clock&gt; m_clock;
</span><span class="cx">     ScriptExecutionContext&amp; m_scriptExecutionContext;
</span><del>-    Timer&lt;MediaController&gt; m_timeupdateTimer;
</del><ins>+    Timer m_timeupdateTimer;
</ins><span class="cx">     double m_previousTimeupdateTime;
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaDocument.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaDocument.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/MediaDocument.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx">     m_replaceMediaElementTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaDocument::replaceMediaElementTimerFired(Timer&lt;MediaDocument&gt;&amp;)
</del><ins>+void MediaDocument::replaceMediaElementTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     HTMLElement* htmlBody = body();
</span><span class="cx">     if (!htmlBody)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaDocument.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaDocument.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/MediaDocument.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -50,9 +50,9 @@
</span><span class="cx"> 
</span><span class="cx">     virtual void defaultEventHandler(Event*) override;
</span><span class="cx"> 
</span><del>-    void replaceMediaElementTimerFired(Timer&lt;MediaDocument&gt;&amp;);
</del><ins>+    void replaceMediaElementTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><del>-    Timer&lt;MediaDocument&gt; m_replaceMediaElementTimer;
</del><ins>+    Timer m_replaceMediaElementTimer;
</ins><span class="cx">     String m_outgoingReferrer;
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlSearchInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/SearchInputType.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/SearchInputType.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/SearchInputType.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx">     m_searchEventTimer.stop();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void SearchInputType::searchEventTimerFired(Timer&lt;SearchInputType&gt;*)
</del><ins>+void SearchInputType::searchEventTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     element().onSearch();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlSearchInputTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/SearchInputType.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/SearchInputType.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/SearchInputType.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -61,13 +61,13 @@
</span><span class="cx">     virtual bool sizeShouldIncludeDecoration(int defaultSize, int&amp; preferredSize) const override;
</span><span class="cx">     virtual float decorationWidth() const override;
</span><span class="cx"> 
</span><del>-    void searchEventTimerFired(Timer&lt;SearchInputType&gt;*);
</del><ins>+    void searchEventTimerFired(Timer*);
</ins><span class="cx">     bool searchEventsShouldBeDispatched() const;
</span><span class="cx">     void startSearchEventTimer();
</span><span class="cx"> 
</span><span class="cx">     SearchFieldResultsButtonElement* m_resultsButton;
</span><span class="cx">     HTMLElement* m_cancelButton;
</span><del>-    Timer&lt;SearchInputType&gt; m_searchEventTimer;
</del><ins>+    Timer m_searchEventTimer;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlValidationMessagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/ValidationMessage.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/ValidationMessage.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/ValidationMessage.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -107,13 +107,13 @@
</span><span class="cx">     ASSERT(!message.isEmpty());
</span><span class="cx">     m_message = message;
</span><span class="cx">     if (!m_bubble)
</span><del>-        m_timer = std::make_unique&lt;Timer&lt;ValidationMessage&gt;&gt;(this, &amp;ValidationMessage::buildBubbleTree);
</del><ins>+        m_timer = std::make_unique&lt;Timer&gt;(this, &amp;ValidationMessage::buildBubbleTree);
</ins><span class="cx">     else
</span><del>-        m_timer = std::make_unique&lt;Timer&lt;ValidationMessage&gt;&gt;(this, &amp;ValidationMessage::setMessageDOMAndStartTimer);
</del><ins>+        m_timer = std::make_unique&lt;Timer&gt;(this, &amp;ValidationMessage::setMessageDOMAndStartTimer);
</ins><span class="cx">     m_timer-&gt;startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void ValidationMessage::setMessageDOMAndStartTimer(Timer&lt;ValidationMessage&gt;*)
</del><ins>+void ValidationMessage::setMessageDOMAndStartTimer(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(!validationMessageClient());
</span><span class="cx">     ASSERT(m_messageHeading);
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx">     if (magnification &lt;= 0)
</span><span class="cx">         m_timer = nullptr;
</span><span class="cx">     else {
</span><del>-        m_timer = std::make_unique&lt;Timer&lt;ValidationMessage&gt;&gt;(this, &amp;ValidationMessage::deleteBubbleTree);
</del><ins>+        m_timer = std::make_unique&lt;Timer&gt;(this, &amp;ValidationMessage::deleteBubbleTree);
</ins><span class="cx">         m_timer-&gt;startOneShot(std::max(5.0, static_cast&lt;double&gt;(m_message.length()) * magnification / 1000));
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx">     bubble-&gt;setInlineStyleProperty(CSSPropertyLeft, bubbleX, CSSPrimitiveValue::CSS_PX);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void ValidationMessage::buildBubbleTree(Timer&lt;ValidationMessage&gt;*)
</del><ins>+void ValidationMessage::buildBubbleTree(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(!validationMessageClient());
</span><span class="cx">     ShadowRoot&amp; shadowRoot = m_element-&gt;ensureUserAgentShadowRoot();
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     // We must not modify the DOM tree in this context by the same reason as setMessage().
</span><del>-    m_timer = std::make_unique&lt;Timer&lt;ValidationMessage&gt;&gt;(this, &amp;ValidationMessage::deleteBubbleTree);
</del><ins>+    m_timer = std::make_unique&lt;Timer&gt;(this, &amp;ValidationMessage::deleteBubbleTree);
</ins><span class="cx">     m_timer-&gt;startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx">     return &amp;m_bubble-&gt;treeScope() == &amp;node.treeScope();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void ValidationMessage::deleteBubbleTree(Timer&lt;ValidationMessage&gt;*)
</del><ins>+void ValidationMessage::deleteBubbleTree(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(!validationMessageClient());
</span><span class="cx">     if (m_bubble) {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlValidationMessageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/ValidationMessage.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/ValidationMessage.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/ValidationMessage.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -60,13 +60,13 @@
</span><span class="cx"> private:
</span><span class="cx">     ValidationMessageClient* validationMessageClient() const;
</span><span class="cx">     void setMessage(const String&amp;);
</span><del>-    void setMessageDOMAndStartTimer(Timer&lt;ValidationMessage&gt;* = 0);
-    void buildBubbleTree(Timer&lt;ValidationMessage&gt;*);
-    void deleteBubbleTree(Timer&lt;ValidationMessage&gt;* = 0);
</del><ins>+    void setMessageDOMAndStartTimer(Timer* = 0);
+    void buildBubbleTree(Timer*);
+    void deleteBubbleTree(Timer* = 0);
</ins><span class="cx"> 
</span><span class="cx">     HTMLFormControlElement* m_element;
</span><span class="cx">     String m_message;
</span><del>-    std::unique_ptr&lt;Timer&lt;ValidationMessage&gt;&gt; m_timer;
</del><ins>+    std::unique_ptr&lt;Timer&gt; m_timer;
</ins><span class="cx">     RefPtr&lt;HTMLElement&gt; m_bubble;
</span><span class="cx">     RefPtr&lt;HTMLElement&gt; m_messageHeading;
</span><span class="cx">     RefPtr&lt;HTMLElement&gt; m_messageBody;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -5923,7 +5923,7 @@
</span><span class="cx">     m_context-&gt;bindBuffer(GraphicsContext3D::ARRAY_BUFFER, objectOrZero(m_boundArrayBuffer.get()));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebGLRenderingContext::dispatchContextLostEvent(Timer&lt;WebGLRenderingContext&gt;*)
</del><ins>+void WebGLRenderingContext::dispatchContextLostEvent(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     RefPtr&lt;WebGLContextEvent&gt; event = WebGLContextEvent::create(eventNames().webglcontextlostEvent, false, true, &quot;&quot;);
</span><span class="cx">     canvas()-&gt;dispatchEvent(event);
</span><span class="lines">@@ -5932,7 +5932,7 @@
</span><span class="cx">         m_restoreTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebGLRenderingContext::maybeRestoreContext(Timer&lt;WebGLRenderingContext&gt;*)
</del><ins>+void WebGLRenderingContext::maybeRestoreContext(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(m_contextLost);
</span><span class="cx">     if (!m_contextLost)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -411,9 +411,9 @@
</span><span class="cx">     // likely that there's no JavaScript on the stack, but that might be dependent
</span><span class="cx">     // on how exactly the platform discovers that the context was lost. For better
</span><span class="cx">     // portability we always defer the dispatch of the event.
</span><del>-    Timer&lt;WebGLRenderingContext&gt; m_dispatchContextLostEventTimer;
</del><ins>+    Timer m_dispatchContextLostEventTimer;
</ins><span class="cx">     bool m_restoreAllowed;
</span><del>-    Timer&lt;WebGLRenderingContext&gt; m_restoreTimer;
</del><ins>+    Timer m_restoreTimer;
</ins><span class="cx"> 
</span><span class="cx">     bool m_needsUpdate;
</span><span class="cx">     bool m_markedCanvasDirty;
</span><span class="lines">@@ -761,9 +761,9 @@
</span><span class="cx">     bool simulateVertexAttrib0(GC3Dsizei numVertex);
</span><span class="cx">     void restoreStatesAfterVertexAttrib0Simulation();
</span><span class="cx"> 
</span><del>-    void dispatchContextLostEvent(Timer&lt;WebGLRenderingContext&gt;*);
</del><ins>+    void dispatchContextLostEvent(Timer*);
</ins><span class="cx">     // Helper for restoration after context lost.
</span><del>-    void maybeRestoreContext(Timer&lt;WebGLRenderingContext&gt;*);
</del><ins>+    void maybeRestoreContext(Timer*);
</ins><span class="cx"> 
</span><span class="cx">     // Determine if we are running privileged code in the browser, for example,
</span><span class="cx">     // a Safari or Chrome extension.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLParserSchedulercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLParserScheduler.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLParserScheduler.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/parser/HTMLParserScheduler.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx">     m_continueNextChunkTimer.stop();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void HTMLParserScheduler::continueNextChunkTimerFired(Timer&lt;HTMLParserScheduler&gt;&amp; timer)
</del><ins>+void HTMLParserScheduler::continueNextChunkTimerFired(Timer&amp; timer)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(!m_suspended);
</span><span class="cx">     ASSERT_UNUSED(timer, &amp;timer == &amp;m_continueNextChunkTimer);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLParserSchedulerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLParserScheduler.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLParserScheduler.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/parser/HTMLParserScheduler.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -97,13 +97,13 @@
</span><span class="cx">     void resume();
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    void continueNextChunkTimerFired(Timer&lt;HTMLParserScheduler&gt;&amp;);
</del><ins>+    void continueNextChunkTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     HTMLDocumentParser&amp; m_parser;
</span><span class="cx"> 
</span><span class="cx">     double m_parserTimeLimit;
</span><span class="cx">     int m_parserChunkSize;
</span><del>-    Timer&lt;HTMLParserScheduler&gt; m_continueNextChunkTimer;
</del><ins>+    Timer m_continueNextChunkTimer;
</ins><span class="cx">     bool m_isSuspendedWithActiveTimer;
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx">     bool m_suspended;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlElementscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlElements.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx">         m_transitionTimer.stop();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaControlPanelElement::transitionTimerFired(Timer&lt;MediaControlPanelElement&gt;&amp;)
</del><ins>+void MediaControlPanelElement::transitionTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     if (!m_opaque)
</span><span class="cx">         hide();
</span><span class="lines">@@ -1243,7 +1243,7 @@
</span><span class="cx"> 
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaControlTextTrackContainerElement::updateTimerFired(Timer&lt;MediaControlTextTrackContainerElement&gt;&amp;)
</del><ins>+void MediaControlTextTrackContainerElement::updateTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     if (!document().page())
</span><span class="cx">         return;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlElementsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControlElements.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> 
</span><span class="cx">     void startTimer();
</span><span class="cx">     void stopTimer();
</span><del>-    void transitionTimerFired(Timer&lt;MediaControlPanelElement&gt;&amp;);
</del><ins>+    void transitionTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     void setPosition(const LayoutPoint&amp;);
</span><span class="cx"> 
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">     LayoutPoint m_lastDragEventLocation;
</span><span class="cx">     LayoutPoint m_cumulativeDragOffset;
</span><span class="cx"> 
</span><del>-    Timer&lt;MediaControlPanelElement&gt; m_transitionTimer;
</del><ins>+    Timer m_transitionTimer;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> // ----------------------------
</span><span class="lines">@@ -451,7 +451,7 @@
</span><span class="cx">     void exitedFullscreen();
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    void updateTimerFired(Timer&lt;MediaControlTextTrackContainerElement&gt;&amp;);
</del><ins>+    void updateTimerFired(Timer&amp;);
</ins><span class="cx">     void updateActiveCuesFontSize();
</span><span class="cx"> 
</span><span class="cx">     explicit MediaControlTextTrackContainerElement(Document&amp;);
</span><span class="lines">@@ -465,7 +465,7 @@
</span><span class="cx">     void updateStyleForTextTrackRepresentation();
</span><span class="cx">     OwnPtr&lt;TextTrackRepresentation&gt; m_textTrackRepresentation;
</span><span class="cx"> 
</span><del>-    Timer&lt;MediaControlTextTrackContainerElement&gt; m_updateTimer;
</del><ins>+    Timer m_updateTimer;
</ins><span class="cx">     IntRect m_videoDisplaySize;
</span><span class="cx">     int m_fontSize;
</span><span class="cx">     bool m_fontSizeIsImportant;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControls.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControls.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/shadow/MediaControls.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -330,7 +330,7 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaControls::hideFullscreenControlsTimerFired(Timer&lt;MediaControls&gt;&amp;)
</del><ins>+void MediaControls::hideFullscreenControlsTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     if (m_mediaController-&gt;paused())
</span><span class="cx">         return;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowMediaControlsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/MediaControls.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/MediaControls.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/shadow/MediaControls.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx">     virtual bool willRespondToMouseMoveEvents() override { return true; }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    virtual void hideFullscreenControlsTimerFired(Timer&lt;MediaControls&gt;&amp;);
</del><ins>+    virtual void hideFullscreenControlsTimerFired(Timer&amp;);
</ins><span class="cx">     virtual void startHideFullscreenControlsTimer();
</span><span class="cx">     virtual void stopHideFullscreenControlsTimer();
</span><span class="cx"> 
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx">     MediaControlToggleClosedCaptionsButtonElement* m_toggleClosedCaptionsButton;
</span><span class="cx">     MediaControlFullscreenButtonElement* m_fullScreenButton;
</span><span class="cx"> 
</span><del>-    Timer&lt;MediaControls&gt; m_hideFullscreenControlsTimer;
</del><ins>+    Timer m_hideFullscreenControlsTimer;
</ins><span class="cx">     bool m_isFullscreen;
</span><span class="cx">     bool m_isMouseOverControls;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowSpinButtonElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/SpinButtonElement.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/SpinButtonElement.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/shadow/SpinButtonElement.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx">     doStepAction(amount);
</span><span class="cx"> }
</span><span class="cx">     
</span><del>-void SpinButtonElement::repeatingTimerFired(Timer&lt;SpinButtonElement&gt;*)
</del><ins>+void SpinButtonElement::repeatingTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     if (m_upDownState != Indeterminate)
</span><span class="cx">         step(m_upDownState == Up ? 1 : -1);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowSpinButtonElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/SpinButtonElement.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/SpinButtonElement.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/shadow/SpinButtonElement.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx">     void doStepAction(int);
</span><span class="cx">     void startRepeatingTimer();
</span><span class="cx">     void stopRepeatingTimer();
</span><del>-    void repeatingTimerFired(Timer&lt;SpinButtonElement&gt;*);
</del><ins>+    void repeatingTimerFired(Timer*);
</ins><span class="cx">     virtual void setHovered(bool = true) override;
</span><span class="cx">     bool shouldRespondToMouseEvents();
</span><span class="cx">     virtual bool isMouseFocusable() const override { return false; }
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx">     bool m_capturing;
</span><span class="cx">     UpDownState m_upDownState;
</span><span class="cx">     UpDownState m_pressStartingState;
</span><del>-    Timer&lt;SpinButtonElement&gt; m_repeatingTimer;
</del><ins>+    Timer m_repeatingTimer;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackLoadableTextTrackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/LoadableTextTrack.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/LoadableTextTrack.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/track/LoadableTextTrack.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx">     m_trackElement = element;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void LoadableTextTrack::loadTimerFired(Timer&lt;LoadableTextTrack&gt;&amp;)
</del><ins>+void LoadableTextTrack::loadTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     if (m_loader)
</span><span class="cx">         m_loader-&gt;cancelLoad();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackLoadableTextTrackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/LoadableTextTrack.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/LoadableTextTrack.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/track/LoadableTextTrack.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -70,10 +70,10 @@
</span><span class="cx"> 
</span><span class="cx">     LoadableTextTrack(HTMLTrackElement*, const String&amp; kind, const String&amp; label, const String&amp; language);
</span><span class="cx"> 
</span><del>-    void loadTimerFired(Timer&lt;LoadableTextTrack&gt;&amp;);
</del><ins>+    void loadTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     HTMLTrackElement* m_trackElement;
</span><del>-    Timer&lt;LoadableTextTrack&gt; m_loadTimer;
</del><ins>+    Timer m_loadTimer;
</ins><span class="cx">     std::unique_ptr&lt;TextTrackLoader&gt; m_loader;
</span><span class="cx">     URL m_url;
</span><span class="cx">     bool m_isDefault;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackVTTRegioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/VTTRegion.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/VTTRegion.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/track/VTTRegion.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -478,7 +478,7 @@
</span><span class="cx">         m_scrollTimer.stop();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void VTTRegion::scrollTimerFired(Timer&lt;VTTRegion&gt;*)
</del><ins>+void VTTRegion::scrollTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     LOG(Media, &quot;VTTRegion::scrollTimerFired&quot;);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackVTTRegionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/VTTRegion.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/VTTRegion.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/html/track/VTTRegion.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx">     // The timer is needed to continue processing when cue scrolling ended.
</span><span class="cx">     void startTimer();
</span><span class="cx">     void stopTimer();
</span><del>-    void scrollTimerFired(Timer&lt;VTTRegion&gt;*);
</del><ins>+    void scrollTimerFired(Timer*);
</ins><span class="cx"> 
</span><span class="cx">     enum RegionSetting {
</span><span class="cx">         None,
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx">     // soon as the animation for rolling out one line has finished, but
</span><span class="cx">     // currently it is used also for non-scrolling regions to use a single
</span><span class="cx">     // code path.
</span><del>-    Timer&lt;VTTRegion&gt; m_scrollTimer;
</del><ins>+    Timer m_scrollTimer;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCSSAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -109,11 +109,11 @@
</span><span class="cx">     void scheduleFor(WebKitNamedFlow*, int documentNodeId);
</span><span class="cx">     void unschedule(WebKitNamedFlow*);
</span><span class="cx">     void reset();
</span><del>-    void timerFired(Timer&lt;ChangeRegionOversetTask&gt;&amp;);
</del><ins>+    void timerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     InspectorCSSAgent* m_cssAgent;
</span><del>-    Timer&lt;ChangeRegionOversetTask&gt; m_timer;
</del><ins>+    Timer m_timer;
</ins><span class="cx">     HashMap&lt;WebKitNamedFlow*, int&gt; m_namedFlows;
</span><span class="cx"> };
</span><span class="cx"> 
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx">     m_namedFlows.clear();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void ChangeRegionOversetTask::timerFired(Timer&lt;ChangeRegionOversetTask&gt;&amp;)
</del><ins>+void ChangeRegionOversetTask::timerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     // The timer is stopped on m_cssAgent destruction, so this method will never be called after m_cssAgent has been destroyed.
</span><span class="cx">     for (HashMap&lt;WebKitNamedFlow*, int&gt;::iterator it = m_namedFlows.begin(), end = m_namedFlows.end(); it != end; ++it)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -162,11 +162,11 @@
</span><span class="cx">     RevalidateStyleAttributeTask(InspectorDOMAgent*);
</span><span class="cx">     void scheduleFor(Element*);
</span><span class="cx">     void reset() { m_timer.stop(); }
</span><del>-    void timerFired(Timer&lt;RevalidateStyleAttributeTask&gt;&amp;);
</del><ins>+    void timerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     InspectorDOMAgent* m_domAgent;
</span><del>-    Timer&lt;RevalidateStyleAttributeTask&gt; m_timer;
</del><ins>+    Timer m_timer;
</ins><span class="cx">     HashSet&lt;RefPtr&lt;Element&gt;&gt; m_elements;
</span><span class="cx"> };
</span><span class="cx"> 
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx">         m_timer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RevalidateStyleAttributeTask::timerFired(Timer&lt;RevalidateStyleAttributeTask&gt;&amp;)
</del><ins>+void RevalidateStyleAttributeTask::timerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     // The timer is stopped on m_domAgent destruction, so this method will never be called after m_domAgent has been destroyed.
</span><span class="cx">     Vector&lt;Element*&gt; elements;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorFrontendClientLocalcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx">         m_timer.stop();
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    void timerFired(Timer&lt;InspectorBackendDispatchTask&gt;&amp;)
</del><ins>+    void timerFired(Timer&amp;)
</ins><span class="cx">     {
</span><span class="cx">         if (!m_messages.isEmpty()) {
</span><span class="cx">             // Dispatch can lead to the timer destruction -&gt; schedule the next shot first.
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     InspectorController* m_inspectorController;
</span><del>-    Timer&lt;InspectorBackendDispatchTask&gt; m_timer;
</del><ins>+    Timer m_timer;
</ins><span class="cx">     Deque&lt;String&gt; m_messages;
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorOverlaycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorOverlay.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorOverlay.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/inspector/InspectorOverlay.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -505,7 +505,7 @@
</span><span class="cx">     forcePaint();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void InspectorOverlay::updatePaintRectsTimerFired(Timer&lt;InspectorOverlay&gt;&amp;)
</del><ins>+void InspectorOverlay::updatePaintRectsTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now();
</span><span class="cx">     bool rectsChanged = false;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorOverlayh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorOverlay.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorOverlay.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/inspector/InspectorOverlay.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx">     void drawQuadHighlight();
</span><span class="cx">     void drawPausedInDebuggerMessage();
</span><span class="cx">     void drawPaintRects();
</span><del>-    void updatePaintRectsTimerFired(Timer&lt;InspectorOverlay&gt;&amp;);
</del><ins>+    void updatePaintRectsTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     Page* overlayPage();
</span><span class="cx"> 
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx">     
</span><span class="cx">     typedef std::pair&lt;std::chrono::steady_clock::time_point, FloatRect&gt; TimeRectPair;
</span><span class="cx">     Deque&lt;TimeRectPair&gt; m_paintRects;
</span><del>-    Timer&lt;InspectorOverlay&gt; m_paintRectUpdateTimer;
</del><ins>+    Timer m_paintRectUpdateTimer;
</ins><span class="cx">     bool m_indicating;
</span><span class="cx">     bool m_showingPaintRects;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -1125,7 +1125,7 @@
</span><span class="cx">         m_substituteResourceDeliveryTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void DocumentLoader::substituteResourceDeliveryTimerFired(Timer&lt;DocumentLoader&gt;&amp;)
</del><ins>+void DocumentLoader::substituteResourceDeliveryTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     if (m_pendingSubstituteResources.isEmpty())
</span><span class="cx">         return;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/loader/DocumentLoader.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -313,14 +313,14 @@
</span><span class="cx"> #if HAVE(RUNLOOP_TIMER)
</span><span class="cx">         typedef RunLoopTimer&lt;DocumentLoader&gt; DocumentLoaderTimer;
</span><span class="cx"> #else
</span><del>-        typedef Timer&lt;DocumentLoader&gt; DocumentLoaderTimer;
</del><ins>+        typedef Timer DocumentLoaderTimer;
</ins><span class="cx"> #endif
</span><span class="cx">         void handleSubstituteDataLoadSoon();
</span><span class="cx">         void handleSubstituteDataLoadNow(DocumentLoaderTimer*);
</span><span class="cx">         void startDataLoadTimer();
</span><span class="cx"> 
</span><span class="cx">         void deliverSubstituteResourcesAfterDelay();
</span><del>-        void substituteResourceDeliveryTimerFired(Timer&lt;DocumentLoader&gt;&amp;);
</del><ins>+        void substituteResourceDeliveryTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">         void clearMainResource();
</span><span class="cx"> 
</span><span class="lines">@@ -386,7 +386,7 @@
</span><span class="cx">         
</span><span class="cx">         typedef HashMap&lt;RefPtr&lt;ResourceLoader&gt;, RefPtr&lt;SubstituteResource&gt;&gt; SubstituteResourceMap;
</span><span class="cx">         SubstituteResourceMap m_pendingSubstituteResources;
</span><del>-        Timer&lt;DocumentLoader&gt; m_substituteResourceDeliveryTimer;
</del><ins>+        Timer m_substituteResourceDeliveryTimer;
</ins><span class="cx"> 
</span><span class="cx">         OwnPtr&lt;ArchiveResourceCollection&gt; m_archiveResourceCollection;
</span><span class="cx"> #if ENABLE(WEB_ARCHIVE) || ENABLE(MHTML)
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -850,7 +850,7 @@
</span><span class="cx">         checkLoadComplete();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void FrameLoader::checkTimerFired(Timer&lt;FrameLoader&gt;&amp;)
</del><ins>+void FrameLoader::checkTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     Ref&lt;Frame&gt; protect(m_frame);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/loader/FrameLoader.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -299,7 +299,7 @@
</span><span class="cx"> 
</span><span class="cx">     bool allChildrenAreComplete() const; // immediate children, not all descendants
</span><span class="cx"> 
</span><del>-    void checkTimerFired(Timer&lt;FrameLoader&gt;&amp;);
</del><ins>+    void checkTimerFired(Timer&amp;);
</ins><span class="cx">     
</span><span class="cx">     void loadSameDocumentItem(HistoryItem*);
</span><span class="cx">     void loadDifferentDocumentItem(HistoryItem*, FrameLoadType, FormSubmissionCacheLoadPolicy);
</span><span class="lines">@@ -423,7 +423,7 @@
</span><span class="cx"> 
</span><span class="cx">     URL m_submittedFormURL;
</span><span class="cx"> 
</span><del>-    Timer&lt;FrameLoader&gt; m_checkTimer;
</del><ins>+    Timer m_checkTimer;
</ins><span class="cx">     bool m_shouldCallCheckCompleted;
</span><span class="cx">     bool m_shouldCallCheckLoadComplete;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderImageLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ImageLoader.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ImageLoader.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/loader/ImageLoader.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -374,7 +374,7 @@
</span><span class="cx">     }   
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void ImageLoader::timerFired(Timer&lt;ImageLoader&gt;&amp;)
</del><ins>+void ImageLoader::timerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     element().deref();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderImageLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ImageLoader.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ImageLoader.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/loader/ImageLoader.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -91,11 +91,11 @@
</span><span class="cx">     void setImageWithoutConsideringPendingLoadEvent(CachedImage*);
</span><span class="cx">     void clearFailedLoadURL();
</span><span class="cx"> 
</span><del>-    void timerFired(Timer&lt;ImageLoader&gt;&amp;);
</del><ins>+    void timerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     Element&amp; m_element;
</span><span class="cx">     CachedResourceHandle&lt;CachedImage&gt; m_image;
</span><del>-    Timer&lt;ImageLoader&gt; m_derefElementTimer;
</del><ins>+    Timer m_derefElementTimer;
</ins><span class="cx">     AtomicString m_failedLoadURL;
</span><span class="cx">     bool m_hasPendingBeforeLoadEvent : 1;
</span><span class="cx">     bool m_hasPendingLoadEvent : 1;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderLinkLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/LinkLoader.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/LinkLoader.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/loader/LinkLoader.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -60,13 +60,13 @@
</span><span class="cx">         m_cachedLinkResource-&gt;removeClient(this);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void LinkLoader::linkLoadTimerFired(Timer&lt;LinkLoader&gt;&amp; timer)
</del><ins>+void LinkLoader::linkLoadTimerFired(Timer&amp; timer)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT_UNUSED(timer, &amp;timer == &amp;m_linkLoadTimer);
</span><span class="cx">     m_client-&gt;linkLoaded();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void LinkLoader::linkLoadingErrorTimerFired(Timer&lt;LinkLoader&gt;&amp; timer)
</del><ins>+void LinkLoader::linkLoadingErrorTimerFired(Timer&amp; timer)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT_UNUSED(timer, &amp;timer == &amp;m_linkLoadingErrorTimer);
</span><span class="cx">     m_client-&gt;linkLoadingErrored();
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderLinkLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/LinkLoader.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/LinkLoader.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/loader/LinkLoader.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -59,14 +59,14 @@
</span><span class="cx">     bool loadLink(const LinkRelAttribute&amp;, const String&amp; type, const String&amp; sizes, const URL&amp;, Document*);
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    void linkLoadTimerFired(Timer&lt;LinkLoader&gt;&amp;);
-    void linkLoadingErrorTimerFired(Timer&lt;LinkLoader&gt;&amp;);
</del><ins>+    void linkLoadTimerFired(Timer&amp;);
+    void linkLoadingErrorTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     LinkLoaderClient* m_client;
</span><span class="cx"> 
</span><span class="cx">     CachedResourceHandle&lt;CachedResource&gt; m_cachedLinkResource;
</span><del>-    Timer&lt;LinkLoader&gt; m_linkLoadTimer;
-    Timer&lt;LinkLoader&gt; m_linkLoadingErrorTimer;
</del><ins>+    Timer m_linkLoadTimer;
+    Timer m_linkLoadingErrorTimer;
</ins><span class="cx"> };
</span><span class="cx">     
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderNavigationSchedulercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/NavigationScheduler.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/NavigationScheduler.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/loader/NavigationScheduler.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx">     virtual void fire(Frame&amp;) = 0;
</span><span class="cx"> 
</span><span class="cx">     virtual bool shouldStartTimer(Frame&amp;) { return true; }
</span><del>-    virtual void didStartTimer(Frame&amp;, Timer&lt;NavigationScheduler&gt;&amp;) { }
</del><ins>+    virtual void didStartTimer(Frame&amp;, Timer&amp;) { }
</ins><span class="cx">     virtual void didStopTimer(Frame&amp;, bool /* newLoadInProgress */) { }
</span><span class="cx"> 
</span><span class="cx">     double delay() const { return m_delay; }
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx">         frame.loader().changeLocation(m_securityOrigin.get(), m_url, m_referrer, lockHistory(), lockBackForwardList(), false);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    virtual void didStartTimer(Frame&amp; frame, Timer&lt;NavigationScheduler&gt;&amp; timer) override
</del><ins>+    virtual void didStartTimer(Frame&amp; frame, Timer&amp; timer) override
</ins><span class="cx">     {
</span><span class="cx">         if (m_haveToldClient)
</span><span class="cx">             return;
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx">         frame.loader().loadFrameRequest(frameRequest, lockHistory(), lockBackForwardList(), m_submission-&gt;event(), m_submission-&gt;state(), MaybeSendReferrer, AllowNavigationToInvalidURL::Yes);
</span><span class="cx">     }
</span><span class="cx">     
</span><del>-    virtual void didStartTimer(Frame&amp; frame, Timer&lt;NavigationScheduler&gt;&amp; timer) override
</del><ins>+    virtual void didStartTimer(Frame&amp; frame, Timer&amp; timer) override
</ins><span class="cx">     {
</span><span class="cx">         if (m_haveToldClient)
</span><span class="cx">             return;
</span><span class="lines">@@ -430,7 +430,7 @@
</span><span class="cx">     schedule(std::make_unique&lt;ScheduledHistoryNavigation&gt;(steps));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void NavigationScheduler::timerFired(Timer&lt;NavigationScheduler&gt;&amp;)
</del><ins>+void NavigationScheduler::timerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     if (!m_frame.page())
</span><span class="cx">         return;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderNavigationSchedulerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/NavigationScheduler.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/NavigationScheduler.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/loader/NavigationScheduler.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -83,13 +83,13 @@
</span><span class="cx">     bool shouldScheduleNavigation() const;
</span><span class="cx">     bool shouldScheduleNavigation(const URL&amp;) const;
</span><span class="cx"> 
</span><del>-    void timerFired(Timer&lt;NavigationScheduler&gt;&amp;);
</del><ins>+    void timerFired(Timer&amp;);
</ins><span class="cx">     void schedule(std::unique_ptr&lt;ScheduledNavigation&gt;);
</span><span class="cx"> 
</span><span class="cx">     static LockBackForwardList mustLockBackForwardList(Frame&amp; targetFrame);
</span><span class="cx"> 
</span><span class="cx">     Frame&amp; m_frame;
</span><del>-    Timer&lt;NavigationScheduler&gt; m_timer;
</del><ins>+    Timer m_timer;
</ins><span class="cx">     std::unique_ptr&lt;ScheduledNavigation&gt; m_redirect;
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderPingLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/PingLoader.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/PingLoader.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/loader/PingLoader.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -69,10 +69,10 @@
</span><span class="cx">     virtual void didFinishLoading(ResourceHandle*, double) override { delete this; }
</span><span class="cx">     virtual void didFail(ResourceHandle*, const ResourceError&amp;) override { delete this; }
</span><span class="cx">     virtual bool shouldUseCredentialStorage(ResourceHandle*)  override { return m_shouldUseCredentialStorage; }
</span><del>-    void timeoutTimerFired(Timer&lt;PingLoader&gt;&amp;) { delete this; }
</del><ins>+    void timeoutTimerFired(Timer&amp;) { delete this; }
</ins><span class="cx"> 
</span><span class="cx">     RefPtr&lt;ResourceHandle&gt; m_handle;
</span><del>-    Timer&lt;PingLoader&gt; m_timeout;
</del><ins>+    Timer m_timeout;
</ins><span class="cx">     bool m_shouldUseCredentialStorage;
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderProgressTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ProgressTracker.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ProgressTracker.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/loader/ProgressTracker.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx">     return m_progressValue &amp;&amp; m_progressValue &lt; finalProgressValue &amp;&amp; m_heartbeatsWithNoProgress &lt; loadStalledHeartbeatCount;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void ProgressTracker::progressHeartbeatTimerFired(Timer&lt;ProgressTracker&gt;&amp;)
</del><ins>+void ProgressTracker::progressHeartbeatTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     if (m_totalBytesReceived &lt; m_totalBytesReceivedBeforePreviousHeartbeat + minumumBytesPerHeartbeatForProgress)
</span><span class="cx">         ++m_heartbeatsWithNoProgress;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderProgressTrackerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ProgressTracker.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ProgressTracker.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/loader/ProgressTracker.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">     void reset();
</span><span class="cx">     void finalProgressComplete();
</span><span class="cx"> 
</span><del>-    void progressHeartbeatTimerFired(Timer&lt;ProgressTracker&gt;&amp;);
</del><ins>+    void progressHeartbeatTimerFired(Timer&amp;);
</ins><span class="cx">     
</span><span class="cx">     static unsigned long s_uniqueIdentifier;
</span><span class="cx">     
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx">     int m_numProgressTrackedFrames;
</span><span class="cx">     HashMap&lt;unsigned long, std::unique_ptr&lt;ProgressItem&gt;&gt; m_progressItems;
</span><span class="cx"> 
</span><del>-    Timer&lt;ProgressTracker&gt; m_progressHeartbeatTimer;
</del><ins>+    Timer m_progressHeartbeatTimer;
</ins><span class="cx">     unsigned m_heartbeatsWithNoProgress;
</span><span class="cx">     long long m_totalBytesReceivedBeforePreviousHeartbeat;
</span><span class="cx">     std::chrono::steady_clock::time_point m_mainLoadCompletionTime;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadSchedulercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoadScheduler.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoadScheduler.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/loader/ResourceLoadScheduler.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -332,7 +332,7 @@
</span><span class="cx">         m_requestTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void ResourceLoadScheduler::requestTimerFired(Timer&lt;ResourceLoadScheduler&gt;&amp;)
</del><ins>+void ResourceLoadScheduler::requestTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     LOG(ResourceLoading, &quot;ResourceLoadScheduler::requestTimerFired\n&quot;);
</span><span class="cx">     servePendingRequests();
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadSchedulerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoadScheduler.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoadScheduler.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/loader/ResourceLoadScheduler.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> private:
</span><span class="cx">     void scheduleLoad(ResourceLoader*);
</span><span class="cx">     void scheduleServePendingRequests();
</span><del>-    void requestTimerFired(Timer&lt;ResourceLoadScheduler&gt;&amp;);
</del><ins>+    void requestTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     bool isSuspendingPendingRequests() const { return !!m_suspendPendingRequestsCount; }
</span><span class="cx"> 
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx">     HostMap m_hosts;
</span><span class="cx">     HostInformation* m_nonHTTPProtocolHost;
</span><span class="cx">         
</span><del>-    Timer&lt;ResourceLoadScheduler&gt; m_requestTimer;
</del><ins>+    Timer m_requestTimer;
</ins><span class="cx"> 
</span><span class="cx">     unsigned m_suspendPendingRequestsCount;
</span><span class="cx">     bool m_isSerialLoadingEnabled;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderTextTrackLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/TextTrackLoader.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/TextTrackLoader.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/loader/TextTrackLoader.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx">         m_resource-&gt;removeClient(this);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void TextTrackLoader::cueLoadTimerFired(Timer&lt;TextTrackLoader&gt;* timer)
</del><ins>+void TextTrackLoader::cueLoadTimerFired(Timer* timer)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT_UNUSED(timer, timer == &amp;m_cueLoadTimer);
</span><span class="cx">     
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderTextTrackLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/TextTrackLoader.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/TextTrackLoader.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/loader/TextTrackLoader.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">     virtual void fileFailedToParse() override;
</span><span class="cx">     
</span><span class="cx">     void processNewCueData(CachedResource*);
</span><del>-    void cueLoadTimerFired(Timer&lt;TextTrackLoader&gt;*);
</del><ins>+    void cueLoadTimerFired(Timer*);
</ins><span class="cx">     void corsPolicyPreventedLoad();
</span><span class="cx"> 
</span><span class="cx">     enum State { Idle, Loading, Finished, Failed };
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx">     std::unique_ptr&lt;WebVTTParser&gt; m_cueParser;
</span><span class="cx">     CachedResourceHandle&lt;CachedTextTrack&gt; m_resource;
</span><span class="cx">     ScriptExecutionContext* m_scriptExecutionContext;
</span><del>-    Timer&lt;TextTrackLoader&gt; m_cueLoadTimer;
</del><ins>+    Timer m_cueLoadTimer;
</ins><span class="cx">     String m_crossOriginMode;
</span><span class="cx">     State m_state;
</span><span class="cx">     unsigned m_parseOffset;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -742,7 +742,7 @@
</span><span class="cx">         m_timer.stop();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void CachedResource::Callback::timerFired(Timer&lt;Callback&gt;&amp;)
</del><ins>+void CachedResource::Callback::timerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     m_resource.didAddClient(&amp;m_client);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/loader/cache/CachedResource.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -347,11 +347,11 @@
</span><span class="cx">     void cancel();
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    void timerFired(Timer&lt;Callback&gt;&amp;);
</del><ins>+    void timerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     CachedResource&amp; m_resource;
</span><span class="cx">     CachedResourceClient&amp; m_client;
</span><del>-    Timer&lt;Callback&gt; m_timer;
</del><ins>+    Timer m_timer;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -778,7 +778,7 @@
</span><span class="cx"> // bookkeeping on CachedResources, so instead pseudo-GC them -- when the
</span><span class="cx"> // reference count reaches 1, m_documentResources is the only reference, so
</span><span class="cx"> // remove it from the map.
</span><del>-void CachedResourceLoader::garbageCollectDocumentResourcesTimerFired(Timer&lt;CachedResourceLoader&gt;&amp; timer)
</del><ins>+void CachedResourceLoader::garbageCollectDocumentResourcesTimerFired(Timer&amp; timer)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT_UNUSED(timer, &amp;timer == &amp;m_garbageCollectDocumentResourcesTimer);
</span><span class="cx">     garbageCollectDocumentResources();
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx">     bool shouldContinueAfterNotifyingLoadedFromMemoryCache(const CachedResourceRequest&amp;, CachedResource*);
</span><span class="cx">     bool checkInsecureContent(CachedResource::Type, const URL&amp;) const;
</span><span class="cx"> 
</span><del>-    void garbageCollectDocumentResourcesTimerFired(Timer&lt;CachedResourceLoader&gt;&amp;);
</del><ins>+    void garbageCollectDocumentResourcesTimerFired(Timer&amp;);
</ins><span class="cx">     void performPostLoadActions();
</span><span class="cx"> 
</span><span class="cx">     bool clientDefersImage(const URL&amp;) const;
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx">     };
</span><span class="cx">     Deque&lt;PendingPreload&gt; m_pendingPreloads;
</span><span class="cx"> 
</span><del>-    Timer&lt;CachedResourceLoader&gt; m_garbageCollectDocumentResourcesTimer;
</del><ins>+    Timer m_garbageCollectDocumentResourcesTimer;
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(RESOURCE_TIMING)
</span><span class="cx">     struct InitiatorInfo {
</span></span></pre></div>
<a id="trunkSourceWebCoreloadericonIconDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/icon/IconDatabase.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/icon/IconDatabase.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/loader/icon/IconDatabase.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -855,7 +855,7 @@
</span><span class="cx">     });
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void IconDatabase::syncTimerFired(Timer&lt;IconDatabase&gt;&amp;)
</del><ins>+void IconDatabase::syncTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT_NOT_SYNC_THREAD();
</span><span class="cx">     wakeSyncThread();
</span></span></pre></div>
<a id="trunkSourceWebCoreloadericonIconDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/icon/IconDatabase.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/icon/IconDatabase.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/loader/icon/IconDatabase.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -115,9 +115,9 @@
</span><span class="cx"> 
</span><span class="cx">     void wakeSyncThread();
</span><span class="cx">     void scheduleOrDeferSyncTimer();
</span><del>-    void syncTimerFired(Timer&lt;IconDatabase&gt;&amp;);
</del><ins>+    void syncTimerFired(Timer&amp;);
</ins><span class="cx">     
</span><del>-    Timer&lt;IconDatabase&gt; m_syncTimer;
</del><ins>+    Timer m_syncTimer;
</ins><span class="cx">     ThreadIdentifier m_syncThread;
</span><span class="cx">     bool m_syncThreadRunning;
</span><span class="cx">     
</span></span></pre></div>
<a id="trunkSourceWebCorepageAutoscrollControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/AutoscrollController.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/AutoscrollController.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/page/AutoscrollController.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-void AutoscrollController::autoscrollTimerFired(Timer&lt;AutoscrollController&gt;&amp;)
</del><ins>+void AutoscrollController::autoscrollTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     if (!m_autoscrollRenderer) {
</span><span class="cx">         stopAutoscrollTimer();
</span></span></pre></div>
<a id="trunkSourceWebCorepageAutoscrollControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/AutoscrollController.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/AutoscrollController.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/page/AutoscrollController.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -69,13 +69,13 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    void autoscrollTimerFired(Timer&lt;AutoscrollController&gt;&amp;);
</del><ins>+    void autoscrollTimerFired(Timer&amp;);
</ins><span class="cx">     void startAutoscrollTimer();
</span><span class="cx"> #if ENABLE(PAN_SCROLLING)
</span><span class="cx">     void updatePanScrollState(FrameView*, const IntPoint&amp;);
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    Timer&lt;AutoscrollController&gt; m_autoscrollTimer;
</del><ins>+    Timer m_autoscrollTimer;
</ins><span class="cx">     RenderBox* m_autoscrollRenderer;
</span><span class="cx">     AutoscrollType m_autoscrollType;
</span><span class="cx">     IntPoint m_dragAndDropAutoscrollReferencePosition;
</span></span></pre></div>
<a id="trunkSourceWebCorepageCaptionUserPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/CaptionUserPreferences.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/CaptionUserPreferences.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/page/CaptionUserPreferences.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void CaptionUserPreferences::timerFired(Timer&lt;CaptionUserPreferences&gt;&amp;)
</del><ins>+void CaptionUserPreferences::timerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     captionPreferencesChanged();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageCaptionUserPreferencesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/CaptionUserPreferences.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/CaptionUserPreferences.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/page/CaptionUserPreferences.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -97,12 +97,12 @@
</span><span class="cx">     void updateCaptionStyleSheetOveride();
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    void timerFired(Timer&lt;CaptionUserPreferences&gt;&amp;);
</del><ins>+    void timerFired(Timer&amp;);
</ins><span class="cx">     void notify();
</span><span class="cx"> 
</span><span class="cx">     PageGroup&amp; m_pageGroup;
</span><span class="cx">     CaptionDisplayMode m_displayMode;
</span><del>-    Timer&lt;CaptionUserPreferences&gt; m_timer;
</del><ins>+    Timer m_timer;
</ins><span class="cx">     String m_userPreferredLanguage;
</span><span class="cx">     String m_captionsStyleSheetOverride;
</span><span class="cx">     String m_primaryAudioTrackLanguageOverride;
</span></span></pre></div>
<a id="trunkSourceWebCorepageCaptionUserPreferencesMediaAFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -224,7 +224,7 @@
</span><span class="cx">     return !(captioningMediaCharacteristics &amp;&amp; CFArrayGetCount(captioningMediaCharacteristics.get()));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void CaptionUserPreferencesMediaAF::updateTimerFired(Timer&lt;CaptionUserPreferencesMediaAF&gt;&amp;)
</del><ins>+void CaptionUserPreferencesMediaAF::updateTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     updateCaptionStyleSheetOveride();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageCaptionUserPreferencesMediaAFh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx"> #if HAVE(MEDIA_ACCESSIBILITY_FRAMEWORK)
</span><del>-    void updateTimerFired(Timer&lt;CaptionUserPreferencesMediaAF&gt;&amp;);
</del><ins>+    void updateTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     String captionsWindowCSS() const;
</span><span class="cx">     String captionsBackgroundCSS() const;
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">     String captionsTextEdgeCSS() const;
</span><span class="cx">     String cssPropertyWithTextEdgeColor(CSSPropertyID, const String&amp;, const Color&amp;, bool) const;
</span><span class="cx">     String colorPropertyCSS(CSSPropertyID, const Color&amp;, bool) const;
</span><del>-    Timer&lt;CaptionUserPreferencesMediaAF&gt; m_updateStyleSheetTimer;
</del><ins>+    Timer m_updateStyleSheetTimer;
</ins><span class="cx"> 
</span><span class="cx">     bool m_listeningForPreferenceChanges;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorepageDeviceControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DeviceController.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DeviceController.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/page/DeviceController.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void DeviceController::fireDeviceEvent(Timer&lt;DeviceController&gt;&amp; timer)
</del><ins>+void DeviceController::fireDeviceEvent(Timer&amp; timer)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT_UNUSED(timer, &amp;timer == &amp;m_timer);
</span><span class="cx">     ASSERT(hasLastData());
</span></span></pre></div>
<a id="trunkSourceWebCorepageDeviceControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DeviceController.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DeviceController.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/page/DeviceController.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -56,12 +56,12 @@
</span><span class="cx">     virtual PassRefPtr&lt;Event&gt; getLastEvent() { return 0; }
</span><span class="cx"> 
</span><span class="cx"> protected:
</span><del>-    void fireDeviceEvent(Timer&lt;DeviceController&gt;&amp;);
</del><ins>+    void fireDeviceEvent(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     HashCountedSet&lt;RefPtr&lt;DOMWindow&gt;&gt; m_listeners;
</span><span class="cx">     HashCountedSet&lt;RefPtr&lt;DOMWindow&gt;&gt; m_lastEventListeners;
</span><span class="cx">     DeviceClient* m_client;
</span><del>-    Timer&lt;DeviceController&gt; m_timer;
</del><ins>+    Timer m_timer;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/page/EventHandler.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -1310,7 +1310,7 @@
</span><span class="cx">     return ((isOverLink || isSubmitImage(node)) &amp;&amp; (!editable || editableLinkEnabled));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void EventHandler::cursorUpdateTimerFired(Timer&lt;EventHandler&gt;&amp;)
</del><ins>+void EventHandler::cursorUpdateTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(m_frame.document());
</span><span class="cx">     updateCursor();
</span><span class="lines">@@ -1553,7 +1553,7 @@
</span><span class="cx">         m_autoHideCursorTimer.stop();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void EventHandler::autoHideCursorTimerFired(Timer&lt;EventHandler&gt;&amp; timer)
</del><ins>+void EventHandler::autoHideCursorTimerFired(Timer&amp; timer)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT_UNUSED(timer, &amp;timer == &amp;m_autoHideCursorTimer);
</span><span class="cx">     m_currentMouseCursor = noneCursor();
</span><span class="lines">@@ -1576,7 +1576,7 @@
</span><span class="cx">     page-&gt;chrome().didBeginTrackingPotentialLongMousePress(m_mouseDownPos, hitTestResult);
</span><span class="cx"> }
</span><span class="cx">     
</span><del>-void EventHandler::recognizeLongMousePress(Timer&lt;EventHandler&gt;&amp; timer)
</del><ins>+void EventHandler::recognizeLongMousePress(Timer&amp; timer)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT_UNUSED(timer, &amp;timer == &amp;m_longMousePressTimer);
</span><span class="cx"> 
</span><span class="lines">@@ -2944,7 +2944,7 @@
</span><span class="cx">     m_fakeMouseMoveEventTimer.stop();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void EventHandler::fakeMouseMoveEventTimerFired(Timer&lt;EventHandler&gt;&amp; timer)
</del><ins>+void EventHandler::fakeMouseMoveEventTimerFired(Timer&amp; timer)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT_UNUSED(timer, &amp;timer == &amp;m_fakeMouseMoveEventTimer);
</span><span class="cx">     ASSERT(!m_mousePressed);
</span><span class="lines">@@ -2980,7 +2980,7 @@
</span><span class="cx">     m_resizeLayer = 0;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void EventHandler::hoverTimerFired(Timer&lt;EventHandler&gt;&amp;)
</del><ins>+void EventHandler::hoverTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     m_hoverTimer.stop();
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/page/EventHandler.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -326,9 +326,9 @@
</span><span class="cx"> 
</span><span class="cx">     OptionalCursor selectCursor(const HitTestResult&amp;, bool shiftKey);
</span><span class="cx"> 
</span><del>-    void hoverTimerFired(Timer&lt;EventHandler&gt;&amp;);
</del><ins>+    void hoverTimerFired(Timer&amp;);
</ins><span class="cx"> #if ENABLE(CURSOR_SUPPORT)
</span><del>-    void cursorUpdateTimerFired(Timer&lt;EventHandler&gt;&amp;);
</del><ins>+    void cursorUpdateTimerFired(Timer&amp;);
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     bool logicalScrollOverflow(ScrollLogicalDirection, ScrollGranularity, Node* startingNode = 0);
</span><span class="lines">@@ -341,7 +341,7 @@
</span><span class="cx">     static bool eventInvertsTabsToLinksClientCallResult(KeyboardEvent*);
</span><span class="cx"> 
</span><span class="cx"> #if !ENABLE(IOS_TOUCH_EVENTS)
</span><del>-    void fakeMouseMoveEventTimerFired(Timer&lt;EventHandler&gt;&amp;);
</del><ins>+    void fakeMouseMoveEventTimerFired(Timer&amp;);
</ins><span class="cx">     void cancelFakeMouseMoveEvent();
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="lines">@@ -437,11 +437,11 @@
</span><span class="cx"> #if ENABLE(CURSOR_VISIBILITY)
</span><span class="cx">     void startAutoHideCursorTimer();
</span><span class="cx">     void cancelAutoHideCursorTimer();
</span><del>-    void autoHideCursorTimerFired(Timer&lt;EventHandler&gt;&amp;);
</del><ins>+    void autoHideCursorTimerFired(Timer&amp;);
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     void beginTrackingPotentialLongMousePress(const HitTestResult&amp;);
</span><del>-    void recognizeLongMousePress(Timer&lt;EventHandler&gt;&amp;);
</del><ins>+    void recognizeLongMousePress(Timer&amp;);
</ins><span class="cx">     void cancelTrackingPotentialLongMousePress();
</span><span class="cx">     bool longMousePressHysteresisExceeded();
</span><span class="cx">     void clearLongMousePressState();
</span><span class="lines">@@ -470,12 +470,12 @@
</span><span class="cx"> 
</span><span class="cx">     bool m_panScrollButtonPressed;
</span><span class="cx"> 
</span><del>-    Timer&lt;EventHandler&gt; m_hoverTimer;
</del><ins>+    Timer m_hoverTimer;
</ins><span class="cx"> #if ENABLE(CURSOR_SUPPORT)
</span><del>-    Timer&lt;EventHandler&gt; m_cursorUpdateTimer;
</del><ins>+    Timer m_cursorUpdateTimer;
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    Timer&lt;EventHandler&gt; m_longMousePressTimer;
</del><ins>+    Timer m_longMousePressTimer;
</ins><span class="cx">     bool m_didRecognizeLongMousePress;
</span><span class="cx"> 
</span><span class="cx">     std::unique_ptr&lt;AutoscrollController&gt; m_autoscrollController;
</span><span class="lines">@@ -483,7 +483,7 @@
</span><span class="cx">     bool m_mouseDownWasInSubframe;
</span><span class="cx"> 
</span><span class="cx"> #if !ENABLE(IOS_TOUCH_EVENTS)
</span><del>-    Timer&lt;EventHandler&gt; m_fakeMouseMoveEventTimer;
</del><ins>+    Timer m_fakeMouseMoveEventTimer;
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     bool m_svgPan;
</span><span class="lines">@@ -558,7 +558,7 @@
</span><span class="cx">     bool m_isHandlingWheelEvent;
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(CURSOR_VISIBILITY)
</span><del>-    Timer&lt;EventHandler&gt; m_autoHideCursorTimer;
</del><ins>+    Timer m_autoHideCursorTimer;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventSource.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventSource.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/page/EventSource.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx">     dispatchEvent(Event::create(eventNames().errorEvent, false, false));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void EventSource::connectTimerFired(Timer&lt;EventSource&gt;&amp;)
</del><ins>+void EventSource::connectTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     connect();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventSource.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventSource.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/page/EventSource.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx">     void networkRequestEnded();
</span><span class="cx">     void scheduleInitialConnect();
</span><span class="cx">     void scheduleReconnect();
</span><del>-    void connectTimerFired(Timer&lt;EventSource&gt;&amp;);
</del><ins>+    void connectTimerFired(Timer&amp;);
</ins><span class="cx">     void abortConnectionAttempt();
</span><span class="cx">     void parseEventStream();
</span><span class="cx">     void parseEventStreamLine(unsigned pos, int fieldLength, int lineLength);
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> 
</span><span class="cx">     RefPtr&lt;TextResourceDecoder&gt; m_decoder;
</span><span class="cx">     RefPtr&lt;ThreadableLoader&gt; m_loader;
</span><del>-    Timer&lt;EventSource&gt; m_connectTimer;
</del><ins>+    Timer m_connectTimer;
</ins><span class="cx">     Vector&lt;UChar&gt; m_receiveBuf;
</span><span class="cx">     bool m_discardTrailingNewline;
</span><span class="cx">     bool m_requestInFlight;
</span></span></pre></div>
<a id="trunkSourceWebCorepageFocusControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FocusController.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FocusController.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/page/FocusController.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -912,7 +912,7 @@
</span><span class="cx">     m_focusRepaintTimer.startOneShot(0.033);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void FocusController::focusRepaintTimerFired(Timer&lt;FocusController&gt;&amp;)
</del><ins>+void FocusController::focusRepaintTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     Document* focusedDocument = focusedOrMainFrame().document();
</span><span class="cx">     if (!focusedDocument)
</span></span></pre></div>
<a id="trunkSourceWebCorepageFocusControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FocusController.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FocusController.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/page/FocusController.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -120,14 +120,14 @@
</span><span class="cx">     bool advanceFocusDirectionallyInContainer(Node* container, const LayoutRect&amp; startingRect, FocusDirection, KeyboardEvent*);
</span><span class="cx">     void findFocusCandidateInContainer(Node* container, const LayoutRect&amp; startingRect, FocusDirection, KeyboardEvent*, FocusCandidate&amp; closest);
</span><span class="cx"> 
</span><del>-    void focusRepaintTimerFired(Timer&lt;FocusController&gt;&amp;);
</del><ins>+    void focusRepaintTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     Page&amp; m_page;
</span><span class="cx">     RefPtr&lt;Frame&gt; m_focusedFrame;
</span><span class="cx">     bool m_isChangingFocusedFrame;
</span><span class="cx">     ViewState::Flags m_viewState;
</span><span class="cx"> 
</span><del>-    Timer&lt;FocusController&gt; m_focusRepaintTimer;
</del><ins>+    Timer m_focusRepaintTimer;
</ins><span class="cx">     double m_focusSetTime;
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepageFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Frame.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Frame.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/page/Frame.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -516,7 +516,7 @@
</span><span class="cx">     selection().updateAppearance();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Frame::overflowAutoScrollTimerFired(Timer&lt;Frame&gt;*)
</del><ins>+void Frame::overflowAutoScrollTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     if (!eventHandler().mousePressed() || checkOverflowScroll(PerformOverflowScroll) == OverflowScrollNone) {
</span><span class="cx">         if (m_overflowAutoScrollTimer.isActive())
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Frame.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Frame.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/page/Frame.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -295,13 +295,13 @@
</span><span class="cx">         bool hitTestResultAtViewportLocation(const FloatPoint&amp; viewportLocation, HitTestResult&amp;, IntPoint&amp; center);
</span><span class="cx">         Node* qualifyingNodeAtViewportLocation(const FloatPoint&amp; viewportLocation, FloatPoint&amp; adjustedViewportLocation, NodeQualifier, bool shouldApproximate);
</span><span class="cx"> 
</span><del>-        void overflowAutoScrollTimerFired(Timer&lt;Frame&gt;*);
</del><ins>+        void overflowAutoScrollTimerFired(Timer*);
</ins><span class="cx">         void startOverflowAutoScroll(const IntPoint&amp;);
</span><span class="cx">         int checkOverflowScroll(OverflowScrollAction);
</span><span class="cx"> 
</span><span class="cx">         void setTimersPausedInternal(bool);
</span><span class="cx"> 
</span><del>-        Timer&lt;Frame&gt; m_overflowAutoScrollTimer;
</del><ins>+        Timer m_overflowAutoScrollTimer;
</ins><span class="cx">         float m_overflowAutoScrollDelta;
</span><span class="cx">         IntPoint m_overflowAutoScrollPos;
</span><span class="cx">         ViewportArguments m_viewportArguments;
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/page/FrameView.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -1738,7 +1738,7 @@
</span><span class="cx">     return maximumOffset;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void FrameView::delayedScrollEventTimerFired(Timer&lt;FrameView&gt;&amp;)
</del><ins>+void FrameView::delayedScrollEventTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     sendScrollEvent();
</span><span class="cx"> }
</span><span class="lines">@@ -2400,7 +2400,7 @@
</span><span class="cx">     m_speculativeTilingEnableTimer.startOneShot(speculativeTilingEnableDelay);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void FrameView::speculativeTilingEnableTimerFired(Timer&lt;FrameView&gt;&amp;)
</del><ins>+void FrameView::speculativeTilingEnableTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     if (m_speculativeTilingEnabled)
</span><span class="cx">         return;
</span><span class="lines">@@ -2408,7 +2408,7 @@
</span><span class="cx">     adjustTiledBackingCoverage();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void FrameView::layoutTimerFired(Timer&lt;FrameView&gt;&amp;)
</del><ins>+void FrameView::layoutTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx"> #ifdef INSTRUMENT_LAYOUT_SCHEDULING
</span><span class="cx">     if (!frame().document()-&gt;ownerElement())
</span><span class="lines">@@ -2850,7 +2850,7 @@
</span><span class="cx">     return m_embeddedObjectsToUpdate-&gt;isEmpty();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void FrameView::updateEmbeddedObjectsTimerFired(Timer&lt;FrameView&gt;*)
</del><ins>+void FrameView::updateEmbeddedObjectsTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     RefPtr&lt;FrameView&gt; protect(this);
</span><span class="cx">     m_updateEmbeddedObjectsTimer.stop();
</span><span class="lines">@@ -2999,7 +2999,7 @@
</span><span class="cx">     adjustTiledBackingCoverage();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void FrameView::postLayoutTimerFired(Timer&lt;FrameView&gt;&amp;)
</del><ins>+void FrameView::postLayoutTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     performPostLayoutTasks();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/page/FrameView.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> 
</span><span class="cx">     void layout(bool allowSubtree = true);
</span><span class="cx">     WEBCORE_EXPORT bool didFirstLayout() const;
</span><del>-    void layoutTimerFired(Timer&lt;FrameView&gt;&amp;);
</del><ins>+    void layoutTimerFired(Timer&amp;);
</ins><span class="cx">     void scheduleRelayout();
</span><span class="cx">     void scheduleRelayoutOfSubtree(RenderElement&amp;);
</span><span class="cx">     void unscheduleRelayout();
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx">     virtual bool isRubberBandInProgress() const override;
</span><span class="cx">     WEBCORE_EXPORT virtual IntPoint minimumScrollPosition() const override;
</span><span class="cx">     WEBCORE_EXPORT virtual IntPoint maximumScrollPosition() const override;
</span><del>-    void delayedScrollEventTimerFired(Timer&lt;FrameView&gt;&amp;);
</del><ins>+    void delayedScrollEventTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     void resumeVisibleImageAnimationsIncludingSubframes();
</span><span class="cx"> 
</span><span class="lines">@@ -301,7 +301,7 @@
</span><span class="cx"> 
</span><span class="cx">     void restoreScrollbar();
</span><span class="cx"> 
</span><del>-    void postLayoutTimerFired(Timer&lt;FrameView&gt;&amp;);
</del><ins>+    void postLayoutTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     WEBCORE_EXPORT bool wasScrolledByUser() const;
</span><span class="cx">     WEBCORE_EXPORT void setWasScrolledByUser(bool);
</span><span class="lines">@@ -607,9 +607,9 @@
</span><span class="cx">     virtual void notifyPageThatContentAreaWillPaint() const override;
</span><span class="cx"> 
</span><span class="cx">     void enableSpeculativeTilingIfNeeded();
</span><del>-    void speculativeTilingEnableTimerFired(Timer&lt;FrameView&gt;&amp;);
</del><ins>+    void speculativeTilingEnableTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><del>-    void updateEmbeddedObjectsTimerFired(Timer&lt;FrameView&gt;*);
</del><ins>+    void updateEmbeddedObjectsTimerFired(Timer*);
</ins><span class="cx">     bool updateEmbeddedObjects();
</span><span class="cx">     void updateEmbeddedObject(RenderEmbeddedObject&amp;);
</span><span class="cx">     void scrollToAnchor();
</span><span class="lines">@@ -653,7 +653,7 @@
</span><span class="cx">     bool m_isOverlapped;
</span><span class="cx">     bool m_contentIsOpaque;
</span><span class="cx"> 
</span><del>-    Timer&lt;FrameView&gt; m_layoutTimer;
</del><ins>+    Timer m_layoutTimer;
</ins><span class="cx">     bool m_delayedLayout;
</span><span class="cx">     RenderElement* m_layoutRoot;
</span><span class="cx"> 
</span><span class="lines">@@ -662,8 +662,8 @@
</span><span class="cx">     bool m_inSynchronousPostLayout;
</span><span class="cx">     int m_layoutCount;
</span><span class="cx">     unsigned m_nestedLayoutCount;
</span><del>-    Timer&lt;FrameView&gt; m_postLayoutTasksTimer;
-    Timer&lt;FrameView&gt; m_updateEmbeddedObjectsTimer;
</del><ins>+    Timer m_postLayoutTasksTimer;
+    Timer m_updateEmbeddedObjectsTimer;
</ins><span class="cx">     bool m_firstLayoutCallbackPending;
</span><span class="cx"> 
</span><span class="cx">     bool m_firstLayout;
</span><span class="lines">@@ -685,7 +685,7 @@
</span><span class="cx">     bool m_wasScrolledByUser;
</span><span class="cx">     bool m_inProgrammaticScroll;
</span><span class="cx">     bool m_safeToPropagateScrollToParent;
</span><del>-    Timer&lt;FrameView&gt; m_delayedScrollEventTimer;
</del><ins>+    Timer m_delayedScrollEventTimer;
</ins><span class="cx"> 
</span><span class="cx">     double m_lastPaintTime;
</span><span class="cx"> 
</span><span class="lines">@@ -714,7 +714,7 @@
</span><span class="cx">     RenderPtr&lt;RenderScrollbarPart&gt; m_scrollCorner;
</span><span class="cx"> 
</span><span class="cx">     bool m_speculativeTilingEnabled;
</span><del>-    Timer&lt;FrameView&gt; m_speculativeTilingEnableTimer;
</del><ins>+    Timer m_speculativeTilingEnableTimer;
</ins><span class="cx"> 
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">     bool m_useCustomFixedPositionLayoutRect;
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageOverlaycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageOverlay.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageOverlay.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/page/PageOverlay.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx">     m_fadeAnimationTimer.startRepeating(1 / fadeAnimationFrameRate);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void PageOverlay::fadeAnimationTimerFired(Timer&lt;PageOverlay&gt;&amp;)
</del><ins>+void PageOverlay::fadeAnimationTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     float animationProgress = (currentTime() - m_fadeAnimationStartTime) / m_fadeAnimationDuration;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageOverlayh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageOverlay.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageOverlay.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/page/PageOverlay.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -112,12 +112,12 @@
</span><span class="cx">     explicit PageOverlay(Client&amp;, OverlayType);
</span><span class="cx"> 
</span><span class="cx">     void startFadeAnimation();
</span><del>-    void fadeAnimationTimerFired(Timer&lt;PageOverlay&gt;&amp;);
</del><ins>+    void fadeAnimationTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     Client&amp; m_client;
</span><span class="cx">     Page* m_page;
</span><span class="cx"> 
</span><del>-    Timer&lt;PageOverlay&gt; m_fadeAnimationTimer;
</del><ins>+    Timer m_fadeAnimationTimer;
</ins><span class="cx">     double m_fadeAnimationStartTime;
</span><span class="cx">     double m_fadeAnimationDuration;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/page/Settings.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -394,7 +394,7 @@
</span><span class="cx">     m_setImageLoadingSettingsTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Settings::imageLoadingSettingsTimerFired(Timer&lt;Settings&gt;*)
</del><ins>+void Settings::imageLoadingSettingsTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     setImageLoadingSettings(m_page);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/page/Settings.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -321,8 +321,8 @@
</span><span class="cx"> 
</span><span class="cx">     double m_timeWithoutMouseMovementBeforeHidingControls;
</span><span class="cx"> 
</span><del>-    Timer&lt;Settings&gt; m_setImageLoadingSettingsTimer;
-    void imageLoadingSettingsTimerFired(Timer&lt;Settings&gt;*);
</del><ins>+    Timer m_setImageLoadingSettingsTimer;
+    void imageLoadingSettingsTimerFired(Timer*);
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(HIDDEN_PAGE_DOM_TIMER_THROTTLING)
</span><span class="cx">     bool m_hiddenPageDOMTimerThrottlingEnabled : 1;
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationAnimationControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/AnimationController.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/AnimationController.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/page/animation/AnimationController.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx">     m_animationTimer.startOneShot(timeToNextService);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void AnimationControllerPrivate::updateStyleIfNeededDispatcherFired(Timer&lt;AnimationControllerPrivate&gt;&amp;)
</del><ins>+void AnimationControllerPrivate::updateStyleIfNeededDispatcherFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     fireEventsAndUpdateStyle();
</span><span class="cx"> }
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-void AnimationControllerPrivate::animationTimerFired(Timer&lt;AnimationControllerPrivate&gt;&amp;)
</del><ins>+void AnimationControllerPrivate::animationTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     // Make sure animationUpdateTime is updated, so that it is current even if no
</span><span class="cx">     // styleChange has happened (e.g. accelerated animations)
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationAnimationControllerPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/AnimationControllerPrivate.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/AnimationControllerPrivate.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/page/animation/AnimationControllerPrivate.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx">     CompositeAnimation&amp; ensureCompositeAnimation(RenderElement&amp;);
</span><span class="cx">     bool clear(RenderElement&amp;);
</span><span class="cx"> 
</span><del>-    void updateStyleIfNeededDispatcherFired(Timer&lt;AnimationControllerPrivate&gt;&amp;);
</del><ins>+    void updateStyleIfNeededDispatcherFired(Timer&amp;);
</ins><span class="cx">     void startUpdateStyleIfNeededDispatcher();
</span><span class="cx">     void addEventToDispatch(PassRefPtr&lt;Element&gt; element, const AtomicString&amp; eventType, const String&amp; name, double elapsedTime);
</span><span class="cx">     void addElementChangeToDispatch(PassRef&lt;Element&gt;);
</span><span class="lines">@@ -114,15 +114,15 @@
</span><span class="cx">     void setAllowsNewAnimationsWhileSuspended(bool);
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    void animationTimerFired(Timer&lt;AnimationControllerPrivate&gt;&amp;);
</del><ins>+    void animationTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     void styleAvailable();
</span><span class="cx">     void fireEventsAndUpdateStyle();
</span><span class="cx">     void startTimeResponse(double t);
</span><span class="cx"> 
</span><span class="cx">     HashMap&lt;RenderElement*, RefPtr&lt;CompositeAnimation&gt;&gt; m_compositeAnimations;
</span><del>-    Timer&lt;AnimationControllerPrivate&gt; m_animationTimer;
-    Timer&lt;AnimationControllerPrivate&gt; m_updateStyleIfNeededDispatcher;
</del><ins>+    Timer m_animationTimer;
+    Timer m_updateStyleIfNeededDispatcher;
</ins><span class="cx">     Frame&amp; m_frame;
</span><span class="cx">     
</span><span class="cx">     class EventToDispatch {
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacServicesOverlayControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/ServicesOverlayController.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/ServicesOverlayController.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/page/mac/ServicesOverlayController.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> 
</span><span class="cx">     bool mouseIsOverHighlight(Highlight&amp;, bool&amp; mouseIsOverButton) const;
</span><span class="cx">     std::chrono::milliseconds remainingTimeUntilHighlightShouldBeShown(Highlight*) const;
</span><del>-    void determineActiveHighlightTimerFired(Timer&lt;ServicesOverlayController&gt;&amp;);
</del><ins>+    void determineActiveHighlightTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     static bool highlightsAreEquivalent(const Highlight* a, const Highlight* b);
</span><span class="cx"> 
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx">     RefPtr&lt;Highlight&gt; m_currentMouseDownOnButtonHighlight;
</span><span class="cx">     IntPoint m_mousePosition;
</span><span class="cx"> 
</span><del>-    Timer&lt;ServicesOverlayController&gt; m_determineActiveHighlightTimer;
</del><ins>+    Timer m_determineActiveHighlightTimer;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacServicesOverlayControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/ServicesOverlayController.mm (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/ServicesOverlayController.mm        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/page/mac/ServicesOverlayController.mm        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -450,7 +450,7 @@
</span><span class="cx">     return std::chrono::duration_cast&lt;std::chrono::milliseconds&gt;(remainingDelay);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void ServicesOverlayController::determineActiveHighlightTimerFired(Timer&lt;ServicesOverlayController&gt;&amp;)
</del><ins>+void ServicesOverlayController::determineActiveHighlightTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     bool mouseIsOverButton;
</span><span class="cx">     determineActiveHighlight(mouseIsOverButton);
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx">     m_updateNodeScrollPositionTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void AsyncScrollingCoordinator::updateScrollPositionAfterAsyncScrollTimerFired(Timer&lt;AsyncScrollingCoordinator&gt;*)
</del><ins>+void AsyncScrollingCoordinator::updateScrollPositionAfterAsyncScrollTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     updateScrollPositionAfterAsyncScroll(m_scheduledScrollUpdate.nodeID, m_scheduledScrollUpdate.scrollPosition, m_scheduledScrollUpdate.isProgrammaticScroll, m_scheduledScrollUpdate.updateLayerPositionAction);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -105,11 +105,11 @@
</span><span class="cx">     void ensureRootStateNodeForFrameView(FrameView*);
</span><span class="cx">     void updateMainFrameScrollLayerPosition();
</span><span class="cx"> 
</span><del>-    void updateScrollPositionAfterAsyncScrollTimerFired(Timer&lt;AsyncScrollingCoordinator&gt;*);
</del><ins>+    void updateScrollPositionAfterAsyncScrollTimerFired(Timer*);
</ins><span class="cx">     
</span><span class="cx">     FrameView* frameViewForScrollingNode(ScrollingNodeID) const;
</span><span class="cx"> 
</span><del>-    Timer&lt;AsyncScrollingCoordinator&gt; m_updateNodeScrollPositionTimer;
</del><ins>+    Timer m_updateNodeScrollPositionTimer;
</ins><span class="cx"> 
</span><span class="cx">     struct ScheduledScrollUpdate {
</span><span class="cx">         ScheduledScrollUpdate()
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingiosScrollingCoordinatorIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -53,10 +53,10 @@
</span><span class="cx"> private:
</span><span class="cx">     virtual void scheduleTreeStateCommit() override;
</span><span class="cx"> 
</span><del>-    void scrollingStateTreeCommitterTimerFired(Timer&lt;ScrollingCoordinatorIOS&gt;*);
</del><ins>+    void scrollingStateTreeCommitterTimerFired(Timer*);
</ins><span class="cx">     void commitTreeState();
</span><span class="cx"> 
</span><del>-    Timer&lt;ScrollingCoordinatorIOS&gt; m_scrollingStateTreeCommitterTimer;
</del><ins>+    Timer m_scrollingStateTreeCommitterTimer;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingiosScrollingCoordinatorIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.mm (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.mm        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.mm        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx">     m_scrollingStateTreeCommitterTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void ScrollingCoordinatorIOS::scrollingStateTreeCommitterTimerFired(Timer&lt;ScrollingCoordinatorIOS&gt;*)
</del><ins>+void ScrollingCoordinatorIOS::scrollingStateTreeCommitterTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     commitTreeState();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingCoordinatorMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -53,12 +53,12 @@
</span><span class="cx"> private:
</span><span class="cx">     virtual void scheduleTreeStateCommit() override;
</span><span class="cx"> 
</span><del>-    void scrollingStateTreeCommitterTimerFired(Timer&lt;ScrollingCoordinatorMac&gt;*);
</del><ins>+    void scrollingStateTreeCommitterTimerFired(Timer*);
</ins><span class="cx">     void commitTreeState();
</span><span class="cx">     
</span><span class="cx">     void updateTiledScrollingIndicator();
</span><span class="cx"> 
</span><del>-    Timer&lt;ScrollingCoordinatorMac&gt; m_scrollingStateTreeCommitterTimer;
</del><ins>+    Timer m_scrollingStateTreeCommitterTimer;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingCoordinatorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx">     m_scrollingStateTreeCommitterTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void ScrollingCoordinatorMac::scrollingStateTreeCommitterTimerFired(Timer&lt;ScrollingCoordinatorMac&gt;*)
</del><ins>+void ScrollingCoordinatorMac::scrollingStateTreeCommitterTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     commitTreeState();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformHysteresisActivityh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/HysteresisActivity.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/HysteresisActivity.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/HysteresisActivity.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx">     }
</span><span class="cx">     
</span><span class="cx"> private:
</span><del>-    void hysteresisTimerFired(Timer&lt;HysteresisActivity&gt;&amp;)
</del><ins>+    void hysteresisTimerFired(Timer&amp;)
</ins><span class="cx">     {
</span><span class="cx">         m_delegate.stopped();
</span><span class="cx">         m_timer.stop();
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx">     Delegate&amp; m_delegate;
</span><span class="cx">     double m_hysteresisSeconds;
</span><span class="cx">     bool m_active;
</span><del>-    Timer&lt;HysteresisActivity&gt; m_timer;
</del><ins>+    Timer m_timer;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollAnimatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollAnimator.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollAnimator.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/ScrollAnimator.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -176,14 +176,14 @@
</span><span class="cx">     // FIXME: Currently, scroll snap animators are recreated even though the snap offsets alone can be updated.
</span><span class="cx">     if (m_scrollableArea-&gt;horizontalSnapOffsets()) {
</span><span class="cx">         m_horizontalScrollSnapAnimator = std::make_unique&lt;AxisScrollSnapAnimator&gt;(this, m_scrollableArea-&gt;horizontalSnapOffsets(), ScrollEventAxis::Horizontal);
</span><del>-        m_horizontalScrollSnapTimer = std::make_unique&lt;Timer&lt;ScrollAnimator&gt;&gt;(this, &amp;ScrollAnimator::horizontalScrollSnapTimerFired);
</del><ins>+        m_horizontalScrollSnapTimer = std::make_unique&lt;Timer&gt;(this, &amp;ScrollAnimator::horizontalScrollSnapTimerFired);
</ins><span class="cx">     } else if (m_horizontalScrollSnapAnimator) {
</span><span class="cx">         m_horizontalScrollSnapAnimator = nullptr;
</span><span class="cx">         m_horizontalScrollSnapTimer = nullptr;
</span><span class="cx">     }
</span><span class="cx">     if (m_scrollableArea-&gt;verticalSnapOffsets()) {
</span><span class="cx">         m_verticalScrollSnapAnimator = std::make_unique&lt;AxisScrollSnapAnimator&gt;(this, m_scrollableArea-&gt;verticalSnapOffsets(), ScrollEventAxis::Vertical);
</span><del>-        m_verticalScrollSnapTimer = std::make_unique&lt;Timer&lt;ScrollAnimator&gt;&gt;(this, &amp;ScrollAnimator::verticalScrollSnapTimerFired);
</del><ins>+        m_verticalScrollSnapTimer = std::make_unique&lt;Timer&gt;(this, &amp;ScrollAnimator::verticalScrollSnapTimerFired);
</ins><span class="cx">     } else if (m_verticalScrollSnapAnimator) {
</span><span class="cx">         m_verticalScrollSnapAnimator = nullptr;
</span><span class="cx">         m_verticalScrollSnapTimer = nullptr;
</span><span class="lines">@@ -207,24 +207,24 @@
</span><span class="cx"> 
</span><span class="cx"> void ScrollAnimator::startScrollSnapTimer(ScrollEventAxis axis)
</span><span class="cx"> {
</span><del>-    Timer&lt;ScrollAnimator&gt;* scrollSnapTimer = axis == ScrollEventAxis::Horizontal ? m_horizontalScrollSnapTimer.get() : m_verticalScrollSnapTimer.get();
</del><ins>+    Timer* scrollSnapTimer = axis == ScrollEventAxis::Horizontal ? m_horizontalScrollSnapTimer.get() : m_verticalScrollSnapTimer.get();
</ins><span class="cx">     if (!scrollSnapTimer-&gt;isActive())
</span><span class="cx">         scrollSnapTimer-&gt;startRepeating(1.0 / 60.0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void ScrollAnimator::stopScrollSnapTimer(ScrollEventAxis axis)
</span><span class="cx"> {
</span><del>-    Timer&lt;ScrollAnimator&gt;* scrollSnapTimer = axis == ScrollEventAxis::Horizontal ? m_horizontalScrollSnapTimer.get() : m_verticalScrollSnapTimer.get();
</del><ins>+    Timer* scrollSnapTimer = axis == ScrollEventAxis::Horizontal ? m_horizontalScrollSnapTimer.get() : m_verticalScrollSnapTimer.get();
</ins><span class="cx">     if (scrollSnapTimer-&gt;isActive())
</span><span class="cx">         scrollSnapTimer-&gt;stop();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void ScrollAnimator::horizontalScrollSnapTimerFired(Timer&lt;ScrollAnimator&gt;&amp;)
</del><ins>+void ScrollAnimator::horizontalScrollSnapTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     m_horizontalScrollSnapAnimator-&gt;scrollSnapAnimationUpdate();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void ScrollAnimator::verticalScrollSnapTimerFired(Timer&lt;ScrollAnimator&gt;&amp;)
</del><ins>+void ScrollAnimator::verticalScrollSnapTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     m_verticalScrollSnapAnimator-&gt;scrollSnapAnimationUpdate();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollAnimatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollAnimator.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollAnimator.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/ScrollAnimator.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -130,8 +130,8 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP) &amp;&amp; PLATFORM(MAC)
</span><span class="cx">     // Trivial wrappers around the actual update loop in AxisScrollSnapAnimator, since WebCore Timer requires a Timer argument.
</span><del>-    void horizontalScrollSnapTimerFired(Timer&lt;ScrollAnimator&gt;&amp;);
-    void verticalScrollSnapTimerFired(Timer&lt;ScrollAnimator&gt;&amp;);
</del><ins>+    void horizontalScrollSnapTimerFired(Timer&amp;);
+    void verticalScrollSnapTimerFired(Timer&amp;);
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     ScrollableArea* m_scrollableArea;
</span><span class="lines">@@ -139,10 +139,10 @@
</span><span class="cx">     float m_currentPosY; // subclass code complexity.
</span><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP) &amp;&amp; PLATFORM(MAC)
</span><span class="cx">     std::unique_ptr&lt;AxisScrollSnapAnimator&gt; m_horizontalScrollSnapAnimator;
</span><del>-    std::unique_ptr&lt;Timer&lt;ScrollAnimator&gt;&gt; m_horizontalScrollSnapTimer;
</del><ins>+    std::unique_ptr&lt;Timer&gt; m_horizontalScrollSnapTimer;
</ins><span class="cx">     // FIXME: Find a way to consolidate both timers into one variable.
</span><span class="cx">     std::unique_ptr&lt;AxisScrollSnapAnimator&gt; m_verticalScrollSnapAnimator;
</span><del>-    std::unique_ptr&lt;Timer&lt;ScrollAnimator&gt;&gt; m_verticalScrollSnapTimer;
</del><ins>+    std::unique_ptr&lt;Timer&gt; m_verticalScrollSnapTimer;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollAnimatorNonecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -491,7 +491,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #if USE(REQUEST_ANIMATION_FRAME_TIMER)
</span><del>-void ScrollAnimatorNone::animationTimerFired(Timer&lt;ScrollAnimatorNone&gt;*)
</del><ins>+void ScrollAnimatorNone::animationTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     animationTimerFired();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollAnimatorNoneh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollAnimatorNone.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollAnimatorNone.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/ScrollAnimatorNone.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx">     };
</span><span class="cx"> 
</span><span class="cx"> #if USE(REQUEST_ANIMATION_FRAME_TIMER)
</span><del>-    void animationTimerFired(Timer&lt;ScrollAnimatorNone&gt;*);
</del><ins>+    void animationTimerFired(Timer*);
</ins><span class="cx">     void startNextTimer(double delay);
</span><span class="cx"> #else
</span><span class="cx">     void startNextTimer();
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> 
</span><span class="cx">     double m_startTime;
</span><span class="cx"> #if USE(REQUEST_ANIMATION_FRAME_TIMER)
</span><del>-    Timer&lt;ScrollAnimatorNone&gt; m_animationTimer;
</del><ins>+    Timer m_animationTimer;
</ins><span class="cx"> #else
</span><span class="cx">     bool m_animationActive;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollbarcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Scrollbar.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Scrollbar.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/Scrollbar.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx">         Widget::paint(context, damageRect);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void Scrollbar::autoscrollTimerFired(Timer&lt;Scrollbar&gt;&amp;)
</del><ins>+void Scrollbar::autoscrollTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     autoscrollPressedPart(theme()-&gt;autoscrollTimerDelay());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollbarh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Scrollbar.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Scrollbar.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/Scrollbar.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx">     virtual void updateThumbPosition();
</span><span class="cx">     virtual void updateThumbProportion();
</span><span class="cx"> 
</span><del>-    void autoscrollTimerFired(Timer&lt;Scrollbar&gt;&amp;);
</del><ins>+    void autoscrollTimerFired(Timer&amp;);
</ins><span class="cx">     void startTimerIfNeeded(double delay);
</span><span class="cx">     void stopTimerIfNeeded();
</span><span class="cx">     void autoscrollPressedPart(double delay);
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> 
</span><span class="cx">     bool m_enabled;
</span><span class="cx"> 
</span><del>-    Timer&lt;Scrollbar&gt; m_scrollTimer;
</del><ins>+    Timer m_scrollTimer;
</ins><span class="cx">     bool m_overlapsResizer;
</span><span class="cx"> 
</span><span class="cx">     bool m_suppressInvalidation;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformTimerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Timer.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Timer.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/Timer.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -112,27 +112,38 @@
</span><span class="cx">     friend class TimerHeapReference;
</span><span class="cx"> };
</span><span class="cx"> 
</span><del>-template &lt;typename TimerFiredClass&gt; class Timer : public TimerBase {
</del><ins>+
+class Timer : public TimerBase {
</ins><span class="cx"> public:
</span><del>-    typedef void (TimerFiredClass::*TimerFiredFunction)(Timer&amp;);
-    typedef void (TimerFiredClass::*DeprecatedTimerFiredFunction)(Timer*);
-
-    Timer(TimerFiredClass* object, TimerFiredFunction function)
</del><ins>+    template &lt;typename TimerFiredClass, typename TimerFiredBaseClass&gt;
+    Timer(TimerFiredClass* object, void (TimerFiredBaseClass::*function)(Timer&amp;))
</ins><span class="cx">         : m_function(std::bind(function, object, std::ref(*this)))
</span><span class="cx">     {
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    Timer(TimerFiredClass* object, DeprecatedTimerFiredFunction function)
</del><ins>+    template &lt;typename TimerFiredClass, typename TimerFiredBaseClass&gt;
+    Timer(TimerFiredClass* object, void (TimerFiredBaseClass::*function)(Timer*))
</ins><span class="cx">         : m_function(std::bind(function, object, this))
</span><span class="cx">     {
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    template &lt;typename TimerFiredClass, typename TimerFiredBaseClass&gt;
+    Timer(TimerFiredClass&amp; object, void (TimerFiredBaseClass::*function)())
+        : m_function(std::bind(function, &amp;object))
+    {
+    }
+
+    Timer(std::function&lt;void ()&gt; function)
+        : m_function(WTF::move(function))
+    {
+    }
+
</ins><span class="cx"> private:
</span><span class="cx">     virtual void fired() override
</span><span class="cx">     {
</span><span class="cx">         m_function();
</span><span class="cx">     }
</span><del>-
</del><ins>+    
</ins><span class="cx">     std::function&lt;void ()&gt; m_function;
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioMediaSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/MediaSession.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/MediaSession.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/audio/MediaSession.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx">         m_clientDataBufferingTimer.startOneShot(kClientDataBufferingTimerThrottleDelay);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaSession::clientDataBufferingTimerFired(Timer&lt;WebCore::MediaSession&gt; &amp;)
</del><ins>+void MediaSession::clientDataBufferingTimerFired(Timer &amp;)
</ins><span class="cx"> {
</span><span class="cx">     updateClientDataBuffering();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudioMediaSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/MediaSession.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/MediaSession.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/audio/MediaSession.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -106,11 +106,11 @@
</span><span class="cx">     MediaSessionClient&amp; client() const { return m_client; }
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    void clientDataBufferingTimerFired(Timer&lt;MediaSession&gt;&amp;);
</del><ins>+    void clientDataBufferingTimerFired(Timer&amp;);
</ins><span class="cx">     void updateClientDataBuffering();
</span><span class="cx"> 
</span><span class="cx">     MediaSessionClient&amp; m_client;
</span><del>-    Timer&lt;MediaSession&gt; m_clientDataBufferingTimer;
</del><ins>+    Timer m_clientDataBufferingTimer;
</ins><span class="cx">     State m_state;
</span><span class="cx">     State m_stateToRestore;
</span><span class="cx">     bool m_notifyingClient;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformeflBatteryProviderEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/efl/BatteryProviderEfl.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/efl/BatteryProviderEfl.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/efl/BatteryProviderEfl.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx">     m_client-&gt;didChangeBatteryStatus(eventType, m_batteryStatus);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void BatteryProviderEfl::timerFired(Timer&lt;BatteryProviderEfl&gt;* timer)
</del><ins>+void BatteryProviderEfl::timerFired(Timer* timer)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT_UNUSED(timer, timer == &amp;m_timer);
</span><span class="cx">     E_DBus_Connection* edbusConnection = e_dbus_bus_get(DBUS_BUS_SYSTEM);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformeflBatteryProviderEflh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/efl/BatteryProviderEfl.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/efl/BatteryProviderEfl.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/efl/BatteryProviderEfl.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -45,12 +45,12 @@
</span><span class="cx">     BatteryStatus* batteryStatus() const;
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    void timerFired(Timer&lt;BatteryProviderEfl&gt;*);
</del><ins>+    void timerFired(Timer*);
</ins><span class="cx">     static void getBatteryStatus(void* data, void* replyData, DBusError*);
</span><span class="cx">     static void setBatteryClient(void* data, void* replyData, DBusError*);
</span><span class="cx"> 
</span><span class="cx">     BatteryProviderEflClient* m_client;
</span><del>-    Timer&lt;BatteryProviderEfl&gt; m_timer;
</del><ins>+    Timer m_timer;
</ins><span class="cx">     RefPtr&lt;BatteryStatus&gt; m_batteryStatus;
</span><span class="cx">     const double m_batteryStatusRefreshInterval;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsBitmapImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/BitmapImage.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/BitmapImage.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/graphics/BitmapImage.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -528,7 +528,7 @@
</span><span class="cx"> 
</span><span class="cx">     if (catchUpIfNecessary == DoNotCatchUp || time &lt; m_desiredFrameStartTime) {
</span><span class="cx">         // Haven't yet reached time for next frame to start; delay until then.
</span><del>-        m_frameTimer = std::make_unique&lt;Timer&lt;BitmapImage&gt;&gt;(this, &amp;BitmapImage::advanceAnimation);
</del><ins>+        m_frameTimer = std::make_unique&lt;Timer&gt;(this, &amp;BitmapImage::advanceAnimation);
</ins><span class="cx">         m_frameTimer-&gt;startOneShot(std::max(m_desiredFrameStartTime - time, 0.));
</span><span class="cx">     } else {
</span><span class="cx">         // We've already reached or passed the time for the next frame to start.
</span><span class="lines">@@ -629,7 +629,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-void BitmapImage::advanceAnimation(Timer&lt;BitmapImage&gt;&amp;)
</del><ins>+void BitmapImage::advanceAnimation(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     internalAdvanceAnimation(false);
</span><span class="cx">     // At this point the image region has been marked dirty, and if it's
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsBitmapImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/BitmapImage.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/BitmapImage.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/graphics/BitmapImage.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-template &lt;typename T&gt; class Timer;
</del><ins>+class Timer;
</ins><span class="cx"> 
</span><span class="cx"> // ================================================
</span><span class="cx"> // FrameData Class
</span><span class="lines">@@ -258,7 +258,7 @@
</span><span class="cx">     int repetitionCount(bool imageKnownToBeComplete);  // |imageKnownToBeComplete| should be set if the caller knows the entire image has been decoded.
</span><span class="cx">     bool shouldAnimate();
</span><span class="cx">     virtual void startAnimation(CatchUpAnimation = CatchUp) override;
</span><del>-    void advanceAnimation(Timer&lt;BitmapImage&gt;&amp;);
</del><ins>+    void advanceAnimation(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     // Function that does the real work of advancing the animation.  When
</span><span class="cx">     // skippingFrames is true, we're in the middle of a loop trying to skip over
</span><span class="lines">@@ -295,7 +295,7 @@
</span><span class="cx">     size_t m_currentFrame; // The index of the current frame of animation.
</span><span class="cx">     Vector&lt;FrameData, 1&gt; m_frames; // An array of the cached frames of the animation. We have to ref frames to pin them in the cache.
</span><span class="cx"> 
</span><del>-    std::unique_ptr&lt;Timer&lt;BitmapImage&gt;&gt; m_frameTimer;
</del><ins>+    std::unique_ptr&lt;Timer&gt; m_frameTimer;
</ins><span class="cx">     int m_repetitionCount; // How many total animation loops we should do.  This will be cAnimationNone if this image type is incapable of animation.
</span><span class="cx">     RepetitionCountStatus m_repetitionCountStatus;
</span><span class="cx">     int m_repetitionsComplete;  // How many repetitions we've finished.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -955,7 +955,7 @@
</span><span class="cx">     return m_private-&gt;videoDecodedByteCount();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayer::reloadTimerFired(Timer&lt;MediaPlayer&gt;&amp;)
</del><ins>+void MediaPlayer::reloadTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     m_private-&gt;cancelLoad();
</span><span class="cx">     loadWithNextMediaEngine(m_currentMediaEngine);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMediaPlayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -582,12 +582,12 @@
</span><span class="cx">     MediaPlayer(MediaPlayerClient&amp;);
</span><span class="cx">     MediaPlayerFactory* nextBestMediaEngine(MediaPlayerFactory*) const;
</span><span class="cx">     void loadWithNextMediaEngine(MediaPlayerFactory*);
</span><del>-    void reloadTimerFired(Timer&lt;MediaPlayer&gt;&amp;);
</del><ins>+    void reloadTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     static void initializeMediaEngines();
</span><span class="cx"> 
</span><span class="cx">     MediaPlayerClient&amp; m_client;
</span><del>-    Timer&lt;MediaPlayer&gt; m_reloadTimer;
</del><ins>+    Timer m_reloadTimer;
</ins><span class="cx">     OwnPtr&lt;MediaPlayerPrivateInterface&gt; m_private;
</span><span class="cx">     MediaPlayerFactory* m_currentMediaEngine;
</span><span class="cx">     URL m_url;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsShadowBlurcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx">     static ScratchBuffer&amp; shared();
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    void timerFired(Timer&lt;ScratchBuffer&gt;*)
</del><ins>+    void timerFired(Timer*)
</ins><span class="cx">     {
</span><span class="cx">         clearScratchBuffer();
</span><span class="cx">     }
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     std::unique_ptr&lt;ImageBuffer&gt; m_imageBuffer;
</span><del>-    Timer&lt;ScratchBuffer&gt; m_purgeTimer;
</del><ins>+    Timer m_purgeTimer;
</ins><span class="cx">     
</span><span class="cx">     FloatRect m_lastInsetBounds;
</span><span class="cx">     FloatRect m_lastShadowRect;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsTiledBackingStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -513,7 +513,7 @@
</span><span class="cx">     m_tileBufferUpdateTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void TiledBackingStore::tileBufferUpdateTimerFired(Timer&lt;TiledBackingStore&gt;*)
</del><ins>+void TiledBackingStore::tileBufferUpdateTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(m_commitTileUpdatesOnIdleEventLoop);
</span><span class="cx">     updateTileBuffers();
</span><span class="lines">@@ -529,7 +529,7 @@
</span><span class="cx">     m_backingStoreUpdateTimer.startOneShot(interval);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void TiledBackingStore::backingStoreUpdateTimerFired(Timer&lt;TiledBackingStore&gt;*)
</del><ins>+void TiledBackingStore::backingStoreUpdateTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(m_commitTileUpdatesOnIdleEventLoop);
</span><span class="cx">     createTiles();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsTiledBackingStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/TiledBackingStore.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/TiledBackingStore.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/graphics/TiledBackingStore.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -81,8 +81,8 @@
</span><span class="cx">     void startTileBufferUpdateTimer();
</span><span class="cx">     void startBackingStoreUpdateTimer(double = 0);
</span><span class="cx"> 
</span><del>-    void tileBufferUpdateTimerFired(Timer&lt;TiledBackingStore&gt;*);
-    void backingStoreUpdateTimerFired(Timer&lt;TiledBackingStore&gt;*);
</del><ins>+    void tileBufferUpdateTimerFired(Timer*);
+    void backingStoreUpdateTimerFired(Timer*);
</ins><span class="cx"> 
</span><span class="cx">     void createTiles();
</span><span class="cx">     void computeCoverAndKeepRect(const IntRect&amp; visibleRect, IntRect&amp; coverRect, IntRect&amp; keepRect) const;
</span><span class="lines">@@ -109,8 +109,8 @@
</span><span class="cx">     typedef HashMap&lt;Tile::Coordinate, RefPtr&lt;Tile&gt; &gt; TileMap;
</span><span class="cx">     TileMap m_tiles;
</span><span class="cx"> 
</span><del>-    Timer&lt;TiledBackingStore&gt; m_tileBufferUpdateTimer;
-    Timer&lt;TiledBackingStore&gt; m_backingStoreUpdateTimer;
</del><ins>+    Timer m_tileBufferUpdateTimer;
+    Timer m_backingStoreUpdateTimer;
</ins><span class="cx"> 
</span><span class="cx">     IntSize m_tileSize;
</span><span class="cx">     float m_coverAreaMultiplier;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationMediaSelectionGroupAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -84,13 +84,13 @@
</span><span class="cx"> private:
</span><span class="cx">     MediaSelectionGroupAVFObjC(AVPlayerItem*, AVMediaSelectionGroup*);
</span><span class="cx"> 
</span><del>-    void selectionTimerFired(Timer&lt;MediaSelectionGroupAVFObjC&gt;&amp;);
</del><ins>+    void selectionTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     RetainPtr&lt;AVPlayerItem&gt; m_playerItem;
</span><span class="cx">     RetainPtr&lt;AVMediaSelectionGroup&gt; m_mediaSelectionGroup;
</span><span class="cx">     OptionContainer m_options;
</span><span class="cx">     MediaSelectionOptionAVFObjC* m_selectedOption;
</span><del>-    Timer&lt;MediaSelectionGroupAVFObjC&gt; m_selectionTimer;
</del><ins>+    Timer m_selectionTimer;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationMediaSelectionGroupAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx">     m_selectionTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaSelectionGroupAVFObjC::selectionTimerFired(Timer&lt;MediaSelectionGroupAVFObjC&gt;&amp;)
</del><ins>+void MediaSelectionGroupAVFObjC::selectionTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     [m_playerItem selectMediaOption:(m_selectedOption ? m_selectedOption-&gt;avMediaSelectionOption() : nil) inMediaSelectionGroup:m_mediaSelectionGroup.get()];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx">     void ensureLayer();
</span><span class="cx">     void destroyLayer();
</span><span class="cx">     bool shouldBePlaying() const;
</span><del>-    void seekTimerFired(Timer&lt;MediaPlayerPrivateMediaSourceAVFObjC&gt;&amp;);
</del><ins>+    void seekTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     friend class MediaSourcePrivateAVFObjC;
</span><span class="cx"> 
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx">     RetainPtr&lt;id&gt; m_timeJumpedObserver;
</span><span class="cx">     RetainPtr&lt;id&gt; m_durationObserver;
</span><span class="cx">     RetainPtr&lt;AVStreamSession&gt; m_streamSession;
</span><del>-    Timer&lt;MediaPlayerPrivateMediaSourceAVFObjC&gt; m_seekTimer;
</del><ins>+    Timer m_seekTimer;
</ins><span class="cx">     CDMSessionMediaSourceAVFObjC* m_session;
</span><span class="cx">     MediaPlayer::NetworkState m_networkState;
</span><span class="cx">     MediaPlayer::ReadyState m_readyState;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -423,7 +423,7 @@
</span><span class="cx">     m_seekTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivateMediaSourceAVFObjC::seekTimerFired(Timer&lt;MediaPlayerPrivateMediaSourceAVFObjC&gt;&amp;)
</del><ins>+void MediaPlayerPrivateMediaSourceAVFObjC::seekTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     seekInternal();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaLayerPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/LayerPool.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/LayerPool.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/graphics/ca/LayerPool.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx">     m_pruneTimer.startOneShot(1);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void LayerPool::pruneTimerFired(Timer&lt;LayerPool&gt;&amp;)
</del><ins>+void LayerPool::pruneTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     unsigned shrinkTo = decayedCapacity();
</span><span class="cx">     while (m_totalBytes &gt; shrinkTo) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaLayerPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/LayerPool.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/LayerPool.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/graphics/ca/LayerPool.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> 
</span><span class="cx">     bool canReuseLayerWithSize(const IntSize&amp; size) const { return m_maxBytesForPool &amp;&amp; !size.isEmpty(); }
</span><span class="cx">     void schedulePrune();
</span><del>-    void pruneTimerFired(Timer&lt;LayerPool&gt;&amp;);
</del><ins>+    void pruneTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     typedef enum { LeaveUnchanged, MarkAsUsed } AccessType;
</span><span class="cx">     LayerList&amp; listOfLayersWithSize(const IntSize&amp;, AccessType = LeaveUnchanged);
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx">     unsigned m_totalBytes;
</span><span class="cx">     unsigned m_maxBytesForPool;
</span><span class="cx"> 
</span><del>-    Timer&lt;LayerPool&gt; m_pruneTimer;
</del><ins>+    Timer m_pruneTimer;
</ins><span class="cx"> 
</span><span class="cx">     double m_lastAddTime;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaTileControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/TileController.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/TileController.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/graphics/ca/TileController.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -340,7 +340,7 @@
</span><span class="cx">     return owningGraphicsLayer()-&gt;platformCALayerShouldTemporarilyRetainTileCohorts(m_tileCacheLayer);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void TileController::tileRevalidationTimerFired(Timer&lt;TileController&gt;*)
</del><ins>+void TileController::tileRevalidationTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     if (!owningGraphicsLayer())
</span><span class="cx">         return;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaTileControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/TileController.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/TileController.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/graphics/ca/TileController.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx">     virtual float zoomedOutContentsScale() const override;
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-    void tileRevalidationTimerFired(Timer&lt;TileController&gt;*);
</del><ins>+    void tileRevalidationTimerFired(Timer*);
</ins><span class="cx"> 
</span><span class="cx">     void setNeedsRevalidateTiles();
</span><span class="cx"> 
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx">     FloatRect m_visibleRectAtLastRevalidate;
</span><span class="cx">     IntRect m_boundsAtLastRevalidate;
</span><span class="cx"> 
</span><del>-    Timer&lt;TileController&gt; m_tileRevalidationTimer;
</del><ins>+    Timer m_tileRevalidationTimer;
</ins><span class="cx"> 
</span><span class="cx">     float m_zoomedOutContentsScale;
</span><span class="cx">     float m_deviceScaleFactor;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaTileGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/TileGrid.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/TileGrid.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/graphics/ca/TileGrid.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -476,7 +476,7 @@
</span><span class="cx">     return creationTime - timeThreshold;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void TileGrid::cohortRemovalTimerFired(Timer&lt;TileGrid&gt;*)
</del><ins>+void TileGrid::cohortRemovalTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     if (m_cohortList.isEmpty()) {
</span><span class="cx">         m_cohortRemovalTimer.stop();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaTileGridh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/TileGrid.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/TileGrid.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/graphics/ca/TileGrid.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx">     void removeTilesInCohort(TileCohort);
</span><span class="cx"> 
</span><span class="cx">     void scheduleCohortRemoval();
</span><del>-    void cohortRemovalTimerFired(Timer&lt;TileGrid&gt;*);
</del><ins>+    void cohortRemovalTimerFired(Timer*);
</ins><span class="cx">     TileCohort nextTileCohort() const;
</span><span class="cx">     void startedNewCohort(TileCohort);
</span><span class="cx">     TileCohort newestTileCohort() const;
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx">     typedef Deque&lt;TileCohortInfo&gt; TileCohortList;
</span><span class="cx">     TileCohortList m_cohortList;
</span><span class="cx"> 
</span><del>-    Timer&lt;TileGrid&gt; m_cohortRemovalTimer;
</del><ins>+    Timer m_cohortRemovalTimer;
</ins><span class="cx"> 
</span><span class="cx">     typedef HashMap&lt;PlatformCALayer*, int&gt; RepaintCountMap;
</span><span class="cx">     RepaintCountMap m_tileRepaintCounts;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscawinLegacyCACFLayerTreeHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/win/LegacyCACFLayerTreeHost.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/win/LegacyCACFLayerTreeHost.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/graphics/ca/win/LegacyCACFLayerTreeHost.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -224,7 +224,7 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void LegacyCACFLayerTreeHost::renderTimerFired(Timer&lt;LegacyCACFLayerTreeHost&gt;*)
</del><ins>+void LegacyCACFLayerTreeHost::renderTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     paint();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscawinLegacyCACFLayerTreeHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/win/LegacyCACFLayerTreeHost.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/win/LegacyCACFLayerTreeHost.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/graphics/ca/win/LegacyCACFLayerTreeHost.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">     bool resetDevice(ResetReason);
</span><span class="cx"> 
</span><span class="cx">     void renderSoon();
</span><del>-    void renderTimerFired(Timer&lt;LegacyCACFLayerTreeHost&gt;*);
</del><ins>+    void renderTimerFired(Timer*);
</ins><span class="cx"> 
</span><span class="cx">     virtual void initializeContext(void* userData, PlatformCALayer*);
</span><span class="cx">     virtual void resize();
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">     virtual GraphicsDeviceAdapter* graphicsDeviceAdapter() const override { return 0; }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    Timer&lt;LegacyCACFLayerTreeHost&gt; m_renderTimer;
</del><ins>+    Timer m_renderTimer;
</ins><span class="cx">     COMPtr&lt;IDirect3DDevice9&gt; m_d3dDevice;
</span><span class="cx">     WKCACFContext* m_context;
</span><span class="cx">     bool m_mightBeAbleToCreateDeviceLater;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgIOSurfacePoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -292,7 +292,7 @@
</span><span class="cx">     return markedAllSurfaces;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void IOSurfacePool::collectionTimerFired(Timer&lt;IOSurfacePool&gt;&amp;)
</del><ins>+void IOSurfacePool::collectionTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     collectInUseSurfaces();
</span><span class="cx">     bool markedAllSurfaces = markOlderSurfacesPurgeable();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgIOSurfacePoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/graphics/cg/IOSurfacePool.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -87,13 +87,13 @@
</span><span class="cx">     void tryEvictOldestCachedSurface();
</span><span class="cx"> 
</span><span class="cx">     void scheduleCollectionTimer();
</span><del>-    void collectionTimerFired(Timer&lt;IOSurfacePool&gt;&amp;);
</del><ins>+    void collectionTimerFired(Timer&amp;);
</ins><span class="cx">     void collectInUseSurfaces();
</span><span class="cx">     bool markOlderSurfacesPurgeable();
</span><span class="cx"> 
</span><span class="cx">     void platformGarbageCollectNow();
</span><span class="cx"> 
</span><del>-    Timer&lt;IOSurfacePool&gt; m_collectionTimer;
</del><ins>+    Timer m_collectionTimer;
</ins><span class="cx">     CachedSurfaceMap m_cachedSurfaces;
</span><span class="cx">     CachedSurfaceQueue m_inUseSurfaces;
</span><span class="cx">     CachedSurfaceDetailsMap m_surfaceDetails;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -1145,7 +1145,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivateGStreamer::fillTimerFired(Timer&lt;MediaPlayerPrivateGStreamer&gt;*)
</del><ins>+void MediaPlayerPrivateGStreamer::fillTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     GstQuery* query = gst_query_new_buffering(GST_FORMAT_PERCENT);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx">     void setPreservesPitch(bool);
</span><span class="cx"> 
</span><span class="cx">     void setPreload(MediaPlayer::Preload);
</span><del>-    void fillTimerFired(Timer&lt;MediaPlayerPrivateGStreamer&gt;*);
</del><ins>+    void fillTimerFired(Timer*);
</ins><span class="cx"> 
</span><span class="cx">     std::unique_ptr&lt;PlatformTimeRanges&gt; buffered() const;
</span><span class="cx">     float maxTimeSeekable() const;
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx">     bool m_errorOccured;
</span><span class="cx">     mutable gfloat m_mediaDuration;
</span><span class="cx">     bool m_downloadFinished;
</span><del>-    Timer&lt;MediaPlayerPrivateGStreamer&gt; m_fillTimer;
</del><ins>+    Timer m_fillTimer;
</ins><span class="cx">     float m_maxTimeLoaded;
</span><span class="cx">     int m_bufferingPercentage;
</span><span class="cx">     MediaPlayer::Preload m_preload;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx">     void updateStates();
</span><span class="cx">     void doSeek();
</span><span class="cx">     void cancelSeek();
</span><del>-    void seekTimerFired(Timer&lt;MediaPlayerPrivateQTKit&gt;&amp;);
</del><ins>+    void seekTimerFired(Timer&amp;);
</ins><span class="cx">     MediaTime maxMediaTimeLoaded() const;
</span><span class="cx">     void disableUnsupportedTracks();
</span><span class="cx">     
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx">     RetainPtr&lt;WebCoreMovieObserver&gt; m_objcObserver;
</span><span class="cx">     String m_movieURL;
</span><span class="cx">     MediaTime m_seekTo;
</span><del>-    Timer&lt;MediaPlayerPrivateQTKit&gt; m_seekTimer;
</del><ins>+    Timer m_seekTimer;
</ins><span class="cx">     MediaPlayer::NetworkState m_networkState;
</span><span class="cx">     MediaPlayer::ReadyState m_readyState;
</span><span class="cx">     IntRect m_rect;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -676,7 +676,7 @@
</span><span class="cx">     m_seekTimer.stop();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void MediaPlayerPrivateQTKit::seekTimerFired(Timer&lt;MediaPlayerPrivateQTKit&gt;&amp;)
</del><ins>+void MediaPlayerPrivateQTKit::seekTimerFired(Timer&amp;)
</ins><span class="cx"> {        
</span><span class="cx">     if (!metaDataAvailable() || !seeking() || currentMediaTime() == m_seekTo) {
</span><span class="cx">         cancelSeek();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMappercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -54,10 +54,10 @@
</span><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     void scheduleReleaseUnusedTextures();
</span><del>-    void releaseUnusedTexturesTimerFired(Timer&lt;BitmapTexturePool&gt;*);
</del><ins>+    void releaseUnusedTexturesTimerFired(Timer*);
</ins><span class="cx"> 
</span><span class="cx">     Vector&lt;BitmapTexturePoolEntry&gt; m_textures;
</span><del>-    Timer&lt;BitmapTexturePool&gt; m_releaseUnusedTexturesTimer;
</del><ins>+    Timer m_releaseUnusedTexturesTimer;
</ins><span class="cx"> 
</span><span class="cx">     static const double s_releaseUnusedSecondsTolerance;
</span><span class="cx">     static const double s_releaseUnusedTexturesTimerInterval;
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx">     m_releaseUnusedTexturesTimer.startOneShot(s_releaseUnusedTexturesTimerInterval);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void BitmapTexturePool::releaseUnusedTexturesTimerFired(Timer&lt;BitmapTexturePool&gt;*)
</del><ins>+void BitmapTexturePool::releaseUnusedTexturesTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     if (m_textures.isEmpty())
</span><span class="cx">         return;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCompositingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -396,7 +396,7 @@
</span><span class="cx">         m_releaseInactiveAtlasesTimer.startRepeating(ReleaseInactiveAtlasesTimerInterval);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void CompositingCoordinator::releaseInactiveAtlasesTimerFired(Timer&lt;CompositingCoordinator&gt;*)
</del><ins>+void CompositingCoordinator::releaseInactiveAtlasesTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     // We always want to keep one atlas for root contents layer.
</span><span class="cx">     std::unique_ptr&lt;UpdateAtlas&gt; atlasToKeepAnyway;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCompositingCoordinatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> 
</span><span class="cx">     void scheduleReleaseInactiveAtlases();
</span><span class="cx"> 
</span><del>-    void releaseInactiveAtlasesTimerFired(Timer&lt;CompositingCoordinator&gt;*);
</del><ins>+    void releaseInactiveAtlasesTimerFired(Timer*);
</ins><span class="cx"> 
</span><span class="cx">     Page* m_page;
</span><span class="cx">     CompositingCoordinator::Client* m_client;
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> 
</span><span class="cx">     bool m_shouldSyncFrame;
</span><span class="cx">     bool m_didInitializeRootCompositingLayer;
</span><del>-    Timer&lt;CompositingCoordinator&gt; m_releaseInactiveAtlasesTimer;
</del><ins>+    Timer m_releaseInactiveAtlasesTimer;
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(REQUEST_ANIMATION_FRAME)
</span><span class="cx">     double m_lastAnimationServiceTime;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -1220,7 +1220,7 @@
</span><span class="cx">     didChangeAnimations();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void CoordinatedGraphicsLayer::animationStartedTimerFired(Timer&lt;CoordinatedGraphicsLayer&gt;*)
</del><ins>+void CoordinatedGraphicsLayer::animationStartedTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     client().notifyAnimationStarted(this, &quot;&quot;, m_lastAnimationStartTime);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx">     void setShouldUpdateVisibleRect();
</span><span class="cx">     float effectiveContentsScale();
</span><span class="cx"> 
</span><del>-    void animationStartedTimerFired(Timer&lt;CoordinatedGraphicsLayer&gt;*);
</del><ins>+    void animationStartedTimerFired(Timer*);
</ins><span class="cx"> 
</span><span class="cx">     CoordinatedLayerID m_id;
</span><span class="cx">     CoordinatedGraphicsLayerState m_layerState;
</span><span class="lines">@@ -243,7 +243,7 @@
</span><span class="cx">     IntSize m_platformLayerSize;
</span><span class="cx">     GraphicsSurfaceToken m_platformLayerToken;
</span><span class="cx"> #endif
</span><del>-    Timer&lt;CoordinatedGraphicsLayer&gt; m_animationStartedTimer;
</del><ins>+    Timer m_animationStartedTimer;
</ins><span class="cx">     GraphicsLayerAnimations m_animations;
</span><span class="cx">     double m_lastAnimationStartTime;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedImageBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void CoordinatedImageBacking::clearContentsTimerFired(Timer&lt;CoordinatedImageBacking&gt;*)
</del><ins>+void CoordinatedImageBacking::clearContentsTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     m_client-&gt;clearImageBackingContents(id());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedImageBackingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> 
</span><span class="cx">     void releaseSurfaceIfNeeded();
</span><span class="cx">     void updateVisibilityIfNeeded(bool&amp; changedToVisible);
</span><del>-    void clearContentsTimerFired(Timer&lt;CoordinatedImageBacking&gt;*);
</del><ins>+    void clearContentsTimerFired(Timer*);
</ins><span class="cx"> 
</span><span class="cx">     Client* m_client;
</span><span class="cx">     RefPtr&lt;Image&gt; m_image;
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> 
</span><span class="cx">     RefPtr&lt;CoordinatedSurface&gt; m_surface;
</span><span class="cx"> 
</span><del>-    Timer&lt;CoordinatedImageBacking&gt; m_clearContentsTimer;
</del><ins>+    Timer m_clearContentsTimer;
</ins><span class="cx"> 
</span><span class="cx">     bool m_isDirty;
</span><span class="cx">     bool m_isVisible;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosLegacyTileCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/LegacyTileCache.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/LegacyTileCache.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/ios/LegacyTileCache.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx">     void createTilesInActiveGrid(SynchronousTileCreationMode);
</span><span class="cx">     void scheduleLayerFlushForPendingRepaint();
</span><span class="cx"> 
</span><del>-    void tileCreationTimerFired(Timer&lt;LegacyTileCache&gt;*);
</del><ins>+    void tileCreationTimerFired(Timer*);
</ins><span class="cx"> 
</span><span class="cx">     void drawReplacementImage(LegacyTileLayer*, CGContextRef, CGImageRef);
</span><span class="cx">     void drawWindowContent(LegacyTileLayer*, CGContextRef, CGRect dirtyRect);
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx">     OwnPtr&lt;LegacyTileGrid&gt; m_zoomedOutTileGrid;
</span><span class="cx">     OwnPtr&lt;LegacyTileGrid&gt; m_zoomedInTileGrid;
</span><span class="cx"> 
</span><del>-    Timer&lt;LegacyTileCache&gt; m_tileCreationTimer;
</del><ins>+    Timer m_tileCreationTimer;
</ins><span class="cx"> 
</span><span class="cx">     Vector&lt;IntRect&gt; m_savedDisplayRects;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosLegacyTileCachemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/LegacyTileCache.mm (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/LegacyTileCache.mm        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/ios/LegacyTileCache.mm        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -415,7 +415,7 @@
</span><span class="cx">         m_tileCreationTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void LegacyTileCache::tileCreationTimerFired(Timer&lt;LegacyTileCache&gt;*)
</del><ins>+void LegacyTileCache::tileCreationTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     if (isTileCreationSuspended())
</span><span class="cx">         return;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacHIDGamepadProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/HIDGamepadProvider.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/HIDGamepadProvider.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/mac/HIDGamepadProvider.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx">     return index;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void HIDGamepadProvider::connectionDelayTimerFired(Timer&lt;HIDGamepadProvider&gt;&amp;)
</del><ins>+void HIDGamepadProvider::connectionDelayTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     m_shouldDispatchCallbacks = true;
</span><span class="cx"> }
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx">         m_inputNotificationTimer.startOneShot(InputNotificationDelay);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void HIDGamepadProvider::inputNotificationTimerFired(Timer&lt;HIDGamepadProvider&gt;&amp;)
</del><ins>+void HIDGamepadProvider::inputNotificationTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     if (!m_shouldDispatchCallbacks)
</span><span class="cx">         return;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacHIDGamepadProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/HIDGamepadProvider.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/HIDGamepadProvider.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/mac/HIDGamepadProvider.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -64,8 +64,8 @@
</span><span class="cx">     void openAndScheduleManager();
</span><span class="cx">     void closeAndUnscheduleManager();
</span><span class="cx"> 
</span><del>-    void connectionDelayTimerFired(Timer&lt;HIDGamepadProvider&gt;&amp;);
-    void inputNotificationTimerFired(Timer&lt;HIDGamepadProvider&gt;&amp;);
</del><ins>+    void connectionDelayTimerFired(Timer&amp;);
+    void inputNotificationTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     unsigned indexForNewlyConnectedDevice();
</span><span class="cx"> 
</span><span class="lines">@@ -77,8 +77,8 @@
</span><span class="cx">     HashSet&lt;GamepadProviderClient*&gt; m_clients;
</span><span class="cx">     bool m_shouldDispatchCallbacks;
</span><span class="cx"> 
</span><del>-    Timer&lt;HIDGamepadProvider&gt; m_connectionDelayTimer;
-    Timer&lt;HIDGamepadProvider&gt; m_inputNotificationTimer;
</del><ins>+    Timer m_connectionDelayTimer;
+    Timer m_inputNotificationTimer;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollAnimatorMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -78,11 +78,11 @@
</span><span class="cx">     RetainPtr&lt;WebScrollbarPainterDelegate&gt; m_horizontalScrollbarPainterDelegate;
</span><span class="cx">     RetainPtr&lt;WebScrollbarPainterDelegate&gt; m_verticalScrollbarPainterDelegate;
</span><span class="cx"> 
</span><del>-    void initialScrollbarPaintTimerFired(Timer&lt;ScrollAnimatorMac&gt;&amp;);
-    Timer&lt;ScrollAnimatorMac&gt; m_initialScrollbarPaintTimer;
</del><ins>+    void initialScrollbarPaintTimerFired(Timer&amp;);
+    Timer m_initialScrollbarPaintTimer;
</ins><span class="cx"> 
</span><del>-    void sendContentAreaScrolledTimerFired(Timer&lt;ScrollAnimatorMac&gt;&amp;);
-    Timer&lt;ScrollAnimatorMac&gt; m_sendContentAreaScrolledTimer;
</del><ins>+    void sendContentAreaScrolledTimerFired(Timer&amp;);
+    Timer m_sendContentAreaScrolledTimer;
</ins><span class="cx">     FloatSize m_contentAreaScrolledTimerScrollDelta;
</span><span class="cx"> 
</span><span class="cx">     virtual bool scroll(ScrollbarOrientation, ScrollGranularity, float step, float multiplier);
</span><span class="lines">@@ -155,12 +155,12 @@
</span><span class="cx">     virtual void adjustScrollPositionToBoundsIfNecessary() override;
</span><span class="cx"> 
</span><span class="cx">     bool pinnedInDirection(float deltaX, float deltaY);
</span><del>-    void snapRubberBandTimerFired(Timer&lt;ScrollAnimatorMac&gt;&amp;);
</del><ins>+    void snapRubberBandTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     bool isAlreadyPinnedInDirectionOfGesture(const PlatformWheelEvent&amp;, ScrollEventAxis);
</span><span class="cx"> 
</span><span class="cx">     ScrollElasticityController m_scrollElasticityController;
</span><del>-    Timer&lt;ScrollAnimatorMac&gt; m_snapRubberBandTimer;
</del><ins>+    Timer m_snapRubberBandTimer;
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     bool m_haveScrolledSincePageLoad;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollAnimatorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -1257,7 +1257,7 @@
</span><span class="cx">     m_snapRubberBandTimer.stop();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void ScrollAnimatorMac::snapRubberBandTimerFired(Timer&lt;ScrollAnimatorMac&gt;&amp;)
</del><ins>+void ScrollAnimatorMac::snapRubberBandTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     m_scrollElasticityController.snapRubberBandTimerFired();
</span><span class="cx"> }
</span><span class="lines">@@ -1338,7 +1338,7 @@
</span><span class="cx">     m_initialScrollbarPaintTimer.stop();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void ScrollAnimatorMac::initialScrollbarPaintTimerFired(Timer&lt;ScrollAnimatorMac&gt;&amp;)
</del><ins>+void ScrollAnimatorMac::initialScrollbarPaintTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     // To force the scrollbars to flash, we have to call hide first. Otherwise, the ScrollbarPainterController
</span><span class="cx">     // might think that the scrollbars are already showing and bail early.
</span><span class="lines">@@ -1362,7 +1362,7 @@
</span><span class="cx">         [m_scrollbarPainterController contentAreaScrolled];
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void ScrollAnimatorMac::sendContentAreaScrolledTimerFired(Timer&lt;ScrollAnimatorMac&gt;&amp;)
</del><ins>+void ScrollAnimatorMac::sendContentAreaScrolledTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     sendContentAreaScrolled(m_contentAreaScrolledTimerScrollDelta);
</span><span class="cx">     m_contentAreaScrolledTimerScrollDelta = FloatSize();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockDeviceMotionClientMockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/DeviceMotionClientMock.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/DeviceMotionClientMock.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/mock/DeviceMotionClientMock.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx">         m_timer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void DeviceMotionClientMock::timerFired(Timer&lt;DeviceMotionClientMock&gt;* timer)
</del><ins>+void DeviceMotionClientMock::timerFired(Timer* timer)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT_UNUSED(timer, timer == &amp;m_timer);
</span><span class="cx">     m_timer.stop();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockDeviceMotionClientMockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/DeviceMotionClientMock.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/DeviceMotionClientMock.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/mock/DeviceMotionClientMock.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -55,11 +55,11 @@
</span><span class="cx">     void setMotion(PassRefPtr&lt;DeviceMotionData&gt;);
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    void timerFired(Timer&lt;DeviceMotionClientMock&gt;*);
</del><ins>+    void timerFired(Timer*);
</ins><span class="cx"> 
</span><span class="cx">     RefPtr&lt;DeviceMotionData&gt; m_motion;
</span><span class="cx">     DeviceMotionController* m_controller;
</span><del>-    Timer&lt;DeviceMotionClientMock&gt; m_timer;
</del><ins>+    Timer m_timer;
</ins><span class="cx">     bool m_isUpdating;
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockDeviceOrientationClientMockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/DeviceOrientationClientMock.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/DeviceOrientationClientMock.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/mock/DeviceOrientationClientMock.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx">         m_timer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void DeviceOrientationClientMock::timerFired(Timer&lt;DeviceOrientationClientMock&gt;&amp; timer)
</del><ins>+void DeviceOrientationClientMock::timerFired(Timer&amp; timer)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT_UNUSED(timer, &amp;timer == &amp;m_timer);
</span><span class="cx">     m_timer.stop();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockDeviceOrientationClientMockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/DeviceOrientationClientMock.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/DeviceOrientationClientMock.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/mock/DeviceOrientationClientMock.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -54,11 +54,11 @@
</span><span class="cx">     WEBCORE_EXPORT void setOrientation(PassRefPtr&lt;DeviceOrientationData&gt;);
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    void timerFired(Timer&lt;DeviceOrientationClientMock&gt;&amp;);
</del><ins>+    void timerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     RefPtr&lt;DeviceOrientationData&gt; m_orientation;
</span><span class="cx">     DeviceOrientationController* m_controller;
</span><del>-    Timer&lt;DeviceOrientationClientMock&gt; m_timer;
</del><ins>+    Timer m_timer;
</ins><span class="cx">     bool m_isUpdating;
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockGeolocationClientMockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/GeolocationClientMock.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/GeolocationClientMock.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/mock/GeolocationClientMock.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx">         m_permissionTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void GeolocationClientMock::permissionTimerFired(WebCore::Timer&lt;GeolocationClientMock&gt;* timer)
</del><ins>+void GeolocationClientMock::permissionTimerFired(WebCore::Timer* timer)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT_UNUSED(timer, timer == &amp;m_permissionTimer);
</span><span class="cx">     ASSERT(m_permissionState != PermissionStateUnset);
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx">         m_controllerTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void GeolocationClientMock::controllerTimerFired(Timer&lt;GeolocationClientMock&gt;* timer)
</del><ins>+void GeolocationClientMock::controllerTimerFired(Timer* timer)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT_UNUSED(timer, timer == &amp;m_controllerTimer);
</span><span class="cx">     ASSERT(m_controller);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockGeolocationClientMockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/GeolocationClientMock.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/GeolocationClientMock.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/mock/GeolocationClientMock.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -70,10 +70,10 @@
</span><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     void asyncUpdateController();
</span><del>-    void controllerTimerFired(Timer&lt;GeolocationClientMock&gt;*);
</del><ins>+    void controllerTimerFired(Timer*);
</ins><span class="cx"> 
</span><span class="cx">     void asyncUpdatePermission();
</span><del>-    void permissionTimerFired(Timer&lt;GeolocationClientMock&gt;*);
</del><ins>+    void permissionTimerFired(Timer*);
</ins><span class="cx"> 
</span><span class="cx">     void clearError();
</span><span class="cx"> 
</span><span class="lines">@@ -81,8 +81,8 @@
</span><span class="cx">     RefPtr&lt;GeolocationPosition&gt; m_lastPosition;
</span><span class="cx">     bool m_hasError;
</span><span class="cx">     String m_errorMessage;
</span><del>-    Timer&lt;GeolocationClientMock&gt; m_controllerTimer;
-    Timer&lt;GeolocationClientMock&gt; m_permissionTimer;
</del><ins>+    Timer m_controllerTimer;
+    Timer m_permissionTimer;
</ins><span class="cx">     bool m_isActive;
</span><span class="cx"> 
</span><span class="cx">     enum PermissionState {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockPlatformSpeechSynthesizerMockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/PlatformSpeechSynthesizerMock.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/PlatformSpeechSynthesizerMock.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/mock/PlatformSpeechSynthesizerMock.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void PlatformSpeechSynthesizerMock::speakingFinished(Timer&lt;PlatformSpeechSynthesizerMock&gt;*)
</del><ins>+void PlatformSpeechSynthesizerMock::speakingFinished(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(m_utterance.get());
</span><span class="cx">     RefPtr&lt;PlatformSpeechSynthesisUtterance&gt; protect(m_utterance);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockPlatformSpeechSynthesizerMockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/PlatformSpeechSynthesizerMock.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/PlatformSpeechSynthesizerMock.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/mock/PlatformSpeechSynthesizerMock.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -45,9 +45,9 @@
</span><span class="cx">     
</span><span class="cx"> private:
</span><span class="cx">     virtual void initializeVoiceList();
</span><del>-    void speakingFinished(Timer&lt;PlatformSpeechSynthesizerMock&gt;*);
</del><ins>+    void speakingFinished(Timer*);
</ins><span class="cx">     
</span><del>-    Timer&lt;PlatformSpeechSynthesizerMock&gt; m_speakingFinishedTimer;
</del><ins>+    Timer m_speakingFinishedTimer;
</ins><span class="cx">     RefPtr&lt;PlatformSpeechSynthesisUtterance&gt; m_utterance;
</span><span class="cx"> };
</span><span class="cx">     
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockTimerEventBasedMockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/TimerEventBasedMock.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/TimerEventBasedMock.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/mock/TimerEventBasedMock.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> 
</span><span class="cx">     virtual ~TimerEvent() { }
</span><span class="cx"> 
</span><del>-    void timerFired(Timer&lt;TimerEvent&gt;*)
</del><ins>+    void timerFired(Timer*)
</ins><span class="cx">     {
</span><span class="cx">         m_notifier-&gt;fire();
</span><span class="cx">         m_mock-&gt;removeEvent(this);
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     TimerEventBasedMock* m_mock;
</span><del>-    Timer&lt;TimerEvent&gt; m_timer;
</del><ins>+    Timer m_timer;
</ins><span class="cx">     RefPtr&lt;MockNotifier&gt; m_notifier;
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkDNSResolveQueuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/DNSResolveQueue.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/DNSResolveQueue.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/network/DNSResolveQueue.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void DNSResolveQueue::timerFired(Timer&lt;DNSResolveQueue&gt;&amp;)
</del><ins>+void DNSResolveQueue::timerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     if (isUsingProxy()) {
</span><span class="cx">         m_names.clear();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkDNSResolveQueueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/DNSResolveQueue.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/DNSResolveQueue.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/network/DNSResolveQueue.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -55,9 +55,9 @@
</span><span class="cx">     bool platformProxyIsEnabledInSystemPreferences();
</span><span class="cx">     void platformResolve(const String&amp;);
</span><span class="cx"> 
</span><del>-    void timerFired(Timer&lt;DNSResolveQueue&gt;&amp;);
</del><ins>+    void timerFired(Timer&amp;);
</ins><span class="cx"> 
</span><del>-    Timer&lt;DNSResolveQueue&gt; m_timer;
</del><ins>+    Timer m_timer;
</ins><span class="cx"> 
</span><span class="cx">     HashSet&lt;String&gt; m_names;
</span><span class="cx">     std::atomic&lt;int&gt; m_requestsInFlight;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkNetworkStateNotifierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/NetworkStateNotifier.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/NetworkStateNotifier.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/network/NetworkStateNotifier.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -73,12 +73,12 @@
</span><span class="cx">     void updateState();
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>-    void networkStateChangeTimerFired(Timer&lt;NetworkStateNotifier&gt;&amp;);
</del><ins>+    void networkStateChangeTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     static void dynamicStoreCallback(SCDynamicStoreRef, CFArrayRef changedKeys, void *info); 
</span><span class="cx"> 
</span><span class="cx">     RetainPtr&lt;SCDynamicStoreRef&gt; m_store;
</span><del>-    Timer&lt;NetworkStateNotifier&gt; m_networkStateChangeTimer;
</del><ins>+    Timer m_networkStateChangeTimer;
</ins><span class="cx"> 
</span><span class="cx"> #elif PLATFORM(WIN)
</span><span class="cx">     static void CALLBACK addrChangeCallback(void*, BOOLEAN timedOut);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandle.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandle.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/network/ResourceHandle.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx">     d-&gt;m_failureTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void ResourceHandle::failureTimerFired(Timer&lt;ResourceHandle&gt;&amp;)
</del><ins>+void ResourceHandle::failureTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     if (!client())
</span><span class="cx">         return;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandle.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandle.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/network/ResourceHandle.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -99,9 +99,8 @@
</span><span class="cx"> class ResourceRequest;
</span><span class="cx"> class ResourceResponse;
</span><span class="cx"> class SharedBuffer;
</span><ins>+class Timer;
</ins><span class="cx"> 
</span><del>-template &lt;typename T&gt; class Timer;
-
</del><span class="cx"> class ResourceHandle : public RefCounted&lt;ResourceHandle&gt;
</span><span class="cx"> #if PLATFORM(COCOA) || USE(CFNETWORK) || USE(CURL) || USE(SOUP)
</span><span class="cx">     , public AuthenticationClient
</span><span class="lines">@@ -183,7 +182,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if USE(WININET)
</span><span class="cx">     void setSynchronousInternetHandle(HINTERNET);
</span><del>-    void fileLoadTimer(Timer&lt;ResourceHandle&gt;*);
</del><ins>+    void fileLoadTimer(Timer*);
</ins><span class="cx">     void onRedirect();
</span><span class="cx">     bool onRequestComplete();
</span><span class="cx">     static void CALLBACK internetStatusCallback(HINTERNET, DWORD_PTR, DWORD, LPVOID, DWORD);
</span><span class="lines">@@ -241,7 +240,7 @@
</span><span class="cx">     WEBCORE_EXPORT ResourceRequest&amp; firstRequest();
</span><span class="cx">     const String&amp; lastHTTPMethod() const;
</span><span class="cx"> 
</span><del>-    void failureTimerFired(Timer&lt;ResourceHandle&gt;&amp;);
</del><ins>+    void failureTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     NetworkingContext* context() const;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandleInternal.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandleInternal.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/network/ResourceHandleInternal.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx">         RetainPtr&lt;CFURLStorageSessionRef&gt; m_storageSession;
</span><span class="cx"> #endif
</span><span class="cx"> #if USE(WININET)
</span><del>-        Timer&lt;ResourceHandle&gt; m_fileLoadTimer;
</del><ins>+        Timer m_fileLoadTimer;
</ins><span class="cx">         HINTERNET m_internetHandle;
</span><span class="cx">         HINTERNET m_connectHandle;
</span><span class="cx">         HINTERNET m_requestHandle;
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx"> 
</span><span class="cx">         AuthenticationChallenge m_currentWebChallenge;
</span><span class="cx">         ResourceHandle::FailureType m_scheduledFailureType;
</span><del>-        Timer&lt;ResourceHandle&gt; m_failureTimer;
</del><ins>+        Timer m_failureTimer;
</ins><span class="cx">     };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlResourceHandleManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -620,7 +620,7 @@
</span><span class="cx">     return sent;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void ResourceHandleManager::downloadTimerCallback(Timer&lt;ResourceHandleManager&gt;* /* timer */)
</del><ins>+void ResourceHandleManager::downloadTimerCallback(Timer* /* timer */)
</ins><span class="cx"> {
</span><span class="cx">     startScheduledJobs();
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlResourceHandleManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> private:
</span><span class="cx">     ResourceHandleManager();
</span><span class="cx">     ~ResourceHandleManager();
</span><del>-    void downloadTimerCallback(Timer&lt;ResourceHandleManager&gt;*);
</del><ins>+    void downloadTimerCallback(Timer*);
</ins><span class="cx">     void removeFromCurl(ResourceHandle*);
</span><span class="cx">     bool removeScheduledJob(ResourceHandle*);
</span><span class="cx">     void startJob(ResourceHandle*);
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> 
</span><span class="cx">     void initCookieSession();
</span><span class="cx"> 
</span><del>-    Timer&lt;ResourceHandleManager&gt; m_downloadTimer;
</del><ins>+    Timer m_downloadTimer;
</ins><span class="cx">     CURLM* m_curlMultiHandle;
</span><span class="cx">     CURLSH* m_curlShareHandle;
</span><span class="cx">     char* m_cookieJarFileName;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacNetworkStateNotifierMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/NetworkStateNotifierMac.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/NetworkStateNotifierMac.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/network/mac/NetworkStateNotifierMac.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx">     notifier-&gt;m_networkStateChangeTimer.startOneShot(StateChangeTimerInterval);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void NetworkStateNotifier::networkStateChangeTimerFired(Timer&lt;NetworkStateNotifier&gt;&amp;)
</del><ins>+void NetworkStateNotifier::networkStateChangeTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     bool oldOnLine = m_isOnLine;
</span><span class="cx">     
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkwinResourceHandleWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/win/ResourceHandleWin.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/win/ResourceHandleWin.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/platform/network/win/ResourceHandleWin.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -353,7 +353,7 @@
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void ResourceHandle::fileLoadTimer(Timer&lt;ResourceHandle&gt;*)
</del><ins>+void ResourceHandle::fileLoadTimer(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     RefPtr&lt;ResourceHandle&gt; protector(this);
</span><span class="cx">     deref(); // balances ref in start
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsPluginPackagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/PluginPackage.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/PluginPackage.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/plugins/PluginPackage.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx">     m_freeLibraryTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void PluginPackage::freeLibraryTimerFired(Timer&lt;PluginPackage&gt;*)
</del><ins>+void PluginPackage::freeLibraryTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(m_module);
</span><span class="cx">     // Do nothing if the module got loaded again meanwhile
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsPluginPackageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/PluginPackage.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/PluginPackage.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/plugins/PluginPackage.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -120,8 +120,8 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">         void freeLibrarySoon();
</span><del>-        void freeLibraryTimerFired(Timer&lt;PluginPackage&gt;*);
-        Timer&lt;PluginPackage&gt; m_freeLibraryTimer;
</del><ins>+        void freeLibraryTimerFired(Timer*);
+        Timer m_freeLibraryTimer;
</ins><span class="cx"> 
</span><span class="cx">         PluginQuirkSet m_quirks;
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_METADATA_CACHE)
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsPluginStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/PluginStream.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/PluginStream.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/plugins/PluginStream.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -321,7 +321,7 @@
</span><span class="cx">         deleteFile(m_path);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void PluginStream::delayDeliveryTimerFired(Timer&lt;PluginStream&gt;* timer)
</del><ins>+void PluginStream::delayDeliveryTimerFired(Timer* timer)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT_UNUSED(timer, timer == &amp;m_delayDeliveryTimer);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsPluginStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/PluginStream.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/PluginStream.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/plugins/PluginStream.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -100,8 +100,8 @@
</span><span class="cx">         PluginStreamState m_streamState;
</span><span class="cx">         bool m_loadManually;
</span><span class="cx"> 
</span><del>-        Timer&lt;PluginStream&gt; m_delayDeliveryTimer;
-        void delayDeliveryTimerFired(Timer&lt;PluginStream&gt;*);
</del><ins>+        Timer m_delayDeliveryTimer;
+        void delayDeliveryTimerFired(Timer*);
</ins><span class="cx"> 
</span><span class="cx">         OwnPtr&lt; Vector&lt;char&gt; &gt; m_deliveryData;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/PluginView.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/PluginView.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/plugins/PluginView.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> 
</span><span class="cx"> PluginView* PluginView::s_currentPluginView = 0;
</span><span class="cx"> 
</span><del>-void PluginView::popPopupsStateTimerFired(Timer&lt;PluginView&gt;*)
</del><ins>+void PluginView::popPopupsStateTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     popPopupsEnabledState();
</span><span class="cx"> }
</span><span class="lines">@@ -479,7 +479,7 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void PluginView::requestTimerFired(Timer&lt;PluginView&gt;* timer)
</del><ins>+void PluginView::requestTimerFired(Timer* timer)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT_UNUSED(timer, timer == &amp;m_requestTimer);
</span><span class="cx">     ASSERT(!m_requests.isEmpty());
</span><span class="lines">@@ -664,7 +664,7 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void PluginView::invalidateTimerFired(Timer&lt;PluginView&gt;* timer)
</del><ins>+void PluginView::invalidateTimerFired(Timer* timer)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT_UNUSED(timer, timer == &amp;m_invalidateTimer);
</span><span class="cx"> 
</span><span class="lines">@@ -1264,7 +1264,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-void PluginView::lifeSupportTimerFired(Timer&lt;PluginView&gt;*)
</del><ins>+void PluginView::lifeSupportTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     deref();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsPluginViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/PluginView.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/PluginView.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/plugins/PluginView.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -288,16 +288,16 @@
</span><span class="cx"> 
</span><span class="cx">         void performRequest(PluginRequest*);
</span><span class="cx">         void scheduleRequest(std::unique_ptr&lt;PluginRequest&gt;);
</span><del>-        void requestTimerFired(Timer&lt;PluginView&gt;*);
-        void invalidateTimerFired(Timer&lt;PluginView&gt;*);
-        Timer&lt;PluginView&gt; m_requestTimer;
-        Timer&lt;PluginView&gt; m_invalidateTimer;
</del><ins>+        void requestTimerFired(Timer*);
+        void invalidateTimerFired(Timer*);
+        Timer m_requestTimer;
+        Timer m_invalidateTimer;
</ins><span class="cx"> 
</span><del>-        void popPopupsStateTimerFired(Timer&lt;PluginView&gt;*);
-        Timer&lt;PluginView&gt; m_popPopupsStateTimer;
</del><ins>+        void popPopupsStateTimerFired(Timer*);
+        Timer m_popPopupsStateTimer;
</ins><span class="cx"> 
</span><del>-        void lifeSupportTimerFired(Timer&lt;PluginView&gt;*);
-        Timer&lt;PluginView&gt; m_lifeSupportTimer;
</del><ins>+        void lifeSupportTimerFired(Timer*);
+        Timer m_lifeSupportTimer;
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx">         bool dispatchNPEvent(NPEvent&amp;);
</span></span></pre></div>
<a id="trunkSourceWebCorepluginswinPluginMessageThrottlerWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/win/PluginMessageThrottlerWin.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/win/PluginMessageThrottlerWin.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/plugins/win/PluginMessageThrottlerWin.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx">     freeMessage(message);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void PluginMessageThrottlerWin::messageThrottleTimerFired(Timer&lt;PluginMessageThrottlerWin&gt;*)
</del><ins>+void PluginMessageThrottlerWin::messageThrottleTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     processQueuedMessage();
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepluginswinPluginMessageThrottlerWinh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/win/PluginMessageThrottlerWin.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/win/PluginMessageThrottlerWin.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/plugins/win/PluginMessageThrottlerWin.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> 
</span><span class="cx">     private:
</span><span class="cx">         void processQueuedMessage();
</span><del>-        void messageThrottleTimerFired(Timer&lt;PluginMessageThrottlerWin&gt;*);
</del><ins>+        void messageThrottleTimerFired(Timer*);
</ins><span class="cx">         PluginMessage* allocateMessage();
</span><span class="cx">         bool isInlineMessage(PluginMessage* message);
</span><span class="cx">         void freeMessage(PluginMessage* message);
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx">         PluginMessage m_inlineMessages[NumInlineMessages];
</span><span class="cx">         PluginMessage* m_freeInlineMessages;
</span><span class="cx"> 
</span><del>-        Timer&lt;PluginMessageThrottlerWin&gt; m_messageThrottleTimer;
</del><ins>+        Timer m_messageThrottleTimer;
</ins><span class="cx">         double m_lastMessageTime;
</span><span class="cx">     };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingImageQualityControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/ImageQualityController.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/ImageQualityController.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/rendering/ImageQualityController.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void ImageQualityController::highQualityRepaintTimerFired(Timer&lt;ImageQualityController&gt;&amp;)
</del><ins>+void ImageQualityController::highQualityRepaintTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     if (m_renderView.documentBeingDestroyed())
</span><span class="cx">         return;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingImageQualityControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/ImageQualityController.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/ImageQualityController.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/rendering/ImageQualityController.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -52,13 +52,13 @@
</span><span class="cx"> 
</span><span class="cx">     void removeLayer(RenderBoxModelObject*, LayerSizeMap* innerMap, const void* layer);
</span><span class="cx">     void set(RenderBoxModelObject*, LayerSizeMap* innerMap, const void* layer, const LayoutSize&amp;);
</span><del>-    void highQualityRepaintTimerFired(Timer&lt;ImageQualityController&gt;&amp;);
</del><ins>+    void highQualityRepaintTimerFired(Timer&amp;);
</ins><span class="cx">     void restartTimer();
</span><span class="cx">     void removeObject(RenderBoxModelObject*);
</span><span class="cx"> 
</span><span class="cx">     const RenderView&amp; m_renderView;
</span><span class="cx">     ObjectLayerSizeMap m_objectLayerSizeMap;
</span><del>-    Timer&lt;ImageQualityController&gt; m_timer;
</del><ins>+    Timer m_timer;
</ins><span class="cx">     bool m_animatedResizeIsActive;
</span><span class="cx">     bool m_liveResizeOptimizationIsActive;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderButtoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderButton.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderButton.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/rendering/RenderButton.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx">     if (!m_default &amp;&amp; theme().isDefault(*this)) {
</span><span class="cx">         if (theme().defaultButtonHasAnimation()) {
</span><span class="cx">             if (!m_timer)
</span><del>-                m_timer = std::make_unique&lt;Timer&lt;RenderButton&gt;&gt;(this, &amp;RenderButton::timerFired);
</del><ins>+                m_timer = std::make_unique&lt;Timer&gt;(this, &amp;RenderButton::timerFired);
</ins><span class="cx">             m_timer-&gt;startRepeating(0.03);
</span><span class="cx">         }
</span><span class="cx">         m_default = true;
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx">     return LayoutRect(additionalOffset.x() + borderLeft(), additionalOffset.y() + borderTop(), width() - borderLeft() - borderRight(), height() - borderTop() - borderBottom());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RenderButton::timerFired(Timer&lt;RenderButton&gt;&amp;)
</del><ins>+void RenderButton::timerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     // FIXME Bug 25110: Ideally we would stop our timer when our Document
</span><span class="cx">     // enters the page cache. But we currently have no way of being notified
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderButtonh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderButton.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderButton.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/rendering/RenderButton.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -74,12 +74,12 @@
</span><span class="cx"> 
</span><span class="cx">     virtual bool requiresForcedStyleRecalcPropagation() const override { return true; }
</span><span class="cx"> 
</span><del>-    void timerFired(Timer&lt;RenderButton&gt;&amp;);
</del><ins>+    void timerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     RenderTextFragment* m_buttonText;
</span><span class="cx">     RenderBlock* m_inner;
</span><span class="cx"> 
</span><del>-    std::unique_ptr&lt;Timer&lt;RenderButton&gt;&gt; m_timer;
</del><ins>+    std::unique_ptr&lt;Timer&gt; m_timer;
</ins><span class="cx">     bool m_default;
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -637,7 +637,7 @@
</span><span class="cx">         m_updateCompositingLayersTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RenderLayerCompositor::updateCompositingLayersTimerFired(Timer&lt;RenderLayerCompositor&gt;&amp;)
</del><ins>+void RenderLayerCompositor::updateCompositingLayersTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     updateCompositingLayers(CompositingUpdateAfterLayout);
</span><span class="cx"> }
</span><span class="lines">@@ -4076,14 +4076,14 @@
</span><span class="cx">     m_layerFlushTimer.startOneShot(throttledLayerFlushInitialDelay);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RenderLayerCompositor::layerFlushTimerFired(Timer&lt;RenderLayerCompositor&gt;&amp;)
</del><ins>+void RenderLayerCompositor::layerFlushTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     if (!m_hasPendingLayerFlush)
</span><span class="cx">         return;
</span><span class="cx">     scheduleLayerFlushNow();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RenderLayerCompositor::paintRelatedMilestonesTimerFired(Timer&lt;RenderLayerCompositor&gt;&amp;)
</del><ins>+void RenderLayerCompositor::paintRelatedMilestonesTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     Frame&amp; frame = m_renderView.frameView().frame();
</span><span class="cx">     Page* page = frame.page();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -336,7 +336,7 @@
</span><span class="cx">     void addToOverlapMap(OverlapMap&amp;, RenderLayer&amp;, IntRect&amp; layerBounds, bool&amp; boundsComputed);
</span><span class="cx">     void addToOverlapMapRecursive(OverlapMap&amp;, RenderLayer&amp;, RenderLayer* ancestorLayer = nullptr);
</span><span class="cx"> 
</span><del>-    void updateCompositingLayersTimerFired(Timer&lt;RenderLayerCompositor&gt;&amp;);
</del><ins>+    void updateCompositingLayersTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     // Returns true if any layer's compositing changed
</span><span class="cx">     void computeCompositingRequirements(RenderLayer* ancestorLayer, RenderLayer&amp;, OverlapMap&amp;, struct CompositingState&amp;, bool&amp; layersChanged, bool&amp; descendantHas3DTransform);
</span><span class="lines">@@ -454,9 +454,9 @@
</span><span class="cx">     bool isThrottlingLayerFlushes() const;
</span><span class="cx">     void startInitialLayerFlushTimerIfNeeded();
</span><span class="cx">     void startLayerFlushTimerIfNeeded();
</span><del>-    void layerFlushTimerFired(Timer&lt;RenderLayerCompositor&gt;&amp;);
</del><ins>+    void layerFlushTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><del>-    void paintRelatedMilestonesTimerFired(Timer&lt;RenderLayerCompositor&gt;&amp;);
</del><ins>+    void paintRelatedMilestonesTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx"> #if !LOG_DISABLED
</span><span class="cx">     const char* logReasonsForCompositing(const RenderLayer&amp;);
</span><span class="lines">@@ -468,7 +468,7 @@
</span><span class="cx"> private:
</span><span class="cx">     RenderView&amp; m_renderView;
</span><span class="cx">     std::unique_ptr&lt;GraphicsLayer&gt; m_rootContentLayer;
</span><del>-    Timer&lt;RenderLayerCompositor&gt; m_updateCompositingLayersTimer;
</del><ins>+    Timer m_updateCompositingLayersTimer;
</ins><span class="cx"> 
</span><span class="cx">     bool m_hasAcceleratedCompositing;
</span><span class="cx">     ChromeClient::CompositingTriggerFlags m_compositingTriggers;
</span><span class="lines">@@ -525,12 +525,12 @@
</span><span class="cx"> 
</span><span class="cx">     std::unique_ptr&lt;GraphicsLayerUpdater&gt; m_layerUpdater; // Updates tiled layer visible area periodically while animations are running.
</span><span class="cx"> 
</span><del>-    Timer&lt;RenderLayerCompositor&gt; m_layerFlushTimer;
</del><ins>+    Timer m_layerFlushTimer;
</ins><span class="cx">     bool m_layerFlushThrottlingEnabled;
</span><span class="cx">     bool m_layerFlushThrottlingTemporarilyDisabledForInteraction;
</span><span class="cx">     bool m_hasPendingLayerFlush;
</span><span class="cx"> 
</span><del>-    Timer&lt;RenderLayerCompositor&gt; m_paintRelatedMilestonesTimer;
</del><ins>+    Timer m_paintRelatedMilestonesTimer;
</ins><span class="cx"> 
</span><span class="cx"> #if !LOG_DISABLED
</span><span class="cx">     int m_rootLayerUpdateCount;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMarqueecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMarquee.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMarquee.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/rendering/RenderMarquee.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -240,7 +240,7 @@
</span><span class="cx">         m_timer.stop();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RenderMarquee::timerFired(Timer&lt;RenderMarquee&gt;&amp;)
</del><ins>+void RenderMarquee::timerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     if (m_layer-&gt;renderer().view().needsLayout())
</span><span class="cx">         return;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMarqueeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMarquee.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMarquee.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/rendering/RenderMarquee.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -79,12 +79,12 @@
</span><span class="cx">     void updateMarqueePosition();
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    void timerFired(Timer&lt;RenderMarquee&gt;&amp;);
</del><ins>+    void timerFired(Timer&amp;);
</ins><span class="cx"> 
</span><span class="cx">     RenderLayer* m_layer;
</span><span class="cx">     int m_currentLoop;
</span><span class="cx">     int m_totalLoops;
</span><del>-    Timer&lt;RenderMarquee&gt; m_timer;
</del><ins>+    Timer m_timer;
</ins><span class="cx">     int m_start;
</span><span class="cx">     int m_end;
</span><span class="cx">     int m_speed;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderNamedFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -566,7 +566,7 @@
</span><span class="cx">         m_regionOversetChangeEventTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RenderNamedFlowThread::regionOversetChangeEventTimerFired(Timer&lt;RenderNamedFlowThread&gt;&amp;)
</del><ins>+void RenderNamedFlowThread::regionOversetChangeEventTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     namedFlow().dispatchRegionOversetChangeEvent();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderNamedFlowThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderNamedFlowThread.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderNamedFlowThread.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/rendering/RenderNamedFlowThread.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx">     void checkInvalidRegions();
</span><span class="cx"> 
</span><span class="cx">     bool canBeDestroyed() const { return m_invalidRegionList.isEmpty() &amp;&amp; m_regionList.isEmpty() &amp;&amp; m_contentElements.isEmpty(); }
</span><del>-    void regionOversetChangeEventTimerFired(Timer&lt;RenderNamedFlowThread&gt;&amp;);
</del><ins>+    void regionOversetChangeEventTimerFired(Timer&amp;);
</ins><span class="cx">     void clearContentElements();
</span><span class="cx">     void updateWritingMode();
</span><span class="cx"> 
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx">     // The DOM Object that represents a named flow.
</span><span class="cx">     Ref&lt;WebKitNamedFlow&gt; m_namedFlow;
</span><span class="cx"> 
</span><del>-    Timer&lt;RenderNamedFlowThread&gt; m_regionOversetChangeEventTimer;
</del><ins>+    Timer m_regionOversetChangeEventTimer;
</ins><span class="cx"> 
</span><span class="cx">     LayoutUnit m_flowContentBottom;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderProgresscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderProgress.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderProgress.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/rendering/RenderProgress.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx">             &amp;&amp; HTMLProgressElement::InvalidPosition != position());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RenderProgress::animationTimerFired(Timer&lt;RenderProgress&gt;&amp;)
</del><ins>+void RenderProgress::animationTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     repaint();
</span><span class="cx">     if (!m_animationTimer.isActive() &amp;&amp; m_animating)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderProgressh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderProgress.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderProgress.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/rendering/RenderProgress.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">     virtual bool requiresForcedStyleRecalcPropagation() const override { return true; }
</span><span class="cx">     virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&amp;) const override;
</span><span class="cx"> 
</span><del>-    void animationTimerFired(Timer&lt;RenderProgress&gt;&amp;);
</del><ins>+    void animationTimerFired(Timer&amp;);
</ins><span class="cx">     void updateAnimationState();
</span><span class="cx"> 
</span><span class="cx">     double m_position;
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx">     double m_animationRepeatInterval;
</span><span class="cx">     double m_animationDuration;
</span><span class="cx">     bool m_animating;
</span><del>-    Timer&lt;RenderProgress&gt; m_animationTimer;
</del><ins>+    Timer m_animationTimer;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/rendering/RenderView.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx">         m_lazyRepaintTimer.stop();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RenderView::lazyRepaintTimerFired(Timer&lt;RenderView&gt;&amp;)
</del><ins>+void RenderView::lazyRepaintTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     bool shouldRepaint = !document().inPageCache();
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/rendering/RenderView.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -342,9 +342,9 @@
</span><span class="cx"> 
</span><span class="cx">     bool shouldUsePrintingLayout() const;
</span><span class="cx"> 
</span><del>-    void lazyRepaintTimerFired(Timer&lt;RenderView&gt;&amp;);
</del><ins>+    void lazyRepaintTimerFired(Timer&amp;);
</ins><span class="cx"> 
</span><del>-    Timer&lt;RenderView&gt; m_lazyRepaintTimer;
</del><ins>+    Timer m_lazyRepaintTimer;
</ins><span class="cx">     HashSet&lt;RenderBox*&gt; m_renderersNeedingLazyRepaint;
</span><span class="cx"> 
</span><span class="cx">     std::unique_ptr&lt;ImageQualityController&gt; m_imageQualityController;
</span></span></pre></div>
<a id="trunkSourceWebCorereplayEventLoopInputDispatchercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/replay/EventLoopInputDispatcher.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/replay/EventLoopInputDispatcher.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/replay/EventLoopInputDispatcher.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx">         m_timer.stop();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void EventLoopInputDispatcher::timerFired(Timer&lt;EventLoopInputDispatcher&gt;*)
</del><ins>+void EventLoopInputDispatcher::timerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     dispatchInput();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorereplayEventLoopInputDispatcherh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/replay/EventLoopInputDispatcher.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/replay/EventLoopInputDispatcher.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/replay/EventLoopInputDispatcher.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -72,12 +72,12 @@
</span><span class="cx"> private:
</span><span class="cx">     void dispatchInputSoon();
</span><span class="cx">     void dispatchInput();
</span><del>-    void timerFired(Timer&lt;EventLoopInputDispatcher&gt;*);
</del><ins>+    void timerFired(Timer*);
</ins><span class="cx"> 
</span><span class="cx">     Page&amp; m_page;
</span><span class="cx">     EventLoopInputDispatcherClient* m_client;
</span><span class="cx">     ReplayingInputCursor&amp; m_cursor;
</span><del>-    Timer&lt;EventLoopInputDispatcher&gt; m_timer;
</del><ins>+    Timer m_timer;
</ins><span class="cx"> 
</span><span class="cx">     // This data is valid when an event loop input is presently dispatching.
</span><span class="cx">     EventLoopInputData m_currentWork;
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageAreaImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageAreaImpl.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageAreaImpl.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/storage/StorageAreaImpl.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void StorageAreaImpl::closeDatabaseTimerFired(Timer&lt;StorageAreaImpl&gt; *)
</del><ins>+void StorageAreaImpl::closeDatabaseTimerFired(Timer *)
</ins><span class="cx"> {
</span><span class="cx">     blockUntilImportComplete();
</span><span class="cx">     if (m_storageAreaSync)
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageAreaImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageAreaImpl.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageAreaImpl.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/storage/StorageAreaImpl.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx">     explicit StorageAreaImpl(StorageAreaImpl*);
</span><span class="cx"> 
</span><span class="cx">     void blockUntilImportComplete() const;
</span><del>-    void closeDatabaseTimerFired(Timer&lt;StorageAreaImpl&gt;*);
</del><ins>+    void closeDatabaseTimerFired(Timer*);
</ins><span class="cx"> 
</span><span class="cx">     void dispatchStorageEvent(const String&amp; key, const String&amp; oldValue, const String&amp; newValue, Frame* sourceFrame);
</span><span class="cx"> 
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx">     bool m_isShutdown;
</span><span class="cx"> #endif
</span><span class="cx">     unsigned m_accessCount;
</span><del>-    Timer&lt;StorageAreaImpl&gt; m_closeDatabaseTimer;
</del><ins>+    Timer m_closeDatabaseTimer;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageAreaSynccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageAreaSync.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageAreaSync.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/storage/StorageAreaSync.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void StorageAreaSync::syncTimerFired(Timer&lt;StorageAreaSync&gt;*)
</del><ins>+void StorageAreaSync::syncTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(isMainThread());
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageAreaSynch"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageAreaSync.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageAreaSync.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/storage/StorageAreaSync.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> private:
</span><span class="cx">     StorageAreaSync(PassRefPtr&lt;StorageSyncManager&gt;, PassRefPtr&lt;StorageAreaImpl&gt;, const String&amp; databaseIdentifier);
</span><span class="cx"> 
</span><del>-    Timer&lt;StorageAreaSync&gt; m_syncTimer;
</del><ins>+    Timer m_syncTimer;
</ins><span class="cx">     HashMap&lt;String, String&gt; m_changedItems;
</span><span class="cx">     bool m_itemsCleared;
</span><span class="cx"> 
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx">       SkipIfNonExistent
</span><span class="cx">     };
</span><span class="cx"> 
</span><del>-    void syncTimerFired(Timer&lt;StorageAreaSync&gt;*);
</del><ins>+    void syncTimerFired(Timer*);
</ins><span class="cx">     void openDatabase(OpenDatabaseParamType openingStrategy);
</span><span class="cx">     void sync(bool clearItems, const HashMap&lt;String, String&gt;&amp; items);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGElement.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGElement.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/svg/SVGElement.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -686,12 +686,12 @@
</span><span class="cx">     svgLoadEventTimer()-&gt;startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void SVGElement::svgLoadEventTimerFired(Timer&lt;SVGElement&gt;*)
</del><ins>+void SVGElement::svgLoadEventTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     sendSVGLoadEventIfPossible();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-Timer&lt;SVGElement&gt;* SVGElement::svgLoadEventTimer()
</del><ins>+Timer* SVGElement::svgLoadEventTimer()
</ins><span class="cx"> {
</span><span class="cx">     ASSERT_NOT_REACHED();
</span><span class="cx">     return 0;
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGElement.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGElement.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/svg/SVGElement.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -89,8 +89,8 @@
</span><span class="cx"> 
</span><span class="cx">     void sendSVGLoadEventIfPossible(bool sendParentLoadEvents = false);
</span><span class="cx">     void sendSVGLoadEventIfPossibleAsynchronously();
</span><del>-    void svgLoadEventTimerFired(Timer&lt;SVGElement&gt;*);
-    virtual Timer&lt;SVGElement&gt;* svgLoadEventTimer();
</del><ins>+    void svgLoadEventTimerFired(Timer*);
+    virtual Timer* svgLoadEventTimer();
</ins><span class="cx"> 
</span><span class="cx">     virtual AffineTransform* supplementalTransform() { return 0; }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGScriptElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGScriptElement.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGScriptElement.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/svg/SVGScriptElement.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx">     virtual void setHaveFiredLoadEvent(bool haveFiredLoadEvent) override { ScriptElement::setHaveFiredLoadEvent(haveFiredLoadEvent); }
</span><span class="cx">     virtual bool isParserInserted() const override { return ScriptElement::isParserInserted(); }
</span><span class="cx">     virtual bool haveFiredLoadEvent() const override { return ScriptElement::haveFiredLoadEvent(); }
</span><del>-    virtual Timer&lt;SVGElement&gt;* svgLoadEventTimer() override { return &amp;m_svgLoadEventTimer; }
</del><ins>+    virtual Timer* svgLoadEventTimer() override { return &amp;m_svgLoadEventTimer; }
</ins><span class="cx"> 
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx">     virtual bool filterOutAnimatableAttribute(const QualifiedName&amp;) const override;
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx">         DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
</span><span class="cx">     END_DECLARE_ANIMATED_PROPERTIES
</span><span class="cx"> 
</span><del>-    Timer&lt;SVGElement&gt; m_svgLoadEventTimer;
</del><ins>+    Timer m_svgLoadEventTimer;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGStyleElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGStyleElement.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGStyleElement.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/svg/SVGStyleElement.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -62,10 +62,10 @@
</span><span class="cx">     virtual bool isLoading() const { return m_styleSheetOwner.isLoading(); }
</span><span class="cx">     virtual bool sheetLoaded() override { return m_styleSheetOwner.sheetLoaded(document()); }
</span><span class="cx">     virtual void startLoadingDynamicSheet() override { m_styleSheetOwner.startLoadingDynamicSheet(document()); }
</span><del>-    virtual Timer&lt;SVGElement&gt;* svgLoadEventTimer() override { return &amp;m_svgLoadEventTimer; }
</del><ins>+    virtual Timer* svgLoadEventTimer() override { return &amp;m_svgLoadEventTimer; }
</ins><span class="cx"> 
</span><span class="cx">     InlineStyleSheetOwner m_styleSheetOwner;
</span><del>-    Timer&lt;SVGElement&gt; m_svgLoadEventTimer;
</del><ins>+    Timer m_svgLoadEventTimer;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGUseElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGUseElement.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGUseElement.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/svg/SVGUseElement.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -118,14 +118,14 @@
</span><span class="cx">     virtual void setHaveFiredLoadEvent(bool haveFiredLoadEvent) override { m_haveFiredLoadEvent = haveFiredLoadEvent; }
</span><span class="cx">     virtual bool isParserInserted() const override { return m_wasInsertedByParser; }
</span><span class="cx">     virtual bool haveFiredLoadEvent() const override { return m_haveFiredLoadEvent; }
</span><del>-    virtual Timer&lt;SVGElement&gt;* svgLoadEventTimer() override { return &amp;m_svgLoadEventTimer; }
</del><ins>+    virtual Timer* svgLoadEventTimer() override { return &amp;m_svgLoadEventTimer; }
</ins><span class="cx"> 
</span><span class="cx">     bool m_wasInsertedByParser;
</span><span class="cx">     bool m_haveFiredLoadEvent;
</span><span class="cx">     bool m_needsShadowTreeRecreation;
</span><span class="cx">     RefPtr&lt;SVGElementInstance&gt; m_targetElementInstance;
</span><span class="cx">     CachedResourceHandle&lt;CachedSVGDocument&gt; m_cachedDocument;
</span><del>-    Timer&lt;SVGElement&gt; m_svgLoadEventTimer;
</del><ins>+    Timer m_svgLoadEventTimer;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoresvganimationSMILTimeContainercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/animation/SMILTimeContainer.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/animation/SMILTimeContainer.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/svg/animation/SMILTimeContainer.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx">     m_timer.startOneShot(delay.value());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void SMILTimeContainer::timerFired(Timer&lt;SMILTimeContainer&gt;*)
</del><ins>+void SMILTimeContainer::timerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(m_beginTime);
</span><span class="cx">     ASSERT(!m_pauseTime);
</span></span></pre></div>
<a id="trunkSourceWebCoresvganimationSMILTimeContainerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/animation/SMILTimeContainer.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/animation/SMILTimeContainer.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/svg/animation/SMILTimeContainer.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> private:
</span><span class="cx">     SMILTimeContainer(SVGSVGElement* owner);
</span><span class="cx"> 
</span><del>-    void timerFired(Timer&lt;SMILTimeContainer&gt;*);
</del><ins>+    void timerFired(Timer*);
</ins><span class="cx">     void startTimer(SMILTime fireTime, SMILTime minimumDelay = 0);
</span><span class="cx">     void updateAnimations(SMILTime elapsed, bool seekToTime = false);
</span><span class="cx">     
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> 
</span><span class="cx">     bool m_documentOrderIndexesDirty;
</span><span class="cx">     
</span><del>-    Timer&lt;SMILTimeContainer&gt; m_timer;
</del><ins>+    Timer m_timer;
</ins><span class="cx"> 
</span><span class="cx">     typedef std::pair&lt;SVGElement*, QualifiedName&gt; ElementAttributePair;
</span><span class="cx">     typedef Vector&lt;SVGSMILElement*&gt; AnimationsVector;
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestProgressEventThrottlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx">     dispatchEvent(event);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void XMLHttpRequestProgressEventThrottle::dispatchDeferredEvents(Timer&lt;XMLHttpRequestProgressEventThrottle&gt;* timer)
</del><ins>+void XMLHttpRequestProgressEventThrottle::dispatchDeferredEvents(Timer* timer)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT_UNUSED(timer, timer == &amp;m_dispatchDeferredEventsTimer);
</span><span class="cx">     ASSERT(m_deferEvents);
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestProgressEventThrottleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx">     static const double minimumProgressEventDispatchingIntervalInSeconds;
</span><span class="cx"> 
</span><span class="cx">     virtual void fired();
</span><del>-    void dispatchDeferredEvents(Timer&lt;XMLHttpRequestProgressEventThrottle&gt;*);
</del><ins>+    void dispatchDeferredEvents(Timer*);
</ins><span class="cx">     void flushProgressEvent();
</span><span class="cx">     void dispatchEvent(PassRefPtr&lt;Event&gt;);
</span><span class="cx"> 
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx">     bool m_deferEvents;
</span><span class="cx">     RefPtr&lt;Event&gt; m_deferredProgressEvent;
</span><span class="cx">     Vector&lt;RefPtr&lt;Event&gt;&gt; m_deferredEvents;
</span><del>-    Timer&lt;XMLHttpRequestProgressEventThrottle&gt; m_dispatchDeferredEventsTimer;
</del><ins>+    Timer m_dispatchDeferredEventsTimer;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebKit/mac/ChangeLog        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-11-05  Jer Noble  &lt;jer.noble@apple.com&gt;
+
+        De-templatize Timer
+        https://bugs.webkit.org/show_bug.cgi?id=138450
+
+        Reviewed by Anders Carlsson.
+
+        Remove template specifiers from Timer.
+
+        * Plugins/Hosted/NetscapePluginInstanceProxy.h:
+        * Plugins/Hosted/NetscapePluginInstanceProxy.mm:
+        (WebKit::NetscapePluginInstanceProxy::requestTimerFired):
+        * Plugins/WebNetscapePluginStream.h:
+        * Plugins/WebNetscapePluginStream.mm:
+        (WebNetscapePluginStream::deliverDataTimerFired):
+
</ins><span class="cx"> 2014-11-05  Dan Bernstein  &lt;mitz@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Remove the unused deletion UI feature
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsHostedNetscapePluginInstanceProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -295,8 +295,8 @@
</span><span class="cx">     NetscapePluginHostProxy* m_pluginHostProxy;
</span><span class="cx">     WebHostedNetscapePluginView *m_pluginView;
</span><span class="cx"> 
</span><del>-    void requestTimerFired(WebCore::Timer&lt;NetscapePluginInstanceProxy&gt;*);
-    WebCore::Timer&lt;NetscapePluginInstanceProxy&gt; m_requestTimer;
</del><ins>+    void requestTimerFired(WebCore::Timer*);
+    WebCore::Timer m_requestTimer;
</ins><span class="cx">     Deque&lt;RefPtr&lt;PluginRequest&gt;&gt; m_pluginRequests;
</span><span class="cx">     
</span><span class="cx">     HashMap&lt;uint32_t, RefPtr&lt;HostedNetscapePluginStream&gt;&gt; m_streams;
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsHostedNetscapePluginInstanceProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -735,7 +735,7 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void NetscapePluginInstanceProxy::requestTimerFired(Timer&lt;NetscapePluginInstanceProxy&gt;*)
</del><ins>+void NetscapePluginInstanceProxy::requestTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(!m_pluginRequests.isEmpty());
</span><span class="cx">     ASSERT(m_pluginView);
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebNetscapePluginStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -123,8 +123,8 @@
</span><span class="cx">     RetainPtr&lt;NSMutableURLRequest&gt; m_request;
</span><span class="cx">     NPPluginFuncs *m_pluginFuncs;
</span><span class="cx"> 
</span><del>-    void deliverDataTimerFired(WebCore::Timer&lt;WebNetscapePluginStream&gt;* timer);
-    WebCore::Timer&lt;WebNetscapePluginStream&gt; m_deliverDataTimer;
</del><ins>+    void deliverDataTimerFired(WebCore::Timer*);
+    WebCore::Timer m_deliverDataTimer;
</ins><span class="cx">     
</span><span class="cx">     WebNetscapePluginStream(WebCore::FrameLoader*);
</span><span class="cx">     WebNetscapePluginStream(NSURLRequest *, NPP, bool sendNotification, void* notifyData);
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebNetscapePluginStreammm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -552,7 +552,7 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebNetscapePluginStream::deliverDataTimerFired(WebCore::Timer&lt;WebNetscapePluginStream&gt;* timer)
</del><ins>+void WebNetscapePluginStream::deliverDataTimerFired(WebCore::Timer* timer)
</ins><span class="cx"> {
</span><span class="cx">     deliverData();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebKit/win/ChangeLog        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-11-05  Jer Noble  &lt;jer.noble@apple.com&gt;
+
+        De-templatize Timer
+        https://bugs.webkit.org/show_bug.cgi?id=138450
+
+        Reviewed by Anders Carlsson.
+
+        * FullscreenVideoController.cpp:
+        (FullscreenVideoController::timerFired):
+        * FullscreenVideoController.h:
+
</ins><span class="cx"> 2014-11-04  Darin Adler  &lt;darin@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Eliminate ResourceBuffer and use SharedBuffer directly instead
</span></span></pre></div>
<a id="trunkSourceWebKitwinFullscreenVideoControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/FullscreenVideoController.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/FullscreenVideoController.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebKit/win/FullscreenVideoController.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -595,7 +595,7 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void FullscreenVideoController::timerFired(Timer&lt;FullscreenVideoController&gt;*)
</del><ins>+void FullscreenVideoController::timerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     // Update the time slider
</span><span class="cx">     m_timeSlider.setValue(currentTime() / duration());
</span></span></pre></div>
<a id="trunkSourceWebKitwinFullscreenVideoControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/FullscreenVideoController.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/FullscreenVideoController.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebKit/win/FullscreenVideoController.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx">     static void registerHUDWindowClass();
</span><span class="cx">     static LRESULT CALLBACK hudWndProc(HWND, UINT message, WPARAM, LPARAM);
</span><span class="cx">     void createHUDWindow();
</span><del>-    void timerFired(WebCore::Timer&lt;FullscreenVideoController&gt;*);
</del><ins>+    void timerFired(WebCore::Timer*);
</ins><span class="cx"> 
</span><span class="cx">     void togglePlay();
</span><span class="cx">     void draw();
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx">     HUDWidget* m_hitWidget;
</span><span class="cx">     WebCore::IntPoint m_moveOffset;
</span><span class="cx">     bool m_movingWindow;
</span><del>-    WebCore::Timer&lt;FullscreenVideoController&gt; m_timer;
</del><ins>+    WebCore::Timer m_timer;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebKit2/ChangeLog        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2014-11-05  Jer Noble  &lt;jer.noble@apple.com&gt;
+
+        De-templatize Timer
+        https://bugs.webkit.org/show_bug.cgi?id=138450
+
+        Reviewed by Anders Carlsson.
+
+        Remove template specifiers from Timer.
+
+        * NetworkProcess/NetworkResourceLoader.cpp:
+        (WebKit::NetworkResourceLoader::bufferingTimerFired):
+        * NetworkProcess/NetworkResourceLoader.h:
+        * Shared/WebMemorySampler.cpp:
+        (WebKit::WebMemorySampler::sampleTimerFired):
+        (WebKit::WebMemorySampler::stopTimerFired):
+        * Shared/WebMemorySampler.h:
+        * Shared/mac/RemoteLayerBackingStoreCollection.h:
+        * Shared/mac/RemoteLayerBackingStoreCollection.mm:
+        (WebKit::RemoteLayerBackingStoreCollection::volatilityTimerFired):
+        * UIProcess/API/efl/EwkView.cpp:
+        (EwkView::displayTimerFired):
+        * UIProcess/API/efl/EwkView.h:
+        * UIProcess/efl/TextCheckerClientEfl.cpp:
+        (TextCheckerClientEfl::languagesUpdateTimerFired):
+        (TextCheckerClientEfl::spellCheckingSettingChangeTimerFired):
+        * UIProcess/efl/TextCheckerClientEfl.h:
+        * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
+        (WebKit::CoordinatedLayerTreeHost::layerFlushTimerFired):
+        * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h:
+        * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:
+        * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
+        (WebKit::RemoteLayerTreeDrawingArea::layerFlushTimerFired):
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::processSuspensionCleanupTimerFired):
+        (WebKit::WebProcess::nonVisibleProcessCleanupTimerFired):
+        * WebProcess/WebProcess.h:
+
</ins><span class="cx"> 2014-11-06  Dean Jackson  &lt;dino@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [filters2] Support for backdrop-filter
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -392,7 +392,7 @@
</span><span class="cx">     m_bufferingTimer.startOneShot(m_parameters.maximumBufferingTime);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void NetworkResourceLoader::bufferingTimerFired(Timer&lt;NetworkResourceLoader&gt;&amp;)
</del><ins>+void NetworkResourceLoader::bufferingTimerFired(Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(m_bufferedData);
</span><span class="cx">     ASSERT(m_handle);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx">     void platformDidReceiveResponse(const WebCore::ResourceResponse&amp;);
</span><span class="cx"> 
</span><span class="cx">     void startBufferingTimerIfNeeded();
</span><del>-    void bufferingTimerFired(WebCore::Timer&lt;NetworkResourceLoader&gt;&amp;);
</del><ins>+    void bufferingTimerFired(WebCore::Timer&amp;);
</ins><span class="cx">     void sendBuffer(WebCore::SharedBuffer*, int encodedDataLength);
</span><span class="cx"> 
</span><span class="cx">     bool isSynchronous() const;
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx">     bool m_didConsumeSandboxExtensions;
</span><span class="cx">     bool m_defersLoading;
</span><span class="cx"> 
</span><del>-    WebCore::Timer&lt;NetworkResourceLoader&gt; m_bufferingTimer;
</del><ins>+    WebCore::Timer m_bufferingTimer;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebMemorySamplercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebMemorySampler.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebMemorySampler.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebKit2/Shared/WebMemorySampler.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -154,13 +154,13 @@
</span><span class="cx">     writeToFile(m_sampleLogFile, utf8String.data(), utf8String.length());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebMemorySampler::sampleTimerFired(Timer&lt;WebMemorySampler&gt;*)
</del><ins>+void WebMemorySampler::sampleTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     sendMemoryPressureEvent();
</span><span class="cx">     appendCurrentMemoryUsageToFile(m_sampleLogFile);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebMemorySampler::stopTimerFired(Timer&lt;WebMemorySampler&gt;*)
</del><ins>+void WebMemorySampler::stopTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     if (!m_isRunning)
</span><span class="cx">         return;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebMemorySamplerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebMemorySampler.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebMemorySampler.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebKit2/Shared/WebMemorySampler.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -85,8 +85,8 @@
</span><span class="cx">     void initializeSandboxedLogFile(const SandboxExtension::Handle&amp;, const String&amp;);
</span><span class="cx">     void writeHeaders();
</span><span class="cx">     void initializeTimers(double);
</span><del>-    void sampleTimerFired(WebCore::Timer&lt;WebMemorySampler&gt;*);
-    void stopTimerFired(WebCore::Timer&lt;WebMemorySampler&gt;*);
</del><ins>+    void sampleTimerFired(WebCore::Timer*);
+    void stopTimerFired(WebCore::Timer*);
</ins><span class="cx">     void appendCurrentMemoryUsageToFile(WebCore::PlatformFileHandle&amp;);
</span><span class="cx">     void sendMemoryPressureEvent();
</span><span class="cx">     
</span><span class="lines">@@ -97,8 +97,8 @@
</span><span class="cx">     
</span><span class="cx">     WebCore::PlatformFileHandle m_sampleLogFile;
</span><span class="cx">     String m_sampleLogFilePath;
</span><del>-    WebCore::Timer&lt;WebMemorySampler&gt; m_sampleTimer;
-    WebCore::Timer&lt;WebMemorySampler&gt; m_stopTimer;
</del><ins>+    WebCore::Timer m_sampleTimer;
+    WebCore::Timer m_stopTimer;
</ins><span class="cx">     bool m_isRunning;
</span><span class="cx">     double m_runningTime;
</span><span class="cx">     RefPtr&lt;SandboxExtension&gt; m_sampleLogSandboxExtension;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerBackingStoreCollectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStoreCollection.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStoreCollection.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStoreCollection.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">     void willCommitLayerTree(RemoteLayerTreeTransaction&amp;);
</span><span class="cx">     void didFlushLayers();
</span><span class="cx"> 
</span><del>-    void volatilityTimerFired(WebCore::Timer&lt;RemoteLayerBackingStoreCollection&gt;&amp;);
</del><ins>+    void volatilityTimerFired(WebCore::Timer&amp;);
</ins><span class="cx">     bool markAllBackingStoreVolatileImmediatelyIfPossible();
</span><span class="cx"> 
</span><span class="cx">     void scheduleVolatilityTimer();
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">     HashSet&lt;RemoteLayerBackingStore*&gt; m_unparentedBackingStore;
</span><span class="cx">     HashSet&lt;RemoteLayerBackingStore*&gt; m_reachableBackingStoreInLatestFlush;
</span><span class="cx"> 
</span><del>-    WebCore::Timer&lt;RemoteLayerBackingStoreCollection&gt; m_volatilityTimer;
</del><ins>+    WebCore::Timer m_volatilityTimer;
</ins><span class="cx"> 
</span><span class="cx">     bool m_inLayerFlush;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerBackingStoreCollectionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStoreCollection.mm (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStoreCollection.mm        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStoreCollection.mm        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx">     return successfullyMadeBackingStoreVolatile;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RemoteLayerBackingStoreCollection::volatilityTimerFired(WebCore::Timer&lt;RemoteLayerBackingStoreCollection&gt;&amp;)
</del><ins>+void RemoteLayerBackingStoreCollection::volatilityTimerFired(WebCore::Timer&amp;)
</ins><span class="cx"> {
</span><span class="cx">     bool successfullyMadeBackingStoreVolatile = true;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflEwkViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -539,7 +539,7 @@
</span><span class="cx">     return toIntSize(WKViewGetSize(wkView()));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void EwkView::displayTimerFired(Timer&lt;EwkView&gt;*)
</del><ins>+void EwkView::displayTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     Ewk_View_Smart_Data* sd = smartData();
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflEwkViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/EwkView.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/EwkView.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebKit2/UIProcess/API/efl/EwkView.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx">     WebCore::IntSize size() const;
</span><span class="cx">     WebCore::IntSize deviceSize() const;
</span><span class="cx"> 
</span><del>-    void displayTimerFired(WebCore::Timer&lt;EwkView&gt;*);
</del><ins>+    void displayTimerFired(WebCore::Timer*);
</ins><span class="cx"> 
</span><span class="cx">     // Evas_Smart_Class callback interface:
</span><span class="cx">     static void handleEvasObjectAdd(Evas_Object*);
</span><span class="lines">@@ -297,7 +297,7 @@
</span><span class="cx">     bool m_touchEventsEnabled;
</span><span class="cx">     std::unique_ptr&lt;WebKit::GestureRecognizer&gt; m_gestureRecognizer;
</span><span class="cx"> #endif
</span><del>-    WebCore::Timer&lt;EwkView&gt; m_displayTimer;
</del><ins>+    WebCore::Timer m_displayTimer;
</ins><span class="cx">     RefPtr&lt;EwkContextMenu&gt; m_contextMenu;
</span><span class="cx">     std::unique_ptr&lt;EwkPopupMenu&gt; m_popupMenu;
</span><span class="cx">     std::unique_ptr&lt;WebKit::InputMethodContextEfl&gt; m_inputMethodContext;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflTextCheckerClientEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/TextCheckerClientEfl.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/TextCheckerClientEfl.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebKit2/UIProcess/efl/TextCheckerClientEfl.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -104,12 +104,12 @@
</span><span class="cx">     m_languagesUpdateTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void TextCheckerClientEfl::languagesUpdateTimerFired(Timer&lt;TextCheckerClientEfl&gt;*)
</del><ins>+void TextCheckerClientEfl::languagesUpdateTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     m_textCheckerEnchant-&gt;updateSpellCheckingLanguages(m_spellCheckingLanguages);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void TextCheckerClientEfl::spellCheckingSettingChangeTimerFired(Timer&lt;TextCheckerClientEfl&gt;*)
</del><ins>+void TextCheckerClientEfl::spellCheckingSettingChangeTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     m_clientCallbacks.continuous_spell_checking_change(
</span><span class="cx">         isContinuousSpellCheckingEnabledCallback(0 /* clientInfo */)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesseflTextCheckerClientEflh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/efl/TextCheckerClientEfl.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/efl/TextCheckerClientEfl.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebKit2/UIProcess/efl/TextCheckerClientEfl.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -55,14 +55,14 @@
</span><span class="cx">     TextCheckerClientEfl();
</span><span class="cx"> 
</span><span class="cx">     // To set languages on timer.
</span><del>-    void languagesUpdateTimerFired(WebCore::Timer&lt;TextCheckerClientEfl&gt;*);
-    WebCore::Timer&lt;TextCheckerClientEfl&gt; m_languagesUpdateTimer;
</del><ins>+    void languagesUpdateTimerFired(WebCore::Timer*);
+    WebCore::Timer m_languagesUpdateTimer;
</ins><span class="cx">     Vector&lt;String&gt; m_spellCheckingLanguages;
</span><span class="cx"> 
</span><span class="cx">     // To notify the client about the setting change on timer.
</span><del>-    void spellCheckingSettingChangeTimerFired(WebCore::Timer&lt;TextCheckerClientEfl&gt;*);
</del><ins>+    void spellCheckingSettingChangeTimerFired(WebCore::Timer*);
</ins><span class="cx">     void callContinuousSpellCheckingChangeCallbackAsync();
</span><del>-    WebCore::Timer&lt;TextCheckerClientEfl&gt; m_spellCheckingSettingChangeTimer;
</del><ins>+    WebCore::Timer m_spellCheckingSettingChangeTimer;
</ins><span class="cx"> 
</span><span class="cx">     // WKTextCheckerClient callbacks.
</span><span class="cx">     static bool isContinuousSpellCheckingEnabledCallback(const void*);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void CoordinatedLayerTreeHost::layerFlushTimerFired(Timer&lt;CoordinatedLayerTreeHost&gt;*)
</del><ins>+void CoordinatedLayerTreeHost::layerFlushTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     performScheduledLayerFlush();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx">     void purgeBackingStores();
</span><span class="cx">     void commitScrollOffset(uint32_t layerID, const WebCore::IntSize&amp; offset);
</span><span class="cx"> 
</span><del>-    void layerFlushTimerFired(WebCore::Timer&lt;CoordinatedLayerTreeHost&gt;*);
</del><ins>+    void layerFlushTimerFired(WebCore::Timer*);
</ins><span class="cx"> 
</span><span class="cx">     void updateRootLayers();
</span><span class="cx"> 
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> 
</span><span class="cx">     LayerTreeContext m_layerTreeContext;
</span><span class="cx"> 
</span><del>-    WebCore::Timer&lt;CoordinatedLayerTreeHost&gt; m_layerFlushTimer;
</del><ins>+    WebCore::Timer m_layerFlushTimer;
</ins><span class="cx">     bool m_layerFlushSchedulingEnabled;
</span><span class="cx">     uint64_t m_forceRepaintAsyncCallbackID;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx">     void updateScrolledExposedRect();
</span><span class="cx">     void updateRootLayers();
</span><span class="cx"> 
</span><del>-    void layerFlushTimerFired(WebCore::Timer&lt;RemoteLayerTreeDrawingArea&gt;*);
</del><ins>+    void layerFlushTimerFired(WebCore::Timer*);
</ins><span class="cx">     void flushLayers();
</span><span class="cx"> 
</span><span class="cx">     WebCore::TiledBacking* mainFrameTiledBacking() const;
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx">     WebCore::FloatRect m_exposedRect;
</span><span class="cx">     WebCore::FloatRect m_scrolledExposedRect;
</span><span class="cx"> 
</span><del>-    WebCore::Timer&lt;RemoteLayerTreeDrawingArea&gt; m_layerFlushTimer;
</del><ins>+    WebCore::Timer m_layerFlushTimer;
</ins><span class="cx">     bool m_isFlushingSuspended;
</span><span class="cx">     bool m_hasDeferredFlush;
</span><span class="cx">     bool m_isThrottlingLayerFlushes;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -313,7 +313,7 @@
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RemoteLayerTreeDrawingArea::layerFlushTimerFired(WebCore::Timer&lt;RemoteLayerTreeDrawingArea&gt;*)
</del><ins>+void RemoteLayerTreeDrawingArea::layerFlushTimerFired(WebCore::Timer*)
</ins><span class="cx"> {
</span><span class="cx">     flushLayers();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -1195,7 +1195,7 @@
</span><span class="cx">     return successfullyMarkedAllLayersVolatile;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebProcess::processSuspensionCleanupTimerFired(Timer&lt;WebProcess&gt;* timer)
</del><ins>+void WebProcess::processSuspensionCleanupTimerFired(Timer* timer)
</ins><span class="cx"> {
</span><span class="cx">     if (markAllLayersVolatileIfPossible()) {
</span><span class="cx">         parentProcessConnection()-&gt;send(Messages::WebProcessProxy::ProcessReadyToSuspend(), 0);
</span><span class="lines">@@ -1217,7 +1217,7 @@
</span><span class="cx">         m_nonVisibleProcessCleanupTimer.startOneShot(nonVisibleProcessCleanupDelay);
</span><span class="cx"> }
</span><span class="cx">     
</span><del>-void WebProcess::nonVisibleProcessCleanupTimerFired(Timer&lt;WebProcess&gt;*)
</del><ins>+void WebProcess::nonVisibleProcessCleanupTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(m_pagesInWindows.isEmpty());
</span><span class="cx">     if (!m_pagesInWindows.isEmpty())
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (175718 => 175719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h        2014-11-06 22:51:34 UTC (rev 175718)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h        2014-11-06 23:06:03 UTC (rev 175719)
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx">     void pageDidEnterWindow(uint64_t pageID);
</span><span class="cx">     void pageWillLeaveWindow(uint64_t pageID);
</span><span class="cx"> 
</span><del>-    void nonVisibleProcessCleanupTimerFired(WebCore::Timer&lt;WebProcess&gt;*);
</del><ins>+    void nonVisibleProcessCleanupTimerFired(WebCore::Timer*);
</ins><span class="cx"> 
</span><span class="cx">     void updateActivePages();
</span><span class="cx"> 
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx">     void processWillSuspend();
</span><span class="cx">     void cancelProcessWillSuspend();
</span><span class="cx">     bool markAllLayersVolatileIfPossible();
</span><del>-    void processSuspensionCleanupTimerFired(WebCore::Timer&lt;WebProcess&gt;*);
</del><ins>+    void processSuspensionCleanupTimerFired(WebCore::Timer*);
</ins><span class="cx"> 
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">     void resetAllGeolocationPermissions();
</span><span class="lines">@@ -306,7 +306,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">     RefPtr&lt;ViewUpdateDispatcher&gt; m_viewUpdateDispatcher;
</span><span class="cx"> #endif
</span><del>-    WebCore::Timer&lt;WebProcess&gt; m_processSuspensionCleanupTimer;
</del><ins>+    WebCore::Timer m_processSuspensionCleanupTimer;
</ins><span class="cx"> 
</span><span class="cx">     bool m_inDidClose;
</span><span class="cx"> 
</span><span class="lines">@@ -360,7 +360,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     HashSet&lt;uint64_t&gt; m_pagesInWindows;
</span><del>-    WebCore::Timer&lt;WebProcess&gt; m_nonVisibleProcessCleanupTimer;
</del><ins>+    WebCore::Timer m_nonVisibleProcessCleanupTimer;
</ins><span class="cx"> 
</span><span class="cx">     std::unique_ptr&lt;WebOriginDataManager&gt; m_webOriginDataManager;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>

</body>
</html>