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

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

Issue 2265823002: DevTools: fix instances where asParsedURL is null (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix instances with parsedURL Created 4 years, 4 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/ServiceWorkerManager.js
diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/ServiceWorkerManager.js b/third_party/WebKit/Source/devtools/front_end/sdk/ServiceWorkerManager.js
index fb6a4595cebd59cd3aa7eec45d3f155709566bda..6bcb2152ca7ce1e355927010982423ec8b0975fb 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/ServiceWorkerManager.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/ServiceWorkerManager.js
@@ -432,7 +432,7 @@ WebInspector.ServiceWorker = function(manager, workerId, url, versionId)
this._versionId = versionId;
var parsedURL = url.asParsedURL();
this._name = parsedURL ? parsedURL.lastPathComponentWithFragment() : "#" + (++WebInspector.ServiceWorker._lastAnonymousTargetId);
- this._scope = parsedURL.host + parsedURL.folderPathComponents;
+ this._scope = parsedURL ? parsedURL.host + parsedURL.folderPathComponents : "";
this._manager._workers.set(workerId, this);
var capabilities = WebInspector.Target.Capability.Network | WebInspector.Target.Capability.Worker;
@@ -679,7 +679,8 @@ WebInspector.ServiceWorkerVersion.prototype = {
{
this.id = payload.versionId;
this.scriptURL = payload.scriptURL;
- this.securityOrigin = payload.scriptURL.asParsedURL().securityOrigin();
+ var parsedURL = new WebInspector.ParsedURL(payload.scriptURL);
+ this.securityOrigin = parsedURL.securityOrigin();
dgozman 2016/08/22 17:05:43 Missing the check here - use empty as a fallback.
luoe 2016/08/22 17:40:40 parsedURL is never null, so securityOrigin will no
dgozman 2016/08/22 19:38:24 I've misread it. This is good enough.
luoe 2016/08/22 19:40:50 Done.
this.runningStatus = payload.runningStatus;
this.status = payload.status;
this.scriptLastModified = payload.scriptLastModified;
@@ -823,7 +824,8 @@ WebInspector.ServiceWorkerRegistration.prototype = {
this._fingerprint = Symbol("fingerprint");
this.id = payload.registrationId;
this.scopeURL = payload.scopeURL;
- this.securityOrigin = payload.scopeURL.asParsedURL().securityOrigin();
+ var parsedURL = new WebInspector.ParsedURL(payload.scopeURL);
+ this.securityOrigin = parsedURL.securityOrigin();
dgozman 2016/08/22 17:05:43 ditto
this.isDeleted = payload.isDeleted;
this.forceUpdateOnPageLoad = payload.forceUpdateOnPageLoad;
},

Powered by Google App Engine
This is Rietveld 408576698