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

Unified Diff: third_party/WebKit/Source/devtools/front_end/sdk/SubTargetsManager.js

Issue 2383743003: [DevTools] Auto-attach to cross-process subframes under experiment. (Closed)
Patch Set: some ui Created 4 years, 3 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/SubTargetsManager.js
diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/SubTargetsManager.js b/third_party/WebKit/Source/devtools/front_end/sdk/SubTargetsManager.js
index c248eeca1e0587f4e1c007dcba5ffe690e719bbc..2980c3b6cf32000b79c36b03ade0112177451a29 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/SubTargetsManager.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/SubTargetsManager.js
@@ -20,6 +20,7 @@ WebInspector.SubTargetsManager = function(target)
this._connections = new Map();
this._agent.setWaitForDebuggerOnStart(true);
+ this._agent.setAttachToFrames(Runtime.experiments.isEnabled("autoAttachToCrossProcessSubframes"));
this._agent.enable();
}
@@ -138,6 +139,10 @@ WebInspector.SubTargetsManager.prototype = {
return WebInspector.Target.Capability.JS | WebInspector.Target.Capability.Log;
if (type === "service_worker")
return WebInspector.Target.Capability.Log | WebInspector.Target.Capability.Network | WebInspector.Target.Capability.Worker;
+ if (type === "iframe")
+ return WebInspector.Target.Capability.Browser | WebInspector.Target.Capability.DOM |
+ WebInspector.Target.Capability.JS | WebInspector.Target.Capability.Log |
+ WebInspector.Target.Capability.Network | WebInspector.Target.Capability.Worker;
return 0;
},
@@ -152,8 +157,11 @@ WebInspector.SubTargetsManager.prototype = {
var connection = new WebInspector.SubTargetConnection(this._agent, targetId);
this._connections.set(targetId, connection);
- var parsedURL = url.asParsedURL();
- var targetName = parsedURL ? parsedURL.lastPathComponentWithFragment() : "#" + (++this._lastAnonymousTargetId);
+ var targetName = "";
+ if (type !== "iframe") {
+ var parsedURL = url.asParsedURL();
+ targetName = parsedURL ? parsedURL.lastPathComponentWithFragment() : "#" + (++this._lastAnonymousTargetId);
+ }
var target = WebInspector.targetManager.createTarget(targetName, this._capabilitiesForType(type), connection, this.target());
target[WebInspector.SubTargetsManager._TypeSymbol] = type;
target[WebInspector.SubTargetsManager._IdSymbol] = targetId;
@@ -278,7 +286,7 @@ WebInspector.TargetInfo = function(payload)
{
this.id = payload.targetId;
this.url = payload.url;
- if (payload.type !== "page" && payload.type !== "frame") {
+ if (payload.type !== "page" && payload.type !== "iframe") {
this.title = WebInspector.UIString("Worker: %s", this.url);
this.canActivate = false;
} else {

Powered by Google App Engine
This is Rietveld 408576698