Title: [185882] trunk/Source/WebKit2
Revision
185882
Author
an...@apple.com
Date
2015-06-23 13:34:50 -0700 (Tue, 23 Jun 2015)

Log Message

CrashTracer: com.apple.WebKit.Networking at _javascript_Core: WTF::String::isolatedCopy const &
https://bugs.webkit.org/show_bug.cgi?id=146236
rdar://problem/21380700

Reviewed by Andreas Kling.

* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::NetworkCache::Cache::clear):

    Don't crash if this is called with network cache disabled.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (185881 => 185882)


--- trunk/Source/WebKit2/ChangeLog	2015-06-23 18:54:26 UTC (rev 185881)
+++ trunk/Source/WebKit2/ChangeLog	2015-06-23 20:34:50 UTC (rev 185882)
@@ -1,3 +1,16 @@
+2015-06-23  Antti Koivisto  <an...@apple.com>
+
+        CrashTracer: com.apple.WebKit.Networking at _javascript_Core: WTF::String::isolatedCopy const &
+        https://bugs.webkit.org/show_bug.cgi?id=146236
+        rdar://problem/21380700
+
+        Reviewed by Andreas Kling.
+
+        * NetworkProcess/cache/NetworkCache.cpp:
+        (WebKit::NetworkCache::Cache::clear):
+
+            Don't crash if this is called with network cache disabled.
+
 2015-06-23  Simon Fraser  <simon.fra...@apple.com>
 
         Expose some more rendering progress events, and have MiniBrowser log for each of them

Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (185881 => 185882)


--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp	2015-06-23 18:54:26 UTC (rev 185881)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp	2015-06-23 20:34:50 UTC (rev 185882)
@@ -545,7 +545,6 @@
 void Cache::clear(std::chrono::system_clock::time_point modifiedSince, std::function<void ()>&& completionHandler)
 {
     LOG(NetworkCache, "(NetworkProcess) clearing cache");
-    deleteDumpFile();
 
     if (m_statistics)
         m_statistics->clear();
@@ -555,6 +554,8 @@
         return;
     }
     m_storage->clear(modifiedSince, WTF::move(completionHandler));
+
+    deleteDumpFile();
 }
 
 void Cache::clear()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to