| Index: third_party/WebKit/Source/platform/heap/Persistent.h
|
| diff --git a/third_party/WebKit/Source/platform/heap/Persistent.h b/third_party/WebKit/Source/platform/heap/Persistent.h
|
| index 3fe022c0d501394e5d665b62fd59cc5242a22f6e..b222c0fadede18f977f4c7c9890a90f2dafdbd58 100644
|
| --- a/third_party/WebKit/Source/platform/heap/Persistent.h
|
| +++ b/third_party/WebKit/Source/platform/heap/Persistent.h
|
| @@ -175,10 +175,9 @@ class PersistentBase {
|
| NO_SANITIZE_ADDRESS
|
| void assign(T* ptr) {
|
| if (crossThreadnessConfiguration == CrossThreadPersistentConfiguration) {
|
| - releaseStore(
|
| - reinterpret_cast<void* volatile*>(
|
| - const_cast<typename std::remove_const<T>::type**>(&m_raw)),
|
| - const_cast<typename std::remove_const<T>::type*>(ptr));
|
| + CrossThreadPersistentRegion::LockScope persistentLock(
|
| + ProcessHeap::crossThreadPersistentRegion());
|
| + m_raw = ptr;
|
| } else {
|
| m_raw = ptr;
|
| }
|
|
|