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

[mnaganov at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit f90585f9e68096e08ed186df38542818353f5eb3
Author: mnaganov at chromium.org <mnaganov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 1 17:22:36 2011 +0000

    2011-02-01  Mikhail Naganov  <mnaganov at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: Fix profiles reset to avoid clearing heap profiles in Chromium.
    
            https://bugs.webkit.org/show_bug.cgi?id=53500
    
            * inspector/InspectorProfilerAgent.cpp:
            (WebCore::InspectorProfilerAgent::resetFrontendProfiles):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77254 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 54503e3..675d3e5 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -2,6 +2,17 @@
 
         Reviewed by Pavel Feldman.
 
+        Web Inspector: Fix profiles reset to avoid clearing heap profiles in Chromium.
+
+        https://bugs.webkit.org/show_bug.cgi?id=53500
+
+        * inspector/InspectorProfilerAgent.cpp:
+        (WebCore::InspectorProfilerAgent::resetFrontendProfiles):
+
+2011-02-01  Mikhail Naganov  <mnaganov at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
         Web Inspector: [Chromium] Landing detailed heap snapshots, part 1.
 
         https://bugs.webkit.org/show_bug.cgi?id=53173
diff --git a/Source/WebCore/inspector/InspectorProfilerAgent.cpp b/Source/WebCore/inspector/InspectorProfilerAgent.cpp
index 47dc585..550febf 100644
--- a/Source/WebCore/inspector/InspectorProfilerAgent.cpp
+++ b/Source/WebCore/inspector/InspectorProfilerAgent.cpp
@@ -220,7 +220,9 @@ void InspectorProfilerAgent::resetState()
 
 void InspectorProfilerAgent::resetFrontendProfiles()
 {
-    if (m_frontend && m_profiles.begin() == m_profiles.end())
+    if (m_frontend
+        && m_profiles.begin() == m_profiles.end()
+        && m_snapshots.begin() == m_snapshots.end())
         m_frontend->resetProfiles();
 }
 

-- 
WebKit Debian packaging