DevTools: kill WI.IsolatedFileSystemManager FileSystemsLoaded event

third_party/WebKit/Source/devtools/front_end/bindings/NetworkMapping.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @constructor
  * @param {!WebInspector.TargetManager} targetManager
  * @param {!WebInspector.Workspace} workspace
  * @param {!WebInspector.FileSystemWorkspaceBinding} fileSystemWorkspaceBinding
  * @param {!WebInspector.FileSystemMapping} fileSystemMapping
  */
 WebInspector.NetworkMapping = function(targetManager, workspace, fileSystemWorkspaceBinding, fileSystemMapping)
 {
     this._targetManager = targetManager;
     this._workspace = workspace;
     this._fileSystemWorkspaceBinding = fileSystemWorkspaceBinding;
     this._fileSystemMapping = fileSystemMapping;
     InspectorFrontendHost.events.addEventListener(InspectorFrontendHostAPI.Events.RevealSourceLine, this._revealSourceLine, this);
 
-    // For now, following block is here primarily for testing since in the real life, network manager is created early enough to capture those events.
-    var fileSystemManager = fileSystemWorkspaceBinding.fileSystemManager();
-    for (var fileSystem of fileSystemManager.fileSystems())
-        this._addMappingsForFilesystem(fileSystem);
-    if (fileSystemManager.fileSystemsLoaded())
-        this._fileSystemsLoaded();
-
+    this._fileSystemManager = fileSystemWorkspaceBinding.fileSystemManager();
     this._eventListeners = [
-        fileSystemManager.addEventListener(WebInspector.IsolatedFileSystemManager.Events.FileSystemAdded, this._fileSystemAdded, this),
-        fileSystemManager.addEventListener(WebInspector.IsolatedFileSystemManager.Events.FileSystemRemoved, this._fileSystemRemoved, this),
-        fileSystemManager.addEventListener(WebInspector.IsolatedFileSystemManager.Events.FileSystemsLoaded, this._fileSystemsLoaded, this),
+        this._fileSystemManager.addEventListener(WebInspector.IsolatedFileSystemManager.Events.FileSystemAdded, this._fileSystemAdded, this),
+        this._fileSystemManager.addEventListener(WebInspector.IsolatedFileSystemManager.Events.FileSystemRemoved, this._fileSystemRemoved, this),
         this._fileSystemMapping.addEventListener(WebInspector.FileSystemMapping.Events.FileMappingAdded, this._fileSystemMappingChanged, this),
         this._fileSystemMapping.addEventListener(WebInspector.FileSystemMapping.Events.FileMappingRemoved, this._fileSystemMappingChanged, this)
     ];
+
+    this._fileSystemManager.waitForFileSystems()
+        .then(this._fileSystemsLoaded.bind(this));
 }
 
 WebInspector.NetworkMapping.prototype = {
+    _fileSystemsLoaded: function()
+    {
+        for (var fileSystem of this._fileSystemManager.fileSystems())

[dgozman, 2016/08/31 01:39:46]

Let's have an array of initial file systems returned from waitForFileSystems.

[lushnikov, 2016/08/31 17:35:10]

Done.

+            this._addMappingsForFilesystem(fileSystem);
+    },
+
     /**
      * @param {!WebInspector.Event} event
      */
     _fileSystemAdded: function(event)
     {
         var fileSystem = /** @type {!WebInspector.IsolatedFileSystem} */ (event.data);
         this._addMappingsForFilesystem(fileSystem);
         this._fileSystemMappingChanged();
     },
 
@@ skipping 184 matching lines @@
             var uiSourceCode = /** @type {!WebInspector.UISourceCode} */ (event.data);
             if (this.networkURL(uiSourceCode) === url) {
                 WebInspector.Revealer.reveal(uiSourceCode.uiLocation(lineNumber, columnNumber));
                 this._workspace.removeEventListener(WebInspector.Workspace.Events.UISourceCodeAdded, listener, this);
             }
         }
 
         this._workspace.addEventListener(WebInspector.Workspace.Events.UISourceCodeAdded, listener, this);
     },
 
-    _fileSystemsLoaded: function()
-    {
-        this._fileSystemsReady = true;
-    },
-
     _fileSystemMappingChanged: function()
     {
-        if (!this._fileSystemsReady || this._addingFileSystem)
+        if (this._addingFileSystem)
             return;
         this._targetManager.suspendAndResumeAllTargets();
     },
 
     dispose: function()
     {
         WebInspector.EventTarget.removeEventListeners(this._eventListeners);
     }
 }
 
 /**
  * @type {!WebInspector.NetworkMapping}
  */
 WebInspector.networkMapping;