Changeset 172404 in webkit

Timestamp:

Aug 11, 2014, 12:50:52 PM (11 years ago)

Author:

timothy@apple.com

Message:

Web Inspector: console.profile shouldn't stop auto-recorded profiles
​https://bugs.webkit.org/show_bug.cgi?id=135810

Reviewed by Joseph Pecoraro.

• inspector/InspectorTimelineAgent.cpp:

(WebCore::InspectorTimelineAgent::start): Added. Call internalStart. Set m_enabledFromFrontend.
(WebCore::InspectorTimelineAgent::stop): Added. Calls internalStop. Clear m_enabledFromFrontend.
(WebCore::InspectorTimelineAgent::internalStart): Renamed from start.
(WebCore::InspectorTimelineAgent::internalStop): Renamed from stop.
(WebCore::InspectorTimelineAgent::startFromConsole): Use internalStart.
(WebCore::InspectorTimelineAgent::stopFromConsole): Use internalStop. Only stop if !m_enabledFromFrontend.
(WebCore::InspectorTimelineAgent::InspectorTimelineAgent): Initialize m_enabledFromFrontend.

• inspector/InspectorTimelineAgent.h: Added m_enabledFromFrontend.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorTimelineAgent.cpp (modified) (5 diffs)
• inspector/InspectorTimelineAgent.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-08-11  Timothy Hatcher  <timothy@apple.com>
+
+        Web Inspector: console.profile shouldn't stop auto-recorded profiles
+        https://bugs.webkit.org/show_bug.cgi?id=135810
+
+        Reviewed by Joseph Pecoraro.
+
+        * inspector/InspectorTimelineAgent.cpp:
+        (WebCore::InspectorTimelineAgent::start): Added. Call internalStart. Set m_enabledFromFrontend.
+        (WebCore::InspectorTimelineAgent::stop): Added. Calls internalStop. Clear m_enabledFromFrontend.
+        (WebCore::InspectorTimelineAgent::internalStart): Renamed from start.
+        (WebCore::InspectorTimelineAgent::internalStop): Renamed from stop.
+        (WebCore::InspectorTimelineAgent::startFromConsole): Use internalStart.
+        (WebCore::InspectorTimelineAgent::stopFromConsole): Use internalStop. Only stop if !m_enabledFromFrontend.
+        (WebCore::InspectorTimelineAgent::InspectorTimelineAgent): Initialize m_enabledFromFrontend.
+        * inspector/InspectorTimelineAgent.h: Added m_enabledFromFrontend.
+
 2014-08-11  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp

@@ -100 +100 @@
 void InspectorTimelineAgent::start(ErrorString*, const int* maxCallStackDepth)
 {
+    m_enabledFromFrontend = true;
+
+    internalStart(maxCallStackDepth);
+}
+
+void InspectorTimelineAgent::stop(ErrorString*)
+{
+    internalStop();
+
+    m_enabledFromFrontend = false;
+}
+
+void InspectorTimelineAgent::internalStart(const int* maxCallStackDepth)
+{
     if (maxCallStackDepth && *maxCallStackDepth > 0)
         m_maxCallStackDepth = *maxCallStackDepth;
@@ -118 +132 @@
 }
 
-void InspectorTimelineAgent::stop(ErrorString*)
+void InspectorTimelineAgent::internalStop()
 {
     if (!m_enabled)
@@ -177 +191 @@
     }
 
-    if (m_pendingConsoleProfileRecords.isEmpty())
-        start();
+    if (!m_enabled && m_pendingConsoleProfileRecords.isEmpty())
+        internalStart();
 
     startProfiling(exec, title);
@@ -204 +218 @@
             m_pendingConsoleProfileRecords.remove(i);
 
-            if (m_pendingConsoleProfileRecords.isEmpty())
-                stop();
+            if (!m_enabledFromFrontend && m_pendingConsoleProfileRecords.isEmpty())
+                internalStop();
 
             return profile.release();
@@ -683 +697 @@
     , m_recordingProfileDepth(0)
     , m_enabled(false)
+    , m_enabledFromFrontend(false)
 {
 }

trunk/Source/WebCore/inspector/InspectorTimelineAgent.h

@@ -246 +246 @@
     };
 
+    void internalStart(const int* maxCallStackDepth = nullptr);
+    void internalStop();
+
     void sendEvent(PassRefPtr<Inspector::InspectorObject>);
     void appendRecord(PassRefPtr<Inspector::InspectorObject> data, TimelineRecordType, bool captureCallStack, Frame*);
@@ -285 +288 @@
     int m_recordingProfileDepth;
     bool m_enabled;
+    bool m_enabledFromFrontend;
 };