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

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

Issue 2168323002: [DevTools] Explicitly require ResourceTreeModel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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/WorkerManager.js
diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/WorkerManager.js b/third_party/WebKit/Source/devtools/front_end/sdk/WorkerManager.js
index 3bde9307c1adbb04e46b058c61eacf5e617594f7..3f449a993950979a2c94586de24d5972f1462e42 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/WorkerManager.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/WorkerManager.js
@@ -57,7 +57,7 @@ WebInspector.WorkerManager.prototype = {
this._enabled = true;
this.target().workerAgent().enable();
- this.target().resourceTreeModel.addEventListener(WebInspector.TargetManager.Events.MainFrameNavigated, this._mainFrameNavigated, this);
+ WebInspector.targetManager.addEventListener(WebInspector.TargetManager.Events.MainFrameNavigated, this._mainFrameNavigated, this);
},
disable: function()
@@ -67,7 +67,7 @@ WebInspector.WorkerManager.prototype = {
this._enabled = false;
this._reset();
this.target().workerAgent().disable();
- this.target().resourceTreeModel.removeEventListener(WebInspector.TargetManager.Events.MainFrameNavigated, this._mainFrameNavigated, this);
+ WebInspector.targetManager.removeEventListener(WebInspector.TargetManager.Events.MainFrameNavigated, this._mainFrameNavigated, this);
},
dispose: function()
@@ -140,6 +140,8 @@ WebInspector.WorkerManager.prototype = {
*/
_mainFrameNavigated: function(event)
{
+ if ((/** @type {?WebInspector.Target} */ (event.target)) !== this.target())
pfeldman 2016/07/22 17:33:47 This never happens.
eostroukhov-old 2016/07/25 19:36:11 Done.
+ return;
this._reset();
dgozman 2016/07/22 17:19:44 TODO(dgozman): we don't have to reset on navigatio
eostroukhov-old 2016/07/25 19:36:11 Added a comment, as per offline discussion.
},

Powered by Google App Engine
This is Rietveld 408576698