Changeset 94831 in webkit

Timestamp:

Sep 8, 2011 8:20:59 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Release the reference to the HTMLPlugInElement's script object, when the element is removed from the document. This breaks a cyclical reference that would otherwise cause the element to be retained until the document is torn down.
​https://bugs.webkit.org/show_bug.cgi?id=66181

Patch by James Weatherall <​wez@chromium.org> on 2011-09-08
Reviewed by Anders Carlsson.

No new tests - no functional change.

• html/HTMLPlugInElement.cpp:

(WebCore::HTMLPlugInElement::removedFromDocument):

• html/HTMLPlugInElement.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLPlugInElement.cpp (modified) (1 diff)
• html/HTMLPlugInElement.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-08  James Weatherall  <wez@chromium.org>
+
+        Release the reference to the HTMLPlugInElement's script object, when the element is removed from the document.  This breaks a cyclical reference that would otherwise cause the element to be retained until the document is torn down.
+        https://bugs.webkit.org/show_bug.cgi?id=66181
+
+        Reviewed by Anders Carlsson.
+
+        No new tests - no functional change.
+
+        * html/HTMLPlugInElement.cpp:
+        (WebCore::HTMLPlugInElement::removedFromDocument):
+        * html/HTMLPlugInElement.h:
+
 2011-09-08  Daniel Bates  <dbates@webkit.org>
 

trunk/Source/WebCore/html/HTMLPlugInElement.cpp

@@ -80 +80 @@
 
     HTMLFrameOwnerElement::detach();
+}
+
+void HTMLPlugInElement::removedFromDocument()
+{
+#if ENABLE(NETSCAPE_PLUGIN_API)
+    if (m_NPObject) {
+        _NPN_ReleaseObject(m_NPObject);
+        m_NPObject = 0;
+    }
+#endif
+
+    HTMLFrameOwnerElement::removedFromDocument();
 }
 

trunk/Source/WebCore/html/HTMLPlugInElement.h

@@ -58 +58 @@
 
     virtual void detach();
-
+    virtual void removedFromDocument();
     virtual bool mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const;
     virtual void parseMappedAttribute(Attribute*);