Attachment 251163 Details for Bug 143944 – Patch

[patch] Patch

bug-143944-20150420094826.patch (text/plain), 6.41 KB, created by Darin Adler on 2015-04-20 09:49:28 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darin Adler

Created: 2015-04-20 09:49:28 PDT

Size: 6.41 KB

patch

obsolete

>Subversion Revision: 183014
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index 185166156b11334a9c641a98ebd1f2cf0a243f77..6da04c3a600ac2e8b6884fd02611bdbc1a185dec 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,19 @@
>+2015-04-20  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 NOBODY (OOPS!).
>+
>+        * 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.
>+
> 2015-04-19  Darin Adler  <darin@apple.com>
> 
>         Update RefPtr documentation and deprecation
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 009663a87475f6d82de054364cee9096abb9d094..94d6ce630fe53a9567b2f40c5298fe026dc7d9e4 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,12 @@
>+2015-04-20  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 NOBODY (OOPS!).
>+
>+        * editing/ios/DictationCommandIOS.h: Added now-needed include of PassOwnPtr.h.
>+
> 2015-04-20  Martin Robinson  <mrobinson@igalia.com>
> 
>         [CMake] Include ICU unconditionally on the source lists
>diff --git a/Source/WTF/wtf/FilePrintStream.h b/Source/WTF/wtf/FilePrintStream.h
>index f698a027083ae5092c6b07bd4af898e78d1d3cbe..0dce33f4e6821a6305c1c18a2a4976501c5e921d 100644
>--- a/Source/WTF/wtf/FilePrintStream.h
>+++ b/Source/WTF/wtf/FilePrintStream.h
>@@ -28,7 +28,6 @@
> 
> #include <stdio.h>
> #include <wtf/PrintStream.h>
>-#include <wtf/OwnPtr.h>
> 
> namespace WTF {
> 
>diff --git a/Source/WTF/wtf/HashTable.h b/Source/WTF/wtf/HashTable.h
>index 8e28b24197075c3a8acbe98d1e31f3ca9499358d..4dc0b0ab8bc8983d685f523662c4c11af4be2b67 100644
>--- a/Source/WTF/wtf/HashTable.h
>+++ b/Source/WTF/wtf/HashTable.h
>@@ -482,7 +482,7 @@ namespace WTF {
>     public:
>         // All access to m_iterators should be guarded with m_mutex.
>         mutable const_iterator* m_iterators;
>-        // Use OwnPtr so HashTable can still be memmove'd or memcpy'ed.
>+        // Use std::unique_ptr so HashTable can still be memmove'd or memcpy'ed.
>         mutable std::unique_ptr<std::mutex> m_mutex;
> #endif
> 
>diff --git a/Source/WTF/wtf/HashTraits.h b/Source/WTF/wtf/HashTraits.h
>index c9321ebd5666bb187cb83cf8bc12628ec98b2641..e47aa8b5f86b4bfdee9e9232cc20df5a9e81f3cd 100644
>--- a/Source/WTF/wtf/HashTraits.h
>+++ b/Source/WTF/wtf/HashTraits.h
>@@ -31,7 +31,6 @@ namespace WTF {
> class String;
> 
> template<typename T> class OwnPtr;
>-template<typename T> class PassOwnPtr;
> 
> template<typename T> struct HashTraits;
> 
>diff --git a/Source/WTF/wtf/ListHashSet.h b/Source/WTF/wtf/ListHashSet.h
>index 82364fd202b0fd007489710315c87362e5a59309..4110b3e0ea78a8fe3ac5af1ec163aeb8e30d6052 100644
>--- a/Source/WTF/wtf/ListHashSet.h
>+++ b/Source/WTF/wtf/ListHashSet.h
>@@ -23,8 +23,6 @@
> #define WTF_ListHashSet_h
> 
> #include <wtf/HashSet.h>
>-#include <wtf/OwnPtr.h>
>-#include <wtf/PassOwnPtr.h>
> 
> namespace WTF {
> 
>diff --git a/Source/WTF/wtf/ThreadingWin.cpp b/Source/WTF/wtf/ThreadingWin.cpp
>index d44f8b5d2e37b4f657617c40a3c1f871914560ae..ea4bd43ae1387e4431642d2a240a6679cc1b91ab 100644
>--- a/Source/WTF/wtf/ThreadingWin.cpp
>+++ b/Source/WTF/wtf/ThreadingWin.cpp
>@@ -99,8 +99,6 @@
> #include <wtf/CurrentTime.h>
> #include <wtf/HashMap.h>
> #include <wtf/MathExtras.h>
>-#include <wtf/OwnPtr.h>
>-#include <wtf/PassOwnPtr.h>
> #include <wtf/RandomNumberSeed.h>
> #include <wtf/WTFThreadData.h>
> 
>@@ -199,7 +197,7 @@ static void clearThreadHandleForIdentifier(ThreadIdentifier id)
> 
> static unsigned __stdcall wtfThreadEntryPoint(void* param)
> {
>-    OwnPtr<ThreadFunctionInvocation> invocation = adoptPtr(static_cast<ThreadFunctionInvocation*>(param));
>+    std::unique_ptr<ThreadFunctionInvocation> invocation(static_cast<ThreadFunctionInvocation*>(param));
>     invocation->function(invocation->data);
> 
> #if !USE(PTHREADS) && OS(WINDOWS)
>@@ -214,7 +212,7 @@ ThreadIdentifier createThreadInternal(ThreadFunction entryPoint, void* data, con
> {
>     unsigned threadIdentifier = 0;
>     ThreadIdentifier threadID = 0;
>-    OwnPtr<ThreadFunctionInvocation> invocation = adoptPtr(new ThreadFunctionInvocation(entryPoint, data));
>+    auto invocation = std::make_unique<ThreadFunctionInvocation>(entryPoint, data);
>     HANDLE threadHandle = reinterpret_cast<HANDLE>(_beginthreadex(0, 0, wtfThreadEntryPoint, invocation.get(), 0, &threadIdentifier));
>     if (!threadHandle) {
> #if !HAVE(ERRNO_H)
>@@ -226,7 +224,7 @@ ThreadIdentifier createThreadInternal(ThreadFunction entryPoint, void* data, con
>     }
> 
>     // The thread will take ownership of invocation.
>-    ThreadFunctionInvocation* leakedInvocation = invocation.leakPtr();
>+    ThreadFunctionInvocation* leakedInvocation = invocation.release();
>     UNUSED_PARAM(leakedInvocation);
> 
>     threadID = static_cast<ThreadIdentifier>(threadIdentifier);
>diff --git a/Source/WTF/wtf/efl/RunLoopEfl.cpp b/Source/WTF/wtf/efl/RunLoopEfl.cpp
>index e7a00ef66244d7c933dc3840f7921a556e5d8072..5dfc2903e8b4d10743b529f4c0c74c6750dae596 100644
>--- a/Source/WTF/wtf/efl/RunLoopEfl.cpp
>+++ b/Source/WTF/wtf/efl/RunLoopEfl.cpp
>@@ -28,8 +28,6 @@
> #include "RunLoop.h"
> 
> #include <Ecore.h>
>-#include <wtf/OwnPtr.h>
>-#include <wtf/PassOwnPtr.h>
> 
> static const int ecorePipeMessageSize = 1;
> static const char wakupEcorePipeMessage[] = "W";
>diff --git a/Source/WebCore/editing/ios/DictationCommandIOS.h b/Source/WebCore/editing/ios/DictationCommandIOS.h
>index 561198c8428eb45240ddd90dc8633e3735fb0a00..631bfb3d42f6efd121758c0662910d8e8f0f8935 100644
>--- a/Source/WebCore/editing/ios/DictationCommandIOS.h
>+++ b/Source/WebCore/editing/ios/DictationCommandIOS.h
>@@ -26,8 +26,9 @@
> #ifndef DictationCommandIOS_h
> #define DictationCommandIOS_h
> 
>-#include "CompositeEditCommand.h"
>-
>+#import "CompositeEditCommand.h"
>+#import <wtf/OwnPtr.h>
>+#import <wtf/PassOwnPtr.h>
> #import <wtf/RetainPtr.h>
> 
> typedef struct objc_object *id;

Flags:

kling: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 143944: 251148 | 251163