Attachment 368425 Details for Bug 197350 – Patch

[patch] Patch

bug-197350-20190428012700.patch (text/plain), 3.67 KB, created by Yusuke Suzuki on 2019-04-28 01:27:01 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Yusuke Suzuki

Created: 2019-04-28 01:27:01 PDT

Size: 3.67 KB

patch

obsolete

>Subversion Revision: 244723
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index 475cdd28b74cf6c19251851e75de9c279aebd116..3d452dd72b718da56209aad54de37e391cb58e52 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-04-28  Yusuke Suzuki  <ysuzuki@apple.com>
>+
>+        [WTF] Remove Threading workaround for support libraries in Windows
>+        https://bugs.webkit.org/show_bug.cgi?id=197350
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        We kept old APIs for some support libraries at 2017. This patch removes them.
>+
>+        * wtf/Threading.h:
>+        * wtf/win/ThreadingWin.cpp:
>+        (WTF::createThread): Deleted.
>+        (WTF::waitForThreadCompletion): Deleted.
>+
> 2019-04-26  Don Olmstead  <don.olmstead@sony.com>
> 
>         Add WTF::findIgnoringASCIICaseWithoutLength to replace strcasestr
>diff --git a/Source/WTF/wtf/Threading.h b/Source/WTF/wtf/Threading.h
>index 3a579b3d47115bccdf344cec8f73bef3bc10f1e8..b95af7359e27ddfa3aaeb5210c0380032c0ad4f4 100644
>--- a/Source/WTF/wtf/Threading.h
>+++ b/Source/WTF/wtf/Threading.h
>@@ -72,22 +72,10 @@ constexpr const int SigThreadSuspendResume = SIGUSR1;
> 
> #endif
> 
>-// FIXME: The following functions remain because they are used from WebKit Windows support library,
>-// WebKitQuartzCoreAdditions.dll. When updating the support library, we should use new API instead
>-// and the following workaound should be removed. And new code should not use the following APIs.
>-// Remove this workaround code when <rdar://problem/31793213> is fixed.
>-#if OS(WINDOWS)
>-WTF_EXPORT_PRIVATE ThreadIdentifier createThread(ThreadFunction, void*, const char* threadName);
>-WTF_EXPORT_PRIVATE int waitForThreadCompletion(ThreadIdentifier);
>-#endif
>-
> class Thread : public ThreadSafeRefCounted<Thread> {
> public:
>     friend class ThreadGroup;
>     friend WTF_EXPORT_PRIVATE void initializeThreading();
>-#if OS(WINDOWS)
>-    friend WTF_EXPORT_PRIVATE int waitForThreadCompletion(ThreadIdentifier);
>-#endif
> 
>     WTF_EXPORT_PRIVATE ~Thread();
> 
>@@ -345,9 +333,3 @@ inline Thread& Thread::current()
> } // namespace WTF
> 
> using WTF::Thread;
>-
>-#if OS(WINDOWS)
>-using WTF::ThreadIdentifier;
>-using WTF::createThread;
>-using WTF::waitForThreadCompletion;
>-#endif
>diff --git a/Source/WTF/wtf/win/ThreadingWin.cpp b/Source/WTF/wtf/win/ThreadingWin.cpp
>index 36fed1bb0d2baed332da1b57e31e7583af832cf3..b302ae4a19540f014c82962f850349e80bee642b 100644
>--- a/Source/WTF/wtf/win/ThreadingWin.cpp
>+++ b/Source/WTF/wtf/win/ThreadingWin.cpp
>@@ -287,7 +287,6 @@ Thread* Thread::currentDying()
>     return threadMap().get(currentID());
> }
> 
>-// FIXME: Remove this workaround code once <rdar://problem/31793213> is fixed.
> RefPtr<Thread> Thread::get(ThreadIdentifier id)
> {
>     auto locker = holdLock(threadMapMutex);
>@@ -427,30 +426,6 @@ void ThreadCondition::broadcast()
>     WakeAllConditionVariable(&m_condition);
> }
> 
>-// Remove this workaround code when <rdar://problem/31793213> is fixed.
>-ThreadIdentifier createThread(ThreadFunction function, void* data, const char* threadName)
>-{
>-    return Thread::create(threadName, [function, data] {
>-        function(data);
>-    })->id();
>-}
>-
>-int waitForThreadCompletion(ThreadIdentifier threadID)
>-{
>-    // This function is implemented based on the old Threading implementation.
>-    // It remains only due to the support library using old Threading APIs and
>-    // it should not be used in new code.
>-    ASSERT(threadID);
>-
>-    RefPtr<Thread> thread = Thread::get(threadID);
>-    if (!thread) {
>-        LOG_ERROR("ThreadIdentifier %u did not correspond to an active thread when trying to quit", threadID);
>-        return WAIT_FAILED;
>-    }
>-    return thread->waitForCompletion();
>-
>-}
>-
> void Thread::yield()
> {
>     SwitchToThread();

Flags:

darin: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 197350: 368425