Title: [213350] trunk/Source/WebCore
Revision
213350
Author
ryanhad...@apple.com
Date
2017-03-02 21:22:28 -0800 (Thu, 02 Mar 2017)

Log Message

Unreviewed, rolling out r213274.

This change caused flakiness with LayoutTest memory/memory-
pressure-simulation.html

Reverted changeset:

"Don't keep dead resources in MemoryCache while under memory
pressure."
https://bugs.webkit.org/show_bug.cgi?id=169070
http://trac.webkit.org/changeset/213274

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (213349 => 213350)


--- trunk/Source/WebCore/ChangeLog	2017-03-03 05:21:51 UTC (rev 213349)
+++ trunk/Source/WebCore/ChangeLog	2017-03-03 05:22:28 UTC (rev 213350)
@@ -1,3 +1,17 @@
+2017-03-02  Ryan Haddad  <ryanhad...@apple.com>
+
+        Unreviewed, rolling out r213274.
+
+        This change caused flakiness with LayoutTest memory/memory-
+        pressure-simulation.html
+
+        Reverted changeset:
+
+        "Don't keep dead resources in MemoryCache while under memory
+        pressure."
+        https://bugs.webkit.org/show_bug.cgi?id=169070
+        http://trac.webkit.org/changeset/213274
+
 2017-03-02  Jiewen Tan  <jiewen_...@apple.com>
 
         WebCrypto API support for AES-GCM

Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (213349 => 213350)


--- trunk/Source/WebCore/loader/cache/CachedResource.cpp	2017-03-03 05:21:51 UTC (rev 213349)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp	2017-03-03 05:22:28 UTC (rev 213350)
@@ -549,12 +549,6 @@
 bool CachedResource::deleteIfPossible()
 {
     if (canDelete()) {
-        if (inCache() && MemoryPressureHandler::singleton().isUnderMemoryPressure()) {
-            MemoryCache::singleton().remove(*this);
-            // MemoryCache::remove() will call back into deleteIfPossible() and succeed.
-            // FIXME: This would be less incomprehensible if CachedResource were ref-counted.
-            return true;
-        }
         if (!inCache()) {
             InspectorInstrumentation::willDestroyCachedResource(*this);
             delete this;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to