third_party/WebKit/Source/devtools/front_end/sdk/WorkerManager.js - Issue 2137773002: [DevTools] Replace the target type with capabilities

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/sdk/WorkerManager.js

Issue 2137773002: [DevTools] Replace the target type with capabilities (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressing the code review comments Created 4 years, 5 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

« third_party/WebKit/Source/devtools/front_end/sdk/TargetManager.js ('K') | « third_party/WebKit/Source/devtools/front_end/sdk/TargetManager.js ('k') | third_party/WebKit/Source/devtools/front_end/security/SecurityPanel.js » ('j') | third_party/WebKit/Source/devtools/front_end/sources/EventListenerBreakpointsSidebarPane.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/devtools/front_end/sdk/WorkerManager.js

diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/WorkerManager.js b/third_party/WebKit/Source/devtools/front_end/sdk/WorkerManager.js

index 2313c2ec23de4c85dceb11d65ab7b1af21cdedd6..2591f8b972a867585b31f6ffac460b3f7eb4bb28 100644

--- a/third_party/WebKit/Source/devtools/front_end/sdk/WorkerManager.js

+++ b/third_party/WebKit/Source/devtools/front_end/sdk/WorkerManager.js

@@ -101,12 +101,12 @@ WebInspector.WorkerManager.prototype = {

var parsedURL = url.asParsedURL();

var workerName = parsedURL ? parsedURL.lastPathComponentWithFragment() : "#" + (++this._lastAnonymousTargetId);

- var target = WebInspector.targetManager.createTarget(workerName, WebInspector.Target.Type.DedicatedWorker, connection, this.target());

+ var target = WebInspector.targetManager.createTarget(workerName, WebInspector.Target.Capability.JS, connection, this.target());

this._targetsByWorkerId.set(workerId, target);

// Only pause new worker if debugging SW - we are going through the

// pause on start checkbox.

- var mainIsServiceWorker = WebInspector.targetManager.mainTarget().isServiceWorker();

+ var mainIsServiceWorker = WebInspector.targetManager.mainTarget().hasJSCapability() && !WebInspector.targetManager.mainTarget().hasBrowserCapability();

dgozman 2016/07/13 00:08:30 This should be "hasWorkerCapability && !hasBrowser

eostroukhov-old 2016/07/13 00:36:29 Done.

if (mainIsServiceWorker && waitingForDebugger)

target.debuggerAgent().pause();

target.runtimeAgent().run();