Title: [127219] trunk/Source/WebKit2
- Revision
- 127219
- Author
- [email protected]
- Date
- 2012-08-30 17:43:15 -0700 (Thu, 30 Aug 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (127218 => 127219)
--- trunk/Source/WebKit2/ChangeLog 2012-08-31 00:39:54 UTC (rev 127218)
+++ trunk/Source/WebKit2/ChangeLog 2012-08-31 00:43:15 UTC (rev 127219)
@@ -1,3 +1,17 @@
+2012-08-30 Mark Hahnenberg <[email protected]>
+
+ ~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 <[email protected]>
Allow dynamic mach-lookup extensions in the WebProcess
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp (127218 => 127219)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp 2012-08-31 00:39:54 UTC (rev 127218)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp 2012-08-31 00:43:15 UTC (rev 127219)
@@ -77,7 +77,8 @@
JSNPObject::~JSNPObject()
{
- ASSERT(!m_npObject);
+ if (m_npObject)
+ invalidate();
}
void JSNPObject::destroy(JSCell* cell)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
