<!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>[183063] trunk/Source</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/183063">183063</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2015-04-21 08:51:05 -0700 (Tue, 21 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove some stray uses of OwnPtr and PassOwnPtr in WTF (outside of the template definitions and traits)
https://bugs.webkit.org/show_bug.cgi?id=143944
Reviewed by Andreas Kling.
Source/WebCore:
* editing/ios/DictationCommandIOS.h: Added now-needed include of PassOwnPtr.h.
Source/WTF:
* wtf/FilePrintStream.h: Removed unneeded include.
* wtf/HashTable.h: Fixed class template name in comment.
* wtf/HashTraits.h: Removed unneeded forward declaration.
* wtf/ListHashSet.h: Removed unneeded includes.
* wtf/ThreadingWin.cpp: Removed unneeded includes.
(WTF::wtfThreadEntryPoint): Changed code to use unique_ptr.
(WTF::createThreadInternal): Changed code to use make_unique and release.
* wtf/efl/RunLoopEfl.cpp: Removed unneeded includes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfFilePrintStreamh">trunk/Source/WTF/wtf/FilePrintStream.h</a></li>
<li><a href="#trunkSourceWTFwtfHashTableh">trunk/Source/WTF/wtf/HashTable.h</a></li>
<li><a href="#trunkSourceWTFwtfHashTraitsh">trunk/Source/WTF/wtf/HashTraits.h</a></li>
<li><a href="#trunkSourceWTFwtfListHashSeth">trunk/Source/WTF/wtf/ListHashSet.h</a></li>
<li><a href="#trunkSourceWTFwtfThreadingWincpp">trunk/Source/WTF/wtf/ThreadingWin.cpp</a></li>
<li><a href="#trunkSourceWTFwtfeflRunLoopEflcpp">trunk/Source/WTF/wtf/efl/RunLoopEfl.cpp</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingiosDictationCommandIOSh">trunk/Source/WebCore/editing/ios/DictationCommandIOS.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (183062 => 183063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-04-21 13:01:18 UTC (rev 183062)
+++ trunk/Source/WTF/ChangeLog 2015-04-21 15:51:05 UTC (rev 183063)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-04-21 Darin Adler <darin@apple.com>
+
+ Remove some stray uses of OwnPtr and PassOwnPtr in WTF (outside of the template definitions and traits)
+ https://bugs.webkit.org/show_bug.cgi?id=143944
+
+ Reviewed by Andreas Kling.
+
+ * wtf/FilePrintStream.h: Removed unneeded include.
+ * wtf/HashTable.h: Fixed class template name in comment.
+ * wtf/HashTraits.h: Removed unneeded forward declaration.
+ * wtf/ListHashSet.h: Removed unneeded includes.
+ * wtf/ThreadingWin.cpp: Removed unneeded includes.
+ (WTF::wtfThreadEntryPoint): Changed code to use unique_ptr.
+ (WTF::createThreadInternal): Changed code to use make_unique and release.
+ * wtf/efl/RunLoopEfl.cpp: Removed unneeded includes.
+
</ins><span class="cx"> 2015-04-19 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Update RefPtr documentation and deprecation
</span></span></pre></div>
<a id="trunkSourceWTFwtfFilePrintStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FilePrintStream.h (183062 => 183063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FilePrintStream.h 2015-04-21 13:01:18 UTC (rev 183062)
+++ trunk/Source/WTF/wtf/FilePrintStream.h 2015-04-21 15:51:05 UTC (rev 183063)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #include <stdio.h>
</span><span class="cx"> #include <wtf/PrintStream.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfHashTableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/HashTable.h (183062 => 183063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/HashTable.h 2015-04-21 13:01:18 UTC (rev 183062)
+++ trunk/Source/WTF/wtf/HashTable.h 2015-04-21 15:51:05 UTC (rev 183063)
</span><span class="lines">@@ -482,7 +482,7 @@
</span><span class="cx"> public:
</span><span class="cx"> // All access to m_iterators should be guarded with m_mutex.
</span><span class="cx"> mutable const_iterator* m_iterators;
</span><del>- // Use OwnPtr so HashTable can still be memmove'd or memcpy'ed.
</del><ins>+ // Use std::unique_ptr so HashTable can still be memmove'd or memcpy'ed.
</ins><span class="cx"> mutable std::unique_ptr<std::mutex> m_mutex;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfHashTraitsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/HashTraits.h (183062 => 183063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/HashTraits.h 2015-04-21 13:01:18 UTC (rev 183062)
+++ trunk/Source/WTF/wtf/HashTraits.h 2015-04-21 15:51:05 UTC (rev 183063)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> class String;
</span><span class="cx">
</span><span class="cx"> template<typename T> class OwnPtr;
</span><del>-template<typename T> class PassOwnPtr;
</del><span class="cx">
</span><span class="cx"> template<typename T> struct HashTraits;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfListHashSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/ListHashSet.h (183062 => 183063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/ListHashSet.h 2015-04-21 13:01:18 UTC (rev 183062)
+++ trunk/Source/WTF/wtf/ListHashSet.h 2015-04-21 15:51:05 UTC (rev 183063)
</span><span class="lines">@@ -23,8 +23,6 @@
</span><span class="cx"> #define WTF_ListHashSet_h
</span><span class="cx">
</span><span class="cx"> #include <wtf/HashSet.h>
</span><del>-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfThreadingWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/ThreadingWin.cpp (183062 => 183063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/ThreadingWin.cpp 2015-04-21 13:01:18 UTC (rev 183062)
+++ trunk/Source/WTF/wtf/ThreadingWin.cpp 2015-04-21 15:51:05 UTC (rev 183063)
</span><span class="lines">@@ -99,8 +99,6 @@
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><del>-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/RandomNumberSeed.h>
</span><span class="cx"> #include <wtf/WTFThreadData.h>
</span><span class="cx">
</span><span class="lines">@@ -199,7 +197,7 @@
</span><span class="cx">
</span><span class="cx"> static unsigned __stdcall wtfThreadEntryPoint(void* param)
</span><span class="cx"> {
</span><del>- OwnPtr<ThreadFunctionInvocation> invocation = adoptPtr(static_cast<ThreadFunctionInvocation*>(param));
</del><ins>+ std::unique_ptr<ThreadFunctionInvocation> invocation(static_cast<ThreadFunctionInvocation*>(param));
</ins><span class="cx"> invocation->function(invocation->data);
</span><span class="cx">
</span><span class="cx"> #if !USE(PTHREADS) && OS(WINDOWS)
</span><span class="lines">@@ -214,7 +212,7 @@
</span><span class="cx"> {
</span><span class="cx"> unsigned threadIdentifier = 0;
</span><span class="cx"> ThreadIdentifier threadID = 0;
</span><del>- OwnPtr<ThreadFunctionInvocation> invocation = adoptPtr(new ThreadFunctionInvocation(entryPoint, data));
</del><ins>+ auto invocation = std::make_unique<ThreadFunctionInvocation>(entryPoint, data);
</ins><span class="cx"> HANDLE threadHandle = reinterpret_cast<HANDLE>(_beginthreadex(0, 0, wtfThreadEntryPoint, invocation.get(), 0, &threadIdentifier));
</span><span class="cx"> if (!threadHandle) {
</span><span class="cx"> #if !HAVE(ERRNO_H)
</span><span class="lines">@@ -226,7 +224,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // The thread will take ownership of invocation.
</span><del>- ThreadFunctionInvocation* leakedInvocation = invocation.leakPtr();
</del><ins>+ ThreadFunctionInvocation* leakedInvocation = invocation.release();
</ins><span class="cx"> UNUSED_PARAM(leakedInvocation);
</span><span class="cx">
</span><span class="cx"> threadID = static_cast<ThreadIdentifier>(threadIdentifier);
</span></span></pre></div>
<a id="trunkSourceWTFwtfeflRunLoopEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/efl/RunLoopEfl.cpp (183062 => 183063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/efl/RunLoopEfl.cpp 2015-04-21 13:01:18 UTC (rev 183062)
+++ trunk/Source/WTF/wtf/efl/RunLoopEfl.cpp 2015-04-21 15:51:05 UTC (rev 183063)
</span><span class="lines">@@ -28,8 +28,6 @@
</span><span class="cx"> #include "RunLoop.h"
</span><span class="cx">
</span><span class="cx"> #include <Ecore.h>
</span><del>-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> static const int ecorePipeMessageSize = 1;
</span><span class="cx"> static const char wakupEcorePipeMessage[] = "W";
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183062 => 183063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-21 13:01:18 UTC (rev 183062)
+++ trunk/Source/WebCore/ChangeLog 2015-04-21 15:51:05 UTC (rev 183063)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-04-21 Darin Adler <darin@apple.com>
+
+ Remove some stray uses of OwnPtr and PassOwnPtr in WTF (outside of the template definitions and traits)
+ https://bugs.webkit.org/show_bug.cgi?id=143944
+
+ Reviewed by Andreas Kling.
+
+ * editing/ios/DictationCommandIOS.h: Added now-needed include of PassOwnPtr.h.
+
</ins><span class="cx"> 2015-04-20 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r177494): -webkit-mask-image: with data URI fails on non-local files
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingiosDictationCommandIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ios/DictationCommandIOS.h (183062 => 183063)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ios/DictationCommandIOS.h 2015-04-21 13:01:18 UTC (rev 183062)
+++ trunk/Source/WebCore/editing/ios/DictationCommandIOS.h 2015-04-21 15:51:05 UTC (rev 183063)
</span><span class="lines">@@ -26,8 +26,9 @@
</span><span class="cx"> #ifndef DictationCommandIOS_h
</span><span class="cx"> #define DictationCommandIOS_h
</span><span class="cx">
</span><del>-#include "CompositeEditCommand.h"
-
</del><ins>+#import "CompositeEditCommand.h"
+#import <wtf/OwnPtr.h>
+#import <wtf/PassOwnPtr.h>
</ins><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> typedef struct objc_object *id;
</span></span></pre>
</div>
</div>
</body>
</html>