Changeset 180901 in webkit

Timestamp:

Mar 2, 2015 3:39:47 PM (9 years ago)

Author:

mark.lam@apple.com

Message:

The InspectorTimelineAgent should gracefully handle attempts to start more than once.
<​https://webkit.org/b/142189>

Reviewed by Joseph Pecoraro.

Source/WebCore:

No new tests. Unskipped an existing test that already asserts this.

InspectorTimelineAgent::internalStop() already checks for redundant calls to it in
case the InspectorTimelineAgent is already disabled. Similarly,
InspectorTimelineAgent::internalStart() should check if the InspectorTimelineAgent
is already enabled before proceeding to do work to enable it. Though wasteful,
it is legal for clients of the InspectorTimelineAgent to invoke start on it more
than once. Hence, this check is needed.

This check fixes the debug assertion failure when running the
inspector/timeline/debugger-paused-while-recording.html test. The test can now
be unskipped.

• inspector/InspectorTimelineAgent.cpp:

(WebCore::InspectorTimelineAgent::internalStart):

LayoutTests:

• TestExpectations:
• Unskipped inspector/timeline tests.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/InspectorTimelineAgent.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-03-02  Mark Lam  <mark.lam@apple.com>
+
+        The InspectorTimelineAgent should gracefully handle attempts to start more than once.
+        <https://webkit.org/b/142189>
+
+        Reviewed by Joseph Pecoraro.
+
+        * TestExpectations:
+        - Unskipped inspector/timeline tests.
+
 2015-03-02  Brent Fulgham  <bfulgham@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -98 +98 @@
 webkit.org/b/137131 inspector/debugger [ Skip ]
 webkit.org/b/137130 inspector/replay [ Skip ]
-webkit.org/b/137131 inspector/timeline [ Skip ]
 inspector/model/remote-object-get-properties.html [ Skip ]
 inspector/model/remote-object-weak-collection.html [ Skip ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-02  Mark Lam  <mark.lam@apple.com>
+
+        The InspectorTimelineAgent should gracefully handle attempts to start more than once.
+        <https://webkit.org/b/142189>
+
+        Reviewed by Joseph Pecoraro.
+
+        No new tests.  Unskipped an existing test that already asserts this.
+
+        InspectorTimelineAgent::internalStop() already checks for redundant calls to it in
+        case the InspectorTimelineAgent is already disabled. Similarly,
+        InspectorTimelineAgent::internalStart() should check if the InspectorTimelineAgent
+        is already enabled before proceeding to do work to enable it. Though wasteful,
+        it is legal for clients of the InspectorTimelineAgent to invoke start on it more
+        than once. Hence, this check is needed.
+
+        This check fixes the debug assertion failure when running the
+        inspector/timeline/debugger-paused-while-recording.html test. The test can now
+        be unskipped.
+
+        * inspector/InspectorTimelineAgent.cpp:
+        (WebCore::InspectorTimelineAgent::internalStart):
+
 2015-03-02  Roger Fong  <roger_fong@apple.com>
 

trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp

@@ -106 +106 @@
 void InspectorTimelineAgent::internalStart(const int* maxCallStackDepth)
 {
+    if (m_enabled)
+        return;
+
     if (maxCallStackDepth && *maxCallStackDepth > 0)
         m_maxCallStackDepth = *maxCallStackDepth;