Skip to content

Commit 3b38600

Browse files
and-oliDevtools-frontend LUCI CQ
authored andcommitted
[PP] Rename stack trace helper
getZeroIndexedStackTraceForEvent->getZeroIndexedStackTraceInEventPayload To make it clear that it returns the stack trace contained in the payload of a trace event. This way it's easier to distinguish from the StackTraceForEvent.ts helper, which can build async stack traces using the call hierarchy built by the RendererHandler. Bug: 389056697 Change-Id: I171d2d2f955a6c78f87f8ce849af9ea4bf7258fc Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6449137 Reviewed-by: Nancy Li <[email protected]> Commit-Queue: Andres Olivares <[email protected]>
1 parent 1e7cdde commit 3b38600

File tree

8 files changed

+14
-14
lines changed

8 files changed

+14
-14
lines changed

front_end/models/trace/handlers/NetworkRequestsHandler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ export async function finalize(): Promise<void> {
490490

491491
// Establish initiator relationships
492492
const initiatorUrl = networkEvent.args.data.initiator?.url ||
493-
Helpers.Trace.getZeroIndexedStackTraceForEvent(networkEvent)?.at(0)?.url;
493+
Helpers.Trace.getZeroIndexedStackTraceInEventPayload(networkEvent)?.at(0)?.url;
494494
if (initiatorUrl) {
495495
const events = networkRequestEventByInitiatorUrl.get(initiatorUrl) ?? [];
496496
events.push(networkEvent);

front_end/models/trace/helpers/Trace.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ export function getZeroIndexedLineAndColumnForEvent(event: Types.Events.Event):
435435
* stack. If you want to obtain the whole stack trace you might need to
436436
* use the @see Trace.Extras.StackTraceForEvent util.
437437
*/
438-
export function getZeroIndexedStackTraceForEvent(event: Types.Events.Event): Types.Events.CallFrame[]|null {
438+
export function getZeroIndexedStackTraceInEventPayload(event: Types.Events.Event): Types.Events.CallFrame[]|null {
439439
const stack = stackTraceInEvent(event);
440440
if (!stack) {
441441
return null;

front_end/models/trace/insights/ForcedReflow.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ function finalize(partialModel: PartialInsightModel<ForcedReflowInsightModel>):
153153
function getBottomCallFrameForEvent(event: Types.Events.Event, traceParsedData: Handlers.Types.ParsedTrace):
154154
Types.Events.CallFrame|Protocol.Runtime.CallFrame|null {
155155
const profileStackTrace = Extras.StackTraceForEvent.get(event, traceParsedData);
156-
const eventStackTrace = Helpers.Trace.getZeroIndexedStackTraceForEvent(event);
156+
const eventStackTrace = Helpers.Trace.getZeroIndexedStackTraceInEventPayload(event);
157157

158158
return profileStackTrace?.callFrames[0] ?? eventStackTrace?.[0] ?? null;
159159
}

front_end/models/trace/insights/NetworkDependencyTree.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ function isCritical(request: Types.Events.SyntheticNetworkRequest, context: Insi
110110
// Requests that have no initiatorRequest are typically ambiguous late-load assets.
111111
// Even on the off chance they were important, we don't have any parent to display for them.
112112
const initiatorUrl =
113-
request.args.data.initiator?.url || Helpers.Trace.getZeroIndexedStackTraceForEvent(request)?.at(0)?.url;
113+
request.args.data.initiator?.url || Helpers.Trace.getZeroIndexedStackTraceInEventPayload(request)?.at(0)?.url;
114114
if (!initiatorUrl) {
115115
return false;
116116
}

front_end/panels/timeline/TimelineUIUtils.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@ export class TimelineUIUtils {
814814
return detailsText;
815815

816816
function linkifyTopCallFrameAsText(): string|null {
817-
const frame = Trace.Helpers.Trace.getZeroIndexedStackTraceForEvent(event)?.at(0) ?? null;
817+
const frame = Trace.Helpers.Trace.getZeroIndexedStackTraceInEventPayload(event)?.at(0) ?? null;
818818
if (!frame) {
819819
return null;
820820
}
@@ -885,7 +885,7 @@ export class TimelineUIUtils {
885885
details = document.createElement('span');
886886

887887
// FunctionCall events have an args.data that could be a CallFrame, if all the details are present, so we check for that.
888-
const callFrame = Trace.Helpers.Trace.getZeroIndexedStackTraceForEvent(event)?.at(0);
888+
const callFrame = Trace.Helpers.Trace.getZeroIndexedStackTraceInEventPayload(event)?.at(0);
889889
if (Trace.Types.Events.isFunctionCall(event) && callFrame) {
890890
UI.UIUtils.createTextChild(
891891
details,
@@ -1004,7 +1004,7 @@ export class TimelineUIUtils {
10041004
static linkifyTopCallFrame(
10051005
event: Trace.Types.Events.Event, target: SDK.Target.Target|null, linkifier: LegacyComponents.Linkifier.Linkifier,
10061006
isFreshRecording = false): Element|null {
1007-
let frame = Trace.Helpers.Trace.getZeroIndexedStackTraceForEvent(event)?.[0];
1007+
let frame = Trace.Helpers.Trace.getZeroIndexedStackTraceInEventPayload(event)?.[0];
10081008
if (Trace.Types.Events.isProfileCall(event)) {
10091009
frame = event.callFrame;
10101010
}
@@ -1644,7 +1644,7 @@ export class TimelineUIUtils {
16441644
}
16451645
}
16461646

1647-
const stackTrace = Trace.Helpers.Trace.getZeroIndexedStackTraceForEvent(event);
1647+
const stackTrace = Trace.Helpers.Trace.getZeroIndexedStackTraceInEventPayload(event);
16481648
if (Trace.Types.Events.isUserTiming(event) || Trace.Types.Extensions.isSyntheticExtensionEntry(event) ||
16491649
Trace.Types.Events.isProfileCall(event) || initiator || initiatorFor || stackTrace ||
16501650
parsedTrace?.Invalidations.invalidationsForEvent.get(event)) {
@@ -1831,7 +1831,7 @@ export class TimelineUIUtils {
18311831
// TODO(andoli): also build stack trace component for other events
18321832
// that have a stack trace using the StackTraceForEvent helper.
18331833
} else {
1834-
const stackTrace = Trace.Helpers.Trace.getZeroIndexedStackTraceForEvent(event);
1834+
const stackTrace = Trace.Helpers.Trace.getZeroIndexedStackTraceInEventPayload(event);
18351835
if (stackTrace?.length) {
18361836
contentHelper.addSection(stackLabel);
18371837
contentHelper.createChildStackTraceElement(TimelineUIUtils.stackTraceFromCallFrames(stackTrace));
@@ -1864,7 +1864,7 @@ export class TimelineUIUtils {
18641864
if (initiator) {
18651865
// If we have an initiator for the event, we can show its stack trace, a link to reveal the initiator,
18661866
// and the time since the initiator (Pending For).
1867-
const stackTrace = Trace.Helpers.Trace.getZeroIndexedStackTraceForEvent(initiator);
1867+
const stackTrace = Trace.Helpers.Trace.getZeroIndexedStackTraceInEventPayload(initiator);
18681868
if (stackTrace) {
18691869
contentHelper.addSection(initiatorStackLabel);
18701870
contentHelper.createChildStackTraceElement(TimelineUIUtils.stackTraceFromCallFrames(stackTrace.map(frame => {
@@ -1992,7 +1992,7 @@ export class TimelineUIUtils {
19921992
const generatedItems = new Set<string>();
19931993

19941994
for (const invalidation of invalidations) {
1995-
const stackTrace = Trace.Helpers.Trace.getZeroIndexedStackTraceForEvent(invalidation);
1995+
const stackTrace = Trace.Helpers.Trace.getZeroIndexedStackTraceInEventPayload(invalidation);
19961996
let scriptLink: HTMLElement|null = null;
19971997
const callFrame = stackTrace?.at(0);
19981998
if (callFrame) {

front_end/panels/timeline/components/NetworkRequestDetails.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ export class NetworkRequestDetails extends HTMLElement {
305305
let link: HTMLElement|null = null;
306306
// If we have a stack trace, that is the most reliable way to get the initiator data and display a link to the source.
307307
if (hasStackTrace) {
308-
const topFrame = Trace.Helpers.Trace.getZeroIndexedStackTraceForEvent(this.#networkRequest)?.at(0) ?? null;
308+
const topFrame = Trace.Helpers.Trace.getZeroIndexedStackTraceInEventPayload(this.#networkRequest)?.at(0) ?? null;
309309
if (topFrame) {
310310
link = this.#linkifier.maybeLinkifyConsoleCallFrame(
311311
this.#maybeTarget, topFrame, {tabStop: true, inlineFrameIndex: 0, showColumnNumber: true});

front_end/panels/timeline/utils/EntityMapper.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ export class EntityMapper {
102102
// The events that don't match the source location, but that we should keep mapped to its current entity.
103103
const unrelatedEvents: Trace.Types.Events.Event[] = [];
104104
currentEntityEvents?.forEach(e => {
105-
const stackTrace = Trace.Helpers.Trace.getZeroIndexedStackTraceForEvent(e);
105+
const stackTrace = Trace.Helpers.Trace.getZeroIndexedStackTraceInEventPayload(e);
106106
const cf = stackTrace?.at(0);
107107

108108
const matchesCallFrame = cf && Trace.Helpers.Trace.isMatchingCallFrame(cf, callFrame);

front_end/panels/timeline/utils/SourceMapsResolver.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export class SourceMapsResolver extends EventTarget {
7878
if (Trace.Types.Events.isProfileCall(entry)) {
7979
callFrame = entry.callFrame;
8080
} else {
81-
const stackTrace = Trace.Helpers.Trace.getZeroIndexedStackTraceForEvent(entry);
81+
const stackTrace = Trace.Helpers.Trace.getZeroIndexedStackTraceInEventPayload(entry);
8282
if (stackTrace === null || stackTrace.length < 1) {
8383
return null;
8484
}

0 commit comments

Comments
 (0)