Attachment 371549 Details for Bug 198639 – Patch

[patch] Patch

bug-198639-20190606190454.patch (text/plain), 1.82 KB, created by Devin Rousso on 2019-06-06 19:04:55 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2019-06-06 19:04:55 PDT

Size: 1.82 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 5c76422138f907692ffeb72bcb8a3af55f08463e..220f79aca93e235fcfb7d1364e34f87e3bfd316a 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2019-06-06  Devin Rousso  <drousso@apple.com>
>+
>+        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 NOBODY (OOPS!).
>+
>+        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  <youenn@apple.com>
> 
>         Allow WebKitTestRunner to terminate network process after it finishes service worker file operations
>diff --git a/Source/WebCore/inspector/agents/InspectorTimelineAgent.cpp b/Source/WebCore/inspector/agents/InspectorTimelineAgent.cpp
>index f63683fa3926b3c75ef1962eabf1691f55e10c29..43a24ea035f99ada6a3c4366f38c07a53a9a9a40 100644
>--- a/Source/WebCore/inspector/agents/InspectorTimelineAgent.cpp
>+++ b/Source/WebCore/inspector/agents/InspectorTimelineAgent.cpp
>@@ -364,7 +364,8 @@ void InspectorTimelineAgent::willComposite(Frame& frame)
> 
> void InspectorTimelineAgent::didComposite()
> {
>-    didCompleteCurrentRecord(TimelineRecordType::Composite);
>+    if (m_startedComposite)
>+        didCompleteCurrentRecord(TimelineRecordType::Composite);
>     m_startedComposite = false;
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 198639: 371549