Changeset 81991 in webkit

Timestamp:

Mar 25, 2011, 2:21:17 PM (14 years ago)

Author:

Stephanie Lewis

Message:

Fix the GTK+ build until we can implement the new cross-platform
FontPlatformData.h bits.

Patch by Martin Robinson <​mrobinson@igalia.com> on 2011-03-25

• platform/graphics/FontPlatformData.h: Include the proper old font headers.

(WebCore::FontPlatformData::FontPlatformData): Eliminate GTK+ specific bits of this file
which reference our obsolete font implementation.
(WebCore::FontPlatformData::hash): Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/cache/CachedScript.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ -616 +616 @@
         * rendering/RenderTreeAsText.cpp:
         (WebCore::quoteAndEscapeNonPrintables):
+
+2011-03-24  Stephanie Lewis  <slewis@apple.com>
+
+        Reviewed by Geoff Garen.
+
+        <rdar://problem/9146716> REGRESSION: ~10 MB increase in memory under CachedScripts
+        Add back a call to destroy decoded data after access.  Keep the SourceProviderCache 
+        around as long as their are still clients to use it.
+
+        No new tests because there is no change in behavior.  Current tests pass.
+
+        * loader/cache/CachedScript.cpp:
+        (WebCore::CachedScript::script):
+        (WebCore::CachedScript::destroyDecodedData):
 
 2011-03-24  Stephanie Lewis  <slewis@apple.com>

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

@@ -89 +89 @@
         setDecodedSize(m_script.length() * sizeof(UChar));
     }
+    m_decodedDataDeletionTimer.startOneShot(0);
+    
     return m_script;
 }
@@ -126 +128 @@
     unsigned extraSize = 0;
 #if USE(JSC)
-    if (m_sourceProviderCache)
+    if (m_sourceProviderCache && m_clients.isEmpty())
         m_sourceProviderCache->clear();