Title: [175206] trunk/Source
- Revision
- 175206
- Author
- [email protected]
- Date
- 2014-10-25 20:52:17 -0700 (Sat, 25 Oct 2014)
Log Message
Web Inspector: timelines should not count time elapsed while paused in the debugger
https://bugs.webkit.org/show_bug.cgi?id=136351
Unreviewed, follow-up fix after r175203. The debugger agent should not assume
that the inspector environment's stopwatch has already been started.
Source/_javascript_Core:
* inspector/agents/InspectorDebuggerAgent.cpp:
(Inspector::InspectorDebuggerAgent::didPause): Check if the stopwatch isActive() before stopping.
Source/WTF:
* wtf/Stopwatch.h:
(WTF::Stopwatch::isActive): Added. Allow peeking at the stopwatch state.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (175205 => 175206)
--- trunk/Source/_javascript_Core/ChangeLog 2014-10-26 03:25:55 UTC (rev 175205)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-10-26 03:52:17 UTC (rev 175206)
@@ -1,3 +1,14 @@
+2014-10-25 Brian J. Burg <[email protected]>
+
+ Web Inspector: timelines should not count time elapsed while paused in the debugger
+ https://bugs.webkit.org/show_bug.cgi?id=136351
+
+ Unreviewed, follow-up fix after r175203. The debugger agent should not assume
+ that the inspector environment's stopwatch has already been started.
+
+ * inspector/agents/InspectorDebuggerAgent.cpp:
+ (Inspector::InspectorDebuggerAgent::didPause): Check if the stopwatch isActive() before stopping.
+
2014-10-18 Brian J. Burg <[email protected]>
Web Inspector: timelines should not count time elapsed while paused in the debugger
Modified: trunk/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.cpp (175205 => 175206)
--- trunk/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.cpp 2014-10-26 03:25:55 UTC (rev 175205)
+++ trunk/Source/_javascript_Core/inspector/agents/InspectorDebuggerAgent.cpp 2014-10-26 03:52:17 UTC (rev 175206)
@@ -653,8 +653,10 @@
if (m_listener)
m_listener->didPause();
-
- m_injectedScriptManager->inspectorEnvironment().executionStopwatch()->stop();
+
+ RefPtr<Stopwatch> stopwatch = m_injectedScriptManager->inspectorEnvironment().executionStopwatch();
+ if (stopwatch && stopwatch->isActive())
+ stopwatch->stop();
}
void InspectorDebuggerAgent::breakpointActionSound(int breakpointActionIdentifier)
Modified: trunk/Source/WTF/ChangeLog (175205 => 175206)
--- trunk/Source/WTF/ChangeLog 2014-10-26 03:25:55 UTC (rev 175205)
+++ trunk/Source/WTF/ChangeLog 2014-10-26 03:52:17 UTC (rev 175206)
@@ -1,3 +1,14 @@
+2014-10-25 Brian J. Burg <[email protected]>
+
+ Web Inspector: timelines should not count time elapsed while paused in the debugger
+ https://bugs.webkit.org/show_bug.cgi?id=136351
+
+ Unreviewed, follow-up fix after r175203. The debugger agent should not assume
+ that the inspector environment's stopwatch has already been started.
+
+ * wtf/Stopwatch.h:
+ (WTF::Stopwatch::isActive): Added. Allow peeking at the stopwatch state.
+
2014-10-18 Brian J. Burg <[email protected]>
Web Inspector: timelines should not count time elapsed while paused in the debugger
Modified: trunk/Source/WTF/wtf/Stopwatch.h (175205 => 175206)
--- trunk/Source/WTF/wtf/Stopwatch.h 2014-10-26 03:25:55 UTC (rev 175205)
+++ trunk/Source/WTF/wtf/Stopwatch.h 2014-10-26 03:52:17 UTC (rev 175206)
@@ -44,6 +44,7 @@
double elapsedTime();
+ bool isActive() const { return !isnan(m_lastStartTime); }
private:
Stopwatch()
: m_elapsedTime(0.0)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
