<!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>[166482] trunk/Source/WTF</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/166482">166482</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-03-31 00:21:05 -0700 (Mon, 31 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use std::unique_ptr in WTF::CompressedVector, WTF::GenericCompressedData
https://bugs.webkit.org/show_bug.cgi?id=130737
Switch to using std::unique_ptr instead of OwnPtr and PassOwnPtr
for the CompressedVector and GenericCompressedData classes.
* wtf/Compression.cpp:
(WTF::GenericCompressedData::create):
* wtf/Compression.h:
(WTF::CompressedVector::create):
(WTF::CompressibleVector::decompressIfNecessary):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfCompressioncpp">trunk/Source/WTF/wtf/Compression.cpp</a></li>
<li><a href="#trunkSourceWTFwtfCompressionh">trunk/Source/WTF/wtf/Compression.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (166481 => 166482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-03-31 07:04:19 UTC (rev 166481)
+++ trunk/Source/WTF/ChangeLog 2014-03-31 07:21:05 UTC (rev 166482)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-03-31 Zan Dobersek <zdobersek@igalia.com>
+
+ Use std::unique_ptr in WTF::CompressedVector, WTF::GenericCompressedData
+ https://bugs.webkit.org/show_bug.cgi?id=130737
+
+ Switch to using std::unique_ptr instead of OwnPtr and PassOwnPtr
+ for the CompressedVector and GenericCompressedData classes.
+
+ * wtf/Compression.cpp:
+ (WTF::GenericCompressedData::create):
+ * wtf/Compression.h:
+ (WTF::CompressedVector::create):
+ (WTF::CompressibleVector::decompressIfNecessary):
+
</ins><span class="cx"> 2014-03-28 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Enable async text input implementation
</span></span></pre></div>
<a id="trunkSourceWTFwtfCompressioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Compression.cpp (166481 => 166482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Compression.cpp 2014-03-31 07:04:19 UTC (rev 166481)
+++ trunk/Source/WTF/wtf/Compression.cpp 2014-03-31 07:21:05 UTC (rev 166482)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> fastFree(data);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<GenericCompressedData> GenericCompressedData::create(const uint8_t* data, size_t dataLength)
</del><ins>+std::unique_ptr<GenericCompressedData> GenericCompressedData::create(const uint8_t* data, size_t dataLength)
</ins><span class="cx"> {
</span><span class="cx"> enum { MinimumSize = sizeof(GenericCompressedData) * 8 };
</span><span class="cx">
</span><span class="lines">@@ -122,8 +122,7 @@
</span><span class="cx">
</span><span class="cx"> totalCompressed += currentCapacity;
</span><span class="cx"> totalInput += dataLength;
</span><del>- GenericCompressedData* result = new (compressedData) GenericCompressedData(dataLength, stream.total_out);
- return adoptPtr(result);
</del><ins>+ return std::unique_ptr<GenericCompressedData>(new (compressedData) GenericCompressedData(dataLength, stream.total_out));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool GenericCompressedData::decompress(uint8_t* destination, size_t bufferSize, size_t* decompressedByteCount)
</span><span class="lines">@@ -165,7 +164,7 @@
</span><span class="cx"> #else
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><del>-PassOwnPtr<GenericCompressedData> GenericCompressedData::create(const uint8_t*, size_t)
</del><ins>+std::unique_ptr<GenericCompressedData> GenericCompressedData::create(const uint8_t*, size_t)
</ins><span class="cx"> {
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWTFwtfCompressionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Compression.h (166481 => 166482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Compression.h 2014-03-31 07:04:19 UTC (rev 166481)
+++ trunk/Source/WTF/wtf/Compression.h 2014-03-31 07:21:05 UTC (rev 166482)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef Compression_h
</span><span class="cx"> #define Compression_h
</span><span class="cx">
</span><del>-#include <wtf/PassOwnPtr.h>
</del><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(GenericCompressedData)
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- WTF_EXPORT_PRIVATE static PassOwnPtr<GenericCompressedData> create(const uint8_t*, size_t);
</del><ins>+ WTF_EXPORT_PRIVATE static std::unique_ptr<GenericCompressedData> create(const uint8_t*, size_t);
</ins><span class="cx"> uint32_t compressedSize() const { return m_compressedSize; }
</span><span class="cx"> uint32_t originalSize() const { return m_originalSize; }
</span><span class="cx">
</span><span class="lines">@@ -57,10 +57,10 @@
</span><span class="cx">
</span><span class="cx"> template <typename T> class CompressedVector : public GenericCompressedData {
</span><span class="cx"> public:
</span><del>- static PassOwnPtr<CompressedVector> create(const Vector<T>& source)
</del><ins>+ static std::unique_ptr<CompressedVector> create(const Vector<T>& source)
</ins><span class="cx"> {
</span><del>- OwnPtr<GenericCompressedData> result = GenericCompressedData::create(reinterpret_cast<const uint8_t*>(source.data()), sizeof(T) * source.size());
- return adoptPtr(static_cast<CompressedVector<T>*>(result.leakPtr()));
</del><ins>+ std::unique_ptr<GenericCompressedData> result = GenericCompressedData::create(reinterpret_cast<const uint8_t*>(source.data()), sizeof(T) * source.size());
+ return std::unique_ptr<CompressedVector<T>>(static_cast<CompressedVector<T>*>(result.release()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void decompress(Vector<T>& destination)
</span><span class="lines">@@ -134,10 +134,10 @@
</span><span class="cx"> if (!m_compressedData)
</span><span class="cx"> return;
</span><span class="cx"> m_compressedData->decompress(m_decompressedData);
</span><del>- m_compressedData.clear();
</del><ins>+ m_compressedData = nullptr;
</ins><span class="cx"> }
</span><span class="cx"> mutable Vector<T> m_decompressedData;
</span><del>- mutable OwnPtr<CompressedVector<T>> m_compressedData;
</del><ins>+ mutable std::unique_ptr<CompressedVector<T>> m_compressedData;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>