Changeset 139236 in webkit

Timestamp:

Jan 9, 2013 1:51:10 PM (11 years ago)

Author:

akling@apple.com

Message:

SVG-as-image: Throw out cached bitmap renderings after they sit unused for some time.
<​http://webkit.org/b/106484>
<rdar://problem/12983216>

Reviewed by Antti Koivisto.

Add a one-shot timer to SVGImageCache to self-clear the bitmap cache 30 seconds after last access.
This prevents us from keeping huge ImageBuffers around in memory for the lifetime of the elements
referencing that particular SVG file. (The ownership model is actually a bit more complicated
but that's irrelevant to this issue.)

10234kB progression on Membuster3.

• svg/graphics/SVGImageCache.cpp:

(WebCore::SVGImageCache::SVGImageCache):
(WebCore::SVGImageCache::~SVGImageCache):
(WebCore::SVGImageCache::clearBitmapCache):
(WebCore::SVGImageCache::cacheClearTimerFired):
(WebCore::SVGImageCache::lookupOrCreateBitmapImageForRenderer):

• svg/graphics/SVGImageCache.h:

(SVGImageCache):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• svg/graphics/SVGImageCache.cpp (modified) (5 diffs)
• svg/graphics/SVGImageCache.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-09  Andreas Kling  <akling@apple.com>
+
+        SVG-as-image: Throw out cached bitmap renderings after they sit unused for some time.
+        <http://webkit.org/b/106484>
+        <rdar://problem/12983216>
+
+        Reviewed by Antti Koivisto.
+
+        Add a one-shot timer to SVGImageCache to self-clear the bitmap cache 30 seconds after last access.
+        This prevents us from keeping huge ImageBuffers around in memory for the lifetime of the elements
+        referencing that particular SVG file. (The ownership model is actually a bit more complicated
+        but that's irrelevant to this issue.)
+
+        10234kB progression on Membuster3.
+
+        * svg/graphics/SVGImageCache.cpp:
+        (WebCore::SVGImageCache::SVGImageCache):
+        (WebCore::SVGImageCache::~SVGImageCache):
+        (WebCore::SVGImageCache::clearBitmapCache):
+        (WebCore::SVGImageCache::cacheClearTimerFired):
+        (WebCore::SVGImageCache::lookupOrCreateBitmapImageForRenderer):
+        * svg/graphics/SVGImageCache.h:
+        (SVGImageCache):
+
 2013-01-09  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/svg/graphics/SVGImageCache.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -32 +33 @@
 namespace WebCore {
 
+static const int timeToKeepCachedBitmapsAfterLastUseInSeconds = 30;
+
 SVGImageCache::SVGImageCache(SVGImage* svgImage)
     : m_svgImage(svgImage)
     , m_redrawTimer(this, &SVGImageCache::redrawTimerFired)
+    , m_cacheClearTimer(this, &SVGImageCache::cacheClearTimerFired, timeToKeepCachedBitmapsAfterLastUseInSeconds)
 {
     ASSERT(m_svgImage);
@@ -42 +46 @@
 {
     m_sizeAndScalesMap.clear();
-
+    clearBitmapCache();
+}
+
+void SVGImageCache::clearBitmapCache()
+{
     ImageDataMap::iterator end = m_imageDataMap.end();
     for (ImageDataMap::iterator it = m_imageDataMap.begin(); it != end; ++it) {
@@ -126 +134 @@
 }
 
+void SVGImageCache::cacheClearTimerFired(DeferrableOneShotTimer<SVGImageCache>*)
+{
+    clearBitmapCache();
+}
+
 Image* SVGImageCache::lookupOrCreateBitmapImageForRenderer(const RenderObject* renderer)
 {
@@ -149 +162 @@
     ASSERT(!size.isEmpty());
 
+    // (Re)schedule the oneshot timer to throw out all the cached ImageBuffers if they remain unused for too long.
+    m_cacheClearTimer.restart();
+
     // Lookup image for client in cache and eventually update it.
     ImageDataMap::iterator it = m_imageDataMap.find(client);

trunk/Source/WebCore/svg/graphics/SVGImageCache.h

@@ -85 +85 @@
     void redraw();
     void redrawTimerFired(Timer<SVGImageCache>*);
+    void cacheClearTimerFired(DeferrableOneShotTimer<SVGImageCache>*);
+    void clearBitmapCache();
 
     struct ImageData {
@@ -115 +117 @@
     ImageDataMap m_imageDataMap;
     Timer<SVGImageCache> m_redrawTimer;
+    DeferrableOneShotTimer<SVGImageCache> m_cacheClearTimer;
 };