| Index: third_party/WebKit/Source/wtf/ThreadSpecific.h
|
| diff --git a/third_party/WebKit/Source/wtf/ThreadSpecific.h b/third_party/WebKit/Source/wtf/ThreadSpecific.h
|
| index 82f2144132138057f3ca924f9c1d4a1ae370fb75..5d7f6d26a9eba250c76907a791b1e34b80de2c5d 100644
|
| --- a/third_party/WebKit/Source/wtf/ThreadSpecific.h
|
| +++ b/third_party/WebKit/Source/wtf/ThreadSpecific.h
|
| @@ -224,7 +224,9 @@ inline void ThreadSpecific<T>::set(T* ptr) {
|
|
|
| template <typename T>
|
| inline void ThreadSpecific<T>::destroy(void* ptr) {
|
| - if (isShutdown())
|
| + // Never call destructors on the main thread.
|
| + // This is fine because Blink no longer has a graceful shutdown sequence.
|
| + if (isMainThread())
|
| return;
|
|
|
| Data* data = static_cast<Data*>(ptr);
|
|
|