Title: [246186] trunk/Source/WebCore
- Revision
- 246186
- Author
- [email protected]
- Date
- 2019-06-06 20:38:22 -0700 (Thu, 06 Jun 2019)
Log Message
Web Inspector: Timelines: only complete Composite records if the m_startedComposite (followup to r246142)
https://bugs.webkit.org/show_bug.cgi?id=198639
Reviewed by Matt Baker.
In r246142, an `ASSERT` was removed because it is possible for Web Inspector to be opened in
between `willComposite` and `didComposite`, meaning that previously the `ASSERT` would fire.
In order to properly handle this, we should replace the `ASSERT` with an `if` so that Web
Inspector doesn't even try to complete a `Composite` record if it was opened in that case.
* inspector/agents/InspectorTimelineAgent.cpp:
(WebCore::InspectorTimelineAgent::didComposite):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (246185 => 246186)
--- trunk/Source/WebCore/ChangeLog 2019-06-07 03:29:01 UTC (rev 246185)
+++ trunk/Source/WebCore/ChangeLog 2019-06-07 03:38:22 UTC (rev 246186)
@@ -1,3 +1,19 @@
+2019-06-06 Devin Rousso <[email protected]>
+
+ Web Inspector: Timelines: only complete Composite records if the m_startedComposite (followup to r246142)
+ https://bugs.webkit.org/show_bug.cgi?id=198639
+
+ Reviewed by Matt Baker.
+
+ In r246142, an `ASSERT` was removed because it is possible for Web Inspector to be opened in
+ between `willComposite` and `didComposite`, meaning that previously the `ASSERT` would fire.
+
+ In order to properly handle this, we should replace the `ASSERT` with an `if` so that Web
+ Inspector doesn't even try to complete a `Composite` record if it was opened in that case.
+
+ * inspector/agents/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::didComposite):
+
2019-06-06 Youenn Fablet <[email protected]>
Allow WebKitTestRunner to terminate network process after it finishes service worker file operations
Modified: trunk/Source/WebCore/inspector/agents/InspectorTimelineAgent.cpp (246185 => 246186)
--- trunk/Source/WebCore/inspector/agents/InspectorTimelineAgent.cpp 2019-06-07 03:29:01 UTC (rev 246185)
+++ trunk/Source/WebCore/inspector/agents/InspectorTimelineAgent.cpp 2019-06-07 03:38:22 UTC (rev 246186)
@@ -364,7 +364,8 @@
void InspectorTimelineAgent::didComposite()
{
- didCompleteCurrentRecord(TimelineRecordType::Composite);
+ if (m_startedComposite)
+ didCompleteCurrentRecord(TimelineRecordType::Composite);
m_startedComposite = false;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
