Changeset 52828 in webkit

Timestamp:

Jan 5, 2010 3:07:08 PM (14 years ago)

Author:

Adam Roben

Message:

Add assertions to catch double-destruction of WebViews earlier

I basically copied the m_deletionHasBegun logic from WTF::RefCounted.

Fixes <​http://webkit.org/b/33219>.

Reviewed by Darin Adler.

• WebView.cpp:

(WebView::WebView): Initialize m_deletionHasBegun
(WebView::AddRef): Assert that deletion hasn't already begun.
(WebView::Release): Assert that deletion hasn't already begun, then
record when deletion *does* begin.

• WebView.h: Added m_deletionHasBegun.

Location:

trunk/WebKit/win

Files:

• ChangeLog (modified) (2 diffs)
• WebView.cpp (modified) (3 diffs)
• WebView.h (modified) (1 diff)

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2010-01-05  Adam Roben  <aroben@apple.com>
+
+        Add assertions to catch double-destruction of WebViews earlier
+
+        I basically copied the m_deletionHasBegun logic from WTF::RefCounted.
+
+        Fixes <http://webkit.org/b/33219>.
+
+        Reviewed by Darin Adler.
+
+        * WebView.cpp:
+        (WebView::WebView): Initialize m_deletionHasBegun
+        (WebView::AddRef): Assert that deletion hasn't already begun.
+        (WebView::Release): Assert that deletion hasn't already begun, then
+        record when deletion *does* begin.
+
+        * WebView.h: Added m_deletionHasBegun.
+
 2010-01-05  Adam Roben  <aroben@apple.com>
 
@@ -72 +90 @@
 
         * WebView.h: onIMERequest functions now return result directly.
+
 
 2010-01-04  Adam Roben  <aroben@apple.com>

trunk/WebKit/win/WebView.cpp

@@ -297 +297 @@
 WebView::WebView()
     : m_refCount(0)
+#if !ASSERT_DISABLED
+    , m_deletionHasBegun(false)
+#endif
     , m_hostWindow(0)
     , m_viewWindow(0)
@@ -2268 +2271 @@
 ULONG STDMETHODCALLTYPE WebView::AddRef(void)
 {
+    ASSERT(!m_deletionHasBegun);
     return ++m_refCount;
 }
@@ -2273 +2277 @@
 ULONG STDMETHODCALLTYPE WebView::Release(void)
 {
+    ASSERT(!m_deletionHasBegun);
+
     ULONG newRef = --m_refCount;
-    if (!newRef)
+    if (!newRef) {
+#if !ASSERT_DISABLED
+        m_deletionHasBegun = true;
+#endif
         delete(this);
+    }
 
     return newRef;

trunk/WebKit/win/WebView.h

@@ -916 +916 @@
 
     ULONG m_refCount;
+#if !ASSERT_DISABLED
+    bool m_deletionHasBegun;
+#endif
     HWND m_hostWindow;
     HWND m_viewWindow;