[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

pfeldman at chromium.org pfeldman at chromium.org
Sun Feb 20 23:35:18 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit e239eadcc2f778087b439d3da4b67d4760938dda
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 21 22:00:52 2011 +0000

    2011-01-21  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Web Inspector: ~InspectorResourceAgent crashes on closing inspected page.
            https://bugs.webkit.org/show_bug.cgi?id=52900
    
            * inspector/InspectorController.cpp:
            (WebCore::InspectorController::~InspectorController):
            (WebCore::InspectorController::inspectedPageDestroyed):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76392 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index cabe68f..852dab2 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-21  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: ~InspectorResourceAgent crashes on closing inspected page.
+        https://bugs.webkit.org/show_bug.cgi?id=52900
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::~InspectorController):
+        (WebCore::InspectorController::inspectedPageDestroyed):
+
 2011-01-21  Chris Rogers  <crogers at google.com>
 
         Reviewed by Darin Fisher.
diff --git a/Source/WebCore/inspector/InspectorController.cpp b/Source/WebCore/inspector/InspectorController.cpp
index fa747cc..8533a5f 100644
--- a/Source/WebCore/inspector/InspectorController.cpp
+++ b/Source/WebCore/inspector/InspectorController.cpp
@@ -158,10 +158,6 @@ InspectorController::~InspectorController()
     ASSERT(!m_client);
     ASSERT(!m_inspectedPage);
     ASSERT(!m_highlightedNode);
-
-    releaseFrontendLifetimeAgents();
-
-    m_injectedScriptHost->disconnectController();
 }
 
 void InspectorController::inspectedPageDestroyed()
@@ -179,6 +175,9 @@ void InspectorController::inspectedPageDestroyed()
     ASSERT(m_inspectedPage);
     m_inspectedPage = 0;
 
+    releaseFrontendLifetimeAgents();
+    m_injectedScriptHost->disconnectController();
+
     m_client->inspectorDestroyed();
     m_client = 0;
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list