Changeset 87344 in webkit

Timestamp:

May 25, 2011, 6:07:57 PM (14 years ago)

Author:

jamesr@google.com

Message:

2011-05-25 James Robinson <​jamesr@chromium.org>

Reviewed by Geoffrey Garen

CachedResource overhead size calculation ignores the actual size of the URL
​https://bugs.webkit.org/show_bug.cgi?id=61481

CachedResource::overheadSize is used to determine the size of an entry in the memory cache to know when to evict
it. When the resource is a large data: URL, for example representing image or audio data, the URL size itself
can be significant.

This patch uses an estimate of actual number of bytes used by the URL that is valid for ASCII urls and close for
other types of strings instead of a fixed number.

• loader/cache/CachedResource.cpp: (WebCore::CachedResource::overheadSize):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/cache/CachedResource.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-25  James Robinson  <jamesr@chromium.org>
+
+        Reviewed by Geoffrey Garen
+
+        CachedResource overhead size calculation ignores the actual size of the URL
+        https://bugs.webkit.org/show_bug.cgi?id=61481
+
+        CachedResource::overheadSize is used to determine the size of an entry in the memory cache to know when to evict
+        it.  When the resource is a large data: URL, for example representing image or audio data, the URL size itself
+        can be significant.
+
+        This patch uses an estimate of actual number of bytes used by the URL that is valid for ASCII urls and close for
+        other types of strings instead of a fixed number.
+
+        * loader/cache/CachedResource.cpp:
+        (WebCore::CachedResource::overheadSize):
+
 2011-05-25  Oliver Hunt  <oliver@apple.com>
 

trunk/Source/WebCore/loader/cache/CachedResource.cpp

@@ -608 +608 @@
 unsigned CachedResource::overheadSize() const
 {
-    return sizeof(CachedResource) + m_response.memoryUsage() + 576;
-    /*
-        576 = 192 +                   // average size of m_url
-              384;                    // average size of m_clients hash map
-    */
+    static const int kAverageClientsHashMapSize = 384;
+    return sizeof(CachedResource) + m_response.memoryUsage() + kAverageClientsHashMapSize + m_resourceRequest.url().string().length() * 2;
 }