third_party/WebKit/Source/devtools/front_end/timeline_model/TimelineModel.js - Issue 2442083002: [DevTools] Merge Worker domain to Target, migrate clients.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/devtools/front_end/timeline_model/TimelineModel.js

Issue 2442083002: [DevTools] Merge Worker domain to Target, migrate clients. (Closed)

Patch Set: rebased all tests Created 4 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: third_party/WebKit/Source/devtools/front_end/timeline_model/TimelineModel.js

diff --git a/third_party/WebKit/Source/devtools/front_end/timeline_model/TimelineModel.js b/third_party/WebKit/Source/devtools/front_end/timeline_model/TimelineModel.js

index 81f9de8e1b0c5b28cffb80c221c42839654cb688..0eaef64a1ed603f7494606ea0b28cff1343c6ac6 100644

--- a/third_party/WebKit/Source/devtools/front_end/timeline_model/TimelineModel.js

+++ b/third_party/WebKit/Source/devtools/front_end/timeline_model/TimelineModel.js

@@ -481,7 +481,7 @@ WebInspector.TimelineModel.prototype = {

// FIXME: Consider returning null for loaded traces.

var workerId = this._workerIdByThread.get(event.thread);

var mainTarget = WebInspector.targetManager.mainTarget();

- return workerId ? mainTarget.workerManager.targetByWorkerId(workerId) : mainTarget;

+ return workerId ? mainTarget.subTargetsManager.targetForId(workerId) : mainTarget;

/**

« no previous file with comments | « third_party/WebKit/Source/devtools/front_end/timeline/TimelineController.js ('k') | no next file » | no next file with comments »