Changeset 78297 in webkit

Timestamp:

Feb 10, 2011 6:10:16 PM (13 years ago)

Author:

msaboff@apple.com

Message:

2011-02-10 Michael Saboff <​msaboff@apple.com>

Reviewed by Geoffrey Garen.

Cached JavaScript Parser Data Being Left in Memory Cache
​https://bugs.webkit.org/show_bug.cgi?id=54245

Added clear method which removes SourceProviderCache items.
Cleaned up extraneous whitespace.

• JavaScriptCore.exp:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• parser/SourceProviderCache.cpp: (JSC::SourceProviderCache::~SourceProviderCache): (JSC::SourceProviderCache::clear): (JSC::SourceProviderCache::byteSize): (JSC::SourceProviderCache::add):
• parser/SourceProviderCache.h:

2011-02-10 Michael Saboff <​msaboff@apple.com>

Reviewed by Geoffrey Garen.

Cached JavaScript Parser Data Being Left in Memory Cache
​https://bugs.webkit.org/show_bug.cgi?id=54245

Added logic in CachedScript to clear SourceProviderCache data in
destroyDecodedData(). Added and changed CachedScript timeout to
act similar to CachedImage. Changed didAddClient to call super
class method instead of duplicating the logic in the derived
classes.

• loader/cache/CachedImage.cpp: (WebCore::CachedImage::didAddClient):
• loader/cache/CachedScript.cpp: (WebCore::CachedScript::didAddClient): (WebCore::CachedScript::allClientsRemoved): (WebCore::CachedScript::script): (WebCore::CachedScript::destroyDecodedData):
• loader/cache/CachedScript.h:

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.exp (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def (modified) (1 diff)
• JavaScriptCore/parser/SourceProviderCache.cpp (modified) (1 diff)
• JavaScriptCore/parser/SourceProviderCache.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/cache/CachedImage.cpp (modified) (1 diff)
• WebCore/loader/cache/CachedScript.cpp (modified) (3 diffs)
• WebCore/loader/cache/CachedScript.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-02-10  Michael Saboff  <msaboff@apple.com>
+
+        Reviewed by Geoffrey Garen.
+
+        Cached JavaScript Parser Data Being Left in Memory Cache
+        https://bugs.webkit.org/show_bug.cgi?id=54245
+
+        Added clear method which removes SourceProviderCache items.
+        Cleaned up extraneous whitespace.
+
+        * JavaScriptCore.exp:
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
+        * parser/SourceProviderCache.cpp:
+        (JSC::SourceProviderCache::~SourceProviderCache):
+        (JSC::SourceProviderCache::clear):
+        (JSC::SourceProviderCache::byteSize):
+        (JSC::SourceProviderCache::add):
+        * parser/SourceProviderCache.h:
+
 2011-02-10  Joseph Pecoraro  <joepeck@webkit.org>
 

trunk/Source/JavaScriptCore/JavaScriptCore.exp

@@ -191 +191 @@
 __ZN3JSC18PropertyDescriptor9setGetterENS_7JSValueE
 __ZN3JSC18PropertyDescriptor9setSetterENS_7JSValueE
+__ZN3JSC19SourceProviderCache5clearEv
 __ZN3JSC19SourceProviderCacheD1Ev
 __ZN3JSC19initializeThreadingEv

trunk/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def

@@ -83 +83 @@
     ?classInfo@JSCell@JSC@@UBEPBUClassInfo@2@XZ
     ?className@JSObject@JSC@@UBE?AVUString@2@XZ
+    ?clear@SourceProviderCache@JSC@@QAEXXZ
     ?collate@Collator@WTF@@QBE?AW4Result@12@PB_WI0I@Z
     ?collectAllGarbage@Heap@JSC@@QAEXXZ

trunk/Source/JavaScriptCore/parser/SourceProviderCache.cpp

@@ -33 +33 @@
 SourceProviderCache::~SourceProviderCache()
 {
+    clear();
+}
+
+void SourceProviderCache::clear()
+{
     deleteAllValues(m_map);
+    m_map.clear();
+    m_contentByteSize = 0;
 }
-    
+
 unsigned SourceProviderCache::byteSize() const
 { 
-    return m_contentByteSize + sizeof(*this) + m_map.capacity() * sizeof(SourceProviderCacheItem*); 
+    return m_contentByteSize + sizeof(*this) + m_map.capacity() * sizeof(SourceProviderCacheItem*);
 }
-    
+
 void SourceProviderCache::add(int sourcePosition, PassOwnPtr<SourceProviderCacheItem> item, unsigned size)
 {
-    m_map.add(sourcePosition, item.leakPtr()); 
-    m_contentByteSize += size; 
+    m_map.add(sourcePosition, item.leakPtr());
+    m_contentByteSize += size;
 }
 

trunk/Source/JavaScriptCore/parser/SourceProviderCache.h

@@ -35 +35 @@
     SourceProviderCache() : m_contentByteSize(0) {}
     ~SourceProviderCache();
-    
+
+    void clear();
     unsigned byteSize() const;
     void add(int sourcePosition, PassOwnPtr<SourceProviderCacheItem>, unsigned size);

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-10  Michael Saboff  <msaboff@apple.com>
+
+        Reviewed by Geoffrey Garen.
+
+        Cached JavaScript Parser Data Being Left in Memory Cache
+        https://bugs.webkit.org/show_bug.cgi?id=54245
+
+        Added logic in CachedScript to clear SourceProviderCache data in
+        destroyDecodedData().  Added and changed CachedScript timeout to
+        act similar to CachedImage.  Changed didAddClient to call super
+        class method instead of duplicating the logic in the derived
+        classes.
+
+        * loader/cache/CachedImage.cpp:
+        (WebCore::CachedImage::didAddClient):
+        * loader/cache/CachedScript.cpp:
+        (WebCore::CachedScript::didAddClient):
+        (WebCore::CachedScript::allClientsRemoved):
+        (WebCore::CachedScript::script):
+        (WebCore::CachedScript::destroyDecodedData):
+        * loader/cache/CachedScript.h:
+
 2011-02-10  Cosmin Truta  <ctruta@chromium.org>
 

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

@@ -100 +100 @@
         c->imageChanged(this);
 
-    if (!isLoading())
-        c->notifyFinished(this);
+    CachedResource::didAddClient(c);
 }
 

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

@@ -56 +56 @@
 }
 
+void CachedScript::didAddClient(CachedResourceClient* c)
+{
+    if (m_decodedDataDeletionTimer.isActive())
+        m_decodedDataDeletionTimer.stop();
+
+    CachedResource::didAddClient(c);
+}
+
 void CachedScript::allClientsRemoved()
 {
-    m_decodedDataDeletionTimer.startOneShot(0);
+    if (double interval = memoryCache()->deadDecodedDataDeletionInterval())
+        m_decodedDataDeletionTimer.startOneShot(interval);
 }
 
@@ -80 +89 @@
         setDecodedSize(m_script.length() * sizeof(UChar));
     }
-    m_decodedDataDeletionTimer.startOneShot(0);
     return m_script;
 }
@@ -118 +126 @@
     unsigned extraSize = 0;
 #if USE(JSC)
-    // FIXME: SourceInfoCache should be wiped out too but not this easily.
+    if (m_sourceProviderCache)
+        m_sourceProviderCache->clear();
+
     extraSize = m_sourceProviderCache ? m_sourceProviderCache->byteSize() : 0;
 #endif

trunk/Source/WebCore/loader/cache/CachedScript.h

@@ -48 +48 @@
         const String& script();
 
+        virtual void didAddClient(CachedResourceClient*);
         virtual void allClientsRemoved();