Changeset 127219 in webkit

Timestamp:

Aug 30, 2012, 5:43:15 PM (14 years ago)

Author:

mhahnenberg@apple.com

Message:

~JSNPObject should call invalidate() if it hasn't been called already
​https://bugs.webkit.org/show_bug.cgi?id=95497

Reviewed by Geoffrey Garen.

Finalization is no longer eager, just like destruction, so the original intent behind
this ASSERT in ~JSNPObject is no longer relevant. Therefore, we can just call invalidate()
ourselves in ~JSNPObject.

• WebProcess/Plugins/Netscape/JSNPObject.cpp:

(WebKit::JSNPObject::~JSNPObject):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Plugins/Netscape/JSNPObject.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-08-30  Mark Hahnenberg  <mhahnenberg@apple.com>
+
+        ~JSNPObject should call invalidate() if it hasn't been called already
+        https://bugs.webkit.org/show_bug.cgi?id=95497
+
+        Reviewed by Geoffrey Garen.
+
+        Finalization is no longer eager, just like destruction, so the original intent behind 
+        this ASSERT in ~JSNPObject is no longer relevant. Therefore, we can just call invalidate() 
+        ourselves in ~JSNPObject.
+
+        * WebProcess/Plugins/Netscape/JSNPObject.cpp:
+        (WebKit::JSNPObject::~JSNPObject):
+
 2012-08-30  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp

@@ -78 +78 @@
 JSNPObject::~JSNPObject()
 {
-    ASSERT(!m_npObject);
+    if (m_npObject)
+        invalidate();
 }