Changeset 167793 in webkit

Timestamp:

Apr 25, 2014 12:19:31 AM (10 years ago)

Author:

akling@apple.com

Message:

[iOS WebKit2] Enable optimization to mmap downloaded resources once they become file-backed.
<​https://webkit.org/b/132171>
<rdar://problem/16720733>

Source/WebCore:
Add a missing export for the USE(CFNETWORK) + WebKit2 combo.

Reviewed by Antti Koivisto.

• WebCore.exp.in:

Source/WebKit2:
Implement a CFNetwork-based version of NetworkResourceLoader::willCacheResponseAsync()
and activate the DiskCacheMonitor code path. This means that once resources go into
file system cache, we get notified and mmap them from disk, saving heaps of memory.

Reviewed by Antti Koivisto.

• NetworkProcess/NetworkResourceLoader.h:
• NetworkProcess/mac/DiskCacheMonitor.mm:
• NetworkProcess/mac/NetworkResourceLoaderMac.mm:

(WebKit::NetworkResourceLoader::willCacheResponseAsync):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/NetworkProcess/NetworkResourceLoader.h (modified) (1 diff)
• WebKit2/NetworkProcess/mac/DiskCacheMonitor.mm (modified) (2 diffs)
• WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-24  Andreas Kling  <akling@apple.com>
+
+        [iOS WebKit2] Enable optimization to mmap downloaded resources once they become file-backed.
+        <https://webkit.org/b/132171>
+        <rdar://problem/16720733>
+
+        Add a missing export for the USE(CFNETWORK) + WebKit2 combo.
+
+        Reviewed by Antti Koivisto.
+
+        * WebCore.exp.in:
+
 2014-04-24  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -2871 +2871 @@
 #if !USE(CFNETWORK)
 __ZN7WebCore14ResourceHandle25continueWillCacheResponseEP19NSCachedURLResponse
+#else
+__ZN7WebCore14ResourceHandle25continueWillCacheResponseEPK20_CFCachedURLResponse
 #endif
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-24  Andreas Kling  <akling@apple.com>
+
+        [iOS WebKit2] Enable optimization to mmap downloaded resources once they become file-backed.
+        <https://webkit.org/b/132171>
+        <rdar://problem/16720733>
+
+        Implement a CFNetwork-based version of NetworkResourceLoader::willCacheResponseAsync()
+        and activate the DiskCacheMonitor code path. This means that once resources go into
+        file system cache, we get notified and mmap them from disk, saving heaps of memory.
+
+        Reviewed by Antti Koivisto.
+
+        * NetworkProcess/NetworkResourceLoader.h:
+        * NetworkProcess/mac/DiskCacheMonitor.mm:
+        * NetworkProcess/mac/NetworkResourceLoaderMac.mm:
+        (WebKit::NetworkResourceLoader::willCacheResponseAsync):
+
 2014-04-24  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h

@@ -112 +112 @@
 #if PLATFORM(COCOA)
     static size_t fileBackedResourceMinimumSize();
-#if !PLATFORM(IOS)
+
+#if USE(CFNETWORK)
+    virtual void willCacheResponseAsync(WebCore::ResourceHandle*, CFCachedURLResponseRef) override;
+#else
     virtual void willCacheResponseAsync(WebCore::ResourceHandle*, NSCachedURLResponse *) override;
 #endif
-#endif // PLATFORM(MAC)
+#endif
 
     // Message handlers.

trunk/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.mm

@@ -38 +38 @@
 #endif
 
-#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
 
 typedef void (^CFCachedURLResponseCallBackBlock)(CFCachedURLResponseRef);
@@ -108 +108 @@
 } // namespace WebKit
 
-#endif // !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#endif

trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm

@@ -104 +104 @@
 }
 
+#if USE(CFNETWORK)
+void NetworkResourceLoader::willCacheResponseAsync(ResourceHandle* handle, CFCachedURLResponseRef cfResponse)
+{
+    ASSERT_UNUSED(handle, handle == m_handle);
+
+    if (m_bytesReceived >= fileBackedResourceMinimumSize())
+        DiskCacheMonitor::monitorFileBackingStoreCreation(cfResponse, this);
+
+    m_handle->continueWillCacheResponse(cfResponse);
+}
+#endif
+
 #if !PLATFORM(IOS)
 void NetworkResourceLoader::willCacheResponseAsync(ResourceHandle* handle, NSCachedURLResponse *nsResponse)