<!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>[187706] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/187706">187706</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-07-31 20:41:07 -0700 (Fri, 31 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Drop dummy Timer callbacks
https://bugs.webkit.org/show_bug.cgi?id=147516
Reviewed by Alexey Proskuryakov.
Drop dummy Timer callbacks in the code base. A lot of Timer callbacks
do nothing else beside calling a particular method. In such case, we
can use the called method as Timer callback instead.
Source/WebCore:
* css/FontLoader.cpp:
(WebCore::FontLoader::FontLoader):
* css/FontLoader.h:
* dom/Document.cpp:
(WebCore::Document::Document):
(WebCore::Document::styleRecalcTimerFired): Deleted.
(WebCore::Document::domCookieCacheExpiryTimerFired): Deleted.
* dom/Document.h:
* html/MediaController.cpp:
(MediaController::MediaController):
(MediaController::timeupdateTimerFired): Deleted.
* html/MediaController.h:
* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::CachedResource):
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::CachedResourceLoader):
(WebCore::CachedResourceLoader::garbageCollectDocumentResourcesTimerFired): Deleted.
* loader/cache/CachedResourceLoader.h:
* loader/cache/MemoryCache.cpp:
(WebCore::MemoryCache::MemoryCache):
(WebCore::MemoryCache::pruneTimerFired): Deleted.
* loader/cache/MemoryCache.h:
* page/EventSource.cpp:
(WebCore::EventSource::EventSource):
(WebCore::EventSource::connectTimerFired): Deleted.
* page/EventSource.h:
* page/FrameView.cpp:
(WebCore::FrameView::FrameView):
(WebCore::FrameView::delayedScrollEventTimerFired): Deleted.
(WebCore::FrameView::postLayoutTimerFired): Deleted.
* page/FrameView.h:
* page/scrolling/ios/ScrollingCoordinatorIOS.h:
* page/scrolling/ios/ScrollingCoordinatorIOS.mm:
(WebCore::ScrollingCoordinatorIOS::ScrollingCoordinatorIOS):
(WebCore::ScrollingCoordinatorIOS::scrollingStateTreeCommitterTimerFired): Deleted.
* page/scrolling/mac/ScrollingCoordinatorMac.h:
* page/scrolling/mac/ScrollingCoordinatorMac.mm:
(WebCore::ScrollingCoordinatorMac::ScrollingCoordinatorMac):
(WebCore::ScrollingCoordinatorMac::scrollingStateTreeCommitterTimerFired): Deleted.
* platform/graphics/FontCache.cpp:
(WebCore::FontCache::FontCache):
(WebCore::FontCache::purgeTimerFired): Deleted.
* platform/graphics/FontCache.h:
* platform/graphics/ShadowBlur.cpp:
(WebCore::ScratchBuffer::ScratchBuffer):
(WebCore::ScratchBuffer::timerFired): Deleted.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::MediaPlayerPrivateMediaSourceAVFObjC):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::seekTimerFired): Deleted.
Source/WebKit/mac:
* Plugins/WebNetscapePluginStream.h:
* Plugins/WebNetscapePluginStream.mm:
(WebNetscapePluginStream::WebNetscapePluginStream):
(WebNetscapePluginStream::deliverDataTimerFired): Deleted.
Source/WebKit2:
* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:
* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
(WebKit::RemoteLayerTreeDrawingArea::RemoteLayerTreeDrawingArea):
(WebKit::RemoteLayerTreeDrawingArea::layerFlushTimerFired): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssFontLoadercpp">trunk/Source/WebCore/css/FontLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorecssFontLoaderh">trunk/Source/WebCore/css/FontLoader.h</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaControllercpp">trunk/Source/WebCore/html/MediaController.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlMediaControllerh">trunk/Source/WebCore/html/MediaController.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourcecpp">trunk/Source/WebCore/loader/cache/CachedResource.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoadercpp">trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoaderh">trunk/Source/WebCore/loader/cache/CachedResourceLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheMemoryCachecpp">trunk/Source/WebCore/loader/cache/MemoryCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheMemoryCacheh">trunk/Source/WebCore/loader/cache/MemoryCache.h</a></li>
<li><a href="#trunkSourceWebCorepageEventSourcecpp">trunk/Source/WebCore/page/EventSource.cpp</a></li>
<li><a href="#trunkSourceWebCorepageEventSourceh">trunk/Source/WebCore/page/EventSource.h</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewh">trunk/Source/WebCore/page/FrameView.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingiosScrollingCoordinatorIOSh">trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingiosScrollingCoordinatorIOSmm">trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.mm</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingCoordinatorMach">trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingCoordinatorMacmm">trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCachecpp">trunk/Source/WebCore/platform/graphics/FontCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCacheh">trunk/Source/WebCore/platform/graphics/FontCache.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsShadowBlurcpp">trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCh">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebNetscapePluginStreamh">trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.h</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebNetscapePluginStreammm">trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187705 => 187706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-01 03:03:02 UTC (rev 187705)
+++ trunk/Source/WebCore/ChangeLog 2015-08-01 03:41:07 UTC (rev 187706)
</span><span class="lines">@@ -1,3 +1,65 @@
</span><ins>+2015-07-31 Chris Dumez <cdumez@apple.com>
+
+ Drop dummy Timer callbacks
+ https://bugs.webkit.org/show_bug.cgi?id=147516
+
+ Reviewed by Alexey Proskuryakov.
+
+ Drop dummy Timer callbacks in the code base. A lot of Timer callbacks
+ do nothing else beside calling a particular method. In such case, we
+ can use the called method as Timer callback instead.
+
+ * css/FontLoader.cpp:
+ (WebCore::FontLoader::FontLoader):
+ * css/FontLoader.h:
+ * dom/Document.cpp:
+ (WebCore::Document::Document):
+ (WebCore::Document::styleRecalcTimerFired): Deleted.
+ (WebCore::Document::domCookieCacheExpiryTimerFired): Deleted.
+ * dom/Document.h:
+ * html/MediaController.cpp:
+ (MediaController::MediaController):
+ (MediaController::timeupdateTimerFired): Deleted.
+ * html/MediaController.h:
+ * loader/cache/CachedResource.cpp:
+ (WebCore::CachedResource::CachedResource):
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::CachedResourceLoader):
+ (WebCore::CachedResourceLoader::garbageCollectDocumentResourcesTimerFired): Deleted.
+ * loader/cache/CachedResourceLoader.h:
+ * loader/cache/MemoryCache.cpp:
+ (WebCore::MemoryCache::MemoryCache):
+ (WebCore::MemoryCache::pruneTimerFired): Deleted.
+ * loader/cache/MemoryCache.h:
+ * page/EventSource.cpp:
+ (WebCore::EventSource::EventSource):
+ (WebCore::EventSource::connectTimerFired): Deleted.
+ * page/EventSource.h:
+ * page/FrameView.cpp:
+ (WebCore::FrameView::FrameView):
+ (WebCore::FrameView::delayedScrollEventTimerFired): Deleted.
+ (WebCore::FrameView::postLayoutTimerFired): Deleted.
+ * page/FrameView.h:
+ * page/scrolling/ios/ScrollingCoordinatorIOS.h:
+ * page/scrolling/ios/ScrollingCoordinatorIOS.mm:
+ (WebCore::ScrollingCoordinatorIOS::ScrollingCoordinatorIOS):
+ (WebCore::ScrollingCoordinatorIOS::scrollingStateTreeCommitterTimerFired): Deleted.
+ * page/scrolling/mac/ScrollingCoordinatorMac.h:
+ * page/scrolling/mac/ScrollingCoordinatorMac.mm:
+ (WebCore::ScrollingCoordinatorMac::ScrollingCoordinatorMac):
+ (WebCore::ScrollingCoordinatorMac::scrollingStateTreeCommitterTimerFired): Deleted.
+ * platform/graphics/FontCache.cpp:
+ (WebCore::FontCache::FontCache):
+ (WebCore::FontCache::purgeTimerFired): Deleted.
+ * platform/graphics/FontCache.h:
+ * platform/graphics/ShadowBlur.cpp:
+ (WebCore::ScratchBuffer::ScratchBuffer):
+ (WebCore::ScratchBuffer::timerFired): Deleted.
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::MediaPlayerPrivateMediaSourceAVFObjC):
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::seekTimerFired): Deleted.
+
</ins><span class="cx"> 2015-07-31 Matthew Daiter <mdaiter@apple.com>
</span><span class="cx">
</span><span class="cx"> Removed pointSize from _addMarkersToList
</span></span></pre></div>
<a id="trunkSourceWebCorecssFontLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/FontLoader.cpp (187705 => 187706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/FontLoader.cpp 2015-08-01 03:03:02 UTC (rev 187705)
+++ trunk/Source/WebCore/css/FontLoader.cpp 2015-08-01 03:41:07 UTC (rev 187706)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> , m_document(document)
</span><span class="cx"> , m_numLoadingFromCSS(0)
</span><span class="cx"> , m_numLoadingFromJS(0)
</span><del>- , m_pendingEventsTimer(*this, &FontLoader::pendingEventsTimerFired)
</del><ins>+ , m_pendingEventsTimer(*this, &FontLoader::firePendingEvents)
</ins><span class="cx"> {
</span><span class="cx"> suspendIfNeeded();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssFontLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/FontLoader.h (187705 => 187706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/FontLoader.h 2015-08-01 03:03:02 UTC (rev 187705)
+++ trunk/Source/WebCore/css/FontLoader.h 2015-08-01 03:41:07 UTC (rev 187706)
</span><span class="lines">@@ -91,7 +91,6 @@
</span><span class="cx"> const char* activeDOMObjectName() const override;
</span><span class="cx"> bool canSuspendForPageCache() const override;
</span><span class="cx">
</span><del>- void pendingEventsTimerFired() { firePendingEvents(); }
</del><span class="cx"> void scheduleEvent(PassRefPtr<Event>);
</span><span class="cx"> void firePendingEvents();
</span><span class="cx"> bool resolveFontStyle(const String&, FontCascade&);
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (187705 => 187706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2015-08-01 03:03:02 UTC (rev 187705)
+++ trunk/Source/WebCore/dom/Document.cpp 2015-08-01 03:41:07 UTC (rev 187706)
</span><span class="lines">@@ -444,7 +444,7 @@
</span><span class="cx"> , m_readyState(Complete)
</span><span class="cx"> , m_bParsing(false)
</span><span class="cx"> , m_optimizedStyleSheetUpdateTimer(*this, &Document::optimizedStyleSheetUpdateTimerFired)
</span><del>- , m_styleRecalcTimer(*this, &Document::styleRecalcTimerFired)
</del><ins>+ , m_styleRecalcTimer(*this, &Document::updateStyleIfNeeded)
</ins><span class="cx"> , m_pendingStyleRecalcShouldForce(false)
</span><span class="cx"> , m_inStyleRecalc(false)
</span><span class="cx"> , m_closeAfterStyleRecalc(false)
</span><span class="lines">@@ -522,7 +522,7 @@
</span><span class="cx"> , m_inputCursor(EmptyInputCursor::create())
</span><span class="cx"> #endif
</span><span class="cx"> , m_didAssociateFormControlsTimer(*this, &Document::didAssociateFormControlsTimerFired)
</span><del>- , m_cookieCacheExpiryTimer(*this, &Document::domCookieCacheExpiryTimerFired)
</del><ins>+ , m_cookieCacheExpiryTimer(*this, &Document::invalidateDOMCookieCache)
</ins><span class="cx"> , m_disabledFieldsetElementsCount(0)
</span><span class="cx"> , m_hasInjectedPlugInsScript(false)
</span><span class="cx"> , m_renderTreeBeingDestroyed(false)
</span><span class="lines">@@ -1753,11 +1753,6 @@
</span><span class="cx"> return m_styleRecalcTimer.isActive() && m_pendingStyleRecalcShouldForce;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::styleRecalcTimerFired()
-{
- updateStyleIfNeeded();
-}
-
</del><span class="cx"> void Document::recalcStyle(Style::Change change)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!view() || !view()->isPainting());
</span><span class="lines">@@ -6533,11 +6528,6 @@
</span><span class="cx"> m_cachedDOMCookies = String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::domCookieCacheExpiryTimerFired()
-{
- invalidateDOMCookieCache();
-}
-
</del><span class="cx"> void Document::didLoadResourceSynchronously(const ResourceRequest&)
</span><span class="cx"> {
</span><span class="cx"> // Synchronous resources loading can set cookies so we invalidate the cookies cache
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (187705 => 187706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2015-08-01 03:03:02 UTC (rev 187705)
+++ trunk/Source/WebCore/dom/Document.h 2015-08-01 03:41:07 UTC (rev 187706)
</span><span class="lines">@@ -725,7 +725,6 @@
</span><span class="cx"> void unscheduleStyleRecalc();
</span><span class="cx"> bool hasPendingStyleRecalc() const;
</span><span class="cx"> bool hasPendingForcedStyleRecalc() const;
</span><del>- void styleRecalcTimerFired();
</del><span class="cx"> void optimizedStyleSheetUpdateTimerFired();
</span><span class="cx">
</span><span class="cx"> void registerNodeListForInvalidation(LiveNodeList&);
</span><span class="lines">@@ -1370,7 +1369,6 @@
</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();
</del><span class="cx"> virtual void didLoadResourceSynchronously(const ResourceRequest&) override final;
</span><span class="cx">
</span><span class="cx"> unsigned m_referencingNodeCount;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaController.cpp (187705 => 187706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaController.cpp 2015-08-01 03:03:02 UTC (rev 187705)
+++ trunk/Source/WebCore/html/MediaController.cpp 2015-08-01 03:41:07 UTC (rev 187706)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> , m_closedCaptionsVisible(false)
</span><span class="cx"> , m_clock(Clock::create())
</span><span class="cx"> , m_scriptExecutionContext(context)
</span><del>- , m_timeupdateTimer(*this, &MediaController::timeupdateTimerFired)
</del><ins>+ , m_timeupdateTimer(*this, &MediaController::scheduleTimeupdateEvent)
</ins><span class="cx"> , m_previousTimeupdateTime(0)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -672,11 +672,6 @@
</span><span class="cx"> m_timeupdateTimer.startRepeating(maxTimeupdateEventFrequency);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaController::timeupdateTimerFired()
-{
- scheduleTimeupdateEvent();
-}
-
</del><span class="cx"> void MediaController::scheduleTimeupdateEvent()
</span><span class="cx"> {
</span><span class="cx"> double now = monotonicallyIncreasingTime();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlMediaControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/MediaController.h (187705 => 187706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/MediaController.h 2015-08-01 03:03:02 UTC (rev 187705)
+++ trunk/Source/WebCore/html/MediaController.h 2015-08-01 03:41:07 UTC (rev 187706)
</span><span class="lines">@@ -127,7 +127,6 @@
</span><span class="cx"> void clearPositionTimerFired();
</span><span class="cx"> bool hasEnded() const;
</span><span class="cx"> void scheduleTimeupdateEvent();
</span><del>- void timeupdateTimerFired();
</del><span class="cx"> void startTimeupdateTimer();
</span><span class="cx">
</span><span class="cx"> // EventTarget
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (187705 => 187706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2015-08-01 03:03:02 UTC (rev 187705)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2015-08-01 03:41:07 UTC (rev 187706)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx">
</span><span class="cx"> CachedResource::CachedResource(const ResourceRequest& request, Type type, SessionID sessionID)
</span><span class="cx"> : m_resourceRequest(request)
</span><del>- , m_decodedDataDeletionTimer(*this, &CachedResource::decodedDataDeletionTimerFired, deadDecodedDataDeletionIntervalForResourceType(type))
</del><ins>+ , m_decodedDataDeletionTimer(*this, &CachedResource::destroyDecodedData, deadDecodedDataDeletionIntervalForResourceType(type))
</ins><span class="cx"> , m_sessionID(sessionID)
</span><span class="cx"> , m_loadPriority(defaultPriorityForResourceType(type))
</span><span class="cx"> , m_responseTimestamp(std::chrono::system_clock::now())
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (187705 => 187706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2015-08-01 03:03:02 UTC (rev 187705)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2015-08-01 03:41:07 UTC (rev 187706)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> : m_document(0)
</span><span class="cx"> , m_documentLoader(documentLoader)
</span><span class="cx"> , m_requestCount(0)
</span><del>- , m_garbageCollectDocumentResourcesTimer(*this, &CachedResourceLoader::garbageCollectDocumentResourcesTimerFired)
</del><ins>+ , m_garbageCollectDocumentResourcesTimer(*this, &CachedResourceLoader::garbageCollectDocumentResources)
</ins><span class="cx"> , m_autoLoadImages(true)
</span><span class="cx"> , m_imagesEnabled(true)
</span><span class="cx"> , m_allowStaleResources(false)
</span><span class="lines">@@ -929,11 +929,6 @@
</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()
-{
- garbageCollectDocumentResources();
-}
-
</del><span class="cx"> void CachedResourceLoader::garbageCollectDocumentResources()
</span><span class="cx"> {
</span><span class="cx"> typedef Vector<String, 10> StringVector;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.h (187705 => 187706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.h 2015-08-01 03:03:02 UTC (rev 187705)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.h 2015-08-01 03:41:07 UTC (rev 187706)
</span><span class="lines">@@ -153,7 +153,6 @@
</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();
</del><span class="cx"> void performPostLoadActions();
</span><span class="cx">
</span><span class="cx"> bool clientDefersImage(const URL&) const;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheMemoryCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/MemoryCache.cpp (187705 => 187706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2015-08-01 03:03:02 UTC (rev 187705)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2015-08-01 03:41:07 UTC (rev 187706)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> , m_deadDecodedDataDeletionInterval(defaultDecodedDataDeletionInterval)
</span><span class="cx"> , m_liveSize(0)
</span><span class="cx"> , m_deadSize(0)
</span><del>- , m_pruneTimer(*this, &MemoryCache::pruneTimerFired)
</del><ins>+ , m_pruneTimer(*this, &MemoryCache::prune)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -759,11 +759,6 @@
</span><span class="cx"> pruneLiveResources();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MemoryCache::pruneTimerFired()
-{
- prune();
-}
-
</del><span class="cx"> void MemoryCache::pruneSoon()
</span><span class="cx"> {
</span><span class="cx"> if (m_pruneTimer.isActive())
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheMemoryCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/MemoryCache.h (187705 => 187706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/MemoryCache.h 2015-08-01 03:03:02 UTC (rev 187705)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.h 2015-08-01 03:41:07 UTC (rev 187706)
</span><span class="lines">@@ -187,7 +187,6 @@
</span><span class="cx"> unsigned liveCapacity() const;
</span><span class="cx"> unsigned deadCapacity() const;
</span><span class="cx"> bool needsPruning() const;
</span><del>- void pruneTimerFired();
</del><span class="cx">
</span><span class="cx"> CachedResource* resourceForRequestImpl(const ResourceRequest&, CachedResourceMap&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventSource.cpp (187705 => 187706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventSource.cpp 2015-08-01 03:03:02 UTC (rev 187705)
+++ trunk/Source/WebCore/page/EventSource.cpp 2015-08-01 03:41:07 UTC (rev 187706)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> , m_withCredentials(false)
</span><span class="cx"> , m_state(CONNECTING)
</span><span class="cx"> , m_decoder(TextResourceDecoder::create("text/plain", "UTF-8"))
</span><del>- , m_connectTimer(*this, &EventSource::connectTimerFired)
</del><ins>+ , m_connectTimer(*this, &EventSource::connect)
</ins><span class="cx"> , m_discardTrailingNewline(false)
</span><span class="cx"> , m_requestInFlight(false)
</span><span class="cx"> , m_reconnectDelay(defaultReconnectDelay)
</span><span class="lines">@@ -169,11 +169,6 @@
</span><span class="cx"> dispatchEvent(Event::create(eventNames().errorEvent, false, false));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void EventSource::connectTimerFired()
-{
- connect();
-}
-
</del><span class="cx"> String EventSource::url() const
</span><span class="cx"> {
</span><span class="cx"> return m_url.string();
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventSource.h (187705 => 187706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventSource.h 2015-08-01 03:03:02 UTC (rev 187705)
+++ trunk/Source/WebCore/page/EventSource.h 2015-08-01 03:41:07 UTC (rev 187706)
</span><span class="lines">@@ -96,7 +96,6 @@
</span><span class="cx"> void networkRequestEnded();
</span><span class="cx"> void scheduleInitialConnect();
</span><span class="cx"> void scheduleReconnect();
</span><del>- void connectTimerFired();
</del><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></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (187705 => 187706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2015-08-01 03:03:02 UTC (rev 187705)
+++ trunk/Source/WebCore/page/FrameView.cpp 2015-08-01 03:41:07 UTC (rev 187706)
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> , m_layoutRoot(nullptr)
</span><span class="cx"> , m_layoutPhase(OutsideLayout)
</span><span class="cx"> , m_inSynchronousPostLayout(false)
</span><del>- , m_postLayoutTasksTimer(*this, &FrameView::postLayoutTimerFired)
</del><ins>+ , m_postLayoutTasksTimer(*this, &FrameView::performPostLayoutTasks)
</ins><span class="cx"> , m_updateEmbeddedObjectsTimer(*this, &FrameView::updateEmbeddedObjectsTimerFired)
</span><span class="cx"> , m_isTransparent(false)
</span><span class="cx"> , m_baseBackgroundColor(Color::white)
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> , m_wasScrolledByUser(false)
</span><span class="cx"> , m_inProgrammaticScroll(false)
</span><span class="cx"> , m_safeToPropagateScrollToParent(true)
</span><del>- , m_delayedScrollEventTimer(*this, &FrameView::delayedScrollEventTimerFired)
</del><ins>+ , m_delayedScrollEventTimer(*this, &FrameView::sendScrollEvent)
</ins><span class="cx"> , m_isTrackingRepaints(false)
</span><span class="cx"> , m_shouldUpdateWhileOffscreen(true)
</span><span class="cx"> , m_exposedRect(FloatRect::infiniteRect())
</span><span class="lines">@@ -1823,11 +1823,6 @@
</span><span class="cx"> return maximumOffset;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameView::delayedScrollEventTimerFired()
-{
- sendScrollEvent();
-}
-
</del><span class="cx"> void FrameView::viewportContentsChanged()
</span><span class="cx"> {
</span><span class="cx"> if (!frame().view()) {
</span><span class="lines">@@ -3164,11 +3159,6 @@
</span><span class="cx"> adjustTiledBackingCoverage();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameView::postLayoutTimerFired()
-{
- performPostLayoutTasks();
-}
-
</del><span class="cx"> void FrameView::autoSizeIfEnabled()
</span><span class="cx"> {
</span><span class="cx"> if (!m_shouldAutoSize)
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (187705 => 187706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h 2015-08-01 03:03:02 UTC (rev 187705)
+++ trunk/Source/WebCore/page/FrameView.h 2015-08-01 03:41:07 UTC (rev 187706)
</span><span class="lines">@@ -245,7 +245,6 @@
</span><span class="cx"> virtual bool isRubberBandInProgress() const override;
</span><span class="cx"> WEBCORE_EXPORT virtual IntPoint minimumScrollPosition() const override;
</span><span class="cx"> WEBCORE_EXPORT virtual IntPoint maximumScrollPosition() const override;
</span><del>- void delayedScrollEventTimerFired();
</del><span class="cx">
</span><span class="cx"> void viewportContentsChanged();
</span><span class="cx"> WEBCORE_EXPORT void resumeVisibleImageAnimationsIncludingSubframes();
</span><span class="lines">@@ -316,8 +315,6 @@
</span><span class="cx">
</span><span class="cx"> void restoreScrollbar();
</span><span class="cx">
</span><del>- void postLayoutTimerFired();
-
</del><span class="cx"> WEBCORE_EXPORT bool wasScrolledByUser() const;
</span><span class="cx"> WEBCORE_EXPORT void setWasScrolledByUser(bool);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingiosScrollingCoordinatorIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.h (187705 => 187706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.h 2015-08-01 03:03:02 UTC (rev 187705)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.h 2015-08-01 03:41:07 UTC (rev 187706)
</span><span class="lines">@@ -53,7 +53,6 @@
</span><span class="cx"> private:
</span><span class="cx"> virtual void scheduleTreeStateCommit() override;
</span><span class="cx">
</span><del>- void scrollingStateTreeCommitterTimerFired();
</del><span class="cx"> void commitTreeState();
</span><span class="cx">
</span><span class="cx"> Timer m_scrollingStateTreeCommitterTimer;
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingiosScrollingCoordinatorIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.mm (187705 => 187706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.mm 2015-08-01 03:03:02 UTC (rev 187705)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.mm 2015-08-01 03:41:07 UTC (rev 187706)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx">
</span><span class="cx"> ScrollingCoordinatorIOS::ScrollingCoordinatorIOS(Page* page)
</span><span class="cx"> : AsyncScrollingCoordinator(page)
</span><del>- , m_scrollingStateTreeCommitterTimer(*this, &ScrollingCoordinatorIOS::scrollingStateTreeCommitterTimerFired)
</del><ins>+ , m_scrollingStateTreeCommitterTimer(*this, &ScrollingCoordinatorIOS::commitTreeState)
</ins><span class="cx"> {
</span><span class="cx"> setScrollingTree(ScrollingTreeIOS::create(this));
</span><span class="cx"> }
</span><span class="lines">@@ -90,11 +90,6 @@
</span><span class="cx"> m_scrollingStateTreeCommitterTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingCoordinatorIOS::scrollingStateTreeCommitterTimerFired()
-{
- commitTreeState();
-}
-
</del><span class="cx"> void ScrollingCoordinatorIOS::commitTreeState()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(scrollingStateTree()->hasChangedProperties());
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingCoordinatorMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h (187705 => 187706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h 2015-08-01 03:03:02 UTC (rev 187705)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h 2015-08-01 03:41:07 UTC (rev 187706)
</span><span class="lines">@@ -53,7 +53,6 @@
</span><span class="cx"> private:
</span><span class="cx"> virtual void scheduleTreeStateCommit() override;
</span><span class="cx">
</span><del>- void scrollingStateTreeCommitterTimerFired();
</del><span class="cx"> void commitTreeState();
</span><span class="cx">
</span><span class="cx"> void updateTiledScrollingIndicator();
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingCoordinatorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm (187705 => 187706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm 2015-08-01 03:03:02 UTC (rev 187705)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm 2015-08-01 03:41:07 UTC (rev 187706)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">
</span><span class="cx"> ScrollingCoordinatorMac::ScrollingCoordinatorMac(Page* page)
</span><span class="cx"> : AsyncScrollingCoordinator(page)
</span><del>- , m_scrollingStateTreeCommitterTimer(*this, &ScrollingCoordinatorMac::scrollingStateTreeCommitterTimerFired)
</del><ins>+ , m_scrollingStateTreeCommitterTimer(*this, &ScrollingCoordinatorMac::commitTreeState)
</ins><span class="cx"> {
</span><span class="cx"> setScrollingTree(ScrollingTreeMac::create(this));
</span><span class="cx"> }
</span><span class="lines">@@ -107,11 +107,6 @@
</span><span class="cx"> m_scrollingStateTreeCommitterTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingCoordinatorMac::scrollingStateTreeCommitterTimerFired()
-{
- commitTreeState();
-}
-
</del><span class="cx"> void ScrollingCoordinatorMac::commitTreeState()
</span><span class="cx"> {
</span><span class="cx"> willCommitTree();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCache.cpp (187705 => 187706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCache.cpp 2015-08-01 03:03:02 UTC (rev 187705)
+++ trunk/Source/WebCore/platform/graphics/FontCache.cpp 2015-08-01 03:41:07 UTC (rev 187706)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FontCache::FontCache()
</span><del>- : m_purgeTimer(*this, &FontCache::purgeTimerFired)
</del><ins>+ : m_purgeTimer(*this, &FontCache::purgeInactiveFontDataIfNeeded)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -395,11 +395,6 @@
</span><span class="cx"> return *addResult.iterator->value;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FontCache::purgeTimerFired()
-{
- purgeInactiveFontDataIfNeeded();
-}
-
</del><span class="cx"> void FontCache::purgeInactiveFontDataIfNeeded()
</span><span class="cx"> {
</span><span class="cx"> bool underMemoryPressure = MemoryPressureHandler::singleton().isUnderMemoryPressure();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCache.h (187705 => 187706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCache.h 2015-08-01 03:03:02 UTC (rev 187705)
+++ trunk/Source/WebCore/platform/graphics/FontCache.h 2015-08-01 03:41:07 UTC (rev 187706)
</span><span class="lines">@@ -164,8 +164,6 @@
</span><span class="cx"> FontCache();
</span><span class="cx"> ~FontCache() = delete;
</span><span class="cx">
</span><del>- void purgeTimerFired();
-
</del><span class="cx"> WEBCORE_EXPORT void purgeInactiveFontDataIfNeeded();
</span><span class="cx">
</span><span class="cx"> // FIXME: This method should eventually be removed.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsShadowBlurcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp (187705 => 187706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp 2015-08-01 03:03:02 UTC (rev 187705)
+++ trunk/Source/WebCore/platform/graphics/ShadowBlur.cpp 2015-08-01 03:41:07 UTC (rev 187706)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="cx"> ScratchBuffer()
</span><del>- : m_purgeTimer(*this, &ScratchBuffer::timerFired)
</del><ins>+ : m_purgeTimer(*this, &ScratchBuffer::clearScratchBuffer)
</ins><span class="cx"> , m_lastWasInset(false)
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> , m_bufferInUse(false)
</span><span class="lines">@@ -130,11 +130,6 @@
</span><span class="cx"> static ScratchBuffer& singleton();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void timerFired()
- {
- clearScratchBuffer();
- }
-
</del><span class="cx"> void clearScratchBuffer()
</span><span class="cx"> {
</span><span class="cx"> m_imageBuffer = nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h (187705 => 187706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h 2015-08-01 03:03:02 UTC (rev 187705)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h 2015-08-01 03:41:07 UTC (rev 187706)
</span><span class="lines">@@ -181,7 +181,6 @@
</span><span class="cx"> void ensureLayer();
</span><span class="cx"> void destroyLayer();
</span><span class="cx"> bool shouldBePlaying() const;
</span><del>- void seekTimerFired();
</del><span class="cx">
</span><span class="cx"> friend class MediaSourcePrivateAVFObjC;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaSourceAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (187705 => 187706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2015-08-01 03:03:02 UTC (rev 187705)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2015-08-01 03:41:07 UTC (rev 187706)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> : m_player(player)
</span><span class="cx"> , m_weakPtrFactory(this)
</span><span class="cx"> , m_synchronizer(adoptNS([allocAVSampleBufferRenderSynchronizerInstance() init]))
</span><del>- , m_seekTimer(*this, &MediaPlayerPrivateMediaSourceAVFObjC::seekTimerFired)
</del><ins>+ , m_seekTimer(*this, &MediaPlayerPrivateMediaSourceAVFObjC::seekInternal)
</ins><span class="cx"> , m_session(nullptr)
</span><span class="cx"> , m_networkState(MediaPlayer::Empty)
</span><span class="cx"> , m_readyState(MediaPlayer::HaveNothing)
</span><span class="lines">@@ -421,11 +421,6 @@
</span><span class="cx"> m_seekTimer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateMediaSourceAVFObjC::seekTimerFired()
-{
- seekInternal();
-}
-
</del><span class="cx"> void MediaPlayerPrivateMediaSourceAVFObjC::seekInternal()
</span><span class="cx"> {
</span><span class="cx"> std::unique_ptr<PendingSeek> pendingSeek;
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (187705 => 187706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-08-01 03:03:02 UTC (rev 187705)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-08-01 03:41:07 UTC (rev 187706)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-07-31 Chris Dumez <cdumez@apple.com>
+
+ Drop dummy Timer callbacks
+ https://bugs.webkit.org/show_bug.cgi?id=147516
+
+ Reviewed by Alexey Proskuryakov.
+
+ Drop dummy Timer callbacks in the code base. A lot of Timer callbacks
+ do nothing else beside calling a particular method. In such case, we
+ can use the called method as Timer callback instead.
+
+ * Plugins/WebNetscapePluginStream.h:
+ * Plugins/WebNetscapePluginStream.mm:
+ (WebNetscapePluginStream::WebNetscapePluginStream):
+ (WebNetscapePluginStream::deliverDataTimerFired): Deleted.
+
</ins><span class="cx"> 2015-07-31 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r174791): Returning a zombie NSImage from sharingService:transitionImageForShareItem:contentRect:
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebNetscapePluginStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.h (187705 => 187706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.h 2015-08-01 03:03:02 UTC (rev 187705)
+++ trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.h 2015-08-01 03:41:07 UTC (rev 187706)
</span><span class="lines">@@ -123,7 +123,6 @@
</span><span class="cx"> RetainPtr<NSMutableURLRequest> m_request;
</span><span class="cx"> NPPluginFuncs *m_pluginFuncs;
</span><span class="cx">
</span><del>- void deliverDataTimerFired();
</del><span class="cx"> WebCore::Timer m_deliverDataTimer;
</span><span class="cx">
</span><span class="cx"> WebNetscapePluginStream(WebCore::FrameLoader*);
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebNetscapePluginStreammm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm (187705 => 187706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm 2015-08-01 03:03:02 UTC (rev 187705)
+++ trunk/Source/WebKit/mac/Plugins/WebNetscapePluginStream.mm 2015-08-01 03:41:07 UTC (rev 187706)
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> , m_newStreamSuccessful(false)
</span><span class="cx"> , m_frameLoader(frameLoader)
</span><span class="cx"> , m_pluginFuncs(0)
</span><del>- , m_deliverDataTimer(*this, &WebNetscapePluginStream::deliverDataTimerFired)
</del><ins>+ , m_deliverDataTimer(*this, &WebNetscapePluginStream::deliverData)
</ins><span class="cx"> {
</span><span class="cx"> memset(&m_stream, 0, sizeof(NPStream));
</span><span class="cx"> }
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> , m_frameLoader(0)
</span><span class="cx"> , m_request(adoptNS([request mutableCopy]))
</span><span class="cx"> , m_pluginFuncs(0)
</span><del>- , m_deliverDataTimer(*this, &WebNetscapePluginStream::deliverDataTimerFired)
</del><ins>+ , m_deliverDataTimer(*this, &WebNetscapePluginStream::deliverData)
</ins><span class="cx"> {
</span><span class="cx"> memset(&m_stream, 0, sizeof(NPStream));
</span><span class="cx">
</span><span class="lines">@@ -552,11 +552,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebNetscapePluginStream::deliverDataTimerFired()
-{
- deliverData();
-}
-
</del><span class="cx"> void WebNetscapePluginStream::deliverDataToFile(NSData *data)
</span><span class="cx"> {
</span><span class="cx"> if (m_fileDescriptor == -1 && !m_path) {
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (187705 => 187706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-08-01 03:03:02 UTC (rev 187705)
+++ trunk/Source/WebKit2/ChangeLog 2015-08-01 03:41:07 UTC (rev 187706)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-07-31 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Drop dummy Timer callbacks
+ https://bugs.webkit.org/show_bug.cgi?id=147516
+
+ Reviewed by Alexey Proskuryakov.
+
+ Drop dummy Timer callbacks in the code base. A lot of Timer callbacks
+ do nothing else beside calling a particular method. In such case, we
+ can use the called method as Timer callback instead.
+
+ * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:
+ * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
+ (WebKit::RemoteLayerTreeDrawingArea::RemoteLayerTreeDrawingArea):
+ (WebKit::RemoteLayerTreeDrawingArea::layerFlushTimerFired): Deleted.
+
+2015-07-31 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> [WK2][NetworkCache] Drop HTTP method from NetworkCache::Key
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=143348
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h (187705 => 187706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h 2015-08-01 03:03:02 UTC (rev 187705)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h 2015-08-01 03:41:07 UTC (rev 187706)
</span><span class="lines">@@ -114,7 +114,6 @@
</span><span class="cx"> void updateScrolledExposedRect();
</span><span class="cx"> void updateRootLayers();
</span><span class="cx">
</span><del>- void layerFlushTimerFired();
</del><span class="cx"> void flushLayers();
</span><span class="cx">
</span><span class="cx"> WebCore::TiledBacking* mainFrameTiledBacking() const;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (187705 => 187706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2015-08-01 03:03:02 UTC (rev 187705)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2015-08-01 03:41:07 UTC (rev 187706)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> , m_rootLayer(GraphicsLayer::create(graphicsLayerFactory(), *this))
</span><span class="cx"> , m_exposedRect(FloatRect::infiniteRect())
</span><span class="cx"> , m_scrolledExposedRect(FloatRect::infiniteRect())
</span><del>- , m_layerFlushTimer(*this, &RemoteLayerTreeDrawingArea::layerFlushTimerFired)
</del><ins>+ , m_layerFlushTimer(*this, &RemoteLayerTreeDrawingArea::flushLayers)
</ins><span class="cx"> , m_isFlushingSuspended(false)
</span><span class="cx"> , m_hasDeferredFlush(false)
</span><span class="cx"> , m_isThrottlingLayerFlushes(false)
</span><span class="lines">@@ -332,11 +332,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RemoteLayerTreeDrawingArea::layerFlushTimerFired()
-{
- flushLayers();
-}
-
</del><span class="cx"> void RemoteLayerTreeDrawingArea::flushLayers()
</span><span class="cx"> {
</span><span class="cx"> if (!m_rootLayer)
</span></span></pre>
</div>
</div>
</body>
</html>