| Index: base/threading/platform_thread_posix.cc
|
| diff --git a/base/threading/platform_thread_posix.cc b/base/threading/platform_thread_posix.cc
|
| index f3a835e54f0b2c56cc02827ee85749a8fb25f214..1e717ce0b048db10a045249e7067c42340ffaba2 100644
|
| --- a/base/threading/platform_thread_posix.cc
|
| +++ b/base/threading/platform_thread_posix.cc
|
| @@ -63,19 +63,16 @@ void* ThreadFunc(void* params) {
|
|
|
| // Stash the id in the handle so the calling thread has a complete
|
| // handle, and unblock the parent thread.
|
| - *(thread_params->handle) = PlatformThreadHandle(pthread_self(),
|
| - PlatformThread::CurrentId());
|
| + *(thread_params->handle) = PlatformThreadHandle(pthread_self());
|
| thread_params->handle_set.Signal();
|
|
|
| ThreadIdNameManager::GetInstance()->RegisterThread(
|
| - PlatformThread::CurrentHandle().platform_handle(),
|
| - PlatformThread::CurrentId());
|
| + PlatformThread::CurrentHandle(), PlatformThread::CurrentId());
|
|
|
| delegate->ThreadMain();
|
|
|
| ThreadIdNameManager::GetInstance()->RemoveName(
|
| - PlatformThread::CurrentHandle().platform_handle(),
|
| - PlatformThread::CurrentId());
|
| + PlatformThread::CurrentHandle(), PlatformThread::CurrentId());
|
|
|
| base::TerminateOnThread();
|
| return NULL;
|
| @@ -129,7 +126,7 @@ bool CreateThread(size_t stack_size, bool joinable,
|
| // is set in the handle.
|
| if (success)
|
| params.handle_set.Wait();
|
| - CHECK_EQ(handle, thread_handle->platform_handle());
|
| + CHECK(thread_handle->is_equal(PlatformThreadHandle(handle)));
|
|
|
| return success;
|
| }
|
| @@ -165,7 +162,7 @@ PlatformThreadRef PlatformThread::CurrentRef() {
|
|
|
| // static
|
| PlatformThreadHandle PlatformThread::CurrentHandle() {
|
| - return PlatformThreadHandle(pthread_self(), CurrentId());
|
| + return PlatformThreadHandle(pthread_self());
|
| }
|
|
|
| // static
|
| @@ -226,7 +223,7 @@ void PlatformThread::Join(PlatformThreadHandle thread_handle) {
|
| // the thread referred to by |thread_handle| may still be running long-lived /
|
| // blocking tasks.
|
| base::ThreadRestrictions::AssertIOAllowed();
|
| - CHECK_EQ(0, pthread_join(thread_handle.platform_handle(), NULL));
|
| + CHECK_EQ(0, pthread_join(thread_handle.handle_, NULL));
|
| }
|
|
|
| // Mac has its own Set/GetCurrentThreadPriority() implementations.
|
|
|