* 修复关闭页面时候可能的崩溃

weolar · Dec 6, 2019 · 7fb5d51 · 7fb5d51
1 parent f7087bc
commit 7fb5d51
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/content/browser/WebPageImpl.cpp b/content/browser/WebPageImpl.cpp
@@ -89,13 +89,16 @@ void WebPageImpl::initBlink()
 
 void WebPageImpl::registerDestroyNotif(DestroyNotif* destroyNotif)
 {
+    WTF::Locker<WTF::Mutex> locker(m_destroyNotifsMutex);
     size_t pos = m_destroyNotifs.find(destroyNotif);
     if (WTF::kNotFound == pos)
         m_destroyNotifs.append(destroyNotif);
 }
 
 void WebPageImpl::unregisterDestroyNotif(DestroyNotif* destroyNotif)
 {
+    RELEASE_ASSERT(WTF::isMainThread());
+    WTF::Locker<WTF::Mutex> locker(m_destroyNotifsMutex);
     size_t pos = m_destroyNotifs.find(destroyNotif);
     if (WTF::kNotFound != pos)
         m_destroyNotifs.remove(pos);

diff --git a/content/browser/WebPageImpl.h b/content/browser/WebPageImpl.h
@@ -290,6 +290,7 @@ class WebPageImpl
     bool m_postCloseWidgetSoonMessage;
 
     WTF::Vector<DestroyNotif*> m_destroyNotifs;
+    WTF::Mutex m_destroyNotifsMutex;
     HRGN m_draggableRegion;
 
     HWND m_popupHandle;