Changeset 186511 in webkit

Timestamp:

Jul 8, 2015 10:18:03 AM (9 years ago)

Author:

Antti Koivisto

Message:

Network Cache: Don't open files in main thread
​https://bugs.webkit.org/show_bug.cgi?id=146722

Follow-up.

• NetworkProcess/cache/NetworkCacheStorage.cpp:

(WebKit::NetworkCache::Storage::dispatchReadOperation):

Accessing m_bodyFilter is technically not thread safe so keep it in main thread.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cache/NetworkCacheStorage.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-07-08  Antti Koivisto  <antti@apple.com>
+
+        Network Cache: Don't open files in main thread
+        https://bugs.webkit.org/show_bug.cgi?id=146722
+
+        Follow-up.
+
+        * NetworkProcess/cache/NetworkCacheStorage.cpp:
+        (WebKit::NetworkCache::Storage::dispatchReadOperation):
+
+            Accessing m_bodyFilter is technically not thread safe so keep it in main thread.
+
 2015-07-08  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp

@@ -486 +486 @@
     ASSERT(m_activeReadOperations.contains(&readOperation));
 
-    ioQueue().dispatch([this, &readOperation] {
+    bool shouldGetBodyBlob = !m_bodyFilter || m_bodyFilter->mayContain(readOperation.key.hash());
+
+    ioQueue().dispatch([this, &readOperation, shouldGetBodyBlob] {
         auto recordPath = recordPathForKey(readOperation.key);
 
         ++readOperation.activeCount;
-
-        bool shouldGetBodyBlob = !m_bodyFilter || m_bodyFilter->mayContain(readOperation.key.hash());
         if (shouldGetBodyBlob)
             ++readOperation.activeCount;