[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit f391c9ce9e1f7cab4512d57f06757068c95c3d49
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 7 01:42:55 2010 +0000

    2010-10-06  Sanjeev Radhakrishnan  <sanjeevr at chromium.org>
    
            Reviewed by Darin Fisher.
    
            Released the pluginNode in PluginDocument::detach() and prevents a memory leak.
            https://bugs.webkit.org/show_bug.cgi?id=47129
    
            * html/PluginDocument.cpp:
            (WebCore::PluginDocument::detach):
            * html/PluginDocument.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69268 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9031081..e5f04bb 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-06  Sanjeev Radhakrishnan  <sanjeevr at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Released the pluginNode in PluginDocument::detach() and prevents a memory leak.
+        https://bugs.webkit.org/show_bug.cgi?id=47129
+
+        * html/PluginDocument.cpp:
+        (WebCore::PluginDocument::detach):
+        * html/PluginDocument.h:
+
 2010-10-06  Vincent Scheib  <scheib at chromium.org>
 
         Reviewed by Kenneth Russell.
diff --git a/WebCore/html/PluginDocument.cpp b/WebCore/html/PluginDocument.cpp
index ca2e19a..cebb949 100644
--- a/WebCore/html/PluginDocument.cpp
+++ b/WebCore/html/PluginDocument.cpp
@@ -155,6 +155,13 @@ Node* PluginDocument::pluginNode()
     return m_pluginNode.get();
 }
 
+void PluginDocument::detach()
+{
+    // Release the plugin node so that we don't have a circular reference.
+    m_pluginNode = 0;
+    HTMLDocument::detach();
+}
+
 void PluginDocument::cancelManualPluginLoad()
 {
     // PluginDocument::cancelManualPluginLoad should only be called once, but there are issues
diff --git a/WebCore/html/PluginDocument.h b/WebCore/html/PluginDocument.h
index 2f7d711..da0bb75 100644
--- a/WebCore/html/PluginDocument.h
+++ b/WebCore/html/PluginDocument.h
@@ -45,6 +45,8 @@ public:
 
     virtual bool isPluginDocument() const { return true; }
 
+    virtual void detach();
+
     void cancelManualPluginLoad();
 
     bool shouldLoadPluginManually() { return m_shouldLoadPluginManually; }

-- 
WebKit Debian packaging