Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(573)

Unified Diff: third_party/WebKit/Source/devtools/front_end/sdk/TargetManager.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/sdk/TargetManager.js
diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/TargetManager.js b/third_party/WebKit/Source/devtools/front_end/sdk/TargetManager.js
index 85e2e4aee06d1567bbf6b9d87ca9411d067d8812..f2afa4f500777defa67dfee04da99e0fe2030151 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/TargetManager.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/TargetManager.js
@@ -217,8 +217,8 @@ WebInspector.TargetManager.prototype = {
new WebInspector.CSSModel(target, domModel);
}
- /** @type {?WebInspector.WorkerManager} */
- target.workerManager = target.hasWorkerCapability() ? new WebInspector.WorkerManager(target) : null;
+ /** @type {?WebInspector.SubTargetsManager} */
+ target.subTargetsManager = target.hasTargetCapability() ? new WebInspector.SubTargetsManager(target) : null;
/** @type {!WebInspector.CPUProfilerModel} */
target.cpuProfilerModel = new WebInspector.CPUProfilerModel(target);
/** @type {!WebInspector.HeapProfilerModel} */
@@ -226,10 +226,8 @@ WebInspector.TargetManager.prototype = {
target.tracingManager = new WebInspector.TracingManager(target);
- if (target.hasBrowserCapability()) {
- target.subTargetsManager = new WebInspector.SubTargetsManager(target);
+ if (target.subTargetsManager && target.hasBrowserCapability())
target.serviceWorkerManager = new WebInspector.ServiceWorkerManager(target, target.subTargetsManager);
- }
this.addTarget(target);
return target;

Powered by Google App Engine
This is Rietveld 408576698