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

Unified Diff: Source/devtools/front_end/sdk/WorkerTargetManager.js

Issue 471413002: DevTools: Avoid exception when inspecting blob-based workers (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/devtools/front_end/sdk/WorkerTargetManager.js
diff --git a/Source/devtools/front_end/sdk/WorkerTargetManager.js b/Source/devtools/front_end/sdk/WorkerTargetManager.js
index 5de90bd806164a728ae3e24871fe678bcfe97f4c..b957898192e6f36a62e7128e11f0b37275e760e2 100644
--- a/Source/devtools/front_end/sdk/WorkerTargetManager.js
+++ b/Source/devtools/front_end/sdk/WorkerTargetManager.js
@@ -13,8 +13,10 @@ WebInspector.WorkerTargetManager = function(mainTarget, targetManager)
this._mainTarget = mainTarget;
this._targetManager = targetManager;
mainTarget.workerManager.addEventListener(WebInspector.WorkerManager.Events.WorkerAdded, this._onWorkerAdded, this);
+ mainTarget.workerManager.addEventListener(WebInspector.WorkerManager.Events.WorkersCleared, this._onWorkersCleared, this);
WebInspector.profilingLock().addEventListener(WebInspector.Lock.Events.StateChanged, this._onProfilingStateChanged, this);
this._onProfilingStateChanged();
+ this._lastAnonymousTargetId = 0;
}
WebInspector.WorkerTargetManager.prototype = {
@@ -38,7 +40,9 @@ WebInspector.WorkerTargetManager.prototype = {
*/
function onConnectionReady(connection)
{
- this._targetManager.createTarget(WebInspector.UIString("Worker %s", data.url.asParsedURL().lastPathComponent), connection, targetCreated)
+ var parsedURL = data.url.asParsedURL();
+ var workerId = parsedURL ? parsedURL.lastPathComponent : "#" + (++this._lastAnonymousTargetId);
+ this._targetManager.createTarget(WebInspector.UIString("Worker %s", workerId), connection, targetCreated);
}
/**
@@ -49,6 +53,11 @@ WebInspector.WorkerTargetManager.prototype = {
if (data.inspectorConnected)
target.runtimeAgent().run();
}
+ },
+
+ _onWorkersCleared: function()
+ {
+ this._lastAnonymousTargetId = 0;
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698