Changeset 181158 in webkit

Timestamp:

Mar 6, 2015, 9:06:56 AM (11 years ago)

Author:

Antti Koivisto

Message:

Use WTF abstraction for page size in NetworkCacheStorage
​https://bugs.webkit.org/show_bug.cgi?id=142396

Reviewed by Darin Adler.

• NetworkProcess/cache/NetworkCacheStorageCocoa.mm:

(WebKit::NetworkCache::decodeEntryMetaData):
(WebKit::NetworkCache::Storage::dispatchFullWriteOperation):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cache/NetworkCacheStorageCocoa.mm (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-03-06  Antti Koivisto  <antti@apple.com>
+
+        Use WTF abstraction for page size in NetworkCacheStorage
+        https://bugs.webkit.org/show_bug.cgi?id=142396
+
+        Reviewed by Darin Adler.
+
+        * NetworkProcess/cache/NetworkCacheStorageCocoa.mm:
+        (WebKit::NetworkCache::decodeEntryMetaData):
+        (WebKit::NetworkCache::Storage::dispatchFullWriteOperation):
+
 2015-03-06  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm

@@ -37 +37 @@
 #include <sys/mman.h>
 #include <sys/stat.h>
+#include <wtf/PageBlock.h>
 #include <wtf/RandomNumber.h>
 #include <wtf/RunLoop.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
-
-#if PLATFORM(IOS)
-#include <mach/vm_page_size.h>
-#endif
 
 namespace WebKit {
@@ -179 +176 @@
             return false;
         metaData.headerOffset = decoder.currentOffset();
-        metaData.bodyOffset = round_page(metaData.headerOffset + metaData.headerSize);
+        metaData.bodyOffset = WTF::roundUpToMultipleOf(pageSize(), metaData.headerOffset + metaData.headerSize);
         success = true;
         return false;
@@ -504 +501 @@
             m_approximateSize += totalSize;
 
-            bool shouldMapBody = !error && bodySize >= vm_page_size;
+            bool shouldMapBody = !error && bodySize >= pageSize();
             auto bodyMap = shouldMapBody ? mapFile(fd, bodyOffset, bodySize) : nullptr;