Title: [181158] trunk/Source/WebKit2
- Revision
- 181158
- Author
- an...@apple.com
- Date
- 2015-03-06 09:06:56 -0800 (Fri, 06 Mar 2015)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (181157 => 181158)
--- trunk/Source/WebKit2/ChangeLog 2015-03-06 16:58:51 UTC (rev 181157)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-06 17:06:56 UTC (rev 181158)
@@ -1,3 +1,14 @@
+2015-03-06 Antti Koivisto <an...@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 <mmaxfi...@apple.com>
[iOS] SVG fonts are garbled
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm (181157 => 181158)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm 2015-03-06 16:58:51 UTC (rev 181157)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorageCocoa.mm 2015-03-06 17:06:56 UTC (rev 181158)
@@ -36,15 +36,12 @@
#include <mach/vm_param.h>
#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 {
namespace NetworkCache {
@@ -178,7 +175,7 @@
if (!decoder.verifyChecksum())
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;
});
@@ -503,7 +500,7 @@
m_approximateSize += totalSize;
- bool shouldMapBody = !error && bodySize >= vm_page_size;
+ bool shouldMapBody = !error && bodySize >= pageSize();
auto bodyMap = shouldMapBody ? mapFile(fd, bodyOffset, bodySize) : nullptr;
Data bodyData(bodyMap, Data::Backing::Map);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
