<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[184449] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/184449">184449</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-17 23:31:25 -0700 (Sun, 17 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Network Cache: Make Data::adoptMap take the ownership of the file descriptor
https://bugs.webkit.org/show_bug.cgi?id=144950
Reviewed by Antti Koivisto.
It will be required to implement ShareableResource for soup
network backend. Also move the common code of Data to a common
file and add mapToFile(). The mapFile version that receives a file
descriptor has been renamed to adoptAndMapFile().
* CMakeLists.txt: Add new file to compilation.
* NetworkProcess/cache/NetworkCacheBlobStorage.cpp:
(WebKit::NetworkCache::BlobStorage::add): Use mapToFile().
* NetworkProcess/cache/NetworkCacheData.cpp: Added.
(WebKit::NetworkCache::Data::mapToFile): Write the data to the
given file and map it.
(WebKit::NetworkCache::mapFile):
(WebKit::NetworkCache::adoptAndMapFile):
(WebKit::NetworkCache::computeSHA1):
(WebKit::NetworkCache::bytesEqual):
* NetworkProcess/cache/NetworkCacheData.h:
* NetworkProcess/cache/NetworkCacheDataCocoa.mm:
(WebKit::NetworkCache::Data::adoptMap): Close the file descriptor.
* NetworkProcess/cache/NetworkCacheDataSoup.cpp:
(WebKit::NetworkCache::Data::Data): Use a constructor that
receives a file descriptor instead of the one receiving
Backing. If the file descriptor is not -1 then the Data is a map.
(WebKit::NetworkCache::MapWrapper::~MapWrapper): Also close the
file descriptor.
(WebKit::NetworkCache::Data::adoptMap): Pass the file descriptor
to the MapWrapper and create the Data passing the file descriptor.
* UIProcess/API/APIUserContentExtensionStore.cpp:
(API::openAndMapContentExtension): Use mapFile that receives a
file path.
(API::compiledToFile): Use adoptAndMapFile() and don't close the
descriptor.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheBlobStoragecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheBlobStorage.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheDatah">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheDataCocoamm">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheDataSoupcpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIUserContentExtensionStorecpp">trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheDatacpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (184448 => 184449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2015-05-18 06:26:10 UTC (rev 184448)
+++ trunk/Source/WebKit2/CMakeLists.txt 2015-05-18 06:31:25 UTC (rev 184449)
</span><span class="lines">@@ -165,6 +165,7 @@
</span><span class="cx"> NetworkProcess/cache/NetworkCache.cpp
</span><span class="cx"> NetworkProcess/cache/NetworkCacheBlobStorage.cpp
</span><span class="cx"> NetworkProcess/cache/NetworkCacheCoders.cpp
</span><ins>+ NetworkProcess/cache/NetworkCacheData.cpp
</ins><span class="cx"> NetworkProcess/cache/NetworkCacheDecoder.cpp
</span><span class="cx"> NetworkProcess/cache/NetworkCacheEncoder.cpp
</span><span class="cx"> NetworkProcess/cache/NetworkCacheEntry.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (184448 => 184449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-05-18 06:26:10 UTC (rev 184448)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-18 06:31:25 UTC (rev 184449)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2015-05-17 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ Network Cache: Make Data::adoptMap take the ownership of the file descriptor
+ https://bugs.webkit.org/show_bug.cgi?id=144950
+
+ Reviewed by Antti Koivisto.
+
+ It will be required to implement ShareableResource for soup
+ network backend. Also move the common code of Data to a common
+ file and add mapToFile(). The mapFile version that receives a file
+ descriptor has been renamed to adoptAndMapFile().
+
+ * CMakeLists.txt: Add new file to compilation.
+ * NetworkProcess/cache/NetworkCacheBlobStorage.cpp:
+ (WebKit::NetworkCache::BlobStorage::add): Use mapToFile().
+ * NetworkProcess/cache/NetworkCacheData.cpp: Added.
+ (WebKit::NetworkCache::Data::mapToFile): Write the data to the
+ given file and map it.
+ (WebKit::NetworkCache::mapFile):
+ (WebKit::NetworkCache::adoptAndMapFile):
+ (WebKit::NetworkCache::computeSHA1):
+ (WebKit::NetworkCache::bytesEqual):
+ * NetworkProcess/cache/NetworkCacheData.h:
+ * NetworkProcess/cache/NetworkCacheDataCocoa.mm:
+ (WebKit::NetworkCache::Data::adoptMap): Close the file descriptor.
+ * NetworkProcess/cache/NetworkCacheDataSoup.cpp:
+ (WebKit::NetworkCache::Data::Data): Use a constructor that
+ receives a file descriptor instead of the one receiving
+ Backing. If the file descriptor is not -1 then the Data is a map.
+ (WebKit::NetworkCache::MapWrapper::~MapWrapper): Also close the
+ file descriptor.
+ (WebKit::NetworkCache::Data::adoptMap): Pass the file descriptor
+ to the MapWrapper and create the Data passing the file descriptor.
+ * UIProcess/API/APIUserContentExtensionStore.cpp:
+ (API::openAndMapContentExtension): Use mapFile that receives a
+ file path.
+ (API::compiledToFile): Use adoptAndMapFile() and don't close the
+ descriptor.
+
</ins><span class="cx"> 2015-05-16 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] WKPDFView should not follow javascript: links
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheBlobStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheBlobStorage.cpp (184448 => 184449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheBlobStorage.cpp 2015-05-18 06:26:10 UTC (rev 184448)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheBlobStorage.cpp 2015-05-18 06:31:25 UTC (rev 184449)
</span><span class="lines">@@ -101,37 +101,13 @@
</span><span class="cx"> unlink(blobPath.data());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- int fd = open(blobPath.data(), O_CREAT | O_EXCL | O_RDWR , S_IRUSR | S_IWUSR);
- if (fd < 0)
</del><ins>+ auto mappedData = data.mapToFile(blobPath.data());
+ if (mappedData.isNull())
</ins><span class="cx"> return { };
</span><span class="cx">
</span><del>- size_t size = data.size();
- if (ftruncate(fd, size) < 0) {
- close(fd);
- return { };
- }
-
- void* map = mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
- close(fd);
-
- if (map == MAP_FAILED)
- return { };
-
- uint8_t* mapData = static_cast<uint8_t*>(map);
- data.apply([&mapData](const uint8_t* bytes, size_t bytesSize) {
- memcpy(mapData, bytes, bytesSize);
- mapData += bytesSize;
- return true;
- });
-
- // Drop the write permission.
- mprotect(map, size, PROT_READ);
-
- auto mappedData = Data::adoptMap(map, size);
-
</del><span class="cx"> link(blobPath.data(), linkPath.data());
</span><span class="cx">
</span><del>- m_approximateSize += size;
</del><ins>+ m_approximateSize += mappedData.size();
</ins><span class="cx">
</span><span class="cx"> return { mappedData, hash };
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheDatacppfromrev184448trunkSourceWebKit2NetworkProcesscacheNetworkCacheDataCocoamm"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.cpp (from rev 184448, trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataCocoa.mm) (0 => 184449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.cpp (rev 0)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.cpp 2015-05-18 06:31:25 UTC (rev 184449)
</span><span class="lines">@@ -0,0 +1,125 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "NetworkCacheData.h"
+
+#if ENABLE(NETWORK_CACHE)
+
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+
+namespace WebKit {
+namespace NetworkCache {
+
+Data Data::mapToFile(const char* path) const
+{
+ int fd = open(path, O_CREAT | O_EXCL | O_RDWR , S_IRUSR | S_IWUSR);
+ if (fd < 0)
+ return { };
+
+ if (ftruncate(fd, m_size) < 0) {
+ close(fd);
+ return { };
+ }
+
+ void* map = mmap(nullptr, m_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
+ if (map == MAP_FAILED) {
+ close(fd);
+ return { };
+ }
+
+ uint8_t* mapData = static_cast<uint8_t*>(map);
+ apply([&mapData](const uint8_t* bytes, size_t bytesSize) {
+ memcpy(mapData, bytes, bytesSize);
+ mapData += bytesSize;
+ return true;
+ });
+
+ // Drop the write permission.
+ mprotect(map, m_size, PROT_READ);
+
+ return Data::adoptMap(map, m_size, fd);
+}
+
+Data mapFile(const char* path)
+{
+ int fd = open(path, O_RDONLY, 0);
+ if (fd < 0)
+ return { };
+ struct stat stat;
+ if (fstat(fd, &stat) < 0) {
+ close(fd);
+ return { };
+ }
+ size_t size = stat.st_size;
+ if (!size) {
+ close(fd);
+ return Data::empty();
+ }
+
+ return adoptAndMapFile(fd, 0, size);
+}
+
+Data adoptAndMapFile(int fd, size_t offset, size_t size)
+{
+ if (!size)
+ return Data::empty();
+
+ void* map = mmap(nullptr, size, PROT_READ, MAP_PRIVATE, fd, offset);
+ if (map == MAP_FAILED) {
+ close(fd);
+ return { };
+ }
+
+ return Data::adoptMap(map, size, fd);
+}
+
+SHA1::Digest computeSHA1(const Data& data)
+{
+ SHA1 sha1;
+ data.apply([&sha1](const uint8_t* data, size_t size) {
+ sha1.addBytes(data, size);
+ return true;
+ });
+ SHA1::Digest digest;
+ sha1.computeHash(digest);
+ return digest;
+}
+
+bool bytesEqual(const Data& a, const Data& b)
+{
+ if (a.isNull() || b.isNull())
+ return false;
+ if (a.size() != b.size())
+ return false;
+ return !memcmp(a.data(), b.data(), a.size());
+}
+
+} // namespace NetworkCache
+} // namespace WebKit
+
+#endif // #if ENABLE(NETWORK_CACHE)
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.h (184448 => 184449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.h 2015-05-18 06:26:10 UTC (rev 184448)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.h 2015-05-18 06:31:25 UTC (rev 184449)
</span><span class="lines">@@ -104,14 +104,14 @@
</span><span class="cx"> Data(const uint8_t*, size_t);
</span><span class="cx">
</span><span class="cx"> static Data empty();
</span><del>- static Data adoptMap(void* map, size_t);
</del><ins>+ static Data adoptMap(void* map, size_t, int fd);
</ins><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> enum class Backing { Buffer, Map };
</span><del>-#if PLATFORM(COCOA)
</del><span class="cx"> Data(DispatchPtr<dispatch_data_t>, Backing = Backing::Buffer);
</span><span class="cx"> #endif
</span><span class="cx"> #if USE(SOUP)
</span><del>- Data(GRefPtr<SoupBuffer>&&, Backing = Backing::Buffer);
</del><ins>+ Data(GRefPtr<SoupBuffer>&&, int fd = -1);
</ins><span class="cx"> #endif
</span><span class="cx"> bool isNull() const;
</span><span class="cx"> bool isEmpty() const { return !m_size; }
</span><span class="lines">@@ -124,6 +124,8 @@
</span><span class="cx">
</span><span class="cx"> bool apply(const std::function<bool (const uint8_t*, size_t)>&&) const;
</span><span class="cx">
</span><ins>+ Data mapToFile(const char* path) const;
+
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> dispatch_data_t dispatchData() const { return m_dispatchData.get(); }
</span><span class="cx"> #endif
</span><span class="lines">@@ -137,6 +139,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #if USE(SOUP)
</span><span class="cx"> mutable GRefPtr<SoupBuffer> m_buffer;
</span><ins>+ int m_fileDescriptor { -1 };
</ins><span class="cx"> #endif
</span><span class="cx"> mutable const uint8_t* m_data { nullptr };
</span><span class="cx"> size_t m_size { 0 };
</span><span class="lines">@@ -145,7 +148,7 @@
</span><span class="cx">
</span><span class="cx"> Data concatenate(const Data&, const Data&);
</span><span class="cx"> bool bytesEqual(const Data&, const Data&);
</span><del>-Data mapFile(int fd, size_t offset, size_t);
</del><ins>+Data adoptAndMapFile(int fd, size_t offset, size_t);
</ins><span class="cx"> Data mapFile(const char* path);
</span><span class="cx"> SHA1::Digest computeSHA1(const Data&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheDataCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataCocoa.mm (184448 => 184449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataCocoa.mm 2015-05-18 06:26:10 UTC (rev 184448)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataCocoa.mm 2015-05-18 06:31:25 UTC (rev 184449)
</span><span class="lines">@@ -93,65 +93,19 @@
</span><span class="cx"> return { adoptDispatch(dispatch_data_create_concat(a.dispatchData(), b.dispatchData())) };
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Data Data::adoptMap(void* map, size_t size)
</del><ins>+Data Data::adoptMap(void* map, size_t size, int fd)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(map && map != MAP_FAILED);
</span><ins>+ close(fd);
</ins><span class="cx"> auto bodyMap = adoptDispatch(dispatch_data_create(map, size, dispatch_get_main_queue(), [map, size] {
</span><span class="cx"> munmap(map, size);
</span><span class="cx"> }));
</span><span class="cx"> return { bodyMap, Data::Backing::Map };
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Data mapFile(int fd, size_t offset, size_t size)
-{
- if (!size)
- return Data::empty();
</del><span class="cx">
</span><del>- void* map = mmap(nullptr, size, PROT_READ, MAP_PRIVATE, fd, offset);
- if (map == MAP_FAILED)
- return { };
- return Data::adoptMap(map, size);
-}
</del><span class="cx">
</span><del>-Data mapFile(const char* path)
-{
- int fd = open(path, O_RDONLY, 0);
- if (fd < 0)
- return { };
- struct stat stat;
- if (fstat(fd, &stat) < 0) {
- close(fd);
- return { };
- }
- size_t size = stat.st_size;
- auto data = mapFile(fd, 0, size);
- close(fd);
-
- return data;
</del><span class="cx"> }
</span><del>-
-SHA1::Digest computeSHA1(const Data& data)
-{
- SHA1 sha1;
- data.apply([&sha1](const uint8_t* data, size_t size) {
- sha1.addBytes(data, size);
- return true;
- });
- SHA1::Digest digest;
- sha1.computeHash(digest);
- return digest;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-bool bytesEqual(const Data& a, const Data& b)
-{
- if (a.isNull() || b.isNull())
- return false;
- if (a.size() != b.size())
- return false;
- return !memcmp(a.data(), b.data(), a.size());
-}
-
-}
-}
-
</del><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheDataSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataSoup.cpp (184448 => 184449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataSoup.cpp 2015-05-18 06:26:10 UTC (rev 184448)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataSoup.cpp 2015-05-18 06:31:25 UTC (rev 184449)
</span><span class="lines">@@ -45,10 +45,11 @@
</span><span class="cx"> m_buffer = adoptGRef(soup_buffer_new_with_owner(copiedData, size, copiedData, fastFree));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Data::Data(GRefPtr<SoupBuffer>&& buffer, Backing backing)
</del><ins>+Data::Data(GRefPtr<SoupBuffer>&& buffer, int fd)
</ins><span class="cx"> : m_buffer(buffer)
</span><ins>+ , m_fileDescriptor(fd)
</ins><span class="cx"> , m_size(buffer ? buffer->length : 0)
</span><del>- , m_isMap(m_size && backing == Backing::Map)
</del><ins>+ , m_isMap(m_size && fd != -1)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -104,10 +105,12 @@
</span><span class="cx"> ~MapWrapper()
</span><span class="cx"> {
</span><span class="cx"> munmap(map, size);
</span><ins>+ close(fileDescriptor);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void* map;
</span><span class="cx"> size_t size;
</span><ins>+ int fileDescriptor;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static void deleteMapWrapper(MapWrapper* wrapper)
</span><span class="lines">@@ -115,64 +118,17 @@
</span><span class="cx"> delete wrapper;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Data mapFile(int fd, size_t offset, size_t size)
</del><ins>+Data Data::adoptMap(void* map, size_t size, int fd)
</ins><span class="cx"> {
</span><del>- if (!size)
- return Data::empty();
-
- void* map = mmap(nullptr, size, PROT_READ, MAP_PRIVATE, fd, offset);
- if (map == MAP_FAILED)
- return { };
- return Data::adoptMap(map, size);
-}
-
-Data Data::adoptMap(void* map, size_t size)
-{
</del><span class="cx"> ASSERT(map);
</span><span class="cx"> ASSERT(map != MAP_FAILED);
</span><del>- MapWrapper* wrapper = new MapWrapper { map, size };
</del><ins>+ MapWrapper* wrapper = new MapWrapper { map, size, fd };
</ins><span class="cx"> GRefPtr<SoupBuffer> buffer = adoptGRef(soup_buffer_new_with_owner(map, size, wrapper, reinterpret_cast<GDestroyNotify>(deleteMapWrapper)));
</span><del>- return { WTF::move(buffer), Data::Backing::Map };
</del><ins>+ return { WTF::move(buffer), fd };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Data mapFile(const char* path)
-{
- int fd = open(path, O_RDONLY, 0);
- if (fd < 0)
- return { };
- struct stat stat;
- if (fstat(fd, &stat) < 0) {
- close(fd);
- return { };
- }
- size_t size = stat.st_size;
- auto data = mapFile(fd, 0, size);
- close(fd);
</del><span class="cx">
</span><del>- return data;
-}
</del><span class="cx">
</span><del>-SHA1::Digest computeSHA1(const Data& data)
-{
- SHA1 sha1;
- data.apply([&sha1](const uint8_t* data, size_t size) {
- sha1.addBytes(data, size);
- return true;
- });
- SHA1::Digest digest;
- sha1.computeHash(digest);
- return digest;
-}
-
-bool bytesEqual(const Data& a, const Data& b)
-{
- if (a.isNull() || b.isNull())
- return false;
- if (a.size() != b.size())
- return false;
- return !memcmp(a.data(), b.data(), a.size());
-}
-
</del><span class="cx"> } // namespace NetworkCache
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIUserContentExtensionStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp (184448 => 184449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp 2015-05-18 06:26:10 UTC (rev 184448)
+++ trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp 2015-05-18 06:31:25 UTC (rev 184449)
</span><span class="lines">@@ -134,19 +134,7 @@
</span><span class="cx">
</span><span class="cx"> static bool openAndMapContentExtension(const String& path, ContentExtensionMetaData& metaData, Data& fileData)
</span><span class="cx"> {
</span><del>- auto fd = WebCore::openFile(path, WebCore::OpenForRead);
- if (fd == WebCore::invalidPlatformFileHandle)
- return false;
-
- long long fileSize = 0;
- if (!WebCore::getFileSize(fd, fileSize)) {
- WebCore::closeFile(fd);
- return false;
- }
-
- fileData = mapFile(fd, 0, static_cast<size_t>(fileSize));
- WebCore::closeFile(fd);
-
</del><ins>+ fileData = mapFile(WebCore::fileSystemRepresentation(path).data());
</ins><span class="cx"> if (fileData.isNull())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -270,9 +258,7 @@
</span><span class="cx"> if (compilationClient.hadErrorWhileWritingToFile())
</span><span class="cx"> return UserContentExtensionStore::Error::CompileFailed;
</span><span class="cx">
</span><del>- mappedData = mapFile(temporaryFileHandle, 0, metaData.fileSize());
- WebCore::closeFile(temporaryFileHandle);
-
</del><ins>+ mappedData = adoptAndMapFile(temporaryFileHandle, 0, metaData.fileSize());
</ins><span class="cx"> if (mappedData.isNull())
</span><span class="cx"> return UserContentExtensionStore::Error::CompileFailed;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (184448 => 184449)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-05-18 06:26:10 UTC (rev 184448)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-05-18 06:31:25 UTC (rev 184449)
</span><span class="lines">@@ -1790,6 +1790,7 @@
</span><span class="cx"> E4436ECE1A0D040B00EAD204 /* NetworkCacheKey.h in Headers */ = {isa = PBXBuildFile; fileRef = E4436EC11A0CFDB200EAD204 /* NetworkCacheKey.h */; };
</span><span class="cx"> E4436ECF1A0D040B00EAD204 /* NetworkCacheStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = E4436EC21A0CFDB200EAD204 /* NetworkCacheStorage.h */; };
</span><span class="cx"> E4436ED01A0D040B00EAD204 /* NetworkCacheStorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4436EC31A0CFDB200EAD204 /* NetworkCacheStorage.cpp */; };
</span><ins>+ E47D1E981B0649FB002676A8 /* NetworkCacheData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E47D1E961B062B66002676A8 /* NetworkCacheData.cpp */; };
</ins><span class="cx"> E489D28A1A0A2DB80078C06A /* NetworkCacheCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = E489D2831A0A2DB80078C06A /* NetworkCacheCoder.h */; };
</span><span class="cx"> E489D28B1A0A2DB80078C06A /* NetworkCacheCoders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E489D2841A0A2DB80078C06A /* NetworkCacheCoders.cpp */; };
</span><span class="cx"> E489D28C1A0A2DB80078C06A /* NetworkCacheCoders.h in Headers */ = {isa = PBXBuildFile; fileRef = E489D2851A0A2DB80078C06A /* NetworkCacheCoders.h */; };
</span><span class="lines">@@ -4056,6 +4057,7 @@
</span><span class="cx"> E4436EC11A0CFDB200EAD204 /* NetworkCacheKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCacheKey.h; sourceTree = "<group>"; };
</span><span class="cx"> E4436EC21A0CFDB200EAD204 /* NetworkCacheStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCacheStorage.h; sourceTree = "<group>"; };
</span><span class="cx"> E4436EC31A0CFDB200EAD204 /* NetworkCacheStorage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCacheStorage.cpp; sourceTree = "<group>"; };
</span><ins>+ E47D1E961B062B66002676A8 /* NetworkCacheData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCacheData.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> E489D2831A0A2DB80078C06A /* NetworkCacheCoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCacheCoder.h; sourceTree = "<group>"; };
</span><span class="cx"> E489D2841A0A2DB80078C06A /* NetworkCacheCoders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCacheCoders.cpp; sourceTree = "<group>"; };
</span><span class="cx"> E489D2851A0A2DB80078C06A /* NetworkCacheCoders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCacheCoders.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -7524,6 +7526,7 @@
</span><span class="cx"> E489D2831A0A2DB80078C06A /* NetworkCacheCoder.h */,
</span><span class="cx"> E489D2841A0A2DB80078C06A /* NetworkCacheCoders.cpp */,
</span><span class="cx"> E489D2851A0A2DB80078C06A /* NetworkCacheCoders.h */,
</span><ins>+ E47D1E961B062B66002676A8 /* NetworkCacheData.cpp */,
</ins><span class="cx"> E42E06111AA75ABD00B11699 /* NetworkCacheData.h */,
</span><span class="cx"> E42E06131AA75B7000B11699 /* NetworkCacheDataCocoa.mm */,
</span><span class="cx"> E489D2861A0A2DB80078C06A /* NetworkCacheDecoder.cpp */,
</span><span class="lines">@@ -10173,6 +10176,7 @@
</span><span class="cx"> 2DC6D9C418C44A610043BAD4 /* WKWebViewContentProviderRegistry.mm in Sources */,
</span><span class="cx"> 1AD60F5D18E20F4C0020C034 /* WKWindowFeatures.mm in Sources */,
</span><span class="cx"> BCBECDE716B6416800047A1A /* XPCServiceEntryPoint.mm in Sources */,
</span><ins>+ E47D1E981B0649FB002676A8 /* NetworkCacheData.cpp in Sources */,
</ins><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>