<!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>[161239] trunk/Source/WebCore</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/161239">161239</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-01-02 16:10:48 -0800 (Thu, 02 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>ImageBufferBackingStoreCache should use DeferrableOneShotTimer
https://bugs.webkit.org/show_bug.cgi?id=126155
Reviewed by Anders Carlsson.
Since ImageBufferBackingStoreCache's purge timer is pushed out every time
a backing store is deallocated, we can easily waste a lot of time rescheduling
the timer. Since it's a cache purge timer and doesn't need that kind of precision,
adopt DeferrableOneShotTimer, which is much more performant when deferred frequently.
* platform/graphics/cg/ImageBufferBackingStoreCache.cpp:
(WebCore::ImageBufferBackingStoreCache::ImageBufferBackingStoreCache):
(WebCore::ImageBufferBackingStoreCache::timerFired):
(WebCore::ImageBufferBackingStoreCache::schedulePurgeTimer):
* platform/graphics/cg/ImageBufferBackingStoreCache.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageBufferBackingStoreCachecpp">trunk/Source/WebCore/platform/graphics/cg/ImageBufferBackingStoreCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageBufferBackingStoreCacheh">trunk/Source/WebCore/platform/graphics/cg/ImageBufferBackingStoreCache.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161238 => 161239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-02 23:58:16 UTC (rev 161238)
+++ trunk/Source/WebCore/ChangeLog 2014-01-03 00:10:48 UTC (rev 161239)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-01-02 Tim Horton <timothy_horton@apple.com>
+
+ ImageBufferBackingStoreCache should use DeferrableOneShotTimer
+ https://bugs.webkit.org/show_bug.cgi?id=126155
+
+ Reviewed by Anders Carlsson.
+
+ Since ImageBufferBackingStoreCache's purge timer is pushed out every time
+ a backing store is deallocated, we can easily waste a lot of time rescheduling
+ the timer. Since it's a cache purge timer and doesn't need that kind of precision,
+ adopt DeferrableOneShotTimer, which is much more performant when deferred frequently.
+
+ * platform/graphics/cg/ImageBufferBackingStoreCache.cpp:
+ (WebCore::ImageBufferBackingStoreCache::ImageBufferBackingStoreCache):
+ (WebCore::ImageBufferBackingStoreCache::timerFired):
+ (WebCore::ImageBufferBackingStoreCache::schedulePurgeTimer):
+ * platform/graphics/cg/ImageBufferBackingStoreCache.h:
+
</ins><span class="cx"> 2014-01-02 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Allow ImageBuffer to re-use IOSurfaces
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageBufferBackingStoreCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferBackingStoreCache.cpp (161238 => 161239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferBackingStoreCache.cpp 2014-01-02 23:58:16 UTC (rev 161238)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferBackingStoreCache.cpp 2014-01-03 00:10:48 UTC (rev 161239)
</span><span class="lines">@@ -29,6 +29,8 @@
</span><span class="cx"> #if USE(IOSURFACE_CANVAS_BACKING_STORE)
</span><span class="cx"> #include <IOSurface/IOSurface.h>
</span><span class="cx">
</span><ins>+static const double purgeInterval = 5;
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> static RetainPtr<IOSurfaceRef> createIOSurface(const IntSize& size)
</span><span class="lines">@@ -69,6 +71,12 @@
</span><span class="cx"> return adoptCF(IOSurfaceCreate(dict.get()));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ImageBufferBackingStoreCache::ImageBufferBackingStoreCache()
+ : m_purgeTimer(this, &ImageBufferBackingStoreCache::timerFired, purgeInterval)
+ , m_pixelsCached(0)
+ {
+ }
+
</ins><span class="cx"> ImageBufferBackingStoreCache& ImageBufferBackingStoreCache::get()
</span><span class="cx"> {
</span><span class="cx"> DEFINE_STATIC_LOCAL(ImageBufferBackingStoreCache, cache, ());
</span><span class="lines">@@ -200,7 +208,7 @@
</span><span class="cx"> schedulePurgeTimer();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ImageBufferBackingStoreCache::timerFired(Timer<ImageBufferBackingStoreCache>*)
</del><ins>+void ImageBufferBackingStoreCache::timerFired(DeferrableOneShotTimer<ImageBufferBackingStoreCache>*)
</ins><span class="cx"> {
</span><span class="cx"> while (!m_cachedSurfaces.isEmpty()) {
</span><span class="cx"> CachedSurfaceMap::iterator iter = m_cachedSurfaces.begin();
</span><span class="lines">@@ -210,11 +218,7 @@
</span><span class="cx">
</span><span class="cx"> void ImageBufferBackingStoreCache::schedulePurgeTimer()
</span><span class="cx"> {
</span><del>- if (m_purgeTimer.isActive())
- m_purgeTimer.stop();
-
- static const double purgeInterval = 5;
- m_purgeTimer.startOneShot(purgeInterval);
</del><ins>+ m_purgeTimer.restart();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageBufferBackingStoreCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferBackingStoreCache.h (161238 => 161239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferBackingStoreCache.h 2014-01-02 23:58:16 UTC (rev 161238)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferBackingStoreCache.h 2014-01-03 00:10:48 UTC (rev 161239)
</span><span class="lines">@@ -63,11 +63,7 @@
</span><span class="cx"> void deallocate(IOSurfaceRef);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- ImageBufferBackingStoreCache()
- : m_purgeTimer(this, &ImageBufferBackingStoreCache::timerFired)
- , m_pixelsCached(0)
- {
- }
</del><ins>+ ImageBufferBackingStoreCache();
</ins><span class="cx">
</span><span class="cx"> struct IOSurfaceAndContextWithCreationParams : public IOSurfaceAndContext, public DoublyLinkedListNode<IOSurfaceAndContextWithCreationParams> {
</span><span class="cx"> IOSurfaceAndContextWithCreationParams()
</span><span class="lines">@@ -102,10 +98,10 @@
</span><span class="cx"> bool tryTakeFromCache(const IntSize&, CGColorSpaceRef, bool needExactSize, IOSurfaceAndContextWithCreationParams& outInfo);
</span><span class="cx"> bool isAcceptableSurface(const IOSurfaceAndContextWithCreationParams&, const IntSize&, CGColorSpaceRef, bool needExactSize) const;
</span><span class="cx">
</span><del>- void timerFired(Timer<ImageBufferBackingStoreCache>*);
</del><ins>+ void timerFired(DeferrableOneShotTimer<ImageBufferBackingStoreCache>*);
</ins><span class="cx"> void schedulePurgeTimer();
</span><span class="cx">
</span><del>- Timer<ImageBufferBackingStoreCache> m_purgeTimer;
</del><ins>+ DeferrableOneShotTimer<ImageBufferBackingStoreCache> m_purgeTimer;
</ins><span class="cx"> ActiveSurfaceMap m_activeSurfaces;
</span><span class="cx"> CachedSurfaceMap m_cachedSurfaces;
</span><span class="cx"> int m_pixelsCached;
</span></span></pre>
</div>
</div>
</body>
</html>