Changeset 160327 in webkit

Timestamp:

Dec 9, 2013 1:15:20 PM (10 years ago)

Author:

akling@apple.com

Message:

REGRESSION(r160260): Memory pressure signal causes web process to hang.
<​https://webkit.org/b/125465>

Reviewed by Tim Horton.

This command caused all of my web processes to hang:

notifyutil -p org.WebKit.lowMemory

This only happens when the cache pruning code encounters a resource
using purgeable memory.

• loader/cache/MemoryCache.cpp:

(WebCore::MemoryCache::pruneLiveResourcesToSize):

Grab the next CachedResource pointer before continuing the loop.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-12-09  Andreas Kling  <akling@apple.com>
+
+        REGRESSION(r160260): Memory pressure signal causes web process to hang.
+        <https://webkit.org/b/125465>
+
+        Reviewed by Tim Horton.
+
+        This command caused all of my web processes to hang:
+
+            notifyutil -p org.WebKit.lowMemory
+
+        This only happens when the cache pruning code encounters a resource
+        using purgeable memory.
+
+        * loader/cache/MemoryCache.cpp:
+        (WebCore::MemoryCache::pruneLiveResourcesToSize):
+
+            Grab the next CachedResource pointer before continuing the loop.
+
 2013-12-09  peavo@outlook.com  <peavo@outlook.com>
 

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

@@ -267 +267 @@
                 return;
 
-            if (current->decodedDataIsPurgeable())
+            if (current->decodedDataIsPurgeable()) {
+                current = prev;
                 continue;
+            }
 
             // Destroy our decoded data. This will remove us from