<!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>[178505] branches/safari-600.5-branch/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/178505">178505</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-01-15 03:40:42 -0800 (Thu, 15 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/175719">r175719</a>. rdar://problem/19424169</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6005branchSourceWebCoreChangeLog">branches/safari-600.5-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreModulesencryptedmediaMediaKeySessioncpp">branches/safari-600.5-branch/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreModulesencryptedmediaMediaKeySessionh">branches/safari-600.5-branch/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreModulesgeolocationGeolocationcpp">branches/safari-600.5-branch/Source/WebCore/Modules/geolocation/Geolocation.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreModulesgeolocationGeolocationh">branches/safari-600.5-branch/Source/WebCore/Modules/geolocation/Geolocation.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreModulesindexeddbIDBTransactionBackendcpp">branches/safari-600.5-branch/Source/WebCore/Modules/indexeddb/IDBTransactionBackend.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreModulesindexeddbIDBTransactionBackendh">branches/safari-600.5-branch/Source/WebCore/Modules/indexeddb/IDBTransactionBackend.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreModulesmediasourceSourceBuffercpp">branches/safari-600.5-branch/Source/WebCore/Modules/mediasource/SourceBuffer.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreModulesmediasourceSourceBufferh">branches/safari-600.5-branch/Source/WebCore/Modules/mediasource/SourceBuffer.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreModulesmediastreamMediaStreamcpp">branches/safari-600.5-branch/Source/WebCore/Modules/mediastream/MediaStream.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreModulesmediastreamMediaStreamh">branches/safari-600.5-branch/Source/WebCore/Modules/mediastream/MediaStream.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreModulesmediastreamRTCDTMFSendercpp">branches/safari-600.5-branch/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreModulesmediastreamRTCDTMFSenderh">branches/safari-600.5-branch/Source/WebCore/Modules/mediastream/RTCDTMFSender.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreModulesmediastreamRTCDataChannelcpp">branches/safari-600.5-branch/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreModulesmediastreamRTCDataChannelh">branches/safari-600.5-branch/Source/WebCore/Modules/mediastream/RTCDataChannel.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreModulesmediastreamRTCPeerConnectioncpp">branches/safari-600.5-branch/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreModulesmediastreamRTCPeerConnectionh">branches/safari-600.5-branch/Source/WebCore/Modules/mediastream/RTCPeerConnection.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreModulesnotificationsNotificationcpp">branches/safari-600.5-branch/Source/WebCore/Modules/notifications/Notification.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreModulesnotificationsNotificationh">branches/safari-600.5-branch/Source/WebCore/Modules/notifications/Notification.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreModulesnotificationsNotificationCentercpp">branches/safari-600.5-branch/Source/WebCore/Modules/notifications/NotificationCenter.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreModulesnotificationsNotificationCenterh">branches/safari-600.5-branch/Source/WebCore/Modules/notifications/NotificationCenter.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreModulesvibrationVibrationcpp">branches/safari-600.5-branch/Source/WebCore/Modules/vibration/Vibration.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreModulesvibrationVibrationh">branches/safari-600.5-branch/Source/WebCore/Modules/vibration/Vibration.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreModuleswebsocketsWebSocketChannelcpp">branches/safari-600.5-branch/Source/WebCore/Modules/websockets/WebSocketChannel.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreModuleswebsocketsWebSocketChannelh">branches/safari-600.5-branch/Source/WebCore/Modules/websockets/WebSocketChannel.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreaccessibilityAXObjectCachecpp">branches/safari-600.5-branch/Source/WebCore/accessibility/AXObjectCache.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreaccessibilityAXObjectCacheh">branches/safari-600.5-branch/Source/WebCore/accessibility/AXObjectCache.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorebindingsjsGCControllercpp">branches/safari-600.5-branch/Source/WebCore/bindings/js/GCController.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorebindingsjsGCControllerh">branches/safari-600.5-branch/Source/WebCore/bindings/js/GCController.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorecssCSSFontFaceSourceh">branches/safari-600.5-branch/Source/WebCore/css/CSSFontFaceSource.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorecssCSSFontSelectorcpp">branches/safari-600.5-branch/Source/WebCore/css/CSSFontSelector.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorecssCSSFontSelectorh">branches/safari-600.5-branch/Source/WebCore/css/CSSFontSelector.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorecssStyleResolvercpp">branches/safari-600.5-branch/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorecssStyleResolverh">branches/safari-600.5-branch/Source/WebCore/css/StyleResolver.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoredomDocumentcpp">branches/safari-600.5-branch/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoredomDocumenth">branches/safari-600.5-branch/Source/WebCore/dom/Document.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoredomEventSenderh">branches/safari-600.5-branch/Source/WebCore/dom/EventSender.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoredomGenericEventQueuecpp">branches/safari-600.5-branch/Source/WebCore/dom/GenericEventQueue.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoredomGenericEventQueueh">branches/safari-600.5-branch/Source/WebCore/dom/GenericEventQueue.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoredomScriptRunnercpp">branches/safari-600.5-branch/Source/WebCore/dom/ScriptRunner.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoredomScriptRunnerh">branches/safari-600.5-branch/Source/WebCore/dom/ScriptRunner.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoredomScriptedAnimationControllercpp">branches/safari-600.5-branch/Source/WebCore/dom/ScriptedAnimationController.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoredomScriptedAnimationControllerh">branches/safari-600.5-branch/Source/WebCore/dom/ScriptedAnimationController.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoredomStyledElementcpp">branches/safari-600.5-branch/Source/WebCore/dom/StyledElement.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreeditingAlternativeTextControllercpp">branches/safari-600.5-branch/Source/WebCore/editing/AlternativeTextController.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreeditingAlternativeTextControllerh">branches/safari-600.5-branch/Source/WebCore/editing/AlternativeTextController.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreeditingEditorcpp">branches/safari-600.5-branch/Source/WebCore/editing/Editor.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreeditingEditorh">branches/safari-600.5-branch/Source/WebCore/editing/Editor.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreeditingFrameSelectioncpp">branches/safari-600.5-branch/Source/WebCore/editing/FrameSelection.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreeditingFrameSelectionh">branches/safari-600.5-branch/Source/WebCore/editing/FrameSelection.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreeditingSpellCheckercpp">branches/safari-600.5-branch/Source/WebCore/editing/SpellChecker.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreeditingSpellCheckerh">branches/safari-600.5-branch/Source/WebCore/editing/SpellChecker.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorehtmlHTMLMediaElementcpp">branches/safari-600.5-branch/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorehtmlHTMLMediaElementh">branches/safari-600.5-branch/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorehtmlHTMLPlugInElementcpp">branches/safari-600.5-branch/Source/WebCore/html/HTMLPlugInElement.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorehtmlHTMLPlugInElementh">branches/safari-600.5-branch/Source/WebCore/html/HTMLPlugInElement.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorehtmlHTMLPlugInImageElementcpp">branches/safari-600.5-branch/Source/WebCore/html/HTMLPlugInImageElement.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorehtmlHTMLPlugInImageElementh">branches/safari-600.5-branch/Source/WebCore/html/HTMLPlugInImageElement.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorehtmlHTMLSourceElementcpp">branches/safari-600.5-branch/Source/WebCore/html/HTMLSourceElement.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorehtmlHTMLSourceElementh">branches/safari-600.5-branch/Source/WebCore/html/HTMLSourceElement.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorehtmlHTMLTrackElementcpp">branches/safari-600.5-branch/Source/WebCore/html/HTMLTrackElement.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorehtmlHTMLTrackElementh">branches/safari-600.5-branch/Source/WebCore/html/HTMLTrackElement.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorehtmlMediaControllercpp">branches/safari-600.5-branch/Source/WebCore/html/MediaController.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorehtmlMediaControllerh">branches/safari-600.5-branch/Source/WebCore/html/MediaController.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorehtmlMediaDocumentcpp">branches/safari-600.5-branch/Source/WebCore/html/MediaDocument.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorehtmlMediaDocumenth">branches/safari-600.5-branch/Source/WebCore/html/MediaDocument.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorehtmlSearchInputTypecpp">branches/safari-600.5-branch/Source/WebCore/html/SearchInputType.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorehtmlSearchInputTypeh">branches/safari-600.5-branch/Source/WebCore/html/SearchInputType.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorehtmlValidationMessagecpp">branches/safari-600.5-branch/Source/WebCore/html/ValidationMessage.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorehtmlValidationMessageh">branches/safari-600.5-branch/Source/WebCore/html/ValidationMessage.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorehtmlcanvasWebGLRenderingContextcpp">branches/safari-600.5-branch/Source/WebCore/html/canvas/WebGLRenderingContext.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorehtmlcanvasWebGLRenderingContexth">branches/safari-600.5-branch/Source/WebCore/html/canvas/WebGLRenderingContext.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorehtmlparserHTMLParserSchedulercpp">branches/safari-600.5-branch/Source/WebCore/html/parser/HTMLParserScheduler.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorehtmlparserHTMLParserSchedulerh">branches/safari-600.5-branch/Source/WebCore/html/parser/HTMLParserScheduler.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorehtmlshadowMediaControlElementscpp">branches/safari-600.5-branch/Source/WebCore/html/shadow/MediaControlElements.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorehtmlshadowMediaControlElementsh">branches/safari-600.5-branch/Source/WebCore/html/shadow/MediaControlElements.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorehtmlshadowMediaControlscpp">branches/safari-600.5-branch/Source/WebCore/html/shadow/MediaControls.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorehtmlshadowMediaControlsh">branches/safari-600.5-branch/Source/WebCore/html/shadow/MediaControls.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorehtmlshadowSpinButtonElementcpp">branches/safari-600.5-branch/Source/WebCore/html/shadow/SpinButtonElement.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorehtmlshadowSpinButtonElementh">branches/safari-600.5-branch/Source/WebCore/html/shadow/SpinButtonElement.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorehtmltrackLoadableTextTrackcpp">branches/safari-600.5-branch/Source/WebCore/html/track/LoadableTextTrack.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorehtmltrackLoadableTextTrackh">branches/safari-600.5-branch/Source/WebCore/html/track/LoadableTextTrack.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorehtmltrackVTTRegioncpp">branches/safari-600.5-branch/Source/WebCore/html/track/VTTRegion.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorehtmltrackVTTRegionh">branches/safari-600.5-branch/Source/WebCore/html/track/VTTRegion.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreinspectorInspectorCSSAgentcpp">branches/safari-600.5-branch/Source/WebCore/inspector/InspectorCSSAgent.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreinspectorInspectorDOMAgentcpp">branches/safari-600.5-branch/Source/WebCore/inspector/InspectorDOMAgent.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreinspectorInspectorFrontendClientLocalcpp">branches/safari-600.5-branch/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreloaderDocumentLoadercpp">branches/safari-600.5-branch/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreloaderDocumentLoaderh">branches/safari-600.5-branch/Source/WebCore/loader/DocumentLoader.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreloaderFrameLoadercpp">branches/safari-600.5-branch/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreloaderFrameLoaderh">branches/safari-600.5-branch/Source/WebCore/loader/FrameLoader.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreloaderImageLoadercpp">branches/safari-600.5-branch/Source/WebCore/loader/ImageLoader.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreloaderImageLoaderh">branches/safari-600.5-branch/Source/WebCore/loader/ImageLoader.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreloaderLinkLoadercpp">branches/safari-600.5-branch/Source/WebCore/loader/LinkLoader.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreloaderLinkLoaderh">branches/safari-600.5-branch/Source/WebCore/loader/LinkLoader.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreloaderNavigationSchedulercpp">branches/safari-600.5-branch/Source/WebCore/loader/NavigationScheduler.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreloaderNavigationSchedulerh">branches/safari-600.5-branch/Source/WebCore/loader/NavigationScheduler.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreloaderPingLoaderh">branches/safari-600.5-branch/Source/WebCore/loader/PingLoader.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreloaderProgressTrackercpp">branches/safari-600.5-branch/Source/WebCore/loader/ProgressTracker.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreloaderProgressTrackerh">branches/safari-600.5-branch/Source/WebCore/loader/ProgressTracker.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreloaderResourceLoadSchedulercpp">branches/safari-600.5-branch/Source/WebCore/loader/ResourceLoadScheduler.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreloaderResourceLoadSchedulerh">branches/safari-600.5-branch/Source/WebCore/loader/ResourceLoadScheduler.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreloaderTextTrackLoadercpp">branches/safari-600.5-branch/Source/WebCore/loader/TextTrackLoader.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreloaderTextTrackLoaderh">branches/safari-600.5-branch/Source/WebCore/loader/TextTrackLoader.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreloadercacheCachedResourcecpp">branches/safari-600.5-branch/Source/WebCore/loader/cache/CachedResource.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreloadercacheCachedResourceh">branches/safari-600.5-branch/Source/WebCore/loader/cache/CachedResource.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreloadercacheCachedResourceLoadercpp">branches/safari-600.5-branch/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreloadercacheCachedResourceLoaderh">branches/safari-600.5-branch/Source/WebCore/loader/cache/CachedResourceLoader.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreloadericonIconDatabasecpp">branches/safari-600.5-branch/Source/WebCore/loader/icon/IconDatabase.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreloadericonIconDatabaseh">branches/safari-600.5-branch/Source/WebCore/loader/icon/IconDatabase.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepageAutoscrollControllercpp">branches/safari-600.5-branch/Source/WebCore/page/AutoscrollController.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepageAutoscrollControllerh">branches/safari-600.5-branch/Source/WebCore/page/AutoscrollController.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepageCaptionUserPreferencescpp">branches/safari-600.5-branch/Source/WebCore/page/CaptionUserPreferences.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepageCaptionUserPreferencesh">branches/safari-600.5-branch/Source/WebCore/page/CaptionUserPreferences.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepageDeviceControllercpp">branches/safari-600.5-branch/Source/WebCore/page/DeviceController.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepageDeviceControllerh">branches/safari-600.5-branch/Source/WebCore/page/DeviceController.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepageEventHandlercpp">branches/safari-600.5-branch/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepageEventHandlerh">branches/safari-600.5-branch/Source/WebCore/page/EventHandler.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepageEventSourcecpp">branches/safari-600.5-branch/Source/WebCore/page/EventSource.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepageEventSourceh">branches/safari-600.5-branch/Source/WebCore/page/EventSource.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepageFocusControllercpp">branches/safari-600.5-branch/Source/WebCore/page/FocusController.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepageFocusControllerh">branches/safari-600.5-branch/Source/WebCore/page/FocusController.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepageFramecpp">branches/safari-600.5-branch/Source/WebCore/page/Frame.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepageFrameh">branches/safari-600.5-branch/Source/WebCore/page/Frame.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepageFrameViewcpp">branches/safari-600.5-branch/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepageFrameViewh">branches/safari-600.5-branch/Source/WebCore/page/FrameView.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepagePageOverlaycpp">branches/safari-600.5-branch/Source/WebCore/page/PageOverlay.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepagePageOverlayh">branches/safari-600.5-branch/Source/WebCore/page/PageOverlay.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepageSettingscpp">branches/safari-600.5-branch/Source/WebCore/page/Settings.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepageSettingsh">branches/safari-600.5-branch/Source/WebCore/page/Settings.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepageanimationAnimationControllercpp">branches/safari-600.5-branch/Source/WebCore/page/animation/AnimationController.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepageanimationAnimationControllerPrivateh">branches/safari-600.5-branch/Source/WebCore/page/animation/AnimationControllerPrivate.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepagemacServicesOverlayControllerh">branches/safari-600.5-branch/Source/WebCore/page/mac/ServicesOverlayController.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepagemacServicesOverlayControllermm">branches/safari-600.5-branch/Source/WebCore/page/mac/ServicesOverlayController.mm</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepagescrollingAsyncScrollingCoordinatorcpp">branches/safari-600.5-branch/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepagescrollingAsyncScrollingCoordinatorh">branches/safari-600.5-branch/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepagescrollingiosScrollingCoordinatorIOSh">branches/safari-600.5-branch/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepagescrollingiosScrollingCoordinatorIOSmm">branches/safari-600.5-branch/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.mm</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepagescrollingmacScrollingCoordinatorMach">branches/safari-600.5-branch/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepagescrollingmacScrollingCoordinatorMacmm">branches/safari-600.5-branch/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformHysteresisActivityh">branches/safari-600.5-branch/Source/WebCore/platform/HysteresisActivity.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformScrollAnimatorNonecpp">branches/safari-600.5-branch/Source/WebCore/platform/ScrollAnimatorNone.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformScrollAnimatorNoneh">branches/safari-600.5-branch/Source/WebCore/platform/ScrollAnimatorNone.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformScrollbarcpp">branches/safari-600.5-branch/Source/WebCore/platform/Scrollbar.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformScrollbarh">branches/safari-600.5-branch/Source/WebCore/platform/Scrollbar.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformTimerh">branches/safari-600.5-branch/Source/WebCore/platform/Timer.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformeflBatteryProviderEflcpp">branches/safari-600.5-branch/Source/WebCore/platform/efl/BatteryProviderEfl.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformeflBatteryProviderEflh">branches/safari-600.5-branch/Source/WebCore/platform/efl/BatteryProviderEfl.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicsBitmapImagecpp">branches/safari-600.5-branch/Source/WebCore/platform/graphics/BitmapImage.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicsBitmapImageh">branches/safari-600.5-branch/Source/WebCore/platform/graphics/BitmapImage.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicsMediaPlayercpp">branches/safari-600.5-branch/Source/WebCore/platform/graphics/MediaPlayer.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicsMediaPlayerh">branches/safari-600.5-branch/Source/WebCore/platform/graphics/MediaPlayer.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicsShadowBlurcpp">branches/safari-600.5-branch/Source/WebCore/platform/graphics/ShadowBlur.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicsTiledBackingStorecpp">branches/safari-600.5-branch/Source/WebCore/platform/graphics/TiledBackingStore.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicsTiledBackingStoreh">branches/safari-600.5-branch/Source/WebCore/platform/graphics/TiledBackingStore.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicsavfoundationMediaSelectionGroupAVFObjCh">branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicsavfoundationMediaSelectionGroupAVFObjCmm">branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCh">branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm">branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicscaLayerPoolcpp">branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/LayerPool.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicscaLayerPoolh">branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/LayerPool.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicscaTileControllercpp">branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/TileController.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicscaTileControllerh">branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/TileController.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicscaTileGridcpp">branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/TileGrid.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicscaTileGridh">branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/TileGrid.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicscawinLegacyCACFLayerTreeHostcpp">branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/win/LegacyCACFLayerTreeHost.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicscawinLegacyCACFLayerTreeHosth">branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/win/LegacyCACFLayerTreeHost.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicscgIOSurfacePoolcpp">branches/safari-600.5-branch/Source/WebCore/platform/graphics/cg/IOSurfacePool.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicscgIOSurfacePoolh">branches/safari-600.5-branch/Source/WebCore/platform/graphics/cg/IOSurfacePool.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp">branches/safari-600.5-branch/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerh">branches/safari-600.5-branch/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKith">branches/safari-600.5-branch/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm">branches/safari-600.5-branch/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicstexmapTextureMappercpp">branches/safari-600.5-branch/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicstexmapcoordinatedCompositingCoordinatorcpp">branches/safari-600.5-branch/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicstexmapcoordinatedCompositingCoordinatorh">branches/safari-600.5-branch/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayercpp">branches/safari-600.5-branch/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayerh">branches/safari-600.5-branch/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedImageBackingcpp">branches/safari-600.5-branch/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedImageBackingh">branches/safari-600.5-branch/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformiosLegacyTileCacheh">branches/safari-600.5-branch/Source/WebCore/platform/ios/LegacyTileCache.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformiosLegacyTileCachemm">branches/safari-600.5-branch/Source/WebCore/platform/ios/LegacyTileCache.mm</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformmacHIDGamepadProvidercpp">branches/safari-600.5-branch/Source/WebCore/platform/mac/HIDGamepadProvider.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformmacHIDGamepadProviderh">branches/safari-600.5-branch/Source/WebCore/platform/mac/HIDGamepadProvider.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformmacScrollAnimatorMach">branches/safari-600.5-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformmacScrollAnimatorMacmm">branches/safari-600.5-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.mm</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformmockDeviceMotionClientMockcpp">branches/safari-600.5-branch/Source/WebCore/platform/mock/DeviceMotionClientMock.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformmockDeviceMotionClientMockh">branches/safari-600.5-branch/Source/WebCore/platform/mock/DeviceMotionClientMock.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformmockDeviceOrientationClientMockcpp">branches/safari-600.5-branch/Source/WebCore/platform/mock/DeviceOrientationClientMock.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformmockDeviceOrientationClientMockh">branches/safari-600.5-branch/Source/WebCore/platform/mock/DeviceOrientationClientMock.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformmockGeolocationClientMockcpp">branches/safari-600.5-branch/Source/WebCore/platform/mock/GeolocationClientMock.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformmockGeolocationClientMockh">branches/safari-600.5-branch/Source/WebCore/platform/mock/GeolocationClientMock.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformmockPlatformSpeechSynthesizerMockcpp">branches/safari-600.5-branch/Source/WebCore/platform/mock/PlatformSpeechSynthesizerMock.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformmockPlatformSpeechSynthesizerMockh">branches/safari-600.5-branch/Source/WebCore/platform/mock/PlatformSpeechSynthesizerMock.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformmockTimerEventBasedMockh">branches/safari-600.5-branch/Source/WebCore/platform/mock/TimerEventBasedMock.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformnetworkDNSResolveQueuecpp">branches/safari-600.5-branch/Source/WebCore/platform/network/DNSResolveQueue.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformnetworkDNSResolveQueueh">branches/safari-600.5-branch/Source/WebCore/platform/network/DNSResolveQueue.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformnetworkNetworkStateNotifierh">branches/safari-600.5-branch/Source/WebCore/platform/network/NetworkStateNotifier.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformnetworkResourceHandlecpp">branches/safari-600.5-branch/Source/WebCore/platform/network/ResourceHandle.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformnetworkResourceHandleh">branches/safari-600.5-branch/Source/WebCore/platform/network/ResourceHandle.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformnetworkResourceHandleInternalh">branches/safari-600.5-branch/Source/WebCore/platform/network/ResourceHandleInternal.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformnetworkcurlResourceHandleManagercpp">branches/safari-600.5-branch/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformnetworkcurlResourceHandleManagerh">branches/safari-600.5-branch/Source/WebCore/platform/network/curl/ResourceHandleManager.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformnetworkmacNetworkStateNotifierMaccpp">branches/safari-600.5-branch/Source/WebCore/platform/network/mac/NetworkStateNotifierMac.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformnetworkwinResourceHandleWincpp">branches/safari-600.5-branch/Source/WebCore/platform/network/win/ResourceHandleWin.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepluginsPluginPackagecpp">branches/safari-600.5-branch/Source/WebCore/plugins/PluginPackage.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepluginsPluginPackageh">branches/safari-600.5-branch/Source/WebCore/plugins/PluginPackage.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepluginsPluginStreamcpp">branches/safari-600.5-branch/Source/WebCore/plugins/PluginStream.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepluginsPluginStreamh">branches/safari-600.5-branch/Source/WebCore/plugins/PluginStream.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepluginsPluginViewcpp">branches/safari-600.5-branch/Source/WebCore/plugins/PluginView.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepluginsPluginViewh">branches/safari-600.5-branch/Source/WebCore/plugins/PluginView.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepluginswinPluginMessageThrottlerWincpp">branches/safari-600.5-branch/Source/WebCore/plugins/win/PluginMessageThrottlerWin.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorepluginswinPluginMessageThrottlerWinh">branches/safari-600.5-branch/Source/WebCore/plugins/win/PluginMessageThrottlerWin.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorerenderingImageQualityControllercpp">branches/safari-600.5-branch/Source/WebCore/rendering/ImageQualityController.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorerenderingImageQualityControllerh">branches/safari-600.5-branch/Source/WebCore/rendering/ImageQualityController.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorerenderingRenderButtoncpp">branches/safari-600.5-branch/Source/WebCore/rendering/RenderButton.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorerenderingRenderButtonh">branches/safari-600.5-branch/Source/WebCore/rendering/RenderButton.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorerenderingRenderLayerCompositorcpp">branches/safari-600.5-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorerenderingRenderLayerCompositorh">branches/safari-600.5-branch/Source/WebCore/rendering/RenderLayerCompositor.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorerenderingRenderMarqueecpp">branches/safari-600.5-branch/Source/WebCore/rendering/RenderMarquee.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorerenderingRenderMarqueeh">branches/safari-600.5-branch/Source/WebCore/rendering/RenderMarquee.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorerenderingRenderNamedFlowThreadcpp">branches/safari-600.5-branch/Source/WebCore/rendering/RenderNamedFlowThread.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorerenderingRenderNamedFlowThreadh">branches/safari-600.5-branch/Source/WebCore/rendering/RenderNamedFlowThread.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorerenderingRenderProgresscpp">branches/safari-600.5-branch/Source/WebCore/rendering/RenderProgress.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorerenderingRenderProgressh">branches/safari-600.5-branch/Source/WebCore/rendering/RenderProgress.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorerenderingRenderViewcpp">branches/safari-600.5-branch/Source/WebCore/rendering/RenderView.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorerenderingRenderViewh">branches/safari-600.5-branch/Source/WebCore/rendering/RenderView.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorereplayEventLoopInputDispatchercpp">branches/safari-600.5-branch/Source/WebCore/replay/EventLoopInputDispatcher.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorereplayEventLoopInputDispatcherh">branches/safari-600.5-branch/Source/WebCore/replay/EventLoopInputDispatcher.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorestorageStorageAreaImplcpp">branches/safari-600.5-branch/Source/WebCore/storage/StorageAreaImpl.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorestorageStorageAreaImplh">branches/safari-600.5-branch/Source/WebCore/storage/StorageAreaImpl.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorestorageStorageAreaSynccpp">branches/safari-600.5-branch/Source/WebCore/storage/StorageAreaSync.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorestorageStorageAreaSynch">branches/safari-600.5-branch/Source/WebCore/storage/StorageAreaSync.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoresvgSVGElementcpp">branches/safari-600.5-branch/Source/WebCore/svg/SVGElement.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoresvgSVGElementh">branches/safari-600.5-branch/Source/WebCore/svg/SVGElement.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoresvgSVGScriptElementh">branches/safari-600.5-branch/Source/WebCore/svg/SVGScriptElement.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoresvgSVGStyleElementh">branches/safari-600.5-branch/Source/WebCore/svg/SVGStyleElement.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoresvgSVGUseElementh">branches/safari-600.5-branch/Source/WebCore/svg/SVGUseElement.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoresvganimationSMILTimeContainercpp">branches/safari-600.5-branch/Source/WebCore/svg/animation/SMILTimeContainer.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoresvganimationSMILTimeContainerh">branches/safari-600.5-branch/Source/WebCore/svg/animation/SMILTimeContainer.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCorexmlXMLHttpRequestProgressEventThrottlecpp">branches/safari-600.5-branch/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCorexmlXMLHttpRequestProgressEventThrottleh">branches/safari-600.5-branch/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.h</a></li>
<li><a href="#branchessafari6005branchSourceWebKitmacChangeLog">branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari6005branchSourceWebKitmacPluginsHostedNetscapePluginInstanceProxyh">branches/safari-600.5-branch/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h</a></li>
<li><a href="#branchessafari6005branchSourceWebKitmacPluginsHostedNetscapePluginInstanceProxymm">branches/safari-600.5-branch/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm</a></li>
<li><a href="#branchessafari6005branchSourceWebKitmacPluginsWebNetscapePluginStreamh">branches/safari-600.5-branch/Source/WebKit/mac/Plugins/WebNetscapePluginStream.h</a></li>
<li><a href="#branchessafari6005branchSourceWebKitmacPluginsWebNetscapePluginStreammm">branches/safari-600.5-branch/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm</a></li>
<li><a href="#branchessafari6005branchSourceWebKitwinChangeLog">branches/safari-600.5-branch/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#branchessafari6005branchSourceWebKitwinFullscreenVideoControllercpp">branches/safari-600.5-branch/Source/WebKit/win/FullscreenVideoController.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebKitwinFullscreenVideoControllerh">branches/safari-600.5-branch/Source/WebKit/win/FullscreenVideoController.h</a></li>
<li><a href="#branchessafari6005branchSourceWebKit2ChangeLog">branches/safari-600.5-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6005branchSourceWebKit2NetworkProcessNetworkResourceLoadSchedulercpp">branches/safari-600.5-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebKit2NetworkProcessNetworkResourceLoadSchedulerh">branches/safari-600.5-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.h</a></li>
<li><a href="#branchessafari6005branchSourceWebKit2SharedWebMemorySamplercpp">branches/safari-600.5-branch/Source/WebKit2/Shared/WebMemorySampler.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebKit2SharedWebMemorySamplerh">branches/safari-600.5-branch/Source/WebKit2/Shared/WebMemorySampler.h</a></li>
<li><a href="#branchessafari6005branchSourceWebKit2SharedmacRemoteLayerBackingStoreCollectionh">branches/safari-600.5-branch/Source/WebKit2/Shared/mac/RemoteLayerBackingStoreCollection.h</a></li>
<li><a href="#branchessafari6005branchSourceWebKit2SharedmacRemoteLayerBackingStoreCollectionmm">branches/safari-600.5-branch/Source/WebKit2/Shared/mac/RemoteLayerBackingStoreCollection.mm</a></li>
<li><a href="#branchessafari6005branchSourceWebKit2UIProcessAPIeflEwkViewcpp">branches/safari-600.5-branch/Source/WebKit2/UIProcess/API/efl/EwkView.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebKit2UIProcessAPIeflEwkViewh">branches/safari-600.5-branch/Source/WebKit2/UIProcess/API/efl/EwkView.h</a></li>
<li><a href="#branchessafari6005branchSourceWebKit2UIProcesseflTextCheckerClientEflcpp">branches/safari-600.5-branch/Source/WebKit2/UIProcess/efl/TextCheckerClientEfl.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebKit2UIProcesseflTextCheckerClientEflh">branches/safari-600.5-branch/Source/WebKit2/UIProcess/efl/TextCheckerClientEfl.h</a></li>
<li><a href="#branchessafari6005branchSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHostcpp">branches/safari-600.5-branch/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHosth">branches/safari-600.5-branch/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h</a></li>
<li><a href="#branchessafari6005branchSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreah">branches/safari-600.5-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h</a></li>
<li><a href="#branchessafari6005branchSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm">branches/safari-600.5-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm</a></li>
<li><a href="#branchessafari6005branchSourceWebKit2WebProcessWebProcesscpp">branches/safari-600.5-branch/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebKit2WebProcessWebProcessh">branches/safari-600.5-branch/Source/WebKit2/WebProcess/WebProcess.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6005branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -1,5 +1,457 @@
</span><span class="cx"> 2015-01-15 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r175719. rdar://problem/19424169
+
+ 2014-11-05 Jer Noble <jer.noble@apple.com>
+
+ 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:
+
+2015-01-15 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r177225. rdar://problem/19424175
</span><span class="cx">
</span><span class="cx"> 2014-12-12 Jer Noble <jer.noble@apple.com>
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreModulesencryptedmediaMediaKeySessioncpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<MediaKeySession>&)
</del><ins>+void MediaKeySession::keyRequestTimerFired(Timer&)
</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<MediaKeySession>&)
</del><ins>+void MediaKeySession::addKeyTimerFired(Timer&)
</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="branchessafari6005branchSourceWebCoreModulesencryptedmediaMediaKeySessionh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h 2015-01-15 11:40:42 UTC (rev 178505)
</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& keySystem);
</span><del>- void keyRequestTimerFired(Timer<MediaKeySession>&);
- void addKeyTimerFired(Timer<MediaKeySession>&);
</del><ins>+ void keyRequestTimerFired(Timer&);
+ void addKeyTimerFired(Timer&);
</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<Uint8Array> initData;
</span><span class="cx"> };
</span><span class="cx"> Deque<PendingKeyRequest> m_pendingKeyRequests;
</span><del>- Timer<MediaKeySession> m_keyRequestTimer;
</del><ins>+ Timer m_keyRequestTimer;
</ins><span class="cx">
</span><span class="cx"> Deque<RefPtr<Uint8Array>> m_pendingKeys;
</span><del>- Timer<MediaKeySession> 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="branchessafari6005branchSourceWebCoreModulesgeolocationGeolocationcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/Modules/geolocation/Geolocation.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/Modules/geolocation/Geolocation.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/Modules/geolocation/Geolocation.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<GeoNotifier>&)
</del><ins>+void Geolocation::GeoNotifier::timerFired(Timer&)
</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<Geolocation>&)
</del><ins>+void Geolocation::resumeTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> m_isSuspended = false;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreModulesgeolocationGeolocationh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/Modules/geolocation/Geolocation.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/Modules/geolocation/Geolocation.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/Modules/geolocation/Geolocation.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<GeoNotifier>&);
</del><ins>+ void timerFired(Timer&);
</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<PositionCallback> m_successCallback;
</span><span class="cx"> RefPtr<PositionErrorCallback> m_errorCallback;
</span><span class="cx"> RefPtr<PositionOptions> m_options;
</span><del>- Timer<GeoNotifier> m_timer;
</del><ins>+ Timer m_timer;
</ins><span class="cx"> RefPtr<PositionError> 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<PositionError> m_errorWaitingForResume;
</span><span class="cx">
</span><del>- void resumeTimerFired(Timer<Geolocation>&);
- Timer<Geolocation> m_resumeTimer;
</del><ins>+ void resumeTimerFired(Timer&);
+ 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="branchessafari6005branchSourceWebCoreModulesindexeddbIDBTransactionBackendcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/Modules/indexeddb/IDBTransactionBackend.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/Modules/indexeddb/IDBTransactionBackend.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/Modules/indexeddb/IDBTransactionBackend.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<IDBTransactionBackend>&)
</del><ins>+void IDBTransactionBackend::taskTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> LOG(StorageAPI, "IDBTransactionBackend::taskTimerFired");
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreModulesindexeddbIDBTransactionBackendh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/Modules/indexeddb/IDBTransactionBackend.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/Modules/indexeddb/IDBTransactionBackend.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/Modules/indexeddb/IDBTransactionBackend.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<IDBTransactionBackend>&);
</del><ins>+ void taskTimerFired(Timer&);
</ins><span class="cx"> void closeOpenCursors();
</span><span class="cx">
</span><span class="cx"> const HashSet<int64_t> m_objectStoreIds;
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> Deque<RefPtr<IDBSynchronousOperation>> m_abortTaskQueue;
</span><span class="cx">
</span><span class="cx"> // FIXME: delete the timer once we have threads instead.
</span><del>- Timer<IDBTransactionBackend> m_taskTimer;
</del><ins>+ Timer m_taskTimer;
</ins><span class="cx"> int m_pendingPreemptiveEvents;
</span><span class="cx">
</span><span class="cx"> HashSet<IDBCursorBackend*> m_openCursors;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreModulesmediasourceSourceBuffercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/Modules/mediasource/SourceBuffer.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -467,7 +467,7 @@
</span><span class="cx"> reportExtraMemoryCost();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SourceBuffer::appendBufferTimerFired(Timer<SourceBuffer>&)
</del><ins>+void SourceBuffer::appendBufferTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> if (isRemoved())
</span><span class="cx"> return;
</span><span class="lines">@@ -692,7 +692,7 @@
</span><span class="cx"> LOG(Media, "SourceBuffer::removeCodedFrames(%p) - buffered = %s", this, toString(m_buffered->ranges()).utf8().data());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SourceBuffer::removeTimerFired(Timer<SourceBuffer>*)
</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="branchessafari6005branchSourceWebCoreModulesmediasourceSourceBufferh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/Modules/mediasource/SourceBuffer.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/Modules/mediasource/SourceBuffer.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/Modules/mediasource/SourceBuffer.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> void scheduleEvent(const AtomicString& eventName);
</span><span class="cx">
</span><span class="cx"> void appendBufferInternal(unsigned char*, unsigned, ExceptionCode&);
</span><del>- void appendBufferTimerFired(Timer<SourceBuffer>&);
</del><ins>+ void appendBufferTimerFired(Timer&);
</ins><span class="cx">
</span><span class="cx"> void setActive(bool);
</span><span class="cx">
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx">
</span><span class="cx"> void monitorBufferingRate();
</span><span class="cx">
</span><del>- void removeTimerFired(Timer<SourceBuffer>*);
</del><ins>+ void removeTimerFired(Timer*);
</ins><span class="cx"> void removeCodedFrames(const MediaTime& start, const MediaTime& end);
</span><span class="cx">
</span><span class="cx"> size_t extraMemoryCost() const;
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> AtomicString m_mode;
</span><span class="cx">
</span><span class="cx"> Vector<unsigned char> m_pendingAppendData;
</span><del>- Timer<SourceBuffer> m_appendBufferTimer;
</del><ins>+ Timer m_appendBufferTimer;
</ins><span class="cx">
</span><span class="cx"> RefPtr<VideoTrackList> m_videoTracks;
</span><span class="cx"> RefPtr<AudioTrackList> m_audioTracks;
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx">
</span><span class="cx"> MediaTime m_pendingRemoveStart;
</span><span class="cx"> MediaTime m_pendingRemoveEnd;
</span><del>- Timer<SourceBuffer> 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="branchessafari6005branchSourceWebCoreModulesmediastreamMediaStreamcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/Modules/mediastream/MediaStream.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/Modules/mediastream/MediaStream.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/Modules/mediastream/MediaStream.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<MediaStream>*)
</del><ins>+void MediaStream::scheduledEventTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx"> Vector<RefPtr<Event>> events;
</span><span class="cx"> events.swap(m_scheduledEvents);
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreModulesmediastreamMediaStreamh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/Modules/mediastream/MediaStream.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/Modules/mediastream/MediaStream.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/Modules/mediastream/MediaStream.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> bool haveTrackWithSource(PassRefPtr<MediaStreamSource>);
</span><span class="cx">
</span><span class="cx"> void scheduleDispatchEvent(PassRefPtr<Event>);
</span><del>- void scheduledEventTimerFired(Timer<MediaStream>*);
</del><ins>+ void scheduledEventTimerFired(Timer*);
</ins><span class="cx">
</span><span class="cx"> void cloneMediaStreamTrackVector(Vector<RefPtr<MediaStreamTrack>>&, const Vector<RefPtr<MediaStreamTrack>>&);
</span><span class="cx">
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> Vector<RefPtr<MediaStreamTrack>> m_audioTracks;
</span><span class="cx"> Vector<RefPtr<MediaStreamTrack>> m_videoTracks;
</span><span class="cx">
</span><del>- Timer<MediaStream> m_scheduledEventTimer;
</del><ins>+ Timer m_scheduledEventTimer;
</ins><span class="cx"> Vector<RefPtr<Event>> m_scheduledEvents;
</span><span class="cx">
</span><span class="cx"> Vector<Observer*> m_observers;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreModulesmediastreamRTCDTMFSendercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<RTCDTMFSender>*)
</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="branchessafari6005branchSourceWebCoreModulesmediastreamRTCDTMFSenderh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/Modules/mediastream/RTCDTMFSender.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/Modules/mediastream/RTCDTMFSender.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/Modules/mediastream/RTCDTMFSender.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> RTCDTMFSender(ScriptExecutionContext*, PassRefPtr<MediaStreamTrack>, std::unique_ptr<RTCDTMFSenderHandler>);
</span><span class="cx">
</span><span class="cx"> void scheduleDispatchEvent(PassRefPtr<Event>);
</span><del>- void scheduledEventTimerFired(Timer<RTCDTMFSender>*);
</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<RTCDTMFSender> m_scheduledEventTimer;
</del><ins>+ Timer m_scheduledEventTimer;
</ins><span class="cx"> Vector<RefPtr<Event>> m_scheduledEvents;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreModulesmediastreamRTCDataChannelcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<RTCDataChannel>*)
</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="branchessafari6005branchSourceWebCoreModulesmediastreamRTCDataChannelh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/Modules/mediastream/RTCDataChannel.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/Modules/mediastream/RTCDataChannel.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/Modules/mediastream/RTCDataChannel.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> RTCDataChannel(ScriptExecutionContext*, std::unique_ptr<RTCDataChannelHandler>);
</span><span class="cx">
</span><span class="cx"> void scheduleDispatchEvent(PassRefPtr<Event>);
</span><del>- void scheduledEventTimerFired(Timer<RTCDataChannel>*);
</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<RTCDataChannel> m_scheduledEventTimer;
</del><ins>+ Timer m_scheduledEventTimer;
</ins><span class="cx"> Vector<RefPtr<Event>> m_scheduledEvents;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreModulesmediastreamRTCPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<RTCPeerConnection>*)
</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="branchessafari6005branchSourceWebCoreModulesmediastreamRTCPeerConnectionh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/Modules/mediastream/RTCPeerConnection.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx">
</span><span class="cx"> static PassRefPtr<RTCConfiguration> parseConfiguration(const Dictionary& configuration, ExceptionCode&);
</span><span class="cx"> void scheduleDispatchEvent(PassRefPtr<Event>);
</span><del>- void scheduledEventTimerFired(Timer<RTCPeerConnection>*);
</del><ins>+ void scheduledEventTimerFired(Timer*);
</ins><span class="cx"> bool hasLocalStreamWithTrackId(const String& 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<RTCPeerConnectionHandler> m_peerHandler;
</span><span class="cx">
</span><del>- Timer<RTCPeerConnection> m_scheduledEventTimer;
</del><ins>+ Timer m_scheduledEventTimer;
</ins><span class="cx"> Vector<RefPtr<Event>> m_scheduledEvents;
</span><span class="cx">
</span><span class="cx"> RefPtr<RTCConfiguration> m_configuration;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreModulesnotificationsNotificationcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/Modules/notifications/Notification.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/Modules/notifications/Notification.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/Modules/notifications/Notification.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> : ActiveDOMObject(&context)
</span><span class="cx"> , m_title(title)
</span><span class="cx"> , m_state(Idle)
</span><del>- , m_taskTimer(std::make_unique<Timer<Notification>>(this, &Notification::taskTimerFired))
</del><ins>+ , m_taskTimer(std::make_unique<Timer>(this, &Notification::taskTimerFired))
</ins><span class="cx"> {
</span><span class="cx"> m_notificationCenter = DOMWindowNotifications::webkitNotifications(toDocument(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<Notification>& timer)
</del><ins>+void Notification::taskTimerFired(Timer& timer)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(scriptExecutionContext()->isDocument());
</span><span class="cx"> ASSERT_UNUSED(timer, &timer == m_taskTimer.get());
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreModulesnotificationsNotificationh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/Modules/notifications/Notification.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/Modules/notifications/Notification.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/Modules/notifications/Notification.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> void finishLoadingIcon();
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NOTIFICATIONS)
</span><del>- void taskTimerFired(Timer<Notification>&);
</del><ins>+ void taskTimerFired(Timer&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Text notifications.
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> RefPtr<NotificationCenter> m_notificationCenter;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NOTIFICATIONS)
</span><del>- std::unique_ptr<Timer<Notification>> m_taskTimer;
</del><ins>+ std::unique_ptr<Timer> m_taskTimer;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreModulesnotificationsNotificationCentercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/Modules/notifications/NotificationCenter.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/Modules/notifications/NotificationCenter.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/Modules/notifications/NotificationCenter.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<NotificationCenter::NotificationRequestCallback>&)
</del><ins>+void NotificationCenter::NotificationRequestCallback::timerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> if (m_callback)
</span><span class="cx"> m_callback->handleEvent();
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreModulesnotificationsNotificationCenterh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/Modules/notifications/NotificationCenter.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/Modules/notifications/NotificationCenter.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/Modules/notifications/NotificationCenter.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -80,12 +80,12 @@
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<NotificationRequestCallback> createAndStartTimer(NotificationCenter*, PassRefPtr<VoidCallback>);
</span><span class="cx"> void startTimer();
</span><del>- void timerFired(Timer<NotificationRequestCallback>&);
</del><ins>+ void timerFired(Timer&);
</ins><span class="cx"> private:
</span><span class="cx"> NotificationRequestCallback(NotificationCenter*, PassRefPtr<VoidCallback>);
</span><span class="cx">
</span><span class="cx"> RefPtr<NotificationCenter> m_notificationCenter;
</span><del>- Timer<NotificationRequestCallback> m_timer;
</del><ins>+ Timer m_timer;
</ins><span class="cx"> RefPtr<VoidCallback> m_callback;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreModulesvibrationVibrationcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/Modules/vibration/Vibration.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/Modules/vibration/Vibration.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/Modules/vibration/Vibration.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<Vibration>* timer)
</del><ins>+void Vibration::timerFired(Timer* timer)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(timer, timer == &m_timer);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreModulesvibrationVibrationh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/Modules/vibration/Vibration.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/Modules/vibration/Vibration.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/Modules/vibration/Vibration.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<Vibration>*);
</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<Vibration*>(Supplement<Page>::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<Vibration> 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="branchessafari6005branchSourceWebCoreModuleswebsocketsWebSocketChannelcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/Modules/websockets/WebSocketChannel.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<WebSocketChannel>* timer)
</del><ins>+void WebSocketChannel::resumeTimerFired(Timer* timer)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(timer, timer == &m_resumeTimer);
</span><span class="cx">
</span><span class="lines">@@ -491,7 +491,7 @@
</span><span class="cx"> m_client->didStartClosingHandshake();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebSocketChannel::closingTimerFired(Timer<WebSocketChannel>* timer)
</del><ins>+void WebSocketChannel::closingTimerFired(Timer* timer)
</ins><span class="cx"> {
</span><span class="cx"> LOG(Network, "WebSocketChannel %p closingTimerFired()", this);
</span><span class="cx"> ASSERT_UNUSED(timer, &m_closingTimer == timer);
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreModuleswebsocketsWebSocketChannelh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/Modules/websockets/WebSocketChannel.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/Modules/websockets/WebSocketChannel.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/Modules/websockets/WebSocketChannel.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<WebSocketChannel>*);
</del><ins>+ void resumeTimerFired(Timer*);
</ins><span class="cx"> void startClosingHandshake(int code, const String& reason);
</span><del>- void closingTimerFired(Timer<WebSocketChannel>*);
</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<SocketStreamHandle> m_handle;
</span><span class="cx"> Vector<char> m_buffer;
</span><span class="cx">
</span><del>- Timer<WebSocketChannel> 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<WebSocketChannel> 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="branchessafari6005branchSourceWebCoreaccessibilityAXObjectCachecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/accessibility/AXObjectCache.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/accessibility/AXObjectCache.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/accessibility/AXObjectCache.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -697,7 +697,7 @@
</span><span class="cx"> obj->childrenChanged();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AXObjectCache::notificationPostTimerFired(Timer<AXObjectCache>&)
</del><ins>+void AXObjectCache::notificationPostTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> Ref<Document> protectorForCacheOwner(m_document);
</span><span class="cx"> m_notificationPostTimer.stop();
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreaccessibilityAXObjectCacheh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/accessibility/AXObjectCache.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/accessibility/AXObjectCache.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/accessibility/AXObjectCache.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -241,9 +241,9 @@
</span><span class="cx">
</span><span class="cx"> HashSet<AXID> m_idsInUse;
</span><span class="cx">
</span><del>- Timer<AXObjectCache> m_notificationPostTimer;
</del><ins>+ Timer m_notificationPostTimer;
</ins><span class="cx"> Vector<std::pair<RefPtr<AccessibilityObject>, AXNotification>> m_notificationsToPost;
</span><del>- void notificationPostTimerFired(Timer<AXObjectCache>&);
</del><ins>+ void notificationPostTimerFired(Timer&);
</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">@@ -270,7 +270,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& document) : m_document(document), m_notificationPostTimer(this, (Timer<AXObjectCache>::TimerFiredFunction) nullptr) { }
</del><ins>+inline AXObjectCache::AXObjectCache(Document& 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 0; }
</span><span class="cx"> inline AccessibilityObject* AXObjectCache::get(RenderObject*) { return 0; }
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorebindingsjsGCControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/bindings/js/GCController.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/bindings/js/GCController.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/bindings/js/GCController.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<GCController>*)
</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="branchessafari6005branchSourceWebCorebindingsjsGCControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/bindings/js/GCController.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/bindings/js/GCController.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/bindings/js/GCController.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<GCController>*);
- Timer<GCController> 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="branchessafari6005branchSourceWebCorecssCSSFontFaceSourceh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/css/CSSFontFaceSource.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/css/CSSFontFaceSource.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/css/CSSFontFaceSource.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<CSSFontFaceSource>*);
</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<CachedFont> m_font; // For remote fonts, a pointer to our cached resource.
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorecssCSSFontSelectorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/css/CSSFontSelector.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/css/CSSFontSelector.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/css/CSSFontSelector.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<WebCore::CSSFontSelector>&)
</del><ins>+void CSSFontSelector::beginLoadTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> Vector<CachedResourceHandle<CachedFont>> fontsToBeginLoading;
</span><span class="cx"> fontsToBeginLoading.swap(m_fontsToBeginLoading);
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorecssCSSFontSelectorh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/css/CSSFontSelector.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/css/CSSFontSelector.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/css/CSSFontSelector.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<CSSFontSelector>&);
</del><ins>+ void beginLoadTimerFired(Timer&);
</ins><span class="cx">
</span><span class="cx"> Document* m_document;
</span><span class="cx"> HashMap<String, std::unique_ptr<Vector<RefPtr<CSSFontFace>>>, CaseFoldingHash> m_fontFaces;
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> HashSet<FontSelectorClient*> m_clients;
</span><span class="cx">
</span><span class="cx"> Vector<CachedResourceHandle<CachedFont>> m_fontsToBeginLoading;
</span><del>- Timer<CSSFontSelector> 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="branchessafari6005branchSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/css/StyleResolver.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/css/StyleResolver.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/css/StyleResolver.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -348,7 +348,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StyleResolver::sweepMatchedPropertiesCache(Timer<StyleResolver>*)
</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="branchessafari6005branchSourceWebCorecssStyleResolverh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/css/StyleResolver.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/css/StyleResolver.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/css/StyleResolver.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -501,7 +501,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<StyleResolver>*);
</del><ins>+ void sweepMatchedPropertiesCache(Timer*);
</ins><span class="cx">
</span><span class="cx"> bool classNamesAffectedByRules(const SpaceSplitString&) const;
</span><span class="cx"> bool sharingCandidateHasIdenticalStyleAffectingAttributes(StyledElement*) const;
</span><span class="lines">@@ -512,7 +512,7 @@
</span><span class="cx"> typedef HashMap<unsigned, MatchedPropertiesCacheItem> MatchedPropertiesCache;
</span><span class="cx"> MatchedPropertiesCache m_matchedPropertiesCache;
</span><span class="cx">
</span><del>- Timer<StyleResolver> m_matchedPropertiesCacheSweepTimer;
</del><ins>+ Timer m_matchedPropertiesCacheSweepTimer;
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<MediaQueryEvaluator> m_medium;
</span><span class="cx"> RefPtr<RenderStyle> m_rootDefaultStyle;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/dom/Document.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/dom/Document.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/dom/Document.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -1263,7 +1263,7 @@
</span><span class="cx"> frame->loader().forcePageTransitionIfNeeded();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::visualUpdatesSuppressionTimerFired(Timer<Document>&)
</del><ins>+void Document::visualUpdatesSuppressionTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_visualUpdatesAllowed);
</span><span class="cx">
</span><span class="lines">@@ -1700,7 +1700,7 @@
</span><span class="cx"> return m_styleRecalcTimer.isActive() && m_pendingStyleRecalcShouldForce;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::styleRecalcTimerFired(Timer<Document>&)
</del><ins>+void Document::styleRecalcTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> updateStyleIfNeeded();
</span><span class="cx"> }
</span><span class="lines">@@ -3202,7 +3202,7 @@
</span><span class="cx"> m_mediaQueryMatcher->styleResolverChanged();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::optimizedStyleSheetUpdateTimerFired(Timer<Document>&)
</del><ins>+void Document::optimizedStyleSheetUpdateTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> styleResolverChanged(RecalcStyleIfNeeded);
</span><span class="cx"> }
</span><span class="lines">@@ -4550,7 +4550,7 @@
</span><span class="cx"> m_cachedResourceLoader->clearPreloads();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::sharedObjectPoolClearTimerFired(Timer<Document>&)
</del><ins>+void Document::sharedObjectPoolClearTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> m_sharedObjectPool = nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -4789,7 +4789,7 @@
</span><span class="cx"> m_updateFocusAppearanceTimer.stop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::updateFocusAppearanceTimerFired(Timer<Document>&)
</del><ins>+void Document::updateFocusAppearanceTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> Element* element = focusedElement();
</span><span class="cx"> if (!element)
</span><span class="lines">@@ -4944,7 +4944,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::pendingTasksTimerFired(Timer<Document>&)
</del><ins>+void Document::pendingTasksTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> Vector<Task> pendingTasks = WTF::move(m_pendingTasks);
</span><span class="cx"> for (auto& task : pendingTasks)
</span><span class="lines">@@ -5479,7 +5479,7 @@
</span><span class="cx"> m_fullScreenRenderer = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::fullScreenChangeDelayTimerFired(Timer<Document>&)
</del><ins>+void Document::fullScreenChangeDelayTimerFired(Timer&)
</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">@@ -5617,7 +5617,7 @@
</span><span class="cx"> m_loadEventDelayTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::loadEventDelayTimerFired(Timer<Document>&)
</del><ins>+void Document::loadEventDelayTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> if (frame())
</span><span class="cx"> frame()->loader().checkCompleted();
</span><span class="lines">@@ -6136,7 +6136,7 @@
</span><span class="cx"> m_didAssociateFormControlsTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::didAssociateFormControlsTimerFired(Timer<Document>& timer)
</del><ins>+void Document::didAssociateFormControlsTimerFired(Timer& timer)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(timer, &timer == &m_didAssociateFormControlsTimer);
</span><span class="cx">
</span><span class="lines">@@ -6164,7 +6164,7 @@
</span><span class="cx"> m_cachedDOMCookies = String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::domCookieCacheExpiryTimerFired(Timer<Document>&)
</del><ins>+void Document::domCookieCacheExpiryTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> invalidateDOMCookieCache();
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/dom/Document.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/dom/Document.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/dom/Document.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -764,8 +764,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<Document>&);
- void optimizedStyleSheetUpdateTimerFired(Timer<Document>&);
</del><ins>+ void styleRecalcTimerFired(Timer&);
+ void optimizedStyleSheetUpdateTimerFired(Timer&);
</ins><span class="cx">
</span><span class="cx"> void registerNodeListForInvalidation(LiveNodeList&);
</span><span class="cx"> void unregisterNodeListForInvalidation(LiveNodeList&);
</span><span class="lines">@@ -1136,7 +1136,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<Document>&);
</del><ins>+ void fullScreenChangeDelayTimerFired(Timer&);
</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">@@ -1324,16 +1324,16 @@
</span><span class="cx"> virtual double timerAlignmentInterval() const override;
</span><span class="cx">
</span><span class="cx"> void updateTitle(const StringWithDirection&);
</span><del>- void updateFocusAppearanceTimerFired(Timer<Document>&);
</del><ins>+ void updateFocusAppearanceTimerFired(Timer&);
</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<Document>&);
</del><ins>+ void loadEventDelayTimerFired(Timer&);
</ins><span class="cx">
</span><del>- void pendingTasksTimerFired(Timer<Document>&);
</del><ins>+ void pendingTasksTimerFired(Timer&);
</ins><span class="cx">
</span><span class="cx"> template <typename CharacterType>
</span><span class="cx"> void displayBufferModifiedByEncodingInternal(CharacterType*, unsigned) const;
</span><span class="lines">@@ -1352,18 +1352,18 @@
</span><span class="cx">
</span><span class="cx"> void setVisualUpdatesAllowed(ReadyState);
</span><span class="cx"> void setVisualUpdatesAllowed(bool);
</span><del>- void visualUpdatesSuppressionTimerFired(Timer<Document>&);
</del><ins>+ void visualUpdatesSuppressionTimerFired(Timer&);
</ins><span class="cx">
</span><span class="cx"> void addListenerType(ListenerType listenerType) { m_listenerTypes |= listenerType; }
</span><span class="cx">
</span><del>- void didAssociateFormControlsTimerFired(Timer<Document>&);
</del><ins>+ void didAssociateFormControlsTimerFired(Timer&);
</ins><span class="cx">
</span><span class="cx"> // DOM Cookies caching.
</span><span class="cx"> const String& cachedDOMCookies() const { return m_cachedDOMCookies; }
</span><span class="cx"> void setCachedDOMCookies(const String&);
</span><span class="cx"> bool isDOMCookieCacheValid() const { return m_cookieCacheExpiryTimer.isActive(); }
</span><span class="cx"> void invalidateDOMCookieCache();
</span><del>- void domCookieCacheExpiryTimerFired(Timer<Document>&);
</del><ins>+ void domCookieCacheExpiryTimerFired(Timer&);
</ins><span class="cx"> void didLoadResourceSynchronously(const ResourceRequest&) override final;
</span><span class="cx">
</span><span class="cx"> unsigned m_referencingNodeCount;
</span><span class="lines">@@ -1453,8 +1453,8 @@
</span><span class="cx"> ReadyState m_readyState;
</span><span class="cx"> bool m_bParsing;
</span><span class="cx">
</span><del>- Timer<Document> m_optimizedStyleSheetUpdateTimer;
- Timer<Document> 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">@@ -1477,7 +1477,7 @@
</span><span class="cx"> std::unique_ptr<AXObjectCache> m_axObjectCache;
</span><span class="cx"> const std::unique_ptr<DocumentMarkerController> m_markers;
</span><span class="cx">
</span><del>- Timer<Document> 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">@@ -1576,7 +1576,7 @@
</span><span class="cx"> RefPtr<Element> m_fullScreenElement;
</span><span class="cx"> Vector<RefPtr<Element>> m_fullScreenElementStack;
</span><span class="cx"> RenderFullScreen* m_fullScreenRenderer;
</span><del>- Timer<Document> m_fullScreenChangeDelayTimer;
</del><ins>+ Timer m_fullScreenChangeDelayTimer;
</ins><span class="cx"> Deque<RefPtr<Node>> m_fullScreenChangeEventTargetQueue;
</span><span class="cx"> Deque<RefPtr<Node>> m_fullScreenErrorEventTargetQueue;
</span><span class="cx"> bool m_isAnimatingFullScreen;
</span><span class="lines">@@ -1585,7 +1585,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> int m_loadEventDelayCount;
</span><del>- Timer<Document> 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">@@ -1641,7 +1641,7 @@
</span><span class="cx"> bool m_isTelephoneNumberParsingAllowed;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- Timer<Document> m_pendingTasksTimer;
</del><ins>+ Timer m_pendingTasksTimer;
</ins><span class="cx"> Vector<Task> m_pendingTasks;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="lines">@@ -1664,7 +1664,7 @@
</span><span class="cx"> bool m_scheduledTasksAreSuspended;
</span><span class="cx">
</span><span class="cx"> bool m_visualUpdatesAllowed;
</span><del>- Timer<Document> m_visualUpdatesSuppressionTimer;
</del><ins>+ Timer m_visualUpdatesSuppressionTimer;
</ins><span class="cx">
</span><span class="cx"> RefPtr<NamedFlowCollection> m_namedFlows;
</span><span class="cx">
</span><span class="lines">@@ -1672,8 +1672,8 @@
</span><span class="cx"> RefPtr<DOMSecurityPolicy> m_domSecurityPolicy;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void sharedObjectPoolClearTimerFired(Timer<Document>&);
- Timer<Document> m_sharedObjectPoolClearTimer;
</del><ins>+ void sharedObjectPoolClearTimerFired(Timer&);
+ Timer m_sharedObjectPoolClearTimer;
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<DocumentSharedObjectPool> m_sharedObjectPool;
</span><span class="cx">
</span><span class="lines">@@ -1697,8 +1697,8 @@
</span><span class="cx"> RefPtr<JSC::InputCursor> m_inputCursor;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- Timer<Document> m_didAssociateFormControlsTimer;
- Timer<Document> m_cookieCacheExpiryTimer;
</del><ins>+ Timer m_didAssociateFormControlsTimer;
+ Timer m_cookieCacheExpiryTimer;
</ins><span class="cx"> String m_cachedDOMCookies;
</span><span class="cx"> HashSet<RefPtr<Element>> m_associatedFormControls;
</span><span class="cx"> unsigned m_disabledFieldsetElementsCount;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoredomEventSenderh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/dom/EventSender.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/dom/EventSender.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/dom/EventSender.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<EventSender<T>>&) { dispatchPendingEvents(); }
</del><ins>+ void timerFired(Timer&) { dispatchPendingEvents(); }
</ins><span class="cx">
</span><span class="cx"> AtomicString m_eventType;
</span><del>- Timer<EventSender<T>> m_timer;
</del><ins>+ Timer m_timer;
</ins><span class="cx"> Vector<T*> m_dispatchSoonList;
</span><span class="cx"> Vector<T*> m_dispatchingList;
</span><span class="cx"> };
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoredomGenericEventQueuecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/dom/GenericEventQueue.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/dom/GenericEventQueue.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/dom/GenericEventQueue.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<GenericEventQueue>&)
</del><ins>+void GenericEventQueue::timerFired(Timer&)
</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="branchessafari6005branchSourceWebCoredomGenericEventQueueh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/dom/GenericEventQueue.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/dom/GenericEventQueue.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/dom/GenericEventQueue.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<GenericEventQueue>&);
</del><ins>+ void timerFired(Timer&);
</ins><span class="cx">
</span><span class="cx"> EventTarget& m_owner;
</span><span class="cx"> Vector<RefPtr<Event>> m_pendingEvents;
</span><del>- Timer<GenericEventQueue> 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="branchessafari6005branchSourceWebCoredomScriptRunnercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/dom/ScriptRunner.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/dom/ScriptRunner.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/dom/ScriptRunner.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<ScriptRunner>& timer)
</del><ins>+void ScriptRunner::timerFired(Timer& timer)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(timer, &timer == &m_timer);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoredomScriptRunnerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/dom/ScriptRunner.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/dom/ScriptRunner.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/dom/ScriptRunner.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<ScriptRunner>&);
</del><ins>+ void timerFired(Timer&);
</ins><span class="cx">
</span><span class="cx"> Document& m_document;
</span><span class="cx"> Vector<PendingScript> m_scriptsToExecuteInOrder;
</span><span class="cx"> Vector<PendingScript> 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<ScriptElement*, PendingScript> m_pendingAsyncScripts;
</span><del>- Timer<ScriptRunner> 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="branchessafari6005branchSourceWebCoredomScriptedAnimationControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/dom/ScriptedAnimationController.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/dom/ScriptedAnimationController.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/dom/ScriptedAnimationController.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<ScriptedAnimationController>&)
</del><ins>+void ScriptedAnimationController::animationTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> m_lastAnimationFrameTimeMonotonic = monotonicallyIncreasingTime();
</span><span class="cx"> serviceScriptedAnimations(m_lastAnimationFrameTimeMonotonic);
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoredomScriptedAnimationControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/dom/ScriptedAnimationController.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/dom/ScriptedAnimationController.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/dom/ScriptedAnimationController.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<ScriptedAnimationController>&);
- Timer<ScriptedAnimationController> m_animationTimer;
</del><ins>+ void animationTimerFired(Timer&);
+ 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="branchessafari6005branchSourceWebCoredomStyledElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/dom/StyledElement.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/dom/StyledElement.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/dom/StyledElement.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<PresentationAttributeCacheCleaner>* timer)
</del><ins>+ void cleanCache(Timer* timer)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(timer, timer == &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<PresentationAttributeCacheCleaner> m_cleanTimer;
</del><ins>+ Timer m_cleanTimer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static PresentationAttributeCacheCleaner& presentationAttributeCacheCleaner()
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreeditingAlternativeTextControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/editing/AlternativeTextController.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/editing/AlternativeTextController.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/editing/AlternativeTextController.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -326,7 +326,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<AlternativeTextController>&)
</del><ins>+void AlternativeTextController::timerFired(Timer&)
</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="branchessafari6005branchSourceWebCoreeditingAlternativeTextControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/editing/AlternativeTextController.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/editing/AlternativeTextController.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/editing/AlternativeTextController.h 2015-01-15 11:40:42 UTC (rev 178505)
</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& alternative, AlternativeTextType, const Vector<DocumentMarker::MarkerType>&);
</span><del>- void timerFired(Timer<AlternativeTextController>&);
</del><ins>+ void timerFired(Timer&);
</ins><span class="cx"> void recordAutocorrectionResponseReversed(const String& replacedString, const String& replacementString);
</span><span class="cx"> void recordSpellcheckerResponseForModifiedCorrection(Range* rangeOfCorrection, const String& corrected, const String& 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<AlternativeTextController> 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="branchessafari6005branchSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/editing/Editor.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/editing/Editor.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/editing/Editor.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -3355,7 +3355,7 @@
</span><span class="cx"> return document().isTelephoneNumberParsingEnabled() && TelephoneNumberDetector::isSupported();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Editor::scanSelectionForTelephoneNumbers(Timer<Editor>&)
</del><ins>+void Editor::scanSelectionForTelephoneNumbers(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> scanSelectionForTelephoneNumbers();
</span><span class="cx"> }
</span><span class="lines">@@ -3462,7 +3462,7 @@
</span><span class="cx"> editorUIUpdateTimerFired(m_editorUIUpdateTimer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Editor::editorUIUpdateTimerFired(Timer<Editor>&)
</del><ins>+void Editor::editorUIUpdateTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> VisibleSelection oldSelection = m_oldSelectionForEditorUIUpdate;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreeditingEditorh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/editing/Editor.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/editing/Editor.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/editing/Editor.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -480,7 +480,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<Editor>&);
</del><ins>+ void editorUIUpdateTimerFired(Timer&);
</ins><span class="cx">
</span><span class="cx"> Node* findEventTargetFromSelection() const;
</span><span class="cx">
</span><span class="lines">@@ -515,16 +515,16 @@
</span><span class="cx"> bool m_overwriteModeEnabled;
</span><span class="cx">
</span><span class="cx"> VisibleSelection m_oldSelectionForEditorUIUpdate;
</span><del>- Timer<Editor> 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) && !PLATFORM(IOS)
</span><span class="cx"> bool shouldDetectTelephoneNumbers();
</span><del>- void scanSelectionForTelephoneNumbers(Timer<Editor>&);
</del><ins>+ void scanSelectionForTelephoneNumbers(Timer&);
</ins><span class="cx"> void scanRangeForTelephoneNumbers(Range&, const StringView&, Vector<RefPtr<Range>>& markedRanges);
</span><span class="cx">
</span><del>- Timer<Editor> m_telephoneNumberDetectionUpdateTimer;
</del><ins>+ Timer m_telephoneNumberDetectionUpdateTimer;
</ins><span class="cx"> Vector<RefPtr<Range>> m_detectedTelephoneNumberRanges;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreeditingFrameSelectioncpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/editing/FrameSelection.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/editing/FrameSelection.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/editing/FrameSelection.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -1893,7 +1893,7 @@
</span><span class="cx"> updateAppearance();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameSelection::caretBlinkTimerFired(Timer<FrameSelection>&)
</del><ins>+void FrameSelection::caretBlinkTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(TEXT_CARET)
</span><span class="cx"> ASSERT(caretIsVisible());
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreeditingFrameSelectionh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/editing/FrameSelection.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/editing/FrameSelection.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/editing/FrameSelection.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<FrameSelection>&);
</del><ins>+ void caretBlinkTimerFired(Timer&);
</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<EditingStyle> m_typingStyle;
</span><span class="cx">
</span><del>- Timer<FrameSelection> 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="branchessafari6005branchSourceWebCoreeditingSpellCheckercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/editing/SpellChecker.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/editing/SpellChecker.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/editing/SpellChecker.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> return page->editorClient()->textChecker();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SpellChecker::timerFiredToProcessQueuedRequest(Timer<SpellChecker>*)
</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="branchessafari6005branchSourceWebCoreeditingSpellCheckerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/editing/SpellChecker.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/editing/SpellChecker.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/editing/SpellChecker.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<SpellChecker>*);
</del><ins>+ void timerFiredToProcessQueuedRequest(Timer*);
</ins><span class="cx"> void invokeRequest(PassRefPtr<SpellCheckRequest>);
</span><span class="cx"> void enqueueRequest(PassRefPtr<SpellCheckRequest>);
</span><span class="cx"> void didCheckSucceed(int sequence, const Vector<TextCheckingResult>&);
</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<SpellChecker> m_timerToProcessQueuedRequest;
</del><ins>+ Timer m_timerToProcessQueuedRequest;
</ins><span class="cx">
</span><span class="cx"> RefPtr<SpellCheckRequest> m_processingRequest;
</span><span class="cx"> RequestQueue m_requestQueue;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/html/HTMLMediaElement.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/html/HTMLMediaElement.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/html/HTMLMediaElement.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -793,7 +793,7 @@
</span><span class="cx"> m_asyncEventQueue.enqueueEvent(event.release());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLMediaElement::loadTimerFired(Timer<HTMLMediaElement>&)
</del><ins>+void HTMLMediaElement::loadTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> Ref<HTMLMediaElement> protect(*this); // loadNextSourceChild may fire 'beforeload', which can make arbitrary DOM mutations.
</span><span class="cx">
</span><span class="lines">@@ -2268,7 +2268,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void HTMLMediaElement::progressEventTimerFired(Timer<HTMLMediaElement>&)
</del><ins>+void HTMLMediaElement::progressEventTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_player);
</span><span class="cx"> if (m_networkState != NETWORK_LOADING)
</span><span class="lines">@@ -2406,7 +2406,7 @@
</span><span class="cx"> seekTimerFired(m_seekTimer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLMediaElement::seekTimerFired(Timer<HTMLMediaElement>&)
</del><ins>+void HTMLMediaElement::seekTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_player) {
</span><span class="cx"> m_seeking = false;
</span><span class="lines">@@ -3150,7 +3150,7 @@
</span><span class="cx"> return rate;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLMediaElement::scanTimerFired(Timer<HTMLMediaElement>&)
</del><ins>+void HTMLMediaElement::scanTimerFired(Timer&)
</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">@@ -3172,7 +3172,7 @@
</span><span class="cx"> m_playbackProgressTimer.startRepeating(maxTimeupdateEventFrequency);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLMediaElement::playbackProgressTimerFired(Timer<HTMLMediaElement>&)
</del><ins>+void HTMLMediaElement::playbackProgressTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_player);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/html/HTMLMediaElement.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/html/HTMLMediaElement.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/html/HTMLMediaElement.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -589,11 +589,11 @@
</span><span class="cx"> virtual bool mediaPlayerGetRawCookies(const URL&, Vector<Cookie>&) const override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void loadTimerFired(Timer<HTMLMediaElement>&);
- void progressEventTimerFired(Timer<HTMLMediaElement>&);
- void playbackProgressTimerFired(Timer<HTMLMediaElement>&);
- void scanTimerFired(Timer<HTMLMediaElement>&);
- void seekTimerFired(Timer<HTMLMediaElement>&);
</del><ins>+ void loadTimerFired(Timer&);
+ void progressEventTimerFired(Timer&);
+ void playbackProgressTimerFired(Timer&);
+ void scanTimerFired(Timer&);
+ void seekTimerFired(Timer&);
</ins><span class="cx"> void startPlaybackProgressTimer();
</span><span class="cx"> void startProgressEventTimer();
</span><span class="cx"> void stopPeriodicTimers();
</span><span class="lines">@@ -717,11 +717,11 @@
</span><span class="cx">
</span><span class="cx"> void updateCaptionContainer();
</span><span class="cx">
</span><del>- Timer<HTMLMediaElement> m_loadTimer;
- Timer<HTMLMediaElement> m_progressEventTimer;
- Timer<HTMLMediaElement> m_playbackProgressTimer;
- Timer<HTMLMediaElement> m_scanTimer;
- Timer<HTMLMediaElement> m_seekTimer;
</del><ins>+ Timer m_loadTimer;
+ Timer m_progressEventTimer;
+ Timer m_playbackProgressTimer;
+ Timer m_scanTimer;
+ Timer m_seekTimer;
</ins><span class="cx"> RefPtr<TimeRanges> m_playedTimeRanges;
</span><span class="cx"> GenericEventQueue m_asyncEventQueue;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorehtmlHTMLPlugInElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/html/HTMLPlugInElement.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/html/HTMLPlugInElement.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/html/HTMLPlugInElement.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx"> return createRenderer<RenderEmbeddedObject>(*this, WTF::move(style));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLPlugInElement::swapRendererTimerFired(Timer<HTMLPlugInElement>&)
</del><ins>+void HTMLPlugInElement::swapRendererTimerFired(Timer&)
</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="branchessafari6005branchSourceWebCorehtmlHTMLPlugInElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/html/HTMLPlugInElement.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/html/HTMLPlugInElement.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/html/HTMLPlugInElement.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<HTMLPlugInElement>&);
</del><ins>+ void swapRendererTimerFired(Timer&);
</ins><span class="cx"> bool shouldOverridePlugin(const String& url, const String& mimeType);
</span><span class="cx">
</span><span class="cx"> bool dispatchBeforeLoadEvent(const String& 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<JSC::Bindings::Instance> m_instance;
</span><del>- Timer<HTMLPlugInElement> m_swapRendererTimer;
</del><ins>+ Timer m_swapRendererTimer;
</ins><span class="cx"> RefPtr<PluginReplacement> m_pluginReplacement;
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> NPObject* m_NPObject;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorehtmlHTMLPlugInImageElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/html/HTMLPlugInImageElement.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/html/HTMLPlugInImageElement.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/html/HTMLPlugInImageElement.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -401,7 +401,7 @@
</span><span class="cx"> return node && snapshotLabel && (node == snapshotLabel.get() || node->isDescendantOf(snapshotLabel.get()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLPlugInImageElement::removeSnapshotTimerFired(Timer<HTMLPlugInImageElement>&)
</del><ins>+void HTMLPlugInImageElement::removeSnapshotTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> m_snapshotImage = nullptr;
</span><span class="cx"> m_isRestartedPlugin = false;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorehtmlHTMLPlugInImageElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/html/HTMLPlugInImageElement.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/html/HTMLPlugInImageElement.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/html/HTMLPlugInImageElement.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<HTMLPlugInImageElement>&);
</del><ins>+ void removeSnapshotTimerFired(Timer&);
</ins><span class="cx"> bool isTopLevelFullPagePlugin(const RenderEmbeddedObject&) 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<MouseEvent> m_pendingClickEventFromSnapshot;
</span><span class="cx"> DeferrableOneShotTimer m_simulatedMouseClickTimer;
</span><del>- Timer<HTMLPlugInImageElement> m_removeSnapshotTimer;
</del><ins>+ Timer m_removeSnapshotTimer;
</ins><span class="cx"> RefPtr<Image> m_snapshotImage;
</span><span class="cx"> bool m_createdDuringUserGesture;
</span><span class="cx"> bool m_isRestartedPlugin;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorehtmlHTMLSourceElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/html/HTMLSourceElement.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/html/HTMLSourceElement.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/html/HTMLSourceElement.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<HTMLSourceElement>&)
</del><ins>+void HTMLSourceElement::errorEventTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> LOG(Media, "HTMLSourceElement::errorEventTimerFired - %p", this);
</span><span class="cx"> dispatchEvent(Event::create(eventNames().errorEvent, false, true));
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorehtmlHTMLSourceElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/html/HTMLSourceElement.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/html/HTMLSourceElement.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/html/HTMLSourceElement.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -52,9 +52,9 @@
</span><span class="cx"> virtual void removedFrom(ContainerNode&) override;
</span><span class="cx"> virtual bool isURLAttribute(const Attribute&) const override;
</span><span class="cx">
</span><del>- void errorEventTimerFired(Timer<HTMLSourceElement>&);
</del><ins>+ void errorEventTimerFired(Timer&);
</ins><span class="cx">
</span><del>- Timer<HTMLSourceElement> m_errorEventTimer;
</del><ins>+ Timer m_errorEventTimer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> NODE_TYPE_CASTS(HTMLSourceElement)
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorehtmlHTMLTrackElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/html/HTMLTrackElement.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/html/HTMLTrackElement.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/html/HTMLTrackElement.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<HTMLTrackElement>&)
</del><ins>+void HTMLTrackElement::loadTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> if (!fastHasAttribute(srcAttr))
</span><span class="cx"> return;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorehtmlHTMLTrackElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/html/HTMLTrackElement.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/html/HTMLTrackElement.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/html/HTMLTrackElement.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx">
</span><span class="cx"> virtual bool isURLAttribute(const Attribute&) const override;
</span><span class="cx">
</span><del>- void loadTimerFired(Timer<HTMLTrackElement>&);
</del><ins>+ void loadTimerFired(Timer&);
</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&);
</span><span class="cx">
</span><span class="cx"> RefPtr<LoadableTextTrack> m_track;
</span><del>- Timer<HTMLTrackElement> m_loadTimer;
</del><ins>+ Timer m_loadTimer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> NODE_TYPE_CASTS(HTMLTrackElement)
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorehtmlMediaControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/html/MediaController.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/html/MediaController.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/html/MediaController.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<MediaController>&)
</del><ins>+void MediaController::asyncEventTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> Vector<RefPtr<Event>> 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<MediaController>&)
</del><ins>+void MediaController::clearPositionTimerFired(Timer&)
</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<MediaController>&)
</del><ins>+void MediaController::timeupdateTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> scheduleTimeupdateEvent();
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorehtmlMediaControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/html/MediaController.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/html/MediaController.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/html/MediaController.h 2015-01-15 11:40:42 UTC (rev 178505)
</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& eventName);
</span><del>- void asyncEventTimerFired(Timer<MediaController>&);
- void clearPositionTimerFired(Timer<MediaController>&);
</del><ins>+ void asyncEventTimerFired(Timer&);
+ void clearPositionTimerFired(Timer&);
</ins><span class="cx"> bool hasEnded() const;
</span><span class="cx"> void scheduleTimeupdateEvent();
</span><del>- void timeupdateTimerFired(Timer<MediaController>&);
</del><ins>+ void timeupdateTimerFired(Timer&);
</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<RefPtr<Event>> m_pendingEvents;
</span><del>- Timer<MediaController> m_asyncEventTimer;
- mutable Timer<MediaController> 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<Clock> m_clock;
</span><span class="cx"> ScriptExecutionContext& m_scriptExecutionContext;
</span><del>- Timer<MediaController> 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="branchessafari6005branchSourceWebCorehtmlMediaDocumentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/html/MediaDocument.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/html/MediaDocument.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/html/MediaDocument.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> m_replaceMediaElementTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaDocument::replaceMediaElementTimerFired(Timer<MediaDocument>&)
</del><ins>+void MediaDocument::replaceMediaElementTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> HTMLElement* htmlBody = body();
</span><span class="cx"> if (!htmlBody)
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorehtmlMediaDocumenth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/html/MediaDocument.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/html/MediaDocument.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/html/MediaDocument.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -49,9 +49,9 @@
</span><span class="cx">
</span><span class="cx"> virtual void defaultEventHandler(Event*) override;
</span><span class="cx">
</span><del>- void replaceMediaElementTimerFired(Timer<MediaDocument>&);
</del><ins>+ void replaceMediaElementTimerFired(Timer&);
</ins><span class="cx">
</span><del>- Timer<MediaDocument> m_replaceMediaElementTimer;
</del><ins>+ Timer m_replaceMediaElementTimer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline bool isMediaDocument(const Document& document) { return document.isMediaDocument(); }
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorehtmlSearchInputTypecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/html/SearchInputType.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/html/SearchInputType.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/html/SearchInputType.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> m_searchEventTimer.stop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SearchInputType::searchEventTimerFired(Timer<SearchInputType>*)
</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="branchessafari6005branchSourceWebCorehtmlSearchInputTypeh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/html/SearchInputType.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/html/SearchInputType.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/html/SearchInputType.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -61,13 +61,13 @@
</span><span class="cx"> virtual bool sizeShouldIncludeDecoration(int defaultSize, int& preferredSize) const override;
</span><span class="cx"> virtual float decorationWidth() const override;
</span><span class="cx">
</span><del>- void searchEventTimerFired(Timer<SearchInputType>*);
</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"> HTMLElement* m_resultsButton;
</span><span class="cx"> HTMLElement* m_cancelButton;
</span><del>- Timer<SearchInputType> 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="branchessafari6005branchSourceWebCorehtmlValidationMessagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/html/ValidationMessage.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/html/ValidationMessage.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/html/ValidationMessage.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<Timer<ValidationMessage>>(this, &ValidationMessage::buildBubbleTree);
</del><ins>+ m_timer = std::make_unique<Timer>(this, &ValidationMessage::buildBubbleTree);
</ins><span class="cx"> else
</span><del>- m_timer = std::make_unique<Timer<ValidationMessage>>(this, &ValidationMessage::setMessageDOMAndStartTimer);
</del><ins>+ m_timer = std::make_unique<Timer>(this, &ValidationMessage::setMessageDOMAndStartTimer);
</ins><span class="cx"> m_timer->startOneShot(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ValidationMessage::setMessageDOMAndStartTimer(Timer<ValidationMessage>*)
</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 <= 0)
</span><span class="cx"> m_timer = nullptr;
</span><span class="cx"> else {
</span><del>- m_timer = std::make_unique<Timer<ValidationMessage>>(this, &ValidationMessage::deleteBubbleTree);
</del><ins>+ m_timer = std::make_unique<Timer>(this, &ValidationMessage::deleteBubbleTree);
</ins><span class="cx"> m_timer->startOneShot(std::max(5.0, static_cast<double>(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->setInlineStyleProperty(CSSPropertyLeft, bubbleX, CSSPrimitiveValue::CSS_PX);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ValidationMessage::buildBubbleTree(Timer<ValidationMessage>*)
</del><ins>+void ValidationMessage::buildBubbleTree(Timer*)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!validationMessageClient());
</span><span class="cx"> ShadowRoot& shadowRoot = m_element->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<Timer<ValidationMessage>>(this, &ValidationMessage::deleteBubbleTree);
</del><ins>+ m_timer = std::make_unique<Timer>(this, &ValidationMessage::deleteBubbleTree);
</ins><span class="cx"> m_timer->startOneShot(0);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> return &m_bubble->treeScope() == &node.treeScope();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ValidationMessage::deleteBubbleTree(Timer<ValidationMessage>*)
</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="branchessafari6005branchSourceWebCorehtmlValidationMessageh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/html/ValidationMessage.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/html/ValidationMessage.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/html/ValidationMessage.h 2015-01-15 11:40:42 UTC (rev 178505)
</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&);
</span><del>- void setMessageDOMAndStartTimer(Timer<ValidationMessage>* = 0);
- void buildBubbleTree(Timer<ValidationMessage>*);
- void deleteBubbleTree(Timer<ValidationMessage>* = 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<Timer<ValidationMessage>> m_timer;
</del><ins>+ std::unique_ptr<Timer> m_timer;
</ins><span class="cx"> RefPtr<HTMLElement> m_bubble;
</span><span class="cx"> RefPtr<HTMLElement> m_messageHeading;
</span><span class="cx"> RefPtr<HTMLElement> m_messageBody;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorehtmlcanvasWebGLRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -5926,7 +5926,7 @@
</span><span class="cx"> m_context->bindBuffer(GraphicsContext3D::ARRAY_BUFFER, objectOrZero(m_boundArrayBuffer.get()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContext::dispatchContextLostEvent(Timer<WebGLRenderingContext>*)
</del><ins>+void WebGLRenderingContext::dispatchContextLostEvent(Timer*)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<WebGLContextEvent> event = WebGLContextEvent::create(eventNames().webglcontextlostEvent, false, true, "");
</span><span class="cx"> canvas()->dispatchEvent(event);
</span><span class="lines">@@ -5935,7 +5935,7 @@
</span><span class="cx"> m_restoreTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContext::maybeRestoreContext(Timer<WebGLRenderingContext>*)
</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="branchessafari6005branchSourceWebCorehtmlcanvasWebGLRenderingContexth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/html/canvas/WebGLRenderingContext.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/html/canvas/WebGLRenderingContext.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/html/canvas/WebGLRenderingContext.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<WebGLRenderingContext> m_dispatchContextLostEventTimer;
</del><ins>+ Timer m_dispatchContextLostEventTimer;
</ins><span class="cx"> bool m_restoreAllowed;
</span><del>- Timer<WebGLRenderingContext> 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<WebGLRenderingContext>*);
</del><ins>+ void dispatchContextLostEvent(Timer*);
</ins><span class="cx"> // Helper for restoration after context lost.
</span><del>- void maybeRestoreContext(Timer<WebGLRenderingContext>*);
</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="branchessafari6005branchSourceWebCorehtmlparserHTMLParserSchedulercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/html/parser/HTMLParserScheduler.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/html/parser/HTMLParserScheduler.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/html/parser/HTMLParserScheduler.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<HTMLParserScheduler>& timer)
</del><ins>+void HTMLParserScheduler::continueNextChunkTimerFired(Timer& timer)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_suspended);
</span><span class="cx"> ASSERT_UNUSED(timer, &timer == &m_continueNextChunkTimer);
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorehtmlparserHTMLParserSchedulerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/html/parser/HTMLParserScheduler.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/html/parser/HTMLParserScheduler.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/html/parser/HTMLParserScheduler.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<HTMLParserScheduler>&);
</del><ins>+ void continueNextChunkTimerFired(Timer&);
</ins><span class="cx">
</span><span class="cx"> HTMLDocumentParser& m_parser;
</span><span class="cx">
</span><span class="cx"> double m_parserTimeLimit;
</span><span class="cx"> int m_parserChunkSize;
</span><del>- Timer<HTMLParserScheduler> 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="branchessafari6005branchSourceWebCorehtmlshadowMediaControlElementscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/html/shadow/MediaControlElements.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/html/shadow/MediaControlElements.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/html/shadow/MediaControlElements.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx"> m_transitionTimer.stop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaControlPanelElement::transitionTimerFired(Timer<MediaControlPanelElement>&)
</del><ins>+void MediaControlPanelElement::transitionTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_opaque)
</span><span class="cx"> hide();
</span><span class="lines">@@ -1405,7 +1405,7 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaControlTextTrackContainerElement::updateTimerFired(Timer<MediaControlTextTrackContainerElement>&)
</del><ins>+void MediaControlTextTrackContainerElement::updateTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> if (!document().page())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorehtmlshadowMediaControlElementsh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/html/shadow/MediaControlElements.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/html/shadow/MediaControlElements.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/html/shadow/MediaControlElements.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">
</span><span class="cx"> void startTimer();
</span><span class="cx"> void stopTimer();
</span><del>- void transitionTimerFired(Timer<MediaControlPanelElement>&);
</del><ins>+ void transitionTimerFired(Timer&);
</ins><span class="cx">
</span><span class="cx"> void setPosition(const LayoutPoint&);
</span><span class="cx">
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> LayoutPoint m_lastDragEventLocation;
</span><span class="cx"> LayoutPoint m_cumulativeDragOffset;
</span><span class="cx">
</span><del>- Timer<MediaControlPanelElement> m_transitionTimer;
</del><ins>+ Timer m_transitionTimer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // ----------------------------
</span><span class="lines">@@ -477,7 +477,7 @@
</span><span class="cx"> static const AtomicString& textTrackContainerElementShadowPseudoId();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void updateTimerFired(Timer<MediaControlTextTrackContainerElement>&);
</del><ins>+ void updateTimerFired(Timer&);
</ins><span class="cx"> void updateActiveCuesFontSize();
</span><span class="cx">
</span><span class="cx"> explicit MediaControlTextTrackContainerElement(Document&);
</span><span class="lines">@@ -492,7 +492,7 @@
</span><span class="cx"> void updateStyleForTextTrackRepresentation();
</span><span class="cx"> OwnPtr<TextTrackRepresentation> m_textTrackRepresentation;
</span><span class="cx">
</span><del>- Timer<MediaControlTextTrackContainerElement> 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="branchessafari6005branchSourceWebCorehtmlshadowMediaControlscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/html/shadow/MediaControls.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/html/shadow/MediaControls.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/html/shadow/MediaControls.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -329,7 +329,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaControls::hideFullscreenControlsTimerFired(Timer<MediaControls>&)
</del><ins>+void MediaControls::hideFullscreenControlsTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> if (m_mediaController->paused())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorehtmlshadowMediaControlsh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/html/shadow/MediaControls.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/html/shadow/MediaControls.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/html/shadow/MediaControls.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<MediaControls>&);
</del><ins>+ virtual void hideFullscreenControlsTimerFired(Timer&);
</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<MediaControls> 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="branchessafari6005branchSourceWebCorehtmlshadowSpinButtonElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/html/shadow/SpinButtonElement.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/html/shadow/SpinButtonElement.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/html/shadow/SpinButtonElement.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -240,7 +240,7 @@
</span><span class="cx"> doStepAction(amount);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SpinButtonElement::repeatingTimerFired(Timer<SpinButtonElement>*)
</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="branchessafari6005branchSourceWebCorehtmlshadowSpinButtonElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/html/shadow/SpinButtonElement.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/html/shadow/SpinButtonElement.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/html/shadow/SpinButtonElement.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -80,7 +80,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<SpinButtonElement>*);
</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">@@ -89,7 +89,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<SpinButtonElement> m_repeatingTimer;
</del><ins>+ Timer m_repeatingTimer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorehtmltrackLoadableTextTrackcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/html/track/LoadableTextTrack.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/html/track/LoadableTextTrack.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/html/track/LoadableTextTrack.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<LoadableTextTrack>&)
</del><ins>+void LoadableTextTrack::loadTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> if (m_loader)
</span><span class="cx"> m_loader->cancelLoad();
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorehtmltrackLoadableTextTrackh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/html/track/LoadableTextTrack.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/html/track/LoadableTextTrack.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/html/track/LoadableTextTrack.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -69,10 +69,10 @@
</span><span class="cx">
</span><span class="cx"> LoadableTextTrack(HTMLTrackElement*, const String& kind, const String& label, const String& language);
</span><span class="cx">
</span><del>- void loadTimerFired(Timer<LoadableTextTrack>&);
</del><ins>+ void loadTimerFired(Timer&);
</ins><span class="cx">
</span><span class="cx"> HTMLTrackElement* m_trackElement;
</span><del>- Timer<LoadableTextTrack> m_loadTimer;
</del><ins>+ Timer m_loadTimer;
</ins><span class="cx"> std::unique_ptr<TextTrackLoader> m_loader;
</span><span class="cx"> URL m_url;
</span><span class="cx"> bool m_isDefault;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorehtmltrackVTTRegioncpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/html/track/VTTRegion.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/html/track/VTTRegion.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/html/track/VTTRegion.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -474,7 +474,7 @@
</span><span class="cx"> m_scrollTimer.stop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void VTTRegion::scrollTimerFired(Timer<VTTRegion>*)
</del><ins>+void VTTRegion::scrollTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx"> LOG(Media, "VTTRegion::scrollTimerFired");
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorehtmltrackVTTRegionh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/html/track/VTTRegion.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/html/track/VTTRegion.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/html/track/VTTRegion.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<VTTRegion>*);
</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<VTTRegion> 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="branchessafari6005branchSourceWebCoreinspectorInspectorCSSAgentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/inspector/InspectorCSSAgent.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/inspector/InspectorCSSAgent.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/inspector/InspectorCSSAgent.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -111,11 +111,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<ChangeRegionOversetTask>&);
</del><ins>+ void timerFired(Timer&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> InspectorCSSAgent* m_cssAgent;
</span><del>- Timer<ChangeRegionOversetTask> m_timer;
</del><ins>+ Timer m_timer;
</ins><span class="cx"> HashMap<WebKitNamedFlow*, int> m_namedFlows;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> m_namedFlows.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ChangeRegionOversetTask::timerFired(Timer<ChangeRegionOversetTask>&)
</del><ins>+void ChangeRegionOversetTask::timerFired(Timer&)
</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<WebKitNamedFlow*, int>::iterator it = m_namedFlows.begin(), end = m_namedFlows.end(); it != end; ++it)
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreinspectorInspectorDOMAgentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/inspector/InspectorDOMAgent.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/inspector/InspectorDOMAgent.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/inspector/InspectorDOMAgent.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -170,11 +170,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<RevalidateStyleAttributeTask>&);
</del><ins>+ void timerFired(Timer&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> InspectorDOMAgent* m_domAgent;
</span><del>- Timer<RevalidateStyleAttributeTask> m_timer;
</del><ins>+ Timer m_timer;
</ins><span class="cx"> HashSet<RefPtr<Element>> m_elements;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> m_timer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RevalidateStyleAttributeTask::timerFired(Timer<RevalidateStyleAttributeTask>&)
</del><ins>+void RevalidateStyleAttributeTask::timerFired(Timer&)
</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<Element*> elements;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreinspectorInspectorFrontendClientLocalcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> m_timer.stop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void timerFired(Timer<InspectorBackendDispatchTask>&)
</del><ins>+ void timerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_messages.isEmpty()) {
</span><span class="cx"> // Dispatch can lead to the timer destruction -> schedule the next shot first.
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> InspectorController* m_inspectorController;
</span><del>- Timer<InspectorBackendDispatchTask> m_timer;
</del><ins>+ Timer m_timer;
</ins><span class="cx"> Deque<String> m_messages;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/loader/DocumentLoader.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/loader/DocumentLoader.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/loader/DocumentLoader.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -1131,7 +1131,7 @@
</span><span class="cx"> m_substituteResourceDeliveryTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DocumentLoader::substituteResourceDeliveryTimerFired(Timer<DocumentLoader>&)
</del><ins>+void DocumentLoader::substituteResourceDeliveryTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> if (m_pendingSubstituteResources.isEmpty())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreloaderDocumentLoaderh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/loader/DocumentLoader.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/loader/DocumentLoader.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/loader/DocumentLoader.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -314,14 +314,14 @@
</span><span class="cx"> #if HAVE(RUNLOOP_TIMER)
</span><span class="cx"> typedef RunLoopTimer<DocumentLoader> DocumentLoaderTimer;
</span><span class="cx"> #else
</span><del>- typedef Timer<DocumentLoader> 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<DocumentLoader>&);
</del><ins>+ void substituteResourceDeliveryTimerFired(Timer&);
</ins><span class="cx">
</span><span class="cx"> void clearMainResource();
</span><span class="cx">
</span><span class="lines">@@ -387,7 +387,7 @@
</span><span class="cx">
</span><span class="cx"> typedef HashMap<RefPtr<ResourceLoader>, RefPtr<SubstituteResource>> SubstituteResourceMap;
</span><span class="cx"> SubstituteResourceMap m_pendingSubstituteResources;
</span><del>- Timer<DocumentLoader> m_substituteResourceDeliveryTimer;
</del><ins>+ Timer m_substituteResourceDeliveryTimer;
</ins><span class="cx">
</span><span class="cx"> OwnPtr<ArchiveResourceCollection> m_archiveResourceCollection;
</span><span class="cx"> #if ENABLE(WEB_ARCHIVE) || ENABLE(MHTML)
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/loader/FrameLoader.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/loader/FrameLoader.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/loader/FrameLoader.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -852,7 +852,7 @@
</span><span class="cx"> checkLoadComplete();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameLoader::checkTimerFired(Timer<FrameLoader>&)
</del><ins>+void FrameLoader::checkTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> Ref<Frame> protect(m_frame);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreloaderFrameLoaderh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/loader/FrameLoader.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/loader/FrameLoader.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/loader/FrameLoader.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -300,7 +300,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<FrameLoader>&);
</del><ins>+ void checkTimerFired(Timer&);
</ins><span class="cx">
</span><span class="cx"> void loadSameDocumentItem(HistoryItem*);
</span><span class="cx"> void loadDifferentDocumentItem(HistoryItem*, FrameLoadType, FormSubmissionCacheLoadPolicy);
</span><span class="lines">@@ -424,7 +424,7 @@
</span><span class="cx">
</span><span class="cx"> URL m_submittedFormURL;
</span><span class="cx">
</span><del>- Timer<FrameLoader> 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="branchessafari6005branchSourceWebCoreloaderImageLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/loader/ImageLoader.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/loader/ImageLoader.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/loader/ImageLoader.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<ImageLoader>&)
</del><ins>+void ImageLoader::timerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> element().deref();
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreloaderImageLoaderh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/loader/ImageLoader.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/loader/ImageLoader.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/loader/ImageLoader.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<ImageLoader>&);
</del><ins>+ void timerFired(Timer&);
</ins><span class="cx">
</span><span class="cx"> Element& m_element;
</span><span class="cx"> CachedResourceHandle<CachedImage> m_image;
</span><del>- Timer<ImageLoader> 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="branchessafari6005branchSourceWebCoreloaderLinkLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/loader/LinkLoader.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/loader/LinkLoader.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/loader/LinkLoader.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -60,13 +60,13 @@
</span><span class="cx"> m_cachedLinkResource->removeClient(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void LinkLoader::linkLoadTimerFired(Timer<LinkLoader>& timer)
</del><ins>+void LinkLoader::linkLoadTimerFired(Timer& timer)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(timer, &timer == &m_linkLoadTimer);
</span><span class="cx"> m_client->linkLoaded();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void LinkLoader::linkLoadingErrorTimerFired(Timer<LinkLoader>& timer)
</del><ins>+void LinkLoader::linkLoadingErrorTimerFired(Timer& timer)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(timer, &timer == &m_linkLoadingErrorTimer);
</span><span class="cx"> m_client->linkLoadingErrored();
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreloaderLinkLoaderh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/loader/LinkLoader.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/loader/LinkLoader.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/loader/LinkLoader.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -59,14 +59,14 @@
</span><span class="cx"> bool loadLink(const LinkRelAttribute&, const String& type, const String& sizes, const URL&, Document*);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void linkLoadTimerFired(Timer<LinkLoader>&);
- void linkLoadingErrorTimerFired(Timer<LinkLoader>&);
</del><ins>+ void linkLoadTimerFired(Timer&);
+ void linkLoadingErrorTimerFired(Timer&);
</ins><span class="cx">
</span><span class="cx"> LinkLoaderClient* m_client;
</span><span class="cx">
</span><span class="cx"> CachedResourceHandle<CachedResource> m_cachedLinkResource;
</span><del>- Timer<LinkLoader> m_linkLoadTimer;
- Timer<LinkLoader> 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="branchessafari6005branchSourceWebCoreloaderNavigationSchedulercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/loader/NavigationScheduler.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/loader/NavigationScheduler.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/loader/NavigationScheduler.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> virtual void fire(Frame&) = 0;
</span><span class="cx">
</span><span class="cx"> virtual bool shouldStartTimer(Frame&) { return true; }
</span><del>- virtual void didStartTimer(Frame&, Timer<NavigationScheduler>&) { }
</del><ins>+ virtual void didStartTimer(Frame&, Timer&) { }
</ins><span class="cx"> virtual void didStopTimer(Frame&, 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& frame, Timer<NavigationScheduler>& timer) override
</del><ins>+ virtual void didStartTimer(Frame& frame, Timer& 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->event(), m_submission->state(), MaybeSendReferrer, AllowNavigationToInvalidURL::Yes);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- virtual void didStartTimer(Frame& frame, Timer<NavigationScheduler>& timer) override
</del><ins>+ virtual void didStartTimer(Frame& frame, Timer& 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<ScheduledHistoryNavigation>(steps));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NavigationScheduler::timerFired(Timer<NavigationScheduler>&)
</del><ins>+void NavigationScheduler::timerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_frame.page())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreloaderNavigationSchedulerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/loader/NavigationScheduler.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/loader/NavigationScheduler.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/loader/NavigationScheduler.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -83,13 +83,13 @@
</span><span class="cx"> bool shouldScheduleNavigation() const;
</span><span class="cx"> bool shouldScheduleNavigation(const URL&) const;
</span><span class="cx">
</span><del>- void timerFired(Timer<NavigationScheduler>&);
</del><ins>+ void timerFired(Timer&);
</ins><span class="cx"> void schedule(std::unique_ptr<ScheduledNavigation>);
</span><span class="cx">
</span><span class="cx"> static LockBackForwardList mustLockBackForwardList(Frame& targetFrame);
</span><span class="cx">
</span><span class="cx"> Frame& m_frame;
</span><del>- Timer<NavigationScheduler> m_timer;
</del><ins>+ Timer m_timer;
</ins><span class="cx"> std::unique_ptr<ScheduledNavigation> m_redirect;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreloaderPingLoaderh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/loader/PingLoader.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/loader/PingLoader.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/loader/PingLoader.h 2015-01-15 11:40:42 UTC (rev 178505)
</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&) override { delete this; }
</span><span class="cx"> virtual bool shouldUseCredentialStorage(ResourceHandle*) override { return m_shouldUseCredentialStorage; }
</span><del>- void timeoutTimerFired(Timer<PingLoader>&) { delete this; }
</del><ins>+ void timeoutTimerFired(Timer&) { delete this; }
</ins><span class="cx">
</span><span class="cx"> RefPtr<ResourceHandle> m_handle;
</span><del>- Timer<PingLoader> 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="branchessafari6005branchSourceWebCoreloaderProgressTrackercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/loader/ProgressTracker.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/loader/ProgressTracker.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/loader/ProgressTracker.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx"> return m_progressValue && m_progressValue < finalProgressValue && m_heartbeatsWithNoProgress < loadStalledHeartbeatCount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ProgressTracker::progressHeartbeatTimerFired(Timer<ProgressTracker>&)
</del><ins>+void ProgressTracker::progressHeartbeatTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> if (m_totalBytesReceived < m_totalBytesReceivedBeforePreviousHeartbeat + minumumBytesPerHeartbeatForProgress)
</span><span class="cx"> ++m_heartbeatsWithNoProgress;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreloaderProgressTrackerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/loader/ProgressTracker.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/loader/ProgressTracker.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/loader/ProgressTracker.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<ProgressTracker>&);
</del><ins>+ void progressHeartbeatTimerFired(Timer&);
</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<unsigned long, std::unique_ptr<ProgressItem>> m_progressItems;
</span><span class="cx">
</span><del>- Timer<ProgressTracker> 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="branchessafari6005branchSourceWebCoreloaderResourceLoadSchedulercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/loader/ResourceLoadScheduler.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/loader/ResourceLoadScheduler.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/loader/ResourceLoadScheduler.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -330,7 +330,7 @@
</span><span class="cx"> m_requestTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ResourceLoadScheduler::requestTimerFired(Timer<ResourceLoadScheduler>&)
</del><ins>+void ResourceLoadScheduler::requestTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> LOG(ResourceLoading, "ResourceLoadScheduler::requestTimerFired\n");
</span><span class="cx"> servePendingRequests();
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreloaderResourceLoadSchedulerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/loader/ResourceLoadScheduler.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/loader/ResourceLoadScheduler.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/loader/ResourceLoadScheduler.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> private:
</span><span class="cx"> void scheduleLoad(ResourceLoader*, ResourceLoadPriority);
</span><span class="cx"> void scheduleServePendingRequests();
</span><del>- void requestTimerFired(Timer<ResourceLoadScheduler>&);
</del><ins>+ void requestTimerFired(Timer&);
</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<ResourceLoadScheduler> 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="branchessafari6005branchSourceWebCoreloaderTextTrackLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/loader/TextTrackLoader.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/loader/TextTrackLoader.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/loader/TextTrackLoader.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> m_resource->removeClient(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TextTrackLoader::cueLoadTimerFired(Timer<TextTrackLoader>* timer)
</del><ins>+void TextTrackLoader::cueLoadTimerFired(Timer* timer)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(timer, timer == &m_cueLoadTimer);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreloaderTextTrackLoaderh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/loader/TextTrackLoader.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/loader/TextTrackLoader.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/loader/TextTrackLoader.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<TextTrackLoader>*);
</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<WebVTTParser> m_cueParser;
</span><span class="cx"> CachedResourceHandle<CachedTextTrack> m_resource;
</span><span class="cx"> ScriptExecutionContext* m_scriptExecutionContext;
</span><del>- Timer<TextTrackLoader> 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="branchessafari6005branchSourceWebCoreloadercacheCachedResourcecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/loader/cache/CachedResource.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/loader/cache/CachedResource.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/loader/cache/CachedResource.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -875,7 +875,7 @@
</span><span class="cx"> m_callbackTimer.stop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CachedResource::CachedResourceCallback::timerFired(Timer<CachedResourceCallback>&)
</del><ins>+void CachedResource::CachedResourceCallback::timerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> m_resource->didAddClient(m_client);
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreloadercacheCachedResourceh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/loader/cache/CachedResource.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/loader/cache/CachedResource.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/loader/cache/CachedResource.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -283,11 +283,11 @@
</span><span class="cx"> void cancel();
</span><span class="cx"> private:
</span><span class="cx"> CachedResourceCallback(CachedResource*, CachedResourceClient*);
</span><del>- void timerFired(Timer<CachedResourceCallback>&);
</del><ins>+ void timerFired(Timer&);
</ins><span class="cx">
</span><span class="cx"> CachedResource* m_resource;
</span><span class="cx"> CachedResourceClient* m_client;
</span><del>- Timer<CachedResourceCallback> m_callbackTimer;
</del><ins>+ Timer m_callbackTimer;
</ins><span class="cx"> };
</span><span class="cx"> HashMap<CachedResourceClient*, OwnPtr<CachedResourceCallback>> m_clientsAwaitingCallback;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/loader/cache/CachedResourceLoader.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -772,7 +772,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<CachedResourceLoader>& timer)
</del><ins>+void CachedResourceLoader::garbageCollectDocumentResourcesTimerFired(Timer& timer)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(timer, &timer == &m_garbageCollectDocumentResourcesTimer);
</span><span class="cx"> garbageCollectDocumentResources();
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreloadercacheCachedResourceLoaderh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/loader/cache/CachedResourceLoader.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/loader/cache/CachedResourceLoader.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/loader/cache/CachedResourceLoader.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> bool shouldContinueAfterNotifyingLoadedFromMemoryCache(const CachedResourceRequest&, CachedResource*);
</span><span class="cx"> bool checkInsecureContent(CachedResource::Type, const URL&) const;
</span><span class="cx">
</span><del>- void garbageCollectDocumentResourcesTimerFired(Timer<CachedResourceLoader>&);
</del><ins>+ void garbageCollectDocumentResourcesTimerFired(Timer&);
</ins><span class="cx"> void performPostLoadActions();
</span><span class="cx">
</span><span class="cx"> bool clientDefersImage(const URL&) const;
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx"> };
</span><span class="cx"> Deque<PendingPreload> m_pendingPreloads;
</span><span class="cx">
</span><del>- Timer<CachedResourceLoader> 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="branchessafari6005branchSourceWebCoreloadericonIconDatabasecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/loader/icon/IconDatabase.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/loader/icon/IconDatabase.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/loader/icon/IconDatabase.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<IconDatabase>&)
</del><ins>+void IconDatabase::syncTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_NOT_SYNC_THREAD();
</span><span class="cx"> wakeSyncThread();
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreloadericonIconDatabaseh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/loader/icon/IconDatabase.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/loader/icon/IconDatabase.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/loader/icon/IconDatabase.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<IconDatabase>&);
</del><ins>+ void syncTimerFired(Timer&);
</ins><span class="cx">
</span><del>- Timer<IconDatabase> 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="branchessafari6005branchSourceWebCorepageAutoscrollControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/page/AutoscrollController.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/page/AutoscrollController.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/page/AutoscrollController.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<AutoscrollController>&)
</del><ins>+void AutoscrollController::autoscrollTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_autoscrollRenderer) {
</span><span class="cx"> stopAutoscrollTimer();
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorepageAutoscrollControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/page/AutoscrollController.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/page/AutoscrollController.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/page/AutoscrollController.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<AutoscrollController>&);
</del><ins>+ void autoscrollTimerFired(Timer&);
</ins><span class="cx"> void startAutoscrollTimer();
</span><span class="cx"> #if ENABLE(PAN_SCROLLING)
</span><span class="cx"> void updatePanScrollState(FrameView*, const IntPoint&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- Timer<AutoscrollController> 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="branchessafari6005branchSourceWebCorepageCaptionUserPreferencescpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/page/CaptionUserPreferences.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/page/CaptionUserPreferences.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/page/CaptionUserPreferences.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<CaptionUserPreferences>&)
</del><ins>+void CaptionUserPreferences::timerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> captionPreferencesChanged();
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorepageCaptionUserPreferencesh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/page/CaptionUserPreferences.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/page/CaptionUserPreferences.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/page/CaptionUserPreferences.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<CaptionUserPreferences>&);
</del><ins>+ void timerFired(Timer&);
</ins><span class="cx"> void notify();
</span><span class="cx">
</span><span class="cx"> PageGroup& m_pageGroup;
</span><span class="cx"> CaptionDisplayMode m_displayMode;
</span><del>- Timer<CaptionUserPreferences> 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="branchessafari6005branchSourceWebCorepageDeviceControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/page/DeviceController.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/page/DeviceController.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/page/DeviceController.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<DeviceController>& timer)
</del><ins>+void DeviceController::fireDeviceEvent(Timer& timer)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(timer, &timer == &m_timer);
</span><span class="cx"> ASSERT(hasLastData());
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorepageDeviceControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/page/DeviceController.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/page/DeviceController.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/page/DeviceController.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -56,12 +56,12 @@
</span><span class="cx"> virtual PassRefPtr<Event> getLastEvent() { return 0; }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- void fireDeviceEvent(Timer<DeviceController>&);
</del><ins>+ void fireDeviceEvent(Timer&);
</ins><span class="cx">
</span><span class="cx"> HashCountedSet<RefPtr<DOMWindow>> m_listeners;
</span><span class="cx"> HashCountedSet<RefPtr<DOMWindow>> m_lastEventListeners;
</span><span class="cx"> DeviceClient* m_client;
</span><del>- Timer<DeviceController> 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="branchessafari6005branchSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/page/EventHandler.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/page/EventHandler.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/page/EventHandler.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -1259,7 +1259,7 @@
</span><span class="cx"> return ((isOverLink || isSubmitImage(node)) && (!editable || editableLinkEnabled));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void EventHandler::cursorUpdateTimerFired(Timer<EventHandler>&)
</del><ins>+void EventHandler::cursorUpdateTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_frame.document());
</span><span class="cx"> updateCursor();
</span><span class="lines">@@ -1504,7 +1504,7 @@
</span><span class="cx"> m_autoHideCursorTimer.stop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void EventHandler::autoHideCursorTimerFired(Timer<EventHandler>& timer)
</del><ins>+void EventHandler::autoHideCursorTimerFired(Timer& timer)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(timer, &timer == &m_autoHideCursorTimer);
</span><span class="cx"> m_currentMouseCursor = noneCursor();
</span><span class="lines">@@ -2838,7 +2838,7 @@
</span><span class="cx"> m_fakeMouseMoveEventTimer.stop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void EventHandler::fakeMouseMoveEventTimerFired(Timer<EventHandler>& timer)
</del><ins>+void EventHandler::fakeMouseMoveEventTimerFired(Timer& timer)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(timer, &timer == &m_fakeMouseMoveEventTimer);
</span><span class="cx"> ASSERT(!m_mousePressed);
</span><span class="lines">@@ -2874,7 +2874,7 @@
</span><span class="cx"> m_resizeLayer = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void EventHandler::hoverTimerFired(Timer<EventHandler>&)
</del><ins>+void EventHandler::hoverTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> m_hoverTimer.stop();
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorepageEventHandlerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/page/EventHandler.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/page/EventHandler.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/page/EventHandler.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -326,9 +326,9 @@
</span><span class="cx">
</span><span class="cx"> OptionalCursor selectCursor(const HitTestResult&, bool shiftKey);
</span><span class="cx">
</span><del>- void hoverTimerFired(Timer<EventHandler>&);
</del><ins>+ void hoverTimerFired(Timer&);
</ins><span class="cx"> #if ENABLE(CURSOR_SUPPORT)
</span><del>- void cursorUpdateTimerFired(Timer<EventHandler>&);
</del><ins>+ void cursorUpdateTimerFired(Timer&);
</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<EventHandler>&);
</del><ins>+ void fakeMouseMoveEventTimerFired(Timer&);
</ins><span class="cx"> void cancelFakeMouseMoveEvent();
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -435,7 +435,7 @@
</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<EventHandler>&);
</del><ins>+ void autoHideCursorTimerFired(Timer&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void clearLatchedState();
</span><span class="lines">@@ -461,9 +461,9 @@
</span><span class="cx">
</span><span class="cx"> bool m_panScrollButtonPressed;
</span><span class="cx">
</span><del>- Timer<EventHandler> m_hoverTimer;
</del><ins>+ Timer m_hoverTimer;
</ins><span class="cx"> #if ENABLE(CURSOR_SUPPORT)
</span><del>- Timer<EventHandler> m_cursorUpdateTimer;
</del><ins>+ Timer m_cursorUpdateTimer;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<AutoscrollController> m_autoscrollController;
</span><span class="lines">@@ -471,7 +471,7 @@
</span><span class="cx"> bool m_mouseDownWasInSubframe;
</span><span class="cx">
</span><span class="cx"> #if !ENABLE(IOS_TOUCH_EVENTS)
</span><del>- Timer<EventHandler> 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">@@ -553,7 +553,7 @@
</span><span class="cx"> bool m_isHandlingWheelEvent;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CURSOR_VISIBILITY)
</span><del>- Timer<EventHandler> 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="branchessafari6005branchSourceWebCorepageEventSourcecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/page/EventSource.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/page/EventSource.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/page/EventSource.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<EventSource>&)
</del><ins>+void EventSource::connectTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> connect();
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorepageEventSourceh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/page/EventSource.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/page/EventSource.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/page/EventSource.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<EventSource>&);
</del><ins>+ void connectTimerFired(Timer&);
</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<TextResourceDecoder> m_decoder;
</span><span class="cx"> RefPtr<ThreadableLoader> m_loader;
</span><del>- Timer<EventSource> m_connectTimer;
</del><ins>+ Timer m_connectTimer;
</ins><span class="cx"> Vector<UChar> m_receiveBuf;
</span><span class="cx"> bool m_discardTrailingNewline;
</span><span class="cx"> bool m_requestInFlight;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorepageFocusControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/page/FocusController.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/page/FocusController.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/page/FocusController.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -911,7 +911,7 @@
</span><span class="cx"> m_focusRepaintTimer.startOneShot(0.033);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FocusController::focusRepaintTimerFired(Timer<FocusController>&)
</del><ins>+void FocusController::focusRepaintTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> Document* focusedDocument = focusedOrMainFrame().document();
</span><span class="cx"> if (!focusedDocument)
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorepageFocusControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/page/FocusController.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/page/FocusController.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/page/FocusController.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -120,14 +120,14 @@
</span><span class="cx"> bool advanceFocusDirectionallyInContainer(Node* container, const LayoutRect& startingRect, FocusDirection, KeyboardEvent*);
</span><span class="cx"> void findFocusCandidateInContainer(Node* container, const LayoutRect& startingRect, FocusDirection, KeyboardEvent*, FocusCandidate& closest);
</span><span class="cx">
</span><del>- void focusRepaintTimerFired(Timer<FocusController>&);
</del><ins>+ void focusRepaintTimerFired(Timer&);
</ins><span class="cx">
</span><span class="cx"> Page& m_page;
</span><span class="cx"> RefPtr<Frame> m_focusedFrame;
</span><span class="cx"> bool m_isChangingFocusedFrame;
</span><span class="cx"> ViewState::Flags m_viewState;
</span><span class="cx">
</span><del>- Timer<FocusController> 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="branchessafari6005branchSourceWebCorepageFramecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/page/Frame.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/page/Frame.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/page/Frame.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -515,7 +515,7 @@
</span><span class="cx"> selection().updateAppearance();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Frame::overflowAutoScrollTimerFired(Timer<Frame>*)
</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="branchessafari6005branchSourceWebCorepageFrameh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/page/Frame.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/page/Frame.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/page/Frame.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -295,13 +295,13 @@
</span><span class="cx"> bool hitTestResultAtViewportLocation(const FloatPoint& viewportLocation, HitTestResult&, IntPoint& center);
</span><span class="cx"> Node* qualifyingNodeAtViewportLocation(const FloatPoint& viewportLocation, FloatPoint& adjustedViewportLocation, NodeQualifier, bool shouldApproximate);
</span><span class="cx">
</span><del>- void overflowAutoScrollTimerFired(Timer<Frame>*);
</del><ins>+ void overflowAutoScrollTimerFired(Timer*);
</ins><span class="cx"> void startOverflowAutoScroll(const IntPoint&);
</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<Frame> 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="branchessafari6005branchSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/page/FrameView.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/page/FrameView.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/page/FrameView.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -1708,7 +1708,7 @@
</span><span class="cx"> return maximumOffset;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameView::delayedScrollEventTimerFired(Timer<FrameView>&)
</del><ins>+void FrameView::delayedScrollEventTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> sendScrollEvent();
</span><span class="cx"> }
</span><span class="lines">@@ -2370,7 +2370,7 @@
</span><span class="cx"> m_speculativeTilingEnableTimer.startOneShot(speculativeTilingEnableDelay);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameView::speculativeTilingEnableTimerFired(Timer<FrameView>&)
</del><ins>+void FrameView::speculativeTilingEnableTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> if (m_speculativeTilingEnabled)
</span><span class="cx"> return;
</span><span class="lines">@@ -2378,7 +2378,7 @@
</span><span class="cx"> adjustTiledBackingCoverage();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameView::layoutTimerFired(Timer<FrameView>&)
</del><ins>+void FrameView::layoutTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> #ifdef INSTRUMENT_LAYOUT_SCHEDULING
</span><span class="cx"> if (!frame().document()->ownerElement())
</span><span class="lines">@@ -2813,7 +2813,7 @@
</span><span class="cx"> return m_embeddedObjectsToUpdate->isEmpty();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameView::updateEmbeddedObjectsTimerFired(Timer<FrameView>*)
</del><ins>+void FrameView::updateEmbeddedObjectsTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<FrameView> protect(this);
</span><span class="cx"> m_updateEmbeddedObjectsTimer.stop();
</span><span class="lines">@@ -2962,7 +2962,7 @@
</span><span class="cx"> adjustTiledBackingCoverage();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameView::postLayoutTimerFired(Timer<FrameView>&)
</del><ins>+void FrameView::postLayoutTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> performPostLayoutTasks();
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/page/FrameView.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/page/FrameView.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/page/FrameView.h 2015-01-15 11:40:42 UTC (rev 178505)
</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"> bool didFirstLayout() const;
</span><del>- void layoutTimerFired(Timer<FrameView>&);
</del><ins>+ void layoutTimerFired(Timer&);
</ins><span class="cx"> void scheduleRelayout();
</span><span class="cx"> void scheduleRelayoutOfSubtree(RenderElement&);
</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"> virtual IntPoint minimumScrollPosition() const override;
</span><span class="cx"> virtual IntPoint maximumScrollPosition() const override;
</span><del>- void delayedScrollEventTimerFired(Timer<FrameView>&);
</del><ins>+ void delayedScrollEventTimerFired(Timer&);
</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<FrameView>&);
</del><ins>+ void postLayoutTimerFired(Timer&);
</ins><span class="cx">
</span><span class="cx"> bool wasScrolledByUser() const;
</span><span class="cx"> void setWasScrolledByUser(bool);
</span><span class="lines">@@ -592,9 +592,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<FrameView>&);
</del><ins>+ void speculativeTilingEnableTimerFired(Timer&);
</ins><span class="cx">
</span><del>- void updateEmbeddedObjectsTimerFired(Timer<FrameView>*);
</del><ins>+ void updateEmbeddedObjectsTimerFired(Timer*);
</ins><span class="cx"> bool updateEmbeddedObjects();
</span><span class="cx"> void updateEmbeddedObject(RenderEmbeddedObject&);
</span><span class="cx"> void scrollToAnchor();
</span><span class="lines">@@ -638,7 +638,7 @@
</span><span class="cx"> bool m_isOverlapped;
</span><span class="cx"> bool m_contentIsOpaque;
</span><span class="cx">
</span><del>- Timer<FrameView> 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">@@ -647,8 +647,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<FrameView> m_postLayoutTasksTimer;
- Timer<FrameView> 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">@@ -670,7 +670,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<FrameView> 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">@@ -699,7 +699,7 @@
</span><span class="cx"> RenderPtr<RenderScrollbarPart> m_scrollCorner;
</span><span class="cx">
</span><span class="cx"> bool m_speculativeTilingEnabled;
</span><del>- Timer<FrameView> 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="branchessafari6005branchSourceWebCorepagePageOverlaycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/page/PageOverlay.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/page/PageOverlay.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/page/PageOverlay.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx"> m_fadeAnimationTimer.startRepeating(1 / fadeAnimationFrameRate);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PageOverlay::fadeAnimationTimerFired(Timer<PageOverlay>&)
</del><ins>+void PageOverlay::fadeAnimationTimerFired(Timer&)
</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="branchessafari6005branchSourceWebCorepagePageOverlayh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/page/PageOverlay.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/page/PageOverlay.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/page/PageOverlay.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -115,12 +115,12 @@
</span><span class="cx"> explicit PageOverlay(Client&, OverlayType);
</span><span class="cx">
</span><span class="cx"> void startFadeAnimation();
</span><del>- void fadeAnimationTimerFired(Timer<PageOverlay>&);
</del><ins>+ void fadeAnimationTimerFired(Timer&);
</ins><span class="cx">
</span><span class="cx"> Client& m_client;
</span><span class="cx"> Page* m_page;
</span><span class="cx">
</span><del>- Timer<PageOverlay> 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="branchessafari6005branchSourceWebCorepageSettingscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/page/Settings.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/page/Settings.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/page/Settings.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -390,7 +390,7 @@
</span><span class="cx"> m_setImageLoadingSettingsTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Settings::imageLoadingSettingsTimerFired(Timer<Settings>*)
</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="branchessafari6005branchSourceWebCorepageSettingsh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/page/Settings.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/page/Settings.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/page/Settings.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -314,8 +314,8 @@
</span><span class="cx">
</span><span class="cx"> double m_timeWithoutMouseMovementBeforeHidingControls;
</span><span class="cx">
</span><del>- Timer<Settings> m_setImageLoadingSettingsTimer;
- void imageLoadingSettingsTimerFired(Timer<Settings>*);
</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="branchessafari6005branchSourceWebCorepageanimationAnimationControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/page/animation/AnimationController.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/page/animation/AnimationController.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/page/animation/AnimationController.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> m_animationTimer.startOneShot(timeToNextService);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AnimationControllerPrivate::updateStyleIfNeededDispatcherFired(Timer<AnimationControllerPrivate>&)
</del><ins>+void AnimationControllerPrivate::updateStyleIfNeededDispatcherFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> fireEventsAndUpdateStyle();
</span><span class="cx"> }
</span><span class="lines">@@ -224,7 +224,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void AnimationControllerPrivate::animationTimerFired(Timer<AnimationControllerPrivate>&)
</del><ins>+void AnimationControllerPrivate::animationTimerFired(Timer&)
</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="branchessafari6005branchSourceWebCorepageanimationAnimationControllerPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/page/animation/AnimationControllerPrivate.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/page/animation/AnimationControllerPrivate.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/page/animation/AnimationControllerPrivate.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> CompositeAnimation& ensureCompositeAnimation(RenderElement*);
</span><span class="cx"> bool clear(RenderElement*);
</span><span class="cx">
</span><del>- void updateStyleIfNeededDispatcherFired(Timer<AnimationControllerPrivate>&);
</del><ins>+ void updateStyleIfNeededDispatcherFired(Timer&);
</ins><span class="cx"> void startUpdateStyleIfNeededDispatcher();
</span><span class="cx"> void addEventToDispatch(PassRefPtr<Element> element, const AtomicString& eventType, const String& name, double elapsedTime);
</span><span class="cx"> void addElementChangeToDispatch(PassRef<Element>);
</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<AnimationControllerPrivate>&);
</del><ins>+ void animationTimerFired(Timer&);
</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<RenderElement*, RefPtr<CompositeAnimation>> m_compositeAnimations;
</span><del>- Timer<AnimationControllerPrivate> m_animationTimer;
- Timer<AnimationControllerPrivate> m_updateStyleIfNeededDispatcher;
</del><ins>+ Timer m_animationTimer;
+ Timer m_updateStyleIfNeededDispatcher;
</ins><span class="cx"> Frame& m_frame;
</span><span class="cx">
</span><span class="cx"> class EventToDispatch {
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorepagemacServicesOverlayControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/page/mac/ServicesOverlayController.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/page/mac/ServicesOverlayController.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/page/mac/ServicesOverlayController.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx">
</span><span class="cx"> bool mouseIsOverHighlight(Highlight&, bool& mouseIsOverButton) const;
</span><span class="cx"> std::chrono::milliseconds remainingTimeUntilHighlightShouldBeShown(Highlight*) const;
</span><del>- void determineActiveHighlightTimerFired(Timer<ServicesOverlayController>&);
</del><ins>+ void determineActiveHighlightTimerFired(Timer&);
</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<Highlight> m_currentMouseDownOnButtonHighlight;
</span><span class="cx"> IntPoint m_mousePosition;
</span><span class="cx">
</span><del>- Timer<ServicesOverlayController> 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="branchessafari6005branchSourceWebCorepagemacServicesOverlayControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/page/mac/ServicesOverlayController.mm (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/page/mac/ServicesOverlayController.mm 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/page/mac/ServicesOverlayController.mm 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -437,7 +437,7 @@
</span><span class="cx"> return std::chrono::duration_cast<std::chrono::milliseconds>(remainingDelay);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ServicesOverlayController::determineActiveHighlightTimerFired(Timer<ServicesOverlayController>&)
</del><ins>+void ServicesOverlayController::determineActiveHighlightTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> bool mouseIsOverButton;
</span><span class="cx"> determineActiveHighlight(mouseIsOverButton);
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorepagescrollingAsyncScrollingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx"> m_updateNodeScrollPositionTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AsyncScrollingCoordinator::updateScrollPositionAfterAsyncScrollTimerFired(Timer<AsyncScrollingCoordinator>*)
</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="branchessafari6005branchSourceWebCorepagescrollingAsyncScrollingCoordinatorh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<AsyncScrollingCoordinator>*);
</del><ins>+ void updateScrollPositionAfterAsyncScrollTimerFired(Timer*);
</ins><span class="cx">
</span><span class="cx"> FrameView* frameViewForScrollingNode(ScrollingNodeID) const;
</span><span class="cx">
</span><del>- Timer<AsyncScrollingCoordinator> 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="branchessafari6005branchSourceWebCorepagescrollingiosScrollingCoordinatorIOSh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<ScrollingCoordinatorIOS>*);
</del><ins>+ void scrollingStateTreeCommitterTimerFired(Timer*);
</ins><span class="cx"> void commitTreeState();
</span><span class="cx">
</span><del>- Timer<ScrollingCoordinatorIOS> 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="branchessafari6005branchSourceWebCorepagescrollingiosScrollingCoordinatorIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.mm (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.mm 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.mm 2015-01-15 11:40:42 UTC (rev 178505)
</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<ScrollingCoordinatorIOS>*)
</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="branchessafari6005branchSourceWebCorepagescrollingmacScrollingCoordinatorMach"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<ScrollingCoordinatorMac>*);
</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<ScrollingCoordinatorMac> 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="branchessafari6005branchSourceWebCorepagescrollingmacScrollingCoordinatorMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm 2015-01-15 11:40:42 UTC (rev 178505)
</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<ScrollingCoordinatorMac>*)
</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="branchessafari6005branchSourceWebCoreplatformHysteresisActivityh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/HysteresisActivity.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/HysteresisActivity.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/HysteresisActivity.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void hysteresisTimerFired(Timer<HysteresisActivity>&)
</del><ins>+ void hysteresisTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> m_delegate.stopped();
</span><span class="cx"> m_timer.stop();
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> Delegate& m_delegate;
</span><span class="cx"> double m_hysteresisSeconds;
</span><span class="cx"> bool m_active;
</span><del>- Timer<HysteresisActivity> 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="branchessafari6005branchSourceWebCoreplatformScrollAnimatorNonecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/ScrollAnimatorNone.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/ScrollAnimatorNone.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/ScrollAnimatorNone.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<ScrollAnimatorNone>* timer)
</del><ins>+void ScrollAnimatorNone::animationTimerFired(Timer* timer)
</ins><span class="cx"> {
</span><span class="cx"> animationTimerFired();
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformScrollAnimatorNoneh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/ScrollAnimatorNone.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/ScrollAnimatorNone.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/ScrollAnimatorNone.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<ScrollAnimatorNone>*);
</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<ScrollAnimatorNone> 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="branchessafari6005branchSourceWebCoreplatformScrollbarcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/Scrollbar.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/Scrollbar.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/Scrollbar.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> Widget::paint(context, damageRect);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Scrollbar::autoscrollTimerFired(Timer<Scrollbar>&)
</del><ins>+void Scrollbar::autoscrollTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> autoscrollPressedPart(theme()->autoscrollTimerDelay());
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformScrollbarh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/Scrollbar.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/Scrollbar.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/Scrollbar.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> virtual void updateThumbPosition();
</span><span class="cx"> virtual void updateThumbProportion();
</span><span class="cx">
</span><del>- void autoscrollTimerFired(Timer<Scrollbar>&);
</del><ins>+ void autoscrollTimerFired(Timer&);
</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">@@ -191,7 +191,7 @@
</span><span class="cx">
</span><span class="cx"> bool m_enabled;
</span><span class="cx">
</span><del>- Timer<Scrollbar> 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="branchessafari6005branchSourceWebCoreplatformTimerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/Timer.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/Timer.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/Timer.h 2015-01-15 11:40:42 UTC (rev 178505)
</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 <typename TimerFiredClass> class Timer : public TimerBase {
</del><ins>+
+class Timer : public TimerBase {
</ins><span class="cx"> public:
</span><del>- typedef void (TimerFiredClass::*TimerFiredFunction)(Timer&);
- typedef void (TimerFiredClass::*DeprecatedTimerFiredFunction)(Timer*);
-
- Timer(TimerFiredClass* object, TimerFiredFunction function)
</del><ins>+ template <typename TimerFiredClass, typename TimerFiredBaseClass>
+ Timer(TimerFiredClass* object, void (TimerFiredBaseClass::*function)(Timer&))
</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 <typename TimerFiredClass, typename TimerFiredBaseClass>
+ 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 <typename TimerFiredClass, typename TimerFiredBaseClass>
+ Timer(TimerFiredClass& object, void (TimerFiredBaseClass::*function)())
+ : m_function(std::bind(function, &object))
+ {
+ }
+
+ Timer(std::function<void ()> 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<void ()> m_function;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformeflBatteryProviderEflcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/efl/BatteryProviderEfl.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/efl/BatteryProviderEfl.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/efl/BatteryProviderEfl.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> m_client->didChangeBatteryStatus(eventType, m_batteryStatus);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BatteryProviderEfl::timerFired(Timer<BatteryProviderEfl>* timer)
</del><ins>+void BatteryProviderEfl::timerFired(Timer* timer)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(timer, timer == &m_timer);
</span><span class="cx"> E_DBus_Connection* edbusConnection = e_dbus_bus_get(DBUS_BUS_SYSTEM);
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformeflBatteryProviderEflh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/efl/BatteryProviderEfl.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/efl/BatteryProviderEfl.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/efl/BatteryProviderEfl.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<BatteryProviderEfl>*);
</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<BatteryProviderEfl> m_timer;
</del><ins>+ Timer m_timer;
</ins><span class="cx"> RefPtr<BatteryStatus> m_batteryStatus;
</span><span class="cx"> const double m_batteryStatusRefreshInterval;
</span><span class="cx"> };
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformgraphicsBitmapImagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/BitmapImage.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/BitmapImage.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/BitmapImage.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -596,7 +596,7 @@
</span><span class="cx">
</span><span class="cx"> if (catchUpIfNecessary == DoNotCatchUp || time < 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<Timer<BitmapImage>>(this, &BitmapImage::advanceAnimation);
</del><ins>+ m_frameTimer = std::make_unique<Timer>(this, &BitmapImage::advanceAnimation);
</ins><span class="cx"> m_frameTimer->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">@@ -697,7 +697,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-void BitmapImage::advanceAnimation(Timer<BitmapImage>&)
</del><ins>+void BitmapImage::advanceAnimation(Timer&)
</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="branchessafari6005branchSourceWebCoreplatformgraphicsBitmapImageh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/BitmapImage.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/BitmapImage.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/BitmapImage.h 2015-01-15 11:40:42 UTC (rev 178505)
</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 <typename T> class Timer;
</del><ins>+class Timer;
</ins><span class="cx">
</span><span class="cx"> // ================================================
</span><span class="cx"> // FrameData Class
</span><span class="lines">@@ -273,7 +273,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<BitmapImage>&);
</del><ins>+ void advanceAnimation(Timer&);
</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">@@ -311,7 +311,7 @@
</span><span class="cx"> size_t m_currentFrame; // The index of the current frame of animation.
</span><span class="cx"> Vector<FrameData, 1> 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<Timer<BitmapImage>> m_frameTimer;
</del><ins>+ std::unique_ptr<Timer> 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="branchessafari6005branchSourceWebCoreplatformgraphicsMediaPlayercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/MediaPlayer.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/MediaPlayer.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/MediaPlayer.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -980,7 +980,7 @@
</span><span class="cx"> return m_private->videoDecodedByteCount();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayer::reloadTimerFired(Timer<MediaPlayer>&)
</del><ins>+void MediaPlayer::reloadTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> m_private->cancelLoad();
</span><span class="cx"> loadWithNextMediaEngine(m_currentMediaEngine);
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformgraphicsMediaPlayerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/MediaPlayer.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/MediaPlayer.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/MediaPlayer.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -599,12 +599,12 @@
</span><span class="cx"> MediaPlayer(MediaPlayerClient*);
</span><span class="cx"> MediaPlayerFactory* nextBestMediaEngine(MediaPlayerFactory*) const;
</span><span class="cx"> void loadWithNextMediaEngine(MediaPlayerFactory*);
</span><del>- void reloadTimerFired(Timer<MediaPlayer>&);
</del><ins>+ void reloadTimerFired(Timer&);
</ins><span class="cx">
</span><span class="cx"> static void initializeMediaEngines();
</span><span class="cx">
</span><span class="cx"> MediaPlayerClient* m_mediaPlayerClient;
</span><del>- Timer<MediaPlayer> m_reloadTimer;
</del><ins>+ Timer m_reloadTimer;
</ins><span class="cx"> OwnPtr<MediaPlayerPrivateInterface> m_private;
</span><span class="cx"> MediaPlayerFactory* m_currentMediaEngine;
</span><span class="cx"> URL m_url;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformgraphicsShadowBlurcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/ShadowBlur.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/ShadowBlur.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/ShadowBlur.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> static ScratchBuffer& shared();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void timerFired(Timer<ScratchBuffer>*)
</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<ImageBuffer> m_imageBuffer;
</span><del>- Timer<ScratchBuffer> 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="branchessafari6005branchSourceWebCoreplatformgraphicsTiledBackingStorecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/TiledBackingStore.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/TiledBackingStore.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/TiledBackingStore.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -542,7 +542,7 @@
</span><span class="cx"> m_tileBufferUpdateTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TiledBackingStore::tileBufferUpdateTimerFired(Timer<TiledBackingStore>*)
</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">@@ -558,7 +558,7 @@
</span><span class="cx"> m_backingStoreUpdateTimer.startOneShot(interval);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TiledBackingStore::backingStoreUpdateTimerFired(Timer<TiledBackingStore>*)
</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="branchessafari6005branchSourceWebCoreplatformgraphicsTiledBackingStoreh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/TiledBackingStore.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/TiledBackingStore.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/TiledBackingStore.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -84,8 +84,8 @@
</span><span class="cx"> void startTileBufferUpdateTimer();
</span><span class="cx"> void startBackingStoreUpdateTimer(double = 0);
</span><span class="cx">
</span><del>- void tileBufferUpdateTimerFired(Timer<TiledBackingStore>*);
- void backingStoreUpdateTimerFired(Timer<TiledBackingStore>*);
</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& visibleRect, IntRect& coverRect, IntRect& keepRect) const;
</span><span class="lines">@@ -117,8 +117,8 @@
</span><span class="cx"> typedef HashMap<Tile::Coordinate, RefPtr<Tile> > TileMap;
</span><span class="cx"> TileMap m_tiles;
</span><span class="cx">
</span><del>- Timer<TiledBackingStore> m_tileBufferUpdateTimer;
- Timer<TiledBackingStore> 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="branchessafari6005branchSourceWebCoreplatformgraphicsavfoundationMediaSelectionGroupAVFObjCh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<MediaSelectionGroupAVFObjC>&);
</del><ins>+ void selectionTimerFired(Timer&);
</ins><span class="cx">
</span><span class="cx"> RetainPtr<AVPlayerItem> m_playerItem;
</span><span class="cx"> RetainPtr<AVMediaSelectionGroup> m_mediaSelectionGroup;
</span><span class="cx"> OptionContainer m_options;
</span><span class="cx"> MediaSelectionOptionAVFObjC* m_selectedOption;
</span><del>- Timer<MediaSelectionGroupAVFObjC> 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="branchessafari6005branchSourceWebCoreplatformgraphicsavfoundationMediaSelectionGroupAVFObjCmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm 2015-01-15 11:40:42 UTC (rev 178505)
</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<MediaSelectionGroupAVFObjC>&)
</del><ins>+void MediaSelectionGroupAVFObjC::selectionTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> [m_playerItem selectMediaOption:(m_selectedOption ? m_selectedOption->avMediaSelectionOption() : nil) inMediaSelectionGroup:m_mediaSelectionGroup.get()];
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<MediaPlayerPrivateMediaSourceAVFObjC>&);
</del><ins>+ void seekTimerFired(Timer&);
</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<id> m_timeJumpedObserver;
</span><span class="cx"> RetainPtr<id> m_durationObserver;
</span><span class="cx"> RetainPtr<AVStreamSession> m_streamSession;
</span><del>- Timer<MediaPlayerPrivateMediaSourceAVFObjC> 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="branchessafari6005branchSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2015-01-15 11:40:42 UTC (rev 178505)
</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<MediaPlayerPrivateMediaSourceAVFObjC>&)
</del><ins>+void MediaPlayerPrivateMediaSourceAVFObjC::seekTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> seekInternal();
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformgraphicscaLayerPoolcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/LayerPool.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/LayerPool.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/LayerPool.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<LayerPool>&)
</del><ins>+void LayerPool::pruneTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> unsigned shrinkTo = decayedCapacity();
</span><span class="cx"> while (m_totalBytes > shrinkTo) {
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformgraphicscaLayerPoolh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/LayerPool.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/LayerPool.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/LayerPool.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">
</span><span class="cx"> bool canReuseLayerWithSize(const IntSize& size) const { return m_maxBytesForPool && !size.isEmpty(); }
</span><span class="cx"> void schedulePrune();
</span><del>- void pruneTimerFired(Timer<LayerPool>&);
</del><ins>+ void pruneTimerFired(Timer&);
</ins><span class="cx">
</span><span class="cx"> typedef enum { LeaveUnchanged, MarkAsUsed } AccessType;
</span><span class="cx"> LayerList& listOfLayersWithSize(const IntSize&, 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<LayerPool> 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="branchessafari6005branchSourceWebCoreplatformgraphicscaTileControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/TileController.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/TileController.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/TileController.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -344,7 +344,7 @@
</span><span class="cx"> return owningGraphicsLayer()->platformCALayerShouldTemporarilyRetainTileCohorts(m_tileCacheLayer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TileController::tileRevalidationTimerFired(Timer<TileController>*)
</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="branchessafari6005branchSourceWebCoreplatformgraphicscaTileControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/TileController.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/TileController.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/TileController.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> virtual float zoomedOutContentsScale() const override;
</span><span class="cx">
</span><span class="cx">
</span><del>- void tileRevalidationTimerFired(Timer<TileController>*);
</del><ins>+ void tileRevalidationTimerFired(Timer*);
</ins><span class="cx">
</span><span class="cx"> void setNeedsRevalidateTiles();
</span><span class="cx">
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> FloatRect m_visibleRectAtLastRevalidate;
</span><span class="cx"> IntRect m_boundsAtLastRevalidate;
</span><span class="cx">
</span><del>- Timer<TileController> 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="branchessafari6005branchSourceWebCoreplatformgraphicscaTileGridcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/TileGrid.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/TileGrid.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/TileGrid.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -475,7 +475,7 @@
</span><span class="cx"> return creationTime - timeThreshold;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TileGrid::cohortRemovalTimerFired(Timer<TileGrid>*)
</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="branchessafari6005branchSourceWebCoreplatformgraphicscaTileGridh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/TileGrid.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/TileGrid.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/TileGrid.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<TileGrid>*);
</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<TileCohortInfo> TileCohortList;
</span><span class="cx"> TileCohortList m_cohortList;
</span><span class="cx">
</span><del>- Timer<TileGrid> m_cohortRemovalTimer;
</del><ins>+ Timer m_cohortRemovalTimer;
</ins><span class="cx">
</span><span class="cx"> typedef HashMap<PlatformCALayer*, int> RepaintCountMap;
</span><span class="cx"> RepaintCountMap m_tileRepaintCounts;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformgraphicscawinLegacyCACFLayerTreeHostcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/win/LegacyCACFLayerTreeHost.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/win/LegacyCACFLayerTreeHost.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/win/LegacyCACFLayerTreeHost.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<LegacyCACFLayerTreeHost>*)
</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="branchessafari6005branchSourceWebCoreplatformgraphicscawinLegacyCACFLayerTreeHosth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/win/LegacyCACFLayerTreeHost.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/win/LegacyCACFLayerTreeHost.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/ca/win/LegacyCACFLayerTreeHost.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<LegacyCACFLayerTreeHost>*);
</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<LegacyCACFLayerTreeHost> m_renderTimer;
</del><ins>+ Timer m_renderTimer;
</ins><span class="cx"> COMPtr<IDirect3DDevice9> m_d3dDevice;
</span><span class="cx"> WKCACFContext* m_context;
</span><span class="cx"> bool m_mightBeAbleToCreateDeviceLater;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformgraphicscgIOSurfacePoolcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/cg/IOSurfacePool.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/cg/IOSurfacePool.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/cg/IOSurfacePool.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<IOSurfacePool>&)
</del><ins>+void IOSurfacePool::collectionTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> collectInUseSurfaces();
</span><span class="cx"> bool markedAllSurfaces = markOlderSurfacesPurgeable();
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformgraphicscgIOSurfacePoolh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/cg/IOSurfacePool.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/cg/IOSurfacePool.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/cg/IOSurfacePool.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<IOSurfacePool>&);
</del><ins>+ void collectionTimerFired(Timer&);
</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<IOSurfacePool> 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="branchessafari6005branchSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -1146,7 +1146,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void MediaPlayerPrivateGStreamer::fillTimerFired(Timer<MediaPlayerPrivateGStreamer>*)
</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="branchessafari6005branchSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<MediaPlayerPrivateGStreamer>*);
</del><ins>+ void fillTimerFired(Timer*);
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<PlatformTimeRanges> buffered() const;
</span><span class="cx"> float maxTimeSeekable() const;
</span><span class="lines">@@ -193,7 +193,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<MediaPlayerPrivateGStreamer> 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="branchessafari6005branchSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKith"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> void updateStates();
</span><span class="cx"> void doSeek();
</span><span class="cx"> void cancelSeek();
</span><del>- void seekTimerFired(Timer<MediaPlayerPrivateQTKit>&);
</del><ins>+ void seekTimerFired(Timer&);
</ins><span class="cx"> MediaTime maxMediaTimeLoaded() const;
</span><span class="cx"> void disableUnsupportedTracks();
</span><span class="cx">
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> RetainPtr<WebCoreMovieObserver> m_objcObserver;
</span><span class="cx"> String m_movieURL;
</span><span class="cx"> MediaTime m_seekTo;
</span><del>- Timer<MediaPlayerPrivateQTKit> 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="branchessafari6005branchSourceWebCoreplatformgraphicsmacMediaPlayerPrivateQTKitmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -783,7 +783,7 @@
</span><span class="cx"> m_seekTimer.stop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateQTKit::seekTimerFired(Timer<MediaPlayerPrivateQTKit>&)
</del><ins>+void MediaPlayerPrivateQTKit::seekTimerFired(Timer&)
</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="branchessafari6005branchSourceWebCoreplatformgraphicstexmapTextureMappercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<BitmapTexturePool>*);
</del><ins>+ void releaseUnusedTexturesTimerFired(Timer*);
</ins><span class="cx">
</span><span class="cx"> Vector<BitmapTexturePoolEntry> m_textures;
</span><del>- Timer<BitmapTexturePool> 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<BitmapTexturePool>*)
</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="branchessafari6005branchSourceWebCoreplatformgraphicstexmapcoordinatedCompositingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<CompositingCoordinator>*)
</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<UpdateAtlas> atlasToKeepAnyway;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformgraphicstexmapcoordinatedCompositingCoordinatorh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<CompositingCoordinator>*);
</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<CompositingCoordinator> 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="branchessafari6005branchSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -1224,7 +1224,7 @@
</span><span class="cx"> didChangeAnimations();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CoordinatedGraphicsLayer::animationStartedTimerFired(Timer<CoordinatedGraphicsLayer>*)
</del><ins>+void CoordinatedGraphicsLayer::animationStartedTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx"> client().notifyAnimationStarted(this, m_lastAnimationStartTime);
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> void setShouldUpdateVisibleRect();
</span><span class="cx"> float effectiveContentsScale();
</span><span class="cx">
</span><del>- void animationStartedTimerFired(Timer<CoordinatedGraphicsLayer>*);
</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">@@ -249,7 +249,7 @@
</span><span class="cx"> IntSize m_canvasSize;
</span><span class="cx"> GraphicsSurfaceToken m_canvasToken;
</span><span class="cx"> #endif
</span><del>- Timer<CoordinatedGraphicsLayer> 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="branchessafari6005branchSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedImageBackingcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<CoordinatedImageBacking>*)
</del><ins>+void CoordinatedImageBacking::clearContentsTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx"> m_client->clearImageBackingContents(id());
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedImageBackingh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.h 2015-01-15 11:40:42 UTC (rev 178505)
</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& changedToVisible);
</span><del>- void clearContentsTimerFired(Timer<CoordinatedImageBacking>*);
</del><ins>+ void clearContentsTimerFired(Timer*);
</ins><span class="cx">
</span><span class="cx"> Client* m_client;
</span><span class="cx"> RefPtr<Image> m_image;
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<CoordinatedSurface> m_surface;
</span><span class="cx">
</span><del>- Timer<CoordinatedImageBacking> 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="branchessafari6005branchSourceWebCoreplatformiosLegacyTileCacheh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/ios/LegacyTileCache.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/ios/LegacyTileCache.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/ios/LegacyTileCache.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<LegacyTileCache>*);
</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<LegacyTileGrid> m_zoomedOutTileGrid;
</span><span class="cx"> OwnPtr<LegacyTileGrid> m_zoomedInTileGrid;
</span><span class="cx">
</span><del>- Timer<LegacyTileCache> m_tileCreationTimer;
</del><ins>+ Timer m_tileCreationTimer;
</ins><span class="cx">
</span><span class="cx"> Vector<IntRect> m_savedDisplayRects;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformiosLegacyTileCachemm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/ios/LegacyTileCache.mm (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/ios/LegacyTileCache.mm 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/ios/LegacyTileCache.mm 2015-01-15 11:40:42 UTC (rev 178505)
</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<LegacyTileCache>*)
</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="branchessafari6005branchSourceWebCoreplatformmacHIDGamepadProvidercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/mac/HIDGamepadProvider.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/mac/HIDGamepadProvider.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/mac/HIDGamepadProvider.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<HIDGamepadProvider>&)
</del><ins>+void HIDGamepadProvider::connectionDelayTimerFired(Timer&)
</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<HIDGamepadProvider>&)
</del><ins>+void HIDGamepadProvider::inputNotificationTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_shouldDispatchCallbacks)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformmacHIDGamepadProviderh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/mac/HIDGamepadProvider.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/mac/HIDGamepadProvider.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/mac/HIDGamepadProvider.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<HIDGamepadProvider>&);
- void inputNotificationTimerFired(Timer<HIDGamepadProvider>&);
</del><ins>+ void connectionDelayTimerFired(Timer&);
+ void inputNotificationTimerFired(Timer&);
</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<GamepadProviderClient*> m_clients;
</span><span class="cx"> bool m_shouldDispatchCallbacks;
</span><span class="cx">
</span><del>- Timer<HIDGamepadProvider> m_connectionDelayTimer;
- Timer<HIDGamepadProvider> 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="branchessafari6005branchSourceWebCoreplatformmacScrollAnimatorMach"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -78,11 +78,11 @@
</span><span class="cx"> RetainPtr<WebScrollbarPainterDelegate> m_horizontalScrollbarPainterDelegate;
</span><span class="cx"> RetainPtr<WebScrollbarPainterDelegate> m_verticalScrollbarPainterDelegate;
</span><span class="cx">
</span><del>- void initialScrollbarPaintTimerFired(Timer<ScrollAnimatorMac>&);
- Timer<ScrollAnimatorMac> m_initialScrollbarPaintTimer;
</del><ins>+ void initialScrollbarPaintTimerFired(Timer&);
+ Timer m_initialScrollbarPaintTimer;
</ins><span class="cx">
</span><del>- void sendContentAreaScrolledTimerFired(Timer<ScrollAnimatorMac>&);
- Timer<ScrollAnimatorMac> m_sendContentAreaScrolledTimer;
</del><ins>+ void sendContentAreaScrolledTimerFired(Timer&);
+ 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,10 +155,10 @@
</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<ScrollAnimatorMac>&);
</del><ins>+ void snapRubberBandTimerFired(Timer&);
</ins><span class="cx">
</span><span class="cx"> ScrollElasticityController m_scrollElasticityController;
</span><del>- Timer<ScrollAnimatorMac> 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="branchessafari6005branchSourceWebCoreplatformmacScrollAnimatorMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -1234,7 +1234,7 @@
</span><span class="cx"> m_snapRubberBandTimer.stop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollAnimatorMac::snapRubberBandTimerFired(Timer<ScrollAnimatorMac>&)
</del><ins>+void ScrollAnimatorMac::snapRubberBandTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> m_scrollElasticityController.snapRubberBandTimerFired();
</span><span class="cx"> }
</span><span class="lines">@@ -1315,7 +1315,7 @@
</span><span class="cx"> m_initialScrollbarPaintTimer.stop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollAnimatorMac::initialScrollbarPaintTimerFired(Timer<ScrollAnimatorMac>&)
</del><ins>+void ScrollAnimatorMac::initialScrollbarPaintTimerFired(Timer&)
</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">@@ -1339,7 +1339,7 @@
</span><span class="cx"> [m_scrollbarPainterController contentAreaScrolled];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollAnimatorMac::sendContentAreaScrolledTimerFired(Timer<ScrollAnimatorMac>&)
</del><ins>+void ScrollAnimatorMac::sendContentAreaScrolledTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> sendContentAreaScrolled(m_contentAreaScrolledTimerScrollDelta);
</span><span class="cx"> m_contentAreaScrolledTimerScrollDelta = FloatSize();
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformmockDeviceMotionClientMockcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/mock/DeviceMotionClientMock.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/mock/DeviceMotionClientMock.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/mock/DeviceMotionClientMock.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<DeviceMotionClientMock>* timer)
</del><ins>+void DeviceMotionClientMock::timerFired(Timer* timer)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(timer, timer == &m_timer);
</span><span class="cx"> m_timer.stop();
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformmockDeviceMotionClientMockh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/mock/DeviceMotionClientMock.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/mock/DeviceMotionClientMock.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/mock/DeviceMotionClientMock.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -55,11 +55,11 @@
</span><span class="cx"> void setMotion(PassRefPtr<DeviceMotionData>);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void timerFired(Timer<DeviceMotionClientMock>*);
</del><ins>+ void timerFired(Timer*);
</ins><span class="cx">
</span><span class="cx"> RefPtr<DeviceMotionData> m_motion;
</span><span class="cx"> DeviceMotionController* m_controller;
</span><del>- Timer<DeviceMotionClientMock> 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="branchessafari6005branchSourceWebCoreplatformmockDeviceOrientationClientMockcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/mock/DeviceOrientationClientMock.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/mock/DeviceOrientationClientMock.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/mock/DeviceOrientationClientMock.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<DeviceOrientationClientMock>& timer)
</del><ins>+void DeviceOrientationClientMock::timerFired(Timer& timer)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(timer, &timer == &m_timer);
</span><span class="cx"> m_timer.stop();
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformmockDeviceOrientationClientMockh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/mock/DeviceOrientationClientMock.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/mock/DeviceOrientationClientMock.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/mock/DeviceOrientationClientMock.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -54,11 +54,11 @@
</span><span class="cx"> void setOrientation(PassRefPtr<DeviceOrientationData>);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void timerFired(Timer<DeviceOrientationClientMock>&);
</del><ins>+ void timerFired(Timer&);
</ins><span class="cx">
</span><span class="cx"> RefPtr<DeviceOrientationData> m_orientation;
</span><span class="cx"> DeviceOrientationController* m_controller;
</span><del>- Timer<DeviceOrientationClientMock> 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="branchessafari6005branchSourceWebCoreplatformmockGeolocationClientMockcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/mock/GeolocationClientMock.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/mock/GeolocationClientMock.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/mock/GeolocationClientMock.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<GeolocationClientMock>* timer)
</del><ins>+void GeolocationClientMock::permissionTimerFired(WebCore::Timer* timer)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(timer, timer == &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<GeolocationClientMock>* timer)
</del><ins>+void GeolocationClientMock::controllerTimerFired(Timer* timer)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(timer, timer == &m_controllerTimer);
</span><span class="cx"> ASSERT(m_controller);
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformmockGeolocationClientMockh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/mock/GeolocationClientMock.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/mock/GeolocationClientMock.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/mock/GeolocationClientMock.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<GeolocationClientMock>*);
</del><ins>+ void controllerTimerFired(Timer*);
</ins><span class="cx">
</span><span class="cx"> void asyncUpdatePermission();
</span><del>- void permissionTimerFired(Timer<GeolocationClientMock>*);
</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<GeolocationPosition> m_lastPosition;
</span><span class="cx"> bool m_hasError;
</span><span class="cx"> String m_errorMessage;
</span><del>- Timer<GeolocationClientMock> m_controllerTimer;
- Timer<GeolocationClientMock> 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="branchessafari6005branchSourceWebCoreplatformmockPlatformSpeechSynthesizerMockcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/mock/PlatformSpeechSynthesizerMock.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/mock/PlatformSpeechSynthesizerMock.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/mock/PlatformSpeechSynthesizerMock.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<PlatformSpeechSynthesizerMock>*)
</del><ins>+void PlatformSpeechSynthesizerMock::speakingFinished(Timer*)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_utterance.get());
</span><span class="cx"> RefPtr<PlatformSpeechSynthesisUtterance> protect(m_utterance);
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformmockPlatformSpeechSynthesizerMockh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/mock/PlatformSpeechSynthesizerMock.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/mock/PlatformSpeechSynthesizerMock.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/mock/PlatformSpeechSynthesizerMock.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<PlatformSpeechSynthesizerMock>*);
</del><ins>+ void speakingFinished(Timer*);
</ins><span class="cx">
</span><del>- Timer<PlatformSpeechSynthesizerMock> m_speakingFinishedTimer;
</del><ins>+ Timer m_speakingFinishedTimer;
</ins><span class="cx"> RefPtr<PlatformSpeechSynthesisUtterance> m_utterance;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformmockTimerEventBasedMockh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/mock/TimerEventBasedMock.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/mock/TimerEventBasedMock.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/mock/TimerEventBasedMock.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<TimerEvent>*)
</del><ins>+ void timerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx"> m_notifier->fire();
</span><span class="cx"> m_mock->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<TimerEvent> m_timer;
</del><ins>+ Timer m_timer;
</ins><span class="cx"> RefPtr<MockNotifier> m_notifier;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformnetworkDNSResolveQueuecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/network/DNSResolveQueue.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/network/DNSResolveQueue.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/network/DNSResolveQueue.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<DNSResolveQueue>&)
</del><ins>+void DNSResolveQueue::timerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> if (isUsingProxy()) {
</span><span class="cx"> m_names.clear();
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformnetworkDNSResolveQueueh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/network/DNSResolveQueue.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/network/DNSResolveQueue.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/network/DNSResolveQueue.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -55,9 +55,9 @@
</span><span class="cx"> bool platformProxyIsEnabledInSystemPreferences();
</span><span class="cx"> void platformResolve(const String&);
</span><span class="cx">
</span><del>- void timerFired(Timer<DNSResolveQueue>&);
</del><ins>+ void timerFired(Timer&);
</ins><span class="cx">
</span><del>- Timer<DNSResolveQueue> m_timer;
</del><ins>+ Timer m_timer;
</ins><span class="cx">
</span><span class="cx"> HashSet<String> m_names;
</span><span class="cx"> std::atomic<int> m_requestsInFlight;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformnetworkNetworkStateNotifierh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/network/NetworkStateNotifier.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/network/NetworkStateNotifier.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/network/NetworkStateNotifier.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<NetworkStateNotifier>&);
</del><ins>+ void networkStateChangeTimerFired(Timer&);
</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<SCDynamicStoreRef> m_store;
</span><del>- Timer<NetworkStateNotifier> 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="branchessafari6005branchSourceWebCoreplatformnetworkResourceHandlecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/network/ResourceHandle.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/network/ResourceHandle.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/network/ResourceHandle.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> d->m_failureTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ResourceHandle::failureTimerFired(Timer<ResourceHandle>&)
</del><ins>+void ResourceHandle::failureTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> if (!client())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformnetworkResourceHandleh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/network/ResourceHandle.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/network/ResourceHandle.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/network/ResourceHandle.h 2015-01-15 11:40:42 UTC (rev 178505)
</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 <typename T> class Timer;
-
</del><span class="cx"> class ResourceHandle : public RefCounted<ResourceHandle>
</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<ResourceHandle>*);
</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">@@ -243,7 +242,7 @@
</span><span class="cx"> ResourceRequest& firstRequest();
</span><span class="cx"> const String& lastHTTPMethod() const;
</span><span class="cx">
</span><del>- void failureTimerFired(Timer<ResourceHandle>&);
</del><ins>+ void failureTimerFired(Timer&);
</ins><span class="cx">
</span><span class="cx"> NetworkingContext* context() const;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformnetworkResourceHandleInternalh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/network/ResourceHandleInternal.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/network/ResourceHandleInternal.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/network/ResourceHandleInternal.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> RetainPtr<CFURLStorageSessionRef> m_storageSession;
</span><span class="cx"> #endif
</span><span class="cx"> #if USE(WININET)
</span><del>- Timer<ResourceHandle> 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<ResourceHandle> 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="branchessafari6005branchSourceWebCoreplatformnetworkcurlResourceHandleManagercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -607,7 +607,7 @@
</span><span class="cx"> return sent;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ResourceHandleManager::downloadTimerCallback(Timer<ResourceHandleManager>* /* 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="branchessafari6005branchSourceWebCoreplatformnetworkcurlResourceHandleManagerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/network/curl/ResourceHandleManager.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/network/curl/ResourceHandleManager.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/network/curl/ResourceHandleManager.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<ResourceHandleManager>*);
</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<ResourceHandleManager> 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="branchessafari6005branchSourceWebCoreplatformnetworkmacNetworkStateNotifierMaccpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/network/mac/NetworkStateNotifierMac.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/network/mac/NetworkStateNotifierMac.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/network/mac/NetworkStateNotifierMac.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> notifier->m_networkStateChangeTimer.startOneShot(StateChangeTimerInterval);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkStateNotifier::networkStateChangeTimerFired(Timer<NetworkStateNotifier>&)
</del><ins>+void NetworkStateNotifier::networkStateChangeTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> bool oldOnLine = m_isOnLine;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformnetworkwinResourceHandleWincpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/network/win/ResourceHandleWin.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/network/win/ResourceHandleWin.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/platform/network/win/ResourceHandleWin.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<ResourceHandle>*)
</del><ins>+void ResourceHandle::fileLoadTimer(Timer*)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<ResourceHandle> protector(this);
</span><span class="cx"> deref(); // balances ref in start
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorepluginsPluginPackagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/plugins/PluginPackage.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/plugins/PluginPackage.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/plugins/PluginPackage.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<PluginPackage>*)
</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="branchessafari6005branchSourceWebCorepluginsPluginPackageh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/plugins/PluginPackage.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/plugins/PluginPackage.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/plugins/PluginPackage.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<PluginPackage>*);
- Timer<PluginPackage> 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="branchessafari6005branchSourceWebCorepluginsPluginStreamcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/plugins/PluginStream.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/plugins/PluginStream.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/plugins/PluginStream.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<PluginStream>* timer)
</del><ins>+void PluginStream::delayDeliveryTimerFired(Timer* timer)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(timer, timer == &m_delayDeliveryTimer);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorepluginsPluginStreamh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/plugins/PluginStream.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/plugins/PluginStream.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/plugins/PluginStream.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<PluginStream> m_delayDeliveryTimer;
- void delayDeliveryTimerFired(Timer<PluginStream>*);
</del><ins>+ Timer m_delayDeliveryTimer;
+ void delayDeliveryTimerFired(Timer*);
</ins><span class="cx">
</span><span class="cx"> OwnPtr< Vector<char> > m_deliveryData;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorepluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/plugins/PluginView.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/plugins/PluginView.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/plugins/PluginView.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<PluginView>*)
</del><ins>+void PluginView::popPopupsStateTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx"> popPopupsEnabledState();
</span><span class="cx"> }
</span><span class="lines">@@ -486,7 +486,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PluginView::requestTimerFired(Timer<PluginView>* timer)
</del><ins>+void PluginView::requestTimerFired(Timer* timer)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(timer, timer == &m_requestTimer);
</span><span class="cx"> ASSERT(!m_requests.isEmpty());
</span><span class="lines">@@ -671,7 +671,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PluginView::invalidateTimerFired(Timer<PluginView>* timer)
</del><ins>+void PluginView::invalidateTimerFired(Timer* timer)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(timer, timer == &m_invalidateTimer);
</span><span class="cx">
</span><span class="lines">@@ -1271,7 +1271,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx">
</span><del>-void PluginView::lifeSupportTimerFired(Timer<PluginView>*)
</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="branchessafari6005branchSourceWebCorepluginsPluginViewh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/plugins/PluginView.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/plugins/PluginView.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/plugins/PluginView.h 2015-01-15 11:40:42 UTC (rev 178505)
</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(PassOwnPtr<PluginRequest>);
</span><del>- void requestTimerFired(Timer<PluginView>*);
- void invalidateTimerFired(Timer<PluginView>*);
- Timer<PluginView> m_requestTimer;
- Timer<PluginView> 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<PluginView>*);
- Timer<PluginView> m_popPopupsStateTimer;
</del><ins>+ void popPopupsStateTimerFired(Timer*);
+ Timer m_popPopupsStateTimer;
</ins><span class="cx">
</span><del>- void lifeSupportTimerFired(Timer<PluginView>*);
- Timer<PluginView> 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&);
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorepluginswinPluginMessageThrottlerWincpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/plugins/win/PluginMessageThrottlerWin.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/plugins/win/PluginMessageThrottlerWin.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/plugins/win/PluginMessageThrottlerWin.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<PluginMessageThrottlerWin>*)
</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="branchessafari6005branchSourceWebCorepluginswinPluginMessageThrottlerWinh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/plugins/win/PluginMessageThrottlerWin.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/plugins/win/PluginMessageThrottlerWin.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/plugins/win/PluginMessageThrottlerWin.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<PluginMessageThrottlerWin>*);
</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<PluginMessageThrottlerWin> 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="branchessafari6005branchSourceWebCorerenderingImageQualityControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/rendering/ImageQualityController.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/rendering/ImageQualityController.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/rendering/ImageQualityController.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<ImageQualityController>&)
</del><ins>+void ImageQualityController::highQualityRepaintTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> if (m_renderView.documentBeingDestroyed())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorerenderingImageQualityControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/rendering/ImageQualityController.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/rendering/ImageQualityController.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/rendering/ImageQualityController.h 2015-01-15 11:40:42 UTC (rev 178505)
</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&);
</span><del>- void highQualityRepaintTimerFired(Timer<ImageQualityController>&);
</del><ins>+ void highQualityRepaintTimerFired(Timer&);
</ins><span class="cx"> void restartTimer();
</span><span class="cx"> void removeObject(RenderBoxModelObject*);
</span><span class="cx">
</span><span class="cx"> const RenderView& m_renderView;
</span><span class="cx"> ObjectLayerSizeMap m_objectLayerSizeMap;
</span><del>- Timer<ImageQualityController> 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="branchessafari6005branchSourceWebCorerenderingRenderButtoncpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/rendering/RenderButton.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/rendering/RenderButton.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/rendering/RenderButton.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx">
</span><span class="cx"> if (!m_default && theme().isDefault(*this)) {
</span><span class="cx"> if (!m_timer)
</span><del>- m_timer = std::make_unique<Timer<RenderButton>>(this, &RenderButton::timerFired);
</del><ins>+ m_timer = std::make_unique<Timer>(this, &RenderButton::timerFired);
</ins><span class="cx"> m_timer->startRepeating(0.03);
</span><span class="cx"> m_default = true;
</span><span class="cx"> } else if (m_default && !theme().isDefault(*this)) {
</span><span class="lines">@@ -185,7 +185,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<RenderButton>&)
</del><ins>+void RenderButton::timerFired(Timer&)
</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="branchessafari6005branchSourceWebCorerenderingRenderButtonh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/rendering/RenderButton.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/rendering/RenderButton.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/rendering/RenderButton.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<RenderButton>&);
</del><ins>+ void timerFired(Timer&);
</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<Timer<RenderButton>> m_timer;
</del><ins>+ std::unique_ptr<Timer> m_timer;
</ins><span class="cx"> bool m_default;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<RenderLayerCompositor>&)
</del><ins>+void RenderLayerCompositor::updateCompositingLayersTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> updateCompositingLayers(CompositingUpdateAfterLayout);
</span><span class="cx"> }
</span><span class="lines">@@ -4012,14 +4012,14 @@
</span><span class="cx"> m_layerFlushTimer.startOneShot(throttledLayerFlushInitialDelay);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderLayerCompositor::layerFlushTimerFired(Timer<RenderLayerCompositor>&)
</del><ins>+void RenderLayerCompositor::layerFlushTimerFired(Timer&)
</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<RenderLayerCompositor>&)
</del><ins>+void RenderLayerCompositor::paintRelatedMilestonesTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> Frame& frame = m_renderView.frameView().frame();
</span><span class="cx"> Page* page = frame.page();
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorerenderingRenderLayerCompositorh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/rendering/RenderLayerCompositor.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/rendering/RenderLayerCompositor.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/rendering/RenderLayerCompositor.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -333,7 +333,7 @@
</span><span class="cx"> void addToOverlapMap(OverlapMap&, RenderLayer&, IntRect& layerBounds, bool& boundsComputed);
</span><span class="cx"> void addToOverlapMapRecursive(OverlapMap&, RenderLayer&, RenderLayer* ancestorLayer = nullptr);
</span><span class="cx">
</span><del>- void updateCompositingLayersTimerFired(Timer<RenderLayerCompositor>&);
</del><ins>+ void updateCompositingLayersTimerFired(Timer&);
</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&, OverlapMap*, struct CompositingState&, bool& layersChanged, bool& descendantHas3DTransform);
</span><span class="lines">@@ -451,9 +451,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<RenderLayerCompositor>&);
</del><ins>+ void layerFlushTimerFired(Timer&);
</ins><span class="cx">
</span><del>- void paintRelatedMilestonesTimerFired(Timer<RenderLayerCompositor>&);
</del><ins>+ void paintRelatedMilestonesTimerFired(Timer&);
</ins><span class="cx">
</span><span class="cx"> #if !LOG_DISABLED
</span><span class="cx"> const char* logReasonsForCompositing(const RenderLayer&);
</span><span class="lines">@@ -465,7 +465,7 @@
</span><span class="cx"> private:
</span><span class="cx"> RenderView& m_renderView;
</span><span class="cx"> std::unique_ptr<GraphicsLayer> m_rootContentLayer;
</span><del>- Timer<RenderLayerCompositor> 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">@@ -522,12 +522,12 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<GraphicsLayerUpdater> m_layerUpdater; // Updates tiled layer visible area periodically while animations are running.
</span><span class="cx">
</span><del>- Timer<RenderLayerCompositor> 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<RenderLayerCompositor> 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="branchessafari6005branchSourceWebCorerenderingRenderMarqueecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/rendering/RenderMarquee.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/rendering/RenderMarquee.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/rendering/RenderMarquee.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<RenderMarquee>&)
</del><ins>+void RenderMarquee::timerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> if (m_layer->renderer().view().needsLayout())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorerenderingRenderMarqueeh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/rendering/RenderMarquee.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/rendering/RenderMarquee.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/rendering/RenderMarquee.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<RenderMarquee>&);
</del><ins>+ void timerFired(Timer&);
</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<RenderMarquee> 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="branchessafari6005branchSourceWebCorerenderingRenderNamedFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/rendering/RenderNamedFlowThread.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/rendering/RenderNamedFlowThread.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/rendering/RenderNamedFlowThread.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -561,7 +561,7 @@
</span><span class="cx"> m_regionOversetChangeEventTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderNamedFlowThread::regionOversetChangeEventTimerFired(Timer<RenderNamedFlowThread>&)
</del><ins>+void RenderNamedFlowThread::regionOversetChangeEventTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> namedFlow().dispatchRegionOversetChangeEvent();
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorerenderingRenderNamedFlowThreadh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/rendering/RenderNamedFlowThread.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/rendering/RenderNamedFlowThread.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/rendering/RenderNamedFlowThread.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> void checkInvalidRegions();
</span><span class="cx">
</span><span class="cx"> bool canBeDestroyed() const { return m_invalidRegionList.isEmpty() && m_regionList.isEmpty() && m_contentElements.isEmpty(); }
</span><del>- void regionOversetChangeEventTimerFired(Timer<RenderNamedFlowThread>&);
</del><ins>+ void regionOversetChangeEventTimerFired(Timer&);
</ins><span class="cx"> void clearContentElements();
</span><span class="cx"> void updateWritingMode();
</span><span class="cx">
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> // The DOM Object that represents a named flow.
</span><span class="cx"> Ref<WebKitNamedFlow> m_namedFlow;
</span><span class="cx">
</span><del>- Timer<RenderNamedFlowThread> 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="branchessafari6005branchSourceWebCorerenderingRenderProgresscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/rendering/RenderProgress.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/rendering/RenderProgress.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/rendering/RenderProgress.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> && HTMLProgressElement::InvalidPosition != position());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderProgress::animationTimerFired(Timer<RenderProgress>&)
</del><ins>+void RenderProgress::animationTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> repaint();
</span><span class="cx"> if (!m_animationTimer.isActive() && m_animating)
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorerenderingRenderProgressh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/rendering/RenderProgress.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/rendering/RenderProgress.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/rendering/RenderProgress.h 2015-01-15 11:40:42 UTC (rev 178505)
</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&) const override;
</span><span class="cx">
</span><del>- void animationTimerFired(Timer<RenderProgress>&);
</del><ins>+ void animationTimerFired(Timer&);
</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<RenderProgress> m_animationTimer;
</del><ins>+ Timer m_animationTimer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> RENDER_OBJECT_TYPE_CASTS(RenderProgress, isProgress())
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/rendering/RenderView.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/rendering/RenderView.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/rendering/RenderView.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> m_lazyRepaintTimer.stop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderView::lazyRepaintTimerFired(Timer<RenderView>&)
</del><ins>+void RenderView::lazyRepaintTimerFired(Timer&)
</ins><span class="cx"> {
</span><span class="cx"> bool shouldRepaint = !document().inPageCache();
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/rendering/RenderView.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/rendering/RenderView.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/rendering/RenderView.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<RenderView>&);
</del><ins>+ void lazyRepaintTimerFired(Timer&);
</ins><span class="cx">
</span><del>- Timer<RenderView> m_lazyRepaintTimer;
</del><ins>+ Timer m_lazyRepaintTimer;
</ins><span class="cx"> HashSet<RenderBox*> m_renderersNeedingLazyRepaint;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<ImageQualityController> m_imageQualityController;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorereplayEventLoopInputDispatchercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/replay/EventLoopInputDispatcher.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/replay/EventLoopInputDispatcher.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/replay/EventLoopInputDispatcher.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> m_timer.stop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void EventLoopInputDispatcher::timerFired(Timer<EventLoopInputDispatcher>*)
</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="branchessafari6005branchSourceWebCorereplayEventLoopInputDispatcherh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/replay/EventLoopInputDispatcher.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/replay/EventLoopInputDispatcher.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/replay/EventLoopInputDispatcher.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<EventLoopInputDispatcher>*);
</del><ins>+ void timerFired(Timer*);
</ins><span class="cx">
</span><span class="cx"> Page& m_page;
</span><span class="cx"> EventLoopInputDispatcherClient* m_client;
</span><span class="cx"> ReplayingInputCursor& m_cursor;
</span><del>- Timer<EventLoopInputDispatcher> m_timer;
</del><ins>+ Timer m_timer;
</ins><span class="cx">
</span><span class="cx"> // This pointer is valid when an event loop input is presently dispatching.
</span><span class="cx"> EventLoopInputBase* m_runningInput;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorestorageStorageAreaImplcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/storage/StorageAreaImpl.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/storage/StorageAreaImpl.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/storage/StorageAreaImpl.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<StorageAreaImpl> *)
</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="branchessafari6005branchSourceWebCorestorageStorageAreaImplh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/storage/StorageAreaImpl.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/storage/StorageAreaImpl.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/storage/StorageAreaImpl.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<StorageAreaImpl>*);
</del><ins>+ void closeDatabaseTimerFired(Timer*);
</ins><span class="cx">
</span><span class="cx"> void dispatchStorageEvent(const String& key, const String& oldValue, const String& 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<StorageAreaImpl> 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="branchessafari6005branchSourceWebCorestorageStorageAreaSynccpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/storage/StorageAreaSync.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/storage/StorageAreaSync.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/storage/StorageAreaSync.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StorageAreaSync::syncTimerFired(Timer<StorageAreaSync>*)
</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="branchessafari6005branchSourceWebCorestorageStorageAreaSynch"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/storage/StorageAreaSync.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/storage/StorageAreaSync.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/storage/StorageAreaSync.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> private:
</span><span class="cx"> StorageAreaSync(PassRefPtr<StorageSyncManager>, PassRefPtr<StorageAreaImpl>, const String& databaseIdentifier);
</span><span class="cx">
</span><del>- Timer<StorageAreaSync> m_syncTimer;
</del><ins>+ Timer m_syncTimer;
</ins><span class="cx"> HashMap<String, String> 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<StorageAreaSync>*);
</del><ins>+ void syncTimerFired(Timer*);
</ins><span class="cx"> void openDatabase(OpenDatabaseParamType openingStrategy);
</span><span class="cx"> void sync(bool clearItems, const HashMap<String, String>& items);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoresvgSVGElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/svg/SVGElement.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/svg/SVGElement.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/svg/SVGElement.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -646,12 +646,12 @@
</span><span class="cx"> svgLoadEventTimer()->startOneShot(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SVGElement::svgLoadEventTimerFired(Timer<SVGElement>*)
</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<SVGElement>* 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="branchessafari6005branchSourceWebCoresvgSVGElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/svg/SVGElement.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/svg/SVGElement.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/svg/SVGElement.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -90,8 +90,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<SVGElement>*);
- virtual Timer<SVGElement>* 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="branchessafari6005branchSourceWebCoresvgSVGScriptElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/svg/SVGScriptElement.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/svg/SVGScriptElement.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/svg/SVGScriptElement.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<SVGElement>* svgLoadEventTimer() override { return &m_svgLoadEventTimer; }
</del><ins>+ virtual Timer* svgLoadEventTimer() override { return &m_svgLoadEventTimer; }
</ins><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> virtual bool filterOutAnimatableAttribute(const QualifiedName&) 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<SVGElement> m_svgLoadEventTimer;
</del><ins>+ Timer m_svgLoadEventTimer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> NODE_TYPE_CASTS(SVGScriptElement)
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoresvgSVGStyleElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/svg/SVGStyleElement.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/svg/SVGStyleElement.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/svg/SVGStyleElement.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<SVGElement>* svgLoadEventTimer() override { return &m_svgLoadEventTimer; }
</del><ins>+ virtual Timer* svgLoadEventTimer() override { return &m_svgLoadEventTimer; }
</ins><span class="cx">
</span><span class="cx"> InlineStyleSheetOwner m_styleSheetOwner;
</span><del>- Timer<SVGElement> m_svgLoadEventTimer;
</del><ins>+ Timer m_svgLoadEventTimer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> NODE_TYPE_CASTS(SVGStyleElement)
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoresvgSVGUseElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/svg/SVGUseElement.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/svg/SVGUseElement.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/svg/SVGUseElement.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<SVGElement>* svgLoadEventTimer() override { return &m_svgLoadEventTimer; }
</del><ins>+ virtual Timer* svgLoadEventTimer() override { return &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<SVGElementInstance> m_targetElementInstance;
</span><span class="cx"> CachedResourceHandle<CachedSVGDocument> m_cachedDocument;
</span><del>- Timer<SVGElement> m_svgLoadEventTimer;
</del><ins>+ Timer m_svgLoadEventTimer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> NODE_TYPE_CASTS(SVGUseElement)
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoresvganimationSMILTimeContainercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/svg/animation/SMILTimeContainer.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/svg/animation/SMILTimeContainer.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/svg/animation/SMILTimeContainer.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx"> m_timer.startOneShot(delay.value());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SMILTimeContainer::timerFired(Timer<SMILTimeContainer>*)
</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="branchessafari6005branchSourceWebCoresvganimationSMILTimeContainerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/svg/animation/SMILTimeContainer.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/svg/animation/SMILTimeContainer.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/svg/animation/SMILTimeContainer.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<SMILTimeContainer>*);
</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<SMILTimeContainer> m_timer;
</del><ins>+ Timer m_timer;
</ins><span class="cx">
</span><span class="cx"> typedef std::pair<SVGElement*, QualifiedName> ElementAttributePair;
</span><span class="cx"> typedef Vector<SVGSMILElement*> AnimationsVector;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorexmlXMLHttpRequestProgressEventThrottlecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> dispatchEvent(event);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void XMLHttpRequestProgressEventThrottle::dispatchDeferredEvents(Timer<XMLHttpRequestProgressEventThrottle>* timer)
</del><ins>+void XMLHttpRequestProgressEventThrottle::dispatchDeferredEvents(Timer* timer)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(timer, timer == &m_dispatchDeferredEventsTimer);
</span><span class="cx"> ASSERT(m_deferEvents);
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCorexmlXMLHttpRequestProgressEventThrottleh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebCore/xml/XMLHttpRequestProgressEventThrottle.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -61,7 +61,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<XMLHttpRequestProgressEventThrottle>*);
</del><ins>+ void dispatchDeferredEvents(Timer*);
</ins><span class="cx"> void flushProgressEvent();
</span><span class="cx">
</span><span class="cx"> bool hasEventToDispatch() const;
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> bool m_deferEvents;
</span><span class="cx"> RefPtr<Event> m_deferredProgressEvent;
</span><span class="cx"> Vector<RefPtr<Event>> m_deferredEvents;
</span><del>- Timer<XMLHttpRequestProgressEventThrottle> 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="branchessafari6005branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebKit/mac/ChangeLog 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-01-15 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r175719. rdar://problem/19424169
+
+ 2014-11-05 Jer Noble <jer.noble@apple.com>
+
+ 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"> 2015-01-15 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r178378. rdar://problem/19274499
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebKitmacPluginsHostedNetscapePluginInstanceProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<NetscapePluginInstanceProxy>*);
- WebCore::Timer<NetscapePluginInstanceProxy> m_requestTimer;
</del><ins>+ void requestTimerFired(WebCore::Timer*);
+ WebCore::Timer m_requestTimer;
</ins><span class="cx"> Deque<RefPtr<PluginRequest>> m_pluginRequests;
</span><span class="cx">
</span><span class="cx"> HashMap<uint32_t, RefPtr<HostedNetscapePluginStream>> m_streams;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebKitmacPluginsHostedNetscapePluginInstanceProxymm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm 2015-01-15 11:40:42 UTC (rev 178505)
</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<NetscapePluginInstanceProxy>*)
</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="branchessafari6005branchSourceWebKitmacPluginsWebNetscapePluginStreamh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit/mac/Plugins/WebNetscapePluginStream.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit/mac/Plugins/WebNetscapePluginStream.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebKit/mac/Plugins/WebNetscapePluginStream.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -123,8 +123,8 @@
</span><span class="cx"> RetainPtr<NSMutableURLRequest> m_request;
</span><span class="cx"> NPPluginFuncs *m_pluginFuncs;
</span><span class="cx">
</span><del>- void deliverDataTimerFired(WebCore::Timer<WebNetscapePluginStream>* timer);
- WebCore::Timer<WebNetscapePluginStream> 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="branchessafari6005branchSourceWebKitmacPluginsWebNetscapePluginStreammm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm 2015-01-15 11:40:42 UTC (rev 178505)
</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<WebNetscapePluginStream>* 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="branchessafari6005branchSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit/win/ChangeLog (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit/win/ChangeLog 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebKit/win/ChangeLog 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-01-15 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r175719. rdar://problem/19424169
+
+ 2014-11-05 Jer Noble <jer.noble@apple.com>
+
+ 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-21 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Support multiple signatures of diagnostic logging.
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebKitwinFullscreenVideoControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit/win/FullscreenVideoController.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit/win/FullscreenVideoController.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebKit/win/FullscreenVideoController.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -594,7 +594,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FullscreenVideoController::timerFired(Timer<FullscreenVideoController>*)
</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="branchessafari6005branchSourceWebKitwinFullscreenVideoControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit/win/FullscreenVideoController.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit/win/FullscreenVideoController.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebKit/win/FullscreenVideoController.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<FullscreenVideoController>*);
</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<FullscreenVideoController> 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="branchessafari6005branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit2/ChangeLog (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit2/ChangeLog 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebKit2/ChangeLog 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2015-01-15 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r175719. rdar://problem/19424169
+
+ 2014-11-05 Jer Noble <jer.noble@apple.com>
+
+ 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"> 2015-01-15 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r178290. rdar://problem/19441243
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebKit2NetworkProcessNetworkResourceLoadSchedulercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> m_requestTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkResourceLoadScheduler::requestTimerFired(WebCore::Timer<NetworkResourceLoadScheduler>*)
</del><ins>+void NetworkResourceLoadScheduler::requestTimerFired(WebCore::Timer*)
</ins><span class="cx"> {
</span><span class="cx"> servePendingRequests();
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebKit2NetworkProcessNetworkResourceLoadSchedulerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> HostRecord* hostForURL(const WebCore::URL&, CreateHostPolicy = FindOnly);
</span><span class="cx">
</span><span class="cx"> void scheduleServePendingRequests();
</span><del>- void requestTimerFired(WebCore::Timer<NetworkResourceLoadScheduler>*);
</del><ins>+ void requestTimerFired(WebCore::Timer*);
</ins><span class="cx">
</span><span class="cx"> void platformInitializeMaximumHTTPConnectionCountPerHost();
</span><span class="cx">
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx">
</span><span class="cx"> bool m_isSerialLoadingEnabled;
</span><span class="cx">
</span><del>- WebCore::Timer<NetworkResourceLoadScheduler> m_requestTimer;
</del><ins>+ WebCore::Timer m_requestTimer;
</ins><span class="cx">
</span><span class="cx"> Mutex m_loadersToRemoveMutex;
</span><span class="cx"> Vector<RefPtr<NetworkResourceLoader>> m_loadersToRemove;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebKit2SharedWebMemorySamplercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit2/Shared/WebMemorySampler.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit2/Shared/WebMemorySampler.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebKit2/Shared/WebMemorySampler.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<WebMemorySampler>*)
</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<WebMemorySampler>*)
</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="branchessafari6005branchSourceWebKit2SharedWebMemorySamplerh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit2/Shared/WebMemorySampler.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit2/Shared/WebMemorySampler.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebKit2/Shared/WebMemorySampler.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -85,8 +85,8 @@
</span><span class="cx"> void initializeSandboxedLogFile(const SandboxExtension::Handle&, const String&);
</span><span class="cx"> void writeHeaders();
</span><span class="cx"> void initializeTimers(double);
</span><del>- void sampleTimerFired(WebCore::Timer<WebMemorySampler>*);
- void stopTimerFired(WebCore::Timer<WebMemorySampler>*);
</del><ins>+ void sampleTimerFired(WebCore::Timer*);
+ void stopTimerFired(WebCore::Timer*);
</ins><span class="cx"> void appendCurrentMemoryUsageToFile(WebCore::PlatformFileHandle&);
</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<WebMemorySampler> m_sampleTimer;
- WebCore::Timer<WebMemorySampler> 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<SandboxExtension> m_sampleLogSandboxExtension;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebKit2SharedmacRemoteLayerBackingStoreCollectionh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit2/Shared/mac/RemoteLayerBackingStoreCollection.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit2/Shared/mac/RemoteLayerBackingStoreCollection.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebKit2/Shared/mac/RemoteLayerBackingStoreCollection.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> void willCommitLayerTree(RemoteLayerTreeTransaction&);
</span><span class="cx"> void didFlushLayers();
</span><span class="cx">
</span><del>- void volatilityTimerFired(WebCore::Timer<RemoteLayerBackingStoreCollection>&);
</del><ins>+ void volatilityTimerFired(WebCore::Timer&);
</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<RemoteLayerBackingStore*> m_unparentedBackingStore;
</span><span class="cx"> HashSet<RemoteLayerBackingStore*> m_reachableBackingStoreInLatestFlush;
</span><span class="cx">
</span><del>- WebCore::Timer<RemoteLayerBackingStoreCollection> 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="branchessafari6005branchSourceWebKit2SharedmacRemoteLayerBackingStoreCollectionmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit2/Shared/mac/RemoteLayerBackingStoreCollection.mm (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit2/Shared/mac/RemoteLayerBackingStoreCollection.mm 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebKit2/Shared/mac/RemoteLayerBackingStoreCollection.mm 2015-01-15 11:40:42 UTC (rev 178505)
</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<RemoteLayerBackingStoreCollection>&)
</del><ins>+void RemoteLayerBackingStoreCollection::volatilityTimerFired(WebCore::Timer&)
</ins><span class="cx"> {
</span><span class="cx"> bool successfullyMadeBackingStoreVolatile = true;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebKit2UIProcessAPIeflEwkViewcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit2/UIProcess/API/efl/EwkView.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit2/UIProcess/API/efl/EwkView.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebKit2/UIProcess/API/efl/EwkView.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -563,7 +563,7 @@
</span><span class="cx"> return toIntSize(WKViewGetSize(wkView()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void EwkView::displayTimerFired(Timer<EwkView>*)
</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="branchessafari6005branchSourceWebKit2UIProcessAPIeflEwkViewh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit2/UIProcess/API/efl/EwkView.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit2/UIProcess/API/efl/EwkView.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebKit2/UIProcess/API/efl/EwkView.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -200,7 +200,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<EwkView>*);
</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">@@ -277,7 +277,7 @@
</span><span class="cx"> bool m_touchEventsEnabled;
</span><span class="cx"> std::unique_ptr<WebKit::GestureRecognizer> m_gestureRecognizer;
</span><span class="cx"> #endif
</span><del>- WebCore::Timer<EwkView> m_displayTimer;
</del><ins>+ WebCore::Timer m_displayTimer;
</ins><span class="cx"> RefPtr<EwkContextMenu> m_contextMenu;
</span><span class="cx"> std::unique_ptr<EwkPopupMenu> m_popupMenu;
</span><span class="cx"> std::unique_ptr<WebKit::InputMethodContextEfl> m_inputMethodContext;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebKit2UIProcesseflTextCheckerClientEflcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit2/UIProcess/efl/TextCheckerClientEfl.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit2/UIProcess/efl/TextCheckerClientEfl.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebKit2/UIProcess/efl/TextCheckerClientEfl.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</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<TextCheckerClientEfl>*)
</del><ins>+void TextCheckerClientEfl::languagesUpdateTimerFired(Timer*)
</ins><span class="cx"> {
</span><span class="cx"> m_textCheckerEnchant->updateSpellCheckingLanguages(m_spellCheckingLanguages);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TextCheckerClientEfl::spellCheckingSettingChangeTimerFired(Timer<TextCheckerClientEfl>*)
</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="branchessafari6005branchSourceWebKit2UIProcesseflTextCheckerClientEflh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit2/UIProcess/efl/TextCheckerClientEfl.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit2/UIProcess/efl/TextCheckerClientEfl.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebKit2/UIProcess/efl/TextCheckerClientEfl.h 2015-01-15 11:40:42 UTC (rev 178505)
</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<TextCheckerClientEfl>*);
- WebCore::Timer<TextCheckerClientEfl> m_languagesUpdateTimer;
</del><ins>+ void languagesUpdateTimerFired(WebCore::Timer*);
+ WebCore::Timer m_languagesUpdateTimer;
</ins><span class="cx"> Vector<String> 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<TextCheckerClientEfl>*);
</del><ins>+ void spellCheckingSettingChangeTimerFired(WebCore::Timer*);
</ins><span class="cx"> void callContinuousSpellCheckingChangeCallbackAsync();
</span><del>- WebCore::Timer<TextCheckerClientEfl> 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="branchessafari6005branchSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHostcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CoordinatedLayerTreeHost::layerFlushTimerFired(Timer<CoordinatedLayerTreeHost>*)
</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="branchessafari6005branchSourceWebKit2WebProcessWebPageCoordinatedGraphicsCoordinatedLayerTreeHosth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> void purgeBackingStores();
</span><span class="cx"> void commitScrollOffset(uint32_t layerID, const WebCore::IntSize& offset);
</span><span class="cx">
</span><del>- void layerFlushTimerFired(WebCore::Timer<CoordinatedLayerTreeHost>*);
</del><ins>+ void layerFlushTimerFired(WebCore::Timer*);
</ins><span class="cx">
</span><span class="cx"> // CompositingCoordinator::Client
</span><span class="cx"> virtual void didFlushRootLayer(const WebCore::FloatRect& visibleContentRect) override;
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx">
</span><span class="cx"> LayerTreeContext m_layerTreeContext;
</span><span class="cx">
</span><del>- WebCore::Timer<CoordinatedLayerTreeHost> 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="branchessafari6005branchSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreah"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> void updateScrolledExposedRect();
</span><span class="cx"> void updateRootLayers();
</span><span class="cx">
</span><del>- void layerFlushTimerFired(WebCore::Timer<RemoteLayerTreeDrawingArea>*);
</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">@@ -148,7 +148,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<RemoteLayerTreeDrawingArea> 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="branchessafari6005branchSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -304,7 +304,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RemoteLayerTreeDrawingArea::layerFlushTimerFired(WebCore::Timer<RemoteLayerTreeDrawingArea>*)
</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="branchessafari6005branchSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit2/WebProcess/WebProcess.cpp (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit2/WebProcess/WebProcess.cpp 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebKit2/WebProcess/WebProcess.cpp 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -1203,7 +1203,7 @@
</span><span class="cx"> return successfullyMarkedAllLayersVolatile;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcess::processSuspensionCleanupTimerFired(Timer<WebProcess>* timer)
</del><ins>+void WebProcess::processSuspensionCleanupTimerFired(Timer* timer)
</ins><span class="cx"> {
</span><span class="cx"> if (markAllLayersVolatileIfPossible()) {
</span><span class="cx"> parentProcessConnection()->send(Messages::WebProcessProxy::ProcessReadyToSuspend(), 0);
</span><span class="lines">@@ -1225,7 +1225,7 @@
</span><span class="cx"> m_nonVisibleProcessCleanupTimer.startOneShot(nonVisibleProcessCleanupDelay);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcess::nonVisibleProcessCleanupTimerFired(Timer<WebProcess>*)
</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="branchessafari6005branchSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit2/WebProcess/WebProcess.h (178504 => 178505)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit2/WebProcess/WebProcess.h 2015-01-15 10:50:44 UTC (rev 178504)
+++ branches/safari-600.5-branch/Source/WebKit2/WebProcess/WebProcess.h 2015-01-15 11:40:42 UTC (rev 178505)
</span><span class="lines">@@ -169,7 +169,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<WebProcess>*);
</del><ins>+ void nonVisibleProcessCleanupTimerFired(WebCore::Timer*);
</ins><span class="cx">
</span><span class="cx"> void updateActivePages();
</span><span class="cx">
</span><span class="lines">@@ -180,7 +180,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<WebProcess>*);
</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">@@ -301,7 +301,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> RefPtr<ViewUpdateDispatcher> m_viewUpdateDispatcher;
</span><span class="cx"> #endif
</span><del>- WebCore::Timer<WebProcess> 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">@@ -352,7 +352,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> HashSet<uint64_t> m_pagesInWindows;
</span><del>- WebCore::Timer<WebProcess> m_nonVisibleProcessCleanupTimer;
</del><ins>+ WebCore::Timer m_nonVisibleProcessCleanupTimer;
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<WebOriginDataManager> m_webOriginDataManager;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>