diff --git a/front_end/network/NetworkDataGridNode.js b/front_end/network/NetworkDataGridNode.js index 6e64b55e3d..3c4027aa7c 100644 --- a/front_end/network/NetworkDataGridNode.js +++ b/front_end/network/NetworkDataGridNode.js @@ -785,12 +785,6 @@ Network.NetworkRequestNode = class extends Network.NetworkNode { cell.request = request; break; - case SDK.NetworkRequest.InitiatorType.Preload: - cell.title = Common.UIString('Preload'); - cell.classList.add('network-dim-cell'); - cell.appendChild(createTextNode(Common.UIString('Preload'))); - break; - default: cell.title = Common.UIString('Other'); cell.classList.add('network-dim-cell'); diff --git a/front_end/sdk/NetworkLog.js b/front_end/sdk/NetworkLog.js index d2632d77e2..4d0752b122 100644 --- a/front_end/sdk/NetworkLog.js +++ b/front_end/sdk/NetworkLog.js @@ -145,8 +145,6 @@ SDK.NetworkLog = class extends SDK.SDKModel { scriptId = topFrame.scriptId; break; } - } else if (initiator.type === Protocol.Network.InitiatorType.Preload) { - type = SDK.NetworkRequest.InitiatorType.Preload; } } diff --git a/front_end/sdk/NetworkRequest.js b/front_end/sdk/NetworkRequest.js index ddb315eea7..a40828f558 100644 --- a/front_end/sdk/NetworkRequest.js +++ b/front_end/sdk/NetworkRequest.js @@ -1136,8 +1136,7 @@ SDK.NetworkRequest.InitiatorType = { Other: 'other', Parser: 'parser', Redirect: 'redirect', - Script: 'script', - Preload: 'preload' + Script: 'script' }; /** @typedef {!{name: string, value: string}} */ diff --git a/front_end/sdk/SubTargetsManager.js b/front_end/sdk/SubTargetsManager.js index f65ec3a617..d5845ad8eb 100644 --- a/front_end/sdk/SubTargetsManager.js +++ b/front_end/sdk/SubTargetsManager.js @@ -130,15 +130,8 @@ SDK.SubTargetsManager = class extends SDK.SDKModel { * @return {number} */ _capabilitiesForType(type) { - if (type === 'worker') { - var capabilities = SDK.Target.Capability.JS | SDK.Target.Capability.Log; - var parentTargetInfo = this.targetInfo(this.target()); - var mainIsServiceWorker = - !this.target().parentTarget() && this.target().hasTargetCapability() && !this.target().hasJSCapability(); - if ((parentTargetInfo && parentTargetInfo.type === 'service_worker') || mainIsServiceWorker) - capabilities |= SDK.Target.Capability.Network; - return capabilities; - } + if (type === 'worker') + return SDK.Target.Capability.JS | SDK.Target.Capability.Log; if (type === 'service_worker') return SDK.Target.Capability.Log | SDK.Target.Capability.Network | SDK.Target.Capability.Target; if (type === 'iframe') { @@ -170,7 +163,7 @@ SDK.SubTargetsManager = class extends SDK.SDKModel { // Only pause new worker if debugging SW - we are going through the pause on start checkbox. var mainIsServiceWorker = - !this.target().parentTarget() && this.target().hasTargetCapability() && !this.target().hasJSCapability(); + !this.target().parentTarget() && this.target().hasTargetCapability() && !this.target().hasBrowserCapability(); if (mainIsServiceWorker && waitingForDebugger) target.debuggerAgent().pause(); target.runtimeAgent().runIfWaitingForDebugger();