Attachment 371719 Details for Bug 197490 – Patch

[patch] Patch

bug-197490-20190609204100.patch (text/plain), 3.76 KB, created by Devin Rousso on 2019-06-09 20:41:01 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2019-06-09 20:41:01 PDT

Size: 3.76 KB

patch

obsolete

>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index c17f70b67d2d8cc7c88d126214e072939a9faf0b..6b79b81d63a859e0a06a0eb004860128547a8224 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,20 @@
>+2019-06-09  Devin Rousso  <drousso@apple.com>
>+
>+        Web Inspector: Timelines: imported recordings do not have JavaScript call trees
>+        https://bugs.webkit.org/show_bug.cgi?id=197490
>+        <rdar://problem/50589158>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UserInterface/Models/TimelineRecording.js:
>+        (WI.TimelineRecording.prototype.initializeCallingContextTrees):
>+        Make sure to actually save the provided stack traces and samples in the export data.
>+
>+        * UserInterface/Models/ScriptTimelineRecord.js:
>+        (WI.ScriptTimelineRecord.fromJSON):
>+        (WI.ScriptTimelineRecord.prototype.toJSON):
>+        Drive-by: include `extraDetails`, which contains useful information like "default prevented".
>+
> 2019-06-07  Nikita Vasilyev  <nvasilyev@apple.com>
> 
>         Web Inspector: longhand CSS properties overridden by shorthands miss strikethrough
>diff --git a/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js b/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js
>index 1b328f3a7a8938b99ae6e5d192ba855cd6770142..f5d7c589552068a7ac2aabe8e972d052360f53ad 100644
>--- a/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js
>+++ b/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js
>@@ -53,18 +53,19 @@ WI.ScriptTimelineRecord = class ScriptTimelineRecord extends WI.TimelineRecord
> 
>     static fromJSON(json)
>     {
>-        let {eventType, startTime, endTime, callFrames, sourceCodeLocation, details, profilePayload} = json;
>+        let {eventType, startTime, endTime, callFrames, sourceCodeLocation, details, profilePayload, extraDetails} = json;
> 
>         if (typeof details === "object" && details.__type === "GarbageCollection")
>             details = WI.GarbageCollection.fromJSON(details);
> 
>-        return new WI.ScriptTimelineRecord(eventType, startTime, endTime, callFrames, sourceCodeLocation, details, profilePayload);
>+        return new WI.ScriptTimelineRecord(eventType, startTime, endTime, callFrames, sourceCodeLocation, details, profilePayload, extraDetails);
>     }
> 
>     toJSON()
>     {
>         // FIXME: CallFrames
>         // FIXME: SourceCodeLocation
>+        // FIXME: profilePayload
> 
>         return {
>             type: this.type,
>@@ -72,6 +73,7 @@ WI.ScriptTimelineRecord = class ScriptTimelineRecord extends WI.TimelineRecord
>             startTime: this.startTime,
>             endTime: this.endTime,
>             details: this._details,
>+            extraDetails: this._extraDetails,
>         };
>     }
> 
>diff --git a/Source/WebInspectorUI/UserInterface/Models/TimelineRecording.js b/Source/WebInspectorUI/UserInterface/Models/TimelineRecording.js
>index 974409cdf3ad5cd851bb4c3bfc35a3ab470407e6..0b4bbc43af3861c0888e4bc4fc7309f698504b16 100644
>--- a/Source/WebInspectorUI/UserInterface/Models/TimelineRecording.js
>+++ b/Source/WebInspectorUI/UserInterface/Models/TimelineRecording.js
>@@ -431,8 +431,8 @@ WI.TimelineRecording = class TimelineRecording extends WI.Object
> 
>     initializeCallingContextTrees(stackTraces, sampleDurations)
>     {
>-        this._exportDataSampleStackTraces.concat(stackTraces);
>-        this._exportDataSampleDurations.concat(sampleDurations);
>+        this._exportDataSampleStackTraces = this._exportDataSampleStackTraces.concat(stackTraces);
>+        this._exportDataSampleDurations = this._exportDataSampleDurations.concat(sampleDurations);
> 
>         for (let i = 0; i < stackTraces.length; i++) {
>             this._topDownCallingContextTree.updateTreeWithStackTrace(stackTraces[i], sampleDurations[i]);

Actions: View | Formatted Diff | Diff

Attachments on bug 197490: 371719