Merge 77254 - 2011-02-01 Mikhail Naganov <mnaganov@chromium.org>...

Source/WebCore/inspector/InspectorProfilerAgent.cpp

 /*
  * Copyright (C) 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 202 matching lines @@
     m_profiles.clear();
     m_snapshots.clear();
     m_currentUserInitiatedProfileNumber = 1;
     m_nextUserInitiatedProfileNumber = 1;
     m_nextUserInitiatedHeapSnapshotNumber = 1;
     resetFrontendProfiles();
 }
 
 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();
 }
 
 void InspectorProfilerAgent::startUserInitiatedProfiling()
 {
     if (m_recordingUserInitiatedProfile)
         return;
     if (!enabled()) {
         enable(false);
         ScriptDebugServer::shared().recompileAllJSFunctions();
@@ skipping 48 matching lines @@
 
 void InspectorProfilerAgent::toggleRecordButton(bool isProfiling)
 {
     if (m_frontend)
         m_frontend->setRecordingProfile(isProfiling);
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)