<!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>[215262] trunk</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/215262">215262</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-04-12 02:25:04 -0700 (Wed, 12 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modernize vector adoption
https://bugs.webkit.org/show_bug.cgi?id=170758
Patch by Alex Christensen <achristensen@webkit.org> on 2017-04-12
Reviewed by Geoffrey Garen.
Source/WebCore:
* Modules/encryptedmedia/InitDataRegistry.cpp:
(WebCore::extractKeyIDsKeyids):
* Modules/indexeddb/IDBGetResult.cpp:
(WebCore::IDBGetResult::dataFromBuffer):
* Modules/indexeddb/IDBKeyData.cpp:
(WebCore::IDBKeyData::decode):
* Modules/indexeddb/server/IDBSerialization.cpp:
(WebCore::serializeIDBKeyData):
(WebCore::decodeKey):
* Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:
(WebCore::IDBServer::SQLiteIDBBackingStore::getRecord):
(WebCore::IDBServer::SQLiteIDBBackingStore::getAllObjectStoreRecords):
(WebCore::IDBServer::SQLiteIDBBackingStore::uncheckedGetIndexRecordForOneKey):
* Modules/indexeddb/server/SQLiteIDBCursor.cpp:
(WebCore::IDBServer::SQLiteIDBCursor::internalFetchNextRecord):
* css/CSSFontFaceSource.cpp:
(WebCore::CSSFontFaceSource::font):
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::loadResourceSynchronously):
* loader/appcache/ApplicationCacheStorage.cpp:
(WebCore::ApplicationCacheStorage::loadCache):
* loader/archive/mhtml/MHTMLParser.cpp:
(WebCore::MHTMLParser::parseNextPart):
* loader/cache/CachedFont.cpp:
(WebCore::CachedFont::createCustomFontData):
* loader/cache/CachedSVGFont.cpp:
(WebCore::CachedSVGFont::ensureCustomFontData):
* platform/SharedBuffer.cpp:
(WebCore::SharedBuffer::create):
(WebCore::utf8Buffer):
(WebCore::SharedBuffer::adoptVector): Deleted.
* platform/SharedBuffer.h:
* platform/ThreadSafeDataBuffer.h:
(WebCore::ThreadSafeDataBufferImpl::ThreadSafeDataBufferImpl):
(WebCore::ThreadSafeDataBuffer::create):
(WebCore::ThreadSafeDataBuffer::ThreadSafeDataBuffer):
(WebCore::ThreadSafeDataBuffer::decode):
(): Deleted.
(WebCore::ThreadSafeDataBuffer::adoptVector): Deleted.
* platform/network/BlobRegistryImpl.cpp:
(WebCore::BlobRegistryImpl::registerBlobURL):
* platform/network/DataURLDecoder.cpp:
(WebCore::DataURLDecoder::decodeBase64):
(WebCore::DataURLDecoder::decodeEscaped):
Source/WebKit2:
* NetworkProcess/capture/NetworkCaptureEvent.cpp:
(WebKit::NetworkCapture::JSONCoder<WebCore::SharedBuffer>::decode):
* WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
(WebKit::WebPlatformStrategies::bufferForType):
Tools:
* TestWebKitAPI/Tests/WebCore/SharedBuffer.cpp:
(TestWebKitAPI::TEST_F):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaInitDataRegistrycpp">trunk/Source/WebCore/Modules/encryptedmedia/InitDataRegistry.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBGetResultcpp">trunk/Source/WebCore/Modules/indexeddb/IDBGetResult.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeyDatacpp">trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverIDBSerializationcpp">trunk/Source/WebCore/Modules/indexeddb/server/IDBSerialization.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverSQLiteIDBBackingStorecpp">trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverSQLiteIDBCursorcpp">trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontFaceSourcecpp">trunk/Source/WebCore/css/CSSFontFaceSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheStoragecpp">trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderarchivemhtmlMHTMLParsercpp">trunk/Source/WebCore/loader/archive/mhtml/MHTMLParser.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedFontcpp">trunk/Source/WebCore/loader/cache/CachedFont.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedSVGFontcpp">trunk/Source/WebCore/loader/cache/CachedSVGFont.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformSharedBuffercpp">trunk/Source/WebCore/platform/SharedBuffer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformSharedBufferh">trunk/Source/WebCore/platform/SharedBuffer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformThreadSafeDataBufferh">trunk/Source/WebCore/platform/ThreadSafeDataBuffer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkBlobRegistryImplcpp">trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkDataURLDecodercpp">trunk/Source/WebCore/platform/network/DataURLDecoder.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscaptureNetworkCaptureEventcpp">trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureEvent.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreSharedBuffercpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/SharedBuffer.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (215261 => 215262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-04-12 08:01:51 UTC (rev 215261)
+++ trunk/Source/WebCore/ChangeLog 2017-04-12 09:25:04 UTC (rev 215262)
</span><span class="lines">@@ -1,3 +1,55 @@
</span><ins>+2017-04-12 Alex Christensen <achristensen@webkit.org>
+
+ Modernize vector adoption
+ https://bugs.webkit.org/show_bug.cgi?id=170758
+
+ Reviewed by Geoffrey Garen.
+
+ * Modules/encryptedmedia/InitDataRegistry.cpp:
+ (WebCore::extractKeyIDsKeyids):
+ * Modules/indexeddb/IDBGetResult.cpp:
+ (WebCore::IDBGetResult::dataFromBuffer):
+ * Modules/indexeddb/IDBKeyData.cpp:
+ (WebCore::IDBKeyData::decode):
+ * Modules/indexeddb/server/IDBSerialization.cpp:
+ (WebCore::serializeIDBKeyData):
+ (WebCore::decodeKey):
+ * Modules/indexeddb/server/SQLiteIDBBackingStore.cpp:
+ (WebCore::IDBServer::SQLiteIDBBackingStore::getRecord):
+ (WebCore::IDBServer::SQLiteIDBBackingStore::getAllObjectStoreRecords):
+ (WebCore::IDBServer::SQLiteIDBBackingStore::uncheckedGetIndexRecordForOneKey):
+ * Modules/indexeddb/server/SQLiteIDBCursor.cpp:
+ (WebCore::IDBServer::SQLiteIDBCursor::internalFetchNextRecord):
+ * css/CSSFontFaceSource.cpp:
+ (WebCore::CSSFontFaceSource::font):
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::loadResourceSynchronously):
+ * loader/appcache/ApplicationCacheStorage.cpp:
+ (WebCore::ApplicationCacheStorage::loadCache):
+ * loader/archive/mhtml/MHTMLParser.cpp:
+ (WebCore::MHTMLParser::parseNextPart):
+ * loader/cache/CachedFont.cpp:
+ (WebCore::CachedFont::createCustomFontData):
+ * loader/cache/CachedSVGFont.cpp:
+ (WebCore::CachedSVGFont::ensureCustomFontData):
+ * platform/SharedBuffer.cpp:
+ (WebCore::SharedBuffer::create):
+ (WebCore::utf8Buffer):
+ (WebCore::SharedBuffer::adoptVector): Deleted.
+ * platform/SharedBuffer.h:
+ * platform/ThreadSafeDataBuffer.h:
+ (WebCore::ThreadSafeDataBufferImpl::ThreadSafeDataBufferImpl):
+ (WebCore::ThreadSafeDataBuffer::create):
+ (WebCore::ThreadSafeDataBuffer::ThreadSafeDataBuffer):
+ (WebCore::ThreadSafeDataBuffer::decode):
+ (): Deleted.
+ (WebCore::ThreadSafeDataBuffer::adoptVector): Deleted.
+ * platform/network/BlobRegistryImpl.cpp:
+ (WebCore::BlobRegistryImpl::registerBlobURL):
+ * platform/network/DataURLDecoder.cpp:
+ (WebCore::DataURLDecoder::decodeBase64):
+ (WebCore::DataURLDecoder::decodeEscaped):
+
</ins><span class="cx"> 2017-04-12 Per Arne Vollan <pvollan@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement stroke-color CSS property.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaInitDataRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/InitDataRegistry.cpp (215261 => 215262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/InitDataRegistry.cpp 2017-04-12 08:01:51 UTC (rev 215261)
+++ trunk/Source/WebCore/Modules/encryptedmedia/InitDataRegistry.cpp 2017-04-12 09:25:04 UTC (rev 215262)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> if (!WTF::base64URLDecode(keyID, { keyIDData }))
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- Ref<SharedBuffer> keyIDBuffer = SharedBuffer::adoptVector(keyIDData);
</del><ins>+ Ref<SharedBuffer> keyIDBuffer = SharedBuffer::create(WTFMove(keyIDData));
</ins><span class="cx"> keyIDs.append(WTFMove(keyIDBuffer));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBGetResultcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBGetResult.cpp (215261 => 215262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBGetResult.cpp 2017-04-12 08:01:51 UTC (rev 215261)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBGetResult.cpp 2017-04-12 09:25:04 UTC (rev 215262)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> Vector<uint8_t> data(buffer.size());
</span><span class="cx"> memcpy(data.data(), buffer.data(), buffer.size());
</span><span class="cx">
</span><del>- m_value = ThreadSafeDataBuffer::adoptVector(data);
</del><ins>+ m_value = ThreadSafeDataBuffer::create(WTFMove(data));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IDBGetResult::IDBGetResult(const IDBGetResult& that, IsolatedCopyTag)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp (215261 => 215262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp 2017-04-12 08:01:51 UTC (rev 215261)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyData.cpp 2017-04-12 09:25:04 UTC (rev 215262)
</span><span class="lines">@@ -242,7 +242,7 @@
</span><span class="cx"> if (!decoder.decodeBytes("binary", bytes))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- result.m_value = ThreadSafeDataBuffer::adoptVector(bytes);
</del><ins>+ result.m_value = ThreadSafeDataBuffer::create(WTFMove(bytes));
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverIDBSerializationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBSerialization.cpp (215261 => 215262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/IDBSerialization.cpp 2017-04-12 08:01:51 UTC (rev 215261)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBSerialization.cpp 2017-04-12 09:25:04 UTC (rev 215262)
</span><span class="lines">@@ -286,7 +286,7 @@
</span><span class="cx"> data.append(SIDBKeyVersion);
</span><span class="cx">
</span><span class="cx"> encodeKey(data, key);
</span><del>- return SharedBuffer::adoptVector(data);
</del><ins>+ return SharedBuffer::create(WTFMove(data));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool decodeKey(const uint8_t*& data, const uint8_t* end, IDBKeyData& result)
</span><span class="lines">@@ -356,7 +356,7 @@
</span><span class="cx"> dataVector.append(data, size);
</span><span class="cx"> data += size;
</span><span class="cx">
</span><del>- result.setBinaryValue(ThreadSafeDataBuffer::adoptVector(dataVector));
</del><ins>+ result.setBinaryValue(ThreadSafeDataBuffer::create(WTFMove(dataVector)));
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> case SIDBKeyType::Array: {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverSQLiteIDBBackingStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp (215261 => 215262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp 2017-04-12 08:01:51 UTC (rev 215261)
+++ trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp 2017-04-12 09:25:04 UTC (rev 215262)
</span><span class="lines">@@ -1961,7 +1961,7 @@
</span><span class="cx">
</span><span class="cx"> Vector<uint8_t> buffer;
</span><span class="cx"> sql->getColumnBlobAsVector(0, buffer);
</span><del>- resultBuffer = ThreadSafeDataBuffer::adoptVector(buffer);
</del><ins>+ resultBuffer = ThreadSafeDataBuffer::create(WTFMove(buffer));
</ins><span class="cx">
</span><span class="cx"> if (type == IDBGetRecordDataType::KeyAndValue)
</span><span class="cx"> recordID = sql->getColumnInt64(1);
</span><span class="lines">@@ -2090,7 +2090,7 @@
</span><span class="cx"> if (getAllRecordsData.getAllType == IndexedDB::GetAllType::Values) {
</span><span class="cx"> Vector<uint8_t> buffer;
</span><span class="cx"> sql->getColumnBlobAsVector(0, buffer);
</span><del>- ThreadSafeDataBuffer resultBuffer = ThreadSafeDataBuffer::adoptVector(buffer);
</del><ins>+ ThreadSafeDataBuffer resultBuffer = ThreadSafeDataBuffer::create(WTFMove(buffer));
</ins><span class="cx">
</span><span class="cx"> auto recordID = sql->getColumnInt64(1);
</span><span class="cx">
</span><span class="lines">@@ -2272,7 +2272,7 @@
</span><span class="cx"> if (!error.isNull())
</span><span class="cx"> return error;
</span><span class="cx">
</span><del>- getResult = { { ThreadSafeDataBuffer::adoptVector(keyVector), WTFMove(blobURLs), WTFMove(blobFilePaths) }, objectStoreKey };
</del><ins>+ getResult = { { ThreadSafeDataBuffer::create(WTFMove(keyVector)), WTFMove(blobURLs), WTFMove(blobFilePaths) }, objectStoreKey };
</ins><span class="cx"> return { };
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverSQLiteIDBCursorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.cpp (215261 => 215262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.cpp 2017-04-12 08:01:51 UTC (rev 215261)
+++ trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBCursor.cpp 2017-04-12 09:25:04 UTC (rev 215262)
</span><span class="lines">@@ -454,7 +454,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_cursorType == IndexedDB::CursorType::KeyAndValue)
</span><del>- record.record.value = std::make_unique<IDBValue>(ThreadSafeDataBuffer::adoptVector(keyData), blobURLs, blobFilePaths);
</del><ins>+ record.record.value = std::make_unique<IDBValue>(ThreadSafeDataBuffer::create(WTFMove(keyData)), blobURLs, blobFilePaths);
</ins><span class="cx"> } else {
</span><span class="cx"> if (!deserializeIDBKeyData(keyData.data(), keyData.size(), record.record.primaryKey)) {
</span><span class="cx"> LOG_ERROR("Unable to deserialize value data from database while advancing index cursor");
</span><span class="lines">@@ -476,7 +476,7 @@
</span><span class="cx">
</span><span class="cx"> if (result == SQLITE_ROW) {
</span><span class="cx"> objectStoreStatement.getColumnBlobAsVector(0, keyData);
</span><del>- record.record.value = std::make_unique<IDBValue>(ThreadSafeDataBuffer::adoptVector(keyData));
</del><ins>+ record.record.value = std::make_unique<IDBValue>(ThreadSafeDataBuffer::create(WTFMove(keyData)));
</ins><span class="cx"> } else if (result == SQLITE_DONE) {
</span><span class="cx"> // This indicates that the record we're trying to retrieve has been removed from the object store.
</span><span class="cx"> // Skip over it.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFaceSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFaceSource.cpp (215261 => 215262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFaceSource.cpp 2017-04-12 08:01:51 UTC (rev 215261)
+++ trunk/Source/WebCore/css/CSSFontFaceSource.cpp 2017-04-12 09:25:04 UTC (rev 215262)
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> if (!m_inDocumentCustomPlatformData) {
</span><span class="cx"> SVGFontElement& fontElement = downcast<SVGFontElement>(*m_svgFontFaceElement->parentNode());
</span><span class="cx"> if (auto otfFont = convertSVGToOTFFont(fontElement))
</span><del>- m_generatedOTFBuffer = SharedBuffer::adoptVector(otfFont.value());
</del><ins>+ m_generatedOTFBuffer = SharedBuffer::create(WTFMove(otfFont.value()));
</ins><span class="cx"> if (!m_generatedOTFBuffer)
</span><span class="cx"> return nullptr;
</span><span class="cx"> m_inDocumentCustomPlatformData = createFontCustomPlatformData(*m_generatedOTFBuffer);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (215261 => 215262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2017-04-12 08:01:51 UTC (rev 215261)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2017-04-12 09:25:04 UTC (rev 215262)
</span><span class="lines">@@ -2824,7 +2824,7 @@
</span><span class="cx"> if (!documentLoader()->applicationCacheHost().maybeLoadSynchronously(newRequest, error, response, data)) {
</span><span class="cx"> Vector<char> buffer;
</span><span class="cx"> platformStrategies()->loaderStrategy()->loadResourceSynchronously(networkingContext(), identifier, newRequest, storedCredentials, clientCredentialPolicy, error, response, buffer);
</span><del>- data = SharedBuffer::adoptVector(buffer);
</del><ins>+ data = SharedBuffer::create(WTFMove(buffer));
</ins><span class="cx"> documentLoader()->applicationCacheHost().maybeLoadFallbackSynchronously(newRequest, error, response, data);
</span><span class="cx"> ResourceLoadObserver::sharedObserver().logSubresourceLoading(&m_frame, newRequest, response);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp (215261 => 215262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp 2017-04-12 08:01:51 UTC (rev 215261)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheStorage.cpp 2017-04-12 09:25:04 UTC (rev 215262)
</span><span class="lines">@@ -1130,7 +1130,7 @@
</span><span class="cx"> Vector<char> blob;
</span><span class="cx"> cacheStatement.getColumnBlobAsVector(6, blob);
</span><span class="cx">
</span><del>- auto data = SharedBuffer::adoptVector(blob);
</del><ins>+ auto data = SharedBuffer::create(WTFMove(blob));
</ins><span class="cx">
</span><span class="cx"> String path = cacheStatement.getColumnText(7);
</span><span class="cx"> long long size = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderarchivemhtmlMHTMLParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/archive/mhtml/MHTMLParser.cpp (215261 => 215262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/archive/mhtml/MHTMLParser.cpp 2017-04-12 08:01:51 UTC (rev 215261)
+++ trunk/Source/WebCore/loader/archive/mhtml/MHTMLParser.cpp 2017-04-12 09:25:04 UTC (rev 215262)
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx"> LOG_ERROR("Invalid encoding for MHTML part.");
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><del>- RefPtr<SharedBuffer> contentBuffer = SharedBuffer::adoptVector(data);
</del><ins>+ RefPtr<SharedBuffer> contentBuffer = SharedBuffer::create(WTFMove(data));
</ins><span class="cx"> // FIXME: the URL in the MIME header could be relative, we should resolve it if it is.
</span><span class="cx"> // The specs mentions 5 ways to resolve a URL: http://tools.ietf.org/html/rfc2557#section-5
</span><span class="cx"> // IE and Firefox (UNMht) seem to generate only absolute URLs.
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedFontcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedFont.cpp (215261 => 215262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedFont.cpp 2017-04-12 08:01:51 UTC (rev 215261)
+++ trunk/Source/WebCore/loader/cache/CachedFont.cpp 2017-04-12 09:25:04 UTC (rev 215262)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> if (!convertWOFFToSfnt(bytes, convertedFont))
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- auto buffer = SharedBuffer::adoptVector(convertedFont);
</del><ins>+ auto buffer = SharedBuffer::create(WTFMove(convertedFont));
</ins><span class="cx"> return createFontCustomPlatformData(buffer);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedSVGFontcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedSVGFont.cpp (215261 => 215262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedSVGFont.cpp 2017-04-12 08:01:51 UTC (rev 215261)
+++ trunk/Source/WebCore/loader/cache/CachedSVGFont.cpp 2017-04-12 09:25:04 UTC (rev 215262)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> if (!m_externalSVGFontElement)
</span><span class="cx"> return false;
</span><span class="cx"> if (auto convertedFont = convertSVGToOTFFont(*m_externalSVGFontElement))
</span><del>- m_convertedFont = SharedBuffer::adoptVector(convertedFont.value());
</del><ins>+ m_convertedFont = SharedBuffer::create(WTFMove(convertedFont.value()));
</ins><span class="cx"> else {
</span><span class="cx"> m_externalSVGDocument = nullptr;
</span><span class="cx"> m_externalSVGFontElement = nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformSharedBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/SharedBuffer.cpp (215261 => 215262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/SharedBuffer.cpp 2017-04-12 08:01:51 UTC (rev 215261)
+++ trunk/Source/WebCore/platform/SharedBuffer.cpp 2017-04-12 09:25:04 UTC (rev 215262)
</span><span class="lines">@@ -106,10 +106,10 @@
</span><span class="cx"> return adoptRef(new SharedBuffer(WTFMove(mappedFileData)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<SharedBuffer> SharedBuffer::adoptVector(Vector<char>& vector)
</del><ins>+Ref<SharedBuffer> SharedBuffer::create(Vector<char>&& vector)
</ins><span class="cx"> {
</span><span class="cx"> auto buffer = create();
</span><del>- buffer->m_buffer->data.swap(vector);
</del><ins>+ buffer->m_buffer->data = WTFMove(vector);
</ins><span class="cx"> buffer->m_size = buffer->m_buffer->data.size();
</span><span class="cx"> return buffer;
</span><span class="cx"> }
</span><span class="lines">@@ -452,7 +452,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> buffer.shrink(p - buffer.data());
</span><del>- return SharedBuffer::adoptVector(buffer);
</del><ins>+ return SharedBuffer::create(WTFMove(buffer));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformSharedBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/SharedBuffer.h (215261 => 215262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/SharedBuffer.h 2017-04-12 08:01:51 UTC (rev 215261)
+++ trunk/Source/WebCore/platform/SharedBuffer.h 2017-04-12 09:25:04 UTC (rev 215262)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT static RefPtr<SharedBuffer> createWithContentsOfFile(const String& filePath);
</span><span class="cx">
</span><del>- WEBCORE_EXPORT static Ref<SharedBuffer> adoptVector(Vector<char>&);
</del><ins>+ WEBCORE_EXPORT static Ref<SharedBuffer> create(Vector<char>&&);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT ~SharedBuffer();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformThreadSafeDataBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ThreadSafeDataBuffer.h (215261 => 215262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ThreadSafeDataBuffer.h 2017-04-12 08:01:51 UTC (rev 215261)
+++ trunk/Source/WebCore/platform/ThreadSafeDataBuffer.h 2017-04-12 09:25:04 UTC (rev 215262)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef ThreadSafeDataBuffer_h
-#define ThreadSafeDataBuffer_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include <wtf/ThreadSafeRefCounted.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="lines">@@ -36,10 +35,9 @@
</span><span class="cx"> class ThreadSafeDataBufferImpl : public ThreadSafeRefCounted<ThreadSafeDataBufferImpl> {
</span><span class="cx"> friend class ThreadSafeDataBuffer;
</span><span class="cx"> private:
</span><del>- enum AdoptVectorTag { AdoptVector };
- ThreadSafeDataBufferImpl(Vector<uint8_t>& data, AdoptVectorTag)
</del><ins>+ ThreadSafeDataBufferImpl(Vector<uint8_t>&& data)
</ins><span class="cx"> {
</span><del>- m_data.swap(data);
</del><ins>+ m_data = WTFMove(data);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ThreadSafeDataBufferImpl(const Vector<uint8_t>& data)
</span><span class="lines">@@ -58,9 +56,9 @@
</span><span class="cx">
</span><span class="cx"> class ThreadSafeDataBuffer {
</span><span class="cx"> public:
</span><del>- static ThreadSafeDataBuffer adoptVector(Vector<uint8_t>& data)
</del><ins>+ static ThreadSafeDataBuffer create(Vector<uint8_t>&& data)
</ins><span class="cx"> {
</span><del>- return ThreadSafeDataBuffer(data, ThreadSafeDataBufferImpl::AdoptVector);
</del><ins>+ return ThreadSafeDataBuffer(WTFMove(data));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static ThreadSafeDataBuffer copyVector(const Vector<uint8_t>& data)
</span><span class="lines">@@ -99,9 +97,9 @@
</span><span class="cx"> template<class Decoder> static bool decode(Decoder&, ThreadSafeDataBuffer&);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit ThreadSafeDataBuffer(Vector<uint8_t>& data, ThreadSafeDataBufferImpl::AdoptVectorTag tag)
</del><ins>+ explicit ThreadSafeDataBuffer(Vector<uint8_t>&& data)
</ins><span class="cx"> {
</span><del>- m_impl = adoptRef(new ThreadSafeDataBufferImpl(data, tag));
</del><ins>+ m_impl = adoptRef(new ThreadSafeDataBufferImpl(WTFMove(data)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> explicit ThreadSafeDataBuffer(const Vector<uint8_t>& data)
</span><span class="lines">@@ -139,7 +137,7 @@
</span><span class="cx"> if (!decoder.decode(data))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- result = ThreadSafeDataBuffer::adoptVector(data);
</del><ins>+ result = ThreadSafeDataBuffer::create(WTFMove(data));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="lines">@@ -146,5 +144,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ThreadSafeDataBuffer_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkBlobRegistryImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp (215261 => 215262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp 2017-04-12 08:01:51 UTC (rev 215261)
+++ trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp 2017-04-12 09:25:04 UTC (rev 215262)
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> switch (part.type()) {
</span><span class="cx"> case BlobPart::Data: {
</span><span class="cx"> auto movedData = part.moveData();
</span><del>- auto data = ThreadSafeDataBuffer::adoptVector(movedData);
</del><ins>+ auto data = ThreadSafeDataBuffer::create(WTFMove(movedData));
</ins><span class="cx"> blobData->appendData(data);
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkDataURLDecodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/DataURLDecoder.cpp (215261 => 215262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/DataURLDecoder.cpp 2017-04-12 08:01:51 UTC (rev 215261)
+++ trunk/Source/WebCore/platform/network/DataURLDecoder.cpp 2017-04-12 09:25:04 UTC (rev 215262)
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> buffer.shrinkToFit();
</span><del>- task.result.data = SharedBuffer::adoptVector(buffer);
</del><ins>+ task.result.data = SharedBuffer::create(WTFMove(buffer));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void decodeEscaped(DecodeTask& task)
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> auto buffer = decodeURLEscapeSequencesAsData(task.encodedData, encoding);
</span><span class="cx">
</span><span class="cx"> buffer.shrinkToFit();
</span><del>- task.result.data = SharedBuffer::adoptVector(buffer);
</del><ins>+ task.result.data = SharedBuffer::create(WTFMove(buffer));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void decode(const URL& url, const ScheduleContext& scheduleContext, DecodeCompletionHandler&& completionHandler)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (215261 => 215262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-04-12 08:01:51 UTC (rev 215261)
+++ trunk/Source/WebKit2/ChangeLog 2017-04-12 09:25:04 UTC (rev 215262)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-04-12 Alex Christensen <achristensen@webkit.org>
+
+ Modernize vector adoption
+ https://bugs.webkit.org/show_bug.cgi?id=170758
+
+ Reviewed by Geoffrey Garen.
+
+ * NetworkProcess/capture/NetworkCaptureEvent.cpp:
+ (WebKit::NetworkCapture::JSONCoder<WebCore::SharedBuffer>::decode):
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebKit::WebPlatformStrategies::bufferForType):
+
</ins><span class="cx"> 2017-04-12 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed GTK+ debug build fix. Drop an unused debug-only member
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscaptureNetworkCaptureEventcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureEvent.cpp (215261 => 215262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureEvent.cpp 2017-04-12 08:01:51 UTC (rev 215261)
+++ trunk/Source/WebKit2/NetworkProcess/capture/NetworkCaptureEvent.cpp 2017-04-12 09:25:04 UTC (rev 215262)
</span><span class="lines">@@ -346,7 +346,7 @@
</span><span class="cx"> const auto& str = jData.get_ref<const std::string&>();
</span><span class="cx"> auto result = base64Decode(str.c_str(), str.size(), data);
</span><span class="cx"> ASSERT_UNUSED(result, result);
</span><del>- return WebCore::SharedBuffer::adoptVector(data);
</del><ins>+ return WebCore::SharedBuffer::create(WTFMove(data));
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (215261 => 215262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2017-04-12 08:01:51 UTC (rev 215261)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2017-04-12 09:25:04 UTC (rev 215262)
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> // First check the overrides.
</span><span class="cx"> Vector<char> overrideBuffer;
</span><span class="cx"> if (WebPasteboardOverrides::sharedPasteboardOverrides().getDataForOverride(pasteboardName, pasteboardType, overrideBuffer))
</span><del>- return SharedBuffer::adoptVector(overrideBuffer);
</del><ins>+ return SharedBuffer::create(WTFMove(overrideBuffer));
</ins><span class="cx">
</span><span class="cx"> // Fallback to messaging the UI process for native pasteboard content.
</span><span class="cx"> SharedMemory::Handle handle;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (215261 => 215262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-04-12 08:01:51 UTC (rev 215261)
+++ trunk/Tools/ChangeLog 2017-04-12 09:25:04 UTC (rev 215262)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-04-12 Alex Christensen <achristensen@webkit.org>
+
+ Modernize vector adoption
+ https://bugs.webkit.org/show_bug.cgi?id=170758
+
+ Reviewed by Geoffrey Garen.
+
+ * TestWebKitAPI/Tests/WebCore/SharedBuffer.cpp:
+ (TestWebKitAPI::TEST_F):
+
</ins><span class="cx"> 2017-04-11 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Disable outdated WritableStream API
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreSharedBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/SharedBuffer.cpp (215261 => 215262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/SharedBuffer.cpp 2017-04-12 08:01:51 UTC (rev 215261)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/SharedBuffer.cpp 2017-04-12 09:25:04 UTC (rev 215262)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> Vector<char> vector1(0x4000, 'b');
</span><span class="cx"> Vector<char> vector2(0x4000, 'c');
</span><span class="cx">
</span><del>- RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::adoptVector(vector0);
</del><ins>+ RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(WTFMove(vector0));
</ins><span class="cx"> sharedBuffer->append(vector1);
</span><span class="cx"> sharedBuffer->append(vector2);
</span><span class="cx"> RefPtr<ArrayBuffer> arrayBuffer = sharedBuffer->createArrayBuffer();
</span></span></pre>
</div>
</div>
</body>
</html>