[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

pfeldman at chromium.org pfeldman at chromium.org
Thu Oct 29 20:49:33 UTC 2009


The following commit has been merged in the webkit-1.1 branch:
commit d785c2f1ac8b37d3925a434ebfeafefb05f6eb25
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 21 13:33:25 2009 +0000

    2009-10-20  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: Fix DOM Agent leak.
    
            https://bugs.webkit.org/show_bug.cgi?id=30615
    
            * inspector/InspectorController.cpp:
            (WebCore::InspectorController::~InspectorController):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49903 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3981921..fd08746 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-20  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: Fix DOM Agent leak.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30615
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::~InspectorController):
+
 2009-10-21  Girish Ramakrishnan  <girish at forwardbias.in>
 
         Reviewed by Holger Freyther.
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 1ea79e9..c54a768 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -171,6 +171,11 @@ InspectorController::~InspectorController()
         s_settingCache = 0;
     }
     
+    // m_domAgent is RefPtr. Remove DOM listeners first to ensure that there are
+    // no references to the DOM agent from the DOM tree.
+    if (m_domAgent)
+        m_domAgent->setDocument(0);
+
     m_inspectorBackend->disconnectController();
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list