[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 57fe9f7fe84f8c04b5cb1363e53de9874c52d145
Author: mnaganov at chromium.org <mnaganov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 20 16:21:35 2011 +0000

    2011-01-20  Mikhail Naganov  <mnaganov at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            Web Inspector: [Chromium] CPU Profiles are cleared when navigating back and forth.
    
            Profiles are now not cleared unless renderer instance was changed.
    
            https://bugs.webkit.org/show_bug.cgi?id=52807
    
            * inspector/InspectorController.cpp:
            (WebCore::InspectorController::restoreProfiler):
            * inspector/InspectorProfilerAgent.cpp:
            (WebCore::InspectorProfilerAgent::resetState):
            (WebCore::InspectorProfilerAgent::resetFrontendProfiles):
            * inspector/InspectorProfilerAgent.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76247 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index e1ebc8c..c59834c 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2011-01-20  Mikhail Naganov  <mnaganov at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: [Chromium] CPU Profiles are cleared when navigating back and forth.
+
+        Profiles are now not cleared unless renderer instance was changed.
+
+        https://bugs.webkit.org/show_bug.cgi?id=52807
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::restoreProfiler):
+        * inspector/InspectorProfilerAgent.cpp:
+        (WebCore::InspectorProfilerAgent::resetState):
+        (WebCore::InspectorProfilerAgent::resetFrontendProfiles):
+        * inspector/InspectorProfilerAgent.h:
+
 2011-01-20  Alexander Pavlov  <apavlov at chromium.org>
 
         Unreviewed, add new JS file refs missing from r76116.
diff --git a/Source/WebCore/inspector/InspectorController.cpp b/Source/WebCore/inspector/InspectorController.cpp
index 776bdd8..7bdcd49 100644
--- a/Source/WebCore/inspector/InspectorController.cpp
+++ b/Source/WebCore/inspector/InspectorController.cpp
@@ -595,7 +595,7 @@ void InspectorController::restoreProfiler(ProfilerRestoreAction action)
     if (!ScriptProfiler::isProfilerAlwaysEnabled() && m_settings->getBoolean(InspectorSettings::ProfilerAlwaysEnabled))
         enableProfiler();
     if (action == ProfilerRestoreResetAgent)
-        m_profilerAgent->resetState();
+        m_profilerAgent->resetFrontendProfiles();
 #endif
 }
 
diff --git a/Source/WebCore/inspector/InspectorProfilerAgent.cpp b/Source/WebCore/inspector/InspectorProfilerAgent.cpp
index da9b67d..79849c5 100644
--- a/Source/WebCore/inspector/InspectorProfilerAgent.cpp
+++ b/Source/WebCore/inspector/InspectorProfilerAgent.cpp
@@ -211,7 +211,12 @@ void InspectorProfilerAgent::resetState()
     m_currentUserInitiatedProfileNumber = 1;
     m_nextUserInitiatedProfileNumber = 1;
     m_nextUserInitiatedHeapSnapshotNumber = 1;
-    if (m_frontend)
+    resetFrontendProfiles();
+}
+
+void InspectorProfilerAgent::resetFrontendProfiles()
+{
+    if (m_frontend && m_profiles.begin() == m_profiles.end())
         m_frontend->resetProfiles();
 }
 
diff --git a/Source/WebCore/inspector/InspectorProfilerAgent.h b/Source/WebCore/inspector/InspectorProfilerAgent.h
index e67848d..7806bfb 100644
--- a/Source/WebCore/inspector/InspectorProfilerAgent.h
+++ b/Source/WebCore/inspector/InspectorProfilerAgent.h
@@ -65,6 +65,7 @@ public:
     bool isRecordingUserInitiatedProfile() { return m_recordingUserInitiatedProfile; }
     void removeProfile(const String& type, unsigned uid);
     void resetState();
+    void resetFrontendProfiles();
     void setFrontend(InspectorFrontend* frontend) { m_frontend = frontend; }
     void startUserInitiatedProfiling();
     void stopUserInitiatedProfiling(bool ignoreProfile = false);

-- 
WebKit Debian packaging