<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[185777] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/185777">185777</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2015-06-19 16:35:53 -0700 (Fri, 19 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: TimelineAgent needs to handle nested runloops
https://bugs.webkit.org/show_bug.cgi?id=145090
Reviewed by Joseph Pecoraro.
Source/WebCore:
Previously nested run loops caused InspectorTimelineAgent to prematurely pop the current run loop record. This
patch adds a counter to track the run loop nesting level, and rendering frame records are only pushed/popped
when the nesting level is zero. Run loop entry/exit notifications received while the debugger is paused do not
affect the nesting level.
* inspector/InspectorTimelineAgent.cpp:
(WebCore::InspectorTimelineAgent::internalStart):
(WebCore::InspectorTimelineAgent::internalStop):
(WebCore::InspectorTimelineAgent::InspectorTimelineAgent):
* inspector/InspectorTimelineAgent.h:
LayoutTests:
* TestExpectations:
Unskip tests after improvements to nested runloop handling in InspectorTimelineAgent.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorTimelineAgentcpp">trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorTimelineAgenth">trunk/Source/WebCore/inspector/InspectorTimelineAgent.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (185776 => 185777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-06-19 23:33:39 UTC (rev 185776)
+++ trunk/LayoutTests/ChangeLog 2015-06-19 23:35:53 UTC (rev 185777)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-06-19 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: TimelineAgent needs to handle nested runloops
+ https://bugs.webkit.org/show_bug.cgi?id=145090
+
+ Reviewed by Joseph Pecoraro.
+
+ * TestExpectations:
+ Unskip tests after improvements to nested runloop handling in InspectorTimelineAgent.
+
</ins><span class="cx"> 2015-06-19 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Various assertion failures occur when executing script in the midst of DOM insertion
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (185776 => 185777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2015-06-19 23:33:39 UTC (rev 185776)
+++ trunk/LayoutTests/TestExpectations 2015-06-19 23:35:53 UTC (rev 185777)
</span><span class="lines">@@ -524,27 +524,6 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/145390 storage/indexeddb/deleteIndex-bug110792.html [ Pass Failure ]
</span><span class="cx">
</span><del>-webkit.org/b/145090 inspector/debugger/break-on-exception.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-exception-catch.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-exception-finally.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-exception-native.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-exception-throw-in-promise.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-exception-throw-in-promise-with-catch.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-exception-throw-in-promise-then.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-exception-throw-in-promise-then-with-catch.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-exception-throw-in-promise-rethrow-in-catch.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-exception-window-onerror.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-uncaught-exception.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-uncaught-exception-catch.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-uncaught-exception-finally.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-uncaught-exception-native.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-uncaught-exception-throw-in-promise.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-uncaught-exception-throw-in-promise-with-catch.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-uncaught-exception-throw-in-promise-then.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-uncaught-exception-throw-in-promise-then-with-catch.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-uncaught-exception-throw-in-promise-rethrow-in-catch.html [ Skip ]
-webkit.org/b/145090 inspector/debugger/break-on-uncaught-exception-window-onerror.html [ Skip ]
-
</del><span class="cx"> # DumpRenderTree does not allow GIFs to animate, thus animated GIF tests don't work in WebKit1.
</span><span class="cx"> fast/images/animated-gif-no-layout.html [ ImageOnlyFailure ]
</span><span class="cx"> fast/images/gif-loop-count.html [ ImageOnlyFailure ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185776 => 185777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-19 23:33:39 UTC (rev 185776)
+++ trunk/Source/WebCore/ChangeLog 2015-06-19 23:35:53 UTC (rev 185777)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-06-19 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: TimelineAgent needs to handle nested runloops
+ https://bugs.webkit.org/show_bug.cgi?id=145090
+
+ Reviewed by Joseph Pecoraro.
+
+ Previously nested run loops caused InspectorTimelineAgent to prematurely pop the current run loop record. This
+ patch adds a counter to track the run loop nesting level, and rendering frame records are only pushed/popped
+ when the nesting level is zero. Run loop entry/exit notifications received while the debugger is paused do not
+ affect the nesting level.
+
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::internalStart):
+ (WebCore::InspectorTimelineAgent::internalStop):
+ (WebCore::InspectorTimelineAgent::InspectorTimelineAgent):
+ * inspector/InspectorTimelineAgent.h:
+
</ins><span class="cx"> 2015-06-19 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Follow-up fix to r185766.
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (185776 => 185777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2015-06-19 23:33:39 UTC (rev 185776)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2015-06-19 23:35:53 UTC (rev 185777)
</span><span class="lines">@@ -140,7 +140,10 @@
</span><span class="cx"> else
</span><span class="cx"> m_maxCallStackDepth = 5;
</span><span class="cx">
</span><del>- m_instrumentingAgents->inspectorEnvironment().executionStopwatch()->start();
</del><ins>+ // If the debugger is paused the environment's stopwatch will be stopped, and shouldn't be
+ // restarted until the debugger continues.
+ if (!m_scriptDebugServer->isPaused())
+ m_instrumentingAgents->inspectorEnvironment().executionStopwatch()->start();
</ins><span class="cx">
</span><span class="cx"> m_instrumentingAgents->setInspectorTimelineAgent(this);
</span><span class="cx">
</span><span class="lines">@@ -153,27 +156,32 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> m_frameStartObserver = RunLoopObserver::create(0, [this]() {
</span><del>- if (!m_enabled || m_didStartRecordingRunLoop)
</del><ins>+ if (!m_enabled || m_scriptDebugServer->isPaused())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- pushCurrentRecord(InspectorObject::create(), TimelineRecordType::RenderingFrame, false, nullptr);
- m_didStartRecordingRunLoop = true;
</del><ins>+ if (!m_runLoopNestingLevel)
+ pushCurrentRecord(InspectorObject::create(), TimelineRecordType::RenderingFrame, false, nullptr);
+ m_runLoopNestingLevel++;
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> m_frameStopObserver = RunLoopObserver::create(frameStopRunLoopOrder, [this]() {
</span><del>- if (!m_enabled || !m_didStartRecordingRunLoop)
</del><ins>+ if (!m_enabled || m_scriptDebugServer->isPaused())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- didCompleteCurrentRecord(TimelineRecordType::RenderingFrame);
- m_didStartRecordingRunLoop = false;
</del><ins>+ ASSERT(m_runLoopNestingLevel > 0);
+ m_runLoopNestingLevel--;
+ if (!m_runLoopNestingLevel)
+ didCompleteCurrentRecord(TimelineRecordType::RenderingFrame);
</ins><span class="cx"> });
</span><span class="cx">
</span><del>- m_frameStartObserver->schedule(currentRunLoop(), kCFRunLoopAfterWaiting | kCFRunLoopBeforeTimers);
- m_frameStopObserver->schedule(currentRunLoop(), kCFRunLoopBeforeWaiting | kCFRunLoopExit);
</del><ins>+ m_frameStartObserver->schedule(currentRunLoop(), kCFRunLoopEntry | kCFRunLoopAfterWaiting);
+ m_frameStopObserver->schedule(currentRunLoop(), kCFRunLoopExit | kCFRunLoopBeforeWaiting);
</ins><span class="cx">
</span><del>- // Create a runloop record immediately in order to capture the rest of the current runloop.
</del><ins>+ // Create a runloop record and increment the runloop nesting level, to capture the current turn of the main runloop
+ // (which is the outer runloop if recording started while paused in the debugger).
</ins><span class="cx"> pushCurrentRecord(InspectorObject::create(), TimelineRecordType::RenderingFrame, false, nullptr);
</span><del>- m_didStartRecordingRunLoop = true;
</del><ins>+
+ m_runLoopNestingLevel = 1;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (m_frontendDispatcher)
</span><span class="lines">@@ -198,13 +206,11 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> m_frameStartObserver = nullptr;
</span><span class="cx"> m_frameStopObserver = nullptr;
</span><del>- if (m_didStartRecordingRunLoop) {
- m_didStartRecordingRunLoop = false;
</del><ins>+ m_runLoopNestingLevel = 0;
</ins><span class="cx">
</span><del>- // Complete all pending records to prevent discarding events that are currently in progress.
- while (!m_recordStack.isEmpty())
- didCompleteCurrentRecord(m_recordStack.last().type);
- }
</del><ins>+ // Complete all pending records to prevent discarding events that are currently in progress.
+ while (!m_recordStack.isEmpty())
+ didCompleteCurrentRecord(m_recordStack.last().type);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> clearRecordStack();
</span><span class="lines">@@ -722,7 +728,7 @@
</span><span class="cx"> , m_client(client)
</span><span class="cx"> , m_enabled(false)
</span><span class="cx"> , m_enabledFromFrontend(false)
</span><del>- , m_didStartRecordingRunLoop(false)
</del><ins>+ , m_runLoopNestingLevel(0)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.h (185776 => 185777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2015-06-19 23:33:39 UTC (rev 185776)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2015-06-19 23:35:53 UTC (rev 185777)
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx"> std::unique_ptr<WebCore::RunLoopObserver> m_frameStartObserver;
</span><span class="cx"> std::unique_ptr<WebCore::RunLoopObserver> m_frameStopObserver;
</span><span class="cx"> #endif
</span><del>- bool m_didStartRecordingRunLoop;
</del><ins>+ int m_runLoopNestingLevel;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>