Changeset 195392 in webkit

Timestamp:

Jan 20, 2016, 4:41:46 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Use TinyLRUCache in caching the CGColorRef in WebCore::cachedCGColor()
​https://bugs.webkit.org/show_bug.cgi?id=153279

Patch by Said Abou-Hallawa <​sabouhallawa@apple.com> on 2016-01-20
Reviewed by Dean Jackson.

Reuse the new template TinyLRUCache in caching the CGColor instead of
having the same code repeated twice.

• platform/graphics/cg/ColorCG.cpp:

(WebCore::leakCGColor):
(WebCore::RetainPtr<CGColorRef>>::createValueForKey):
(WebCore::cachedCGColor):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cg/ColorCG.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-01-20  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        Use TinyLRUCache in caching the CGColorRef in WebCore::cachedCGColor()
+        https://bugs.webkit.org/show_bug.cgi?id=153279
+
+        Reviewed by Dean Jackson.
+
+        Reuse the new template TinyLRUCache in caching the CGColor instead of
+        having the same code repeated twice.
+
+        * platform/graphics/cg/ColorCG.cpp:
+        (WebCore::leakCGColor):
+        (WebCore::RetainPtr<CGColorRef>>::createValueForKey):
+        (WebCore::cachedCGColor):
+
 2016-01-20  Timothy Hatcher  <timothy@apple.com>
 

trunk/Source/WebCore/platform/graphics/cg/ColorCG.cpp

@@ -32 +32 @@
 #include <wtf/Assertions.h>
 #include <wtf/RetainPtr.h>
+#include <wtf/TinyLRUCache.h>
 #if !PLATFORM(IOS)
 #include <ApplicationServices/ApplicationServices.h>
@@ -108 +109 @@
 }
 
+template<>
+RetainPtr<CGColorRef> TinyLRUCachePolicy<Color, RetainPtr<CGColorRef>>::createValueForKey(const Color& color)
+{
+    return adoptCF(leakCGColor(color));
+}
+
 CGColorRef cachedCGColor(const Color& color)
 {
@@ -127 +134 @@
     ASSERT(color.rgb());
 
-    const size_t cacheSize = 32;
-    static RGBA32 cachedRGBAValues[cacheSize];
-    static RetainPtr<CGColorRef>* cachedCGColors = new RetainPtr<CGColorRef>[cacheSize];
-
-    for (size_t i = 0; i < cacheSize; ++i) {
-        if (cachedRGBAValues[i] == color.rgb())
-            return cachedCGColors[i].get();
-    }
-
-    CGColorRef newCGColor = leakCGColor(color);
-
-    static size_t cursor;
-    cachedRGBAValues[cursor] = color.rgb();
-    cachedCGColors[cursor] = adoptCF(newCGColor);
-    if (++cursor == cacheSize)
-        cursor = 0;
-
-    return newCGColor;
+    static NeverDestroyed<TinyLRUCache<Color, RetainPtr<CGColorRef>, 32>> cache;
+    return cache.get().get(color).get();
 }