DevTools: remove indirection between CSSWorkspaceBindings and CSS mappings

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

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 27 matching lines @@
 {
     this._cssModel = cssModel;
     this._workspace = workspace;
     this._networkMapping = networkMapping;
 
     /** @type {!Map<string, !Map<string, !Map<string, !WebInspector.CSSStyleSheetHeader>>>} */
     this._urlToHeadersByFrameId = new Map();
     /** @type {!Map.<!WebInspector.UISourceCode, !WebInspector.StyleFile>} */
     this._styleFiles = new Map();
 
-    this._workspace.addEventListener(WebInspector.Workspace.Events.ProjectRemoved, this._projectRemoved, this);
-    this._workspace.addEventListener(WebInspector.Workspace.Events.UISourceCodeAdded, this._uiSourceCodeAddedToWorkspace, this);
-    this._workspace.addEventListener(WebInspector.Workspace.Events.UISourceCodeRemoved, this._uiSourceCodeRemoved, this);
-    this._cssModel.addEventListener(WebInspector.CSSModel.Events.StyleSheetChanged, this._styleSheetChanged, this);
-    WebInspector.ResourceTreeModel.fromTarget(cssModel.target()).addEventListener(
-        WebInspector.ResourceTreeModel.Events.MainFrameNavigated, this._unbindAllUISourceCodes, this);
+    this._eventListeners = [
+        this._workspace.addEventListener(WebInspector.Workspace.Events.ProjectRemoved, this._projectRemoved, this),
+        this._workspace.addEventListener(WebInspector.Workspace.Events.UISourceCodeAdded, this._uiSourceCodeAddedToWorkspace, this),
+        this._workspace.addEventListener(WebInspector.Workspace.Events.UISourceCodeRemoved, this._uiSourceCodeRemoved, this),
+        this._cssModel.addEventListener(WebInspector.CSSModel.Events.StyleSheetAdded, this._styleSheetAdded, this),
+        this._cssModel.addEventListener(WebInspector.CSSModel.Events.StyleSheetRemoved, this._styleSheetRemoved, this),
+        this._cssModel.addEventListener(WebInspector.CSSModel.Events.StyleSheetChanged, this._styleSheetChanged, this),
+        WebInspector.ResourceTreeModel.fromTarget(cssModel.target()).addEventListener(
+            WebInspector.ResourceTreeModel.Events.MainFrameNavigated, this._unbindAllUISourceCodes, this)
+    ];
 }
 
 WebInspector.StylesSourceMapping.ChangeUpdateTimeoutMs = 200;
 
 WebInspector.StylesSourceMapping.prototype = {
     /**
      * @param {!WebInspector.CSSLocation} rawLocation
      * @return {?WebInspector.UILocation}
      */
     rawLocationToUILocation: function(rawLocation)
     {
         var uiSourceCode = this._networkMapping.uiSourceCodeForStyleURL(rawLocation.url, rawLocation.header());
         if (!uiSourceCode)
             return null;
         var lineNumber = rawLocation.lineNumber;
         var columnNumber = rawLocation.columnNumber;
         var header = this._cssModel.styleSheetHeaderForId(rawLocation.styleSheetId);
         if (header && header.isInline && header.hasSourceURL) {
             lineNumber -= header.lineNumberInSource(0);
             columnNumber -= header.columnNumberInSource(lineNumber, 0);
         }
         return uiSourceCode.uiLocation(lineNumber, columnNumber);
     },
 
     /**
-     * @param {!WebInspector.CSSStyleSheetHeader} header
+     * @param {!WebInspector.Event} event
      */
-    addHeader: function(header)
+    _styleSheetAdded: function(event)
     {
+        var header = /** @type {!WebInspector.CSSStyleSheetHeader} */(event.data);
         var url = header.resourceURL();
         if (!url)
             return;
 
         var map = this._urlToHeadersByFrameId.get(url);
         if (!map) {
             map = /** @type {!Map.<string, !Map.<string, !WebInspector.CSSStyleSheetHeader>>} */ (new Map());
             this._urlToHeadersByFrameId.set(url, map);
         }
         var headersById = map.get(header.frameId);
         if (!headersById) {
             headersById = /** @type {!Map.<string, !WebInspector.CSSStyleSheetHeader>} */ (new Map());
             map.set(header.frameId, headersById);
         }
         headersById.set(header.id, header);
         var uiSourceCode = this._networkMapping.uiSourceCodeForStyleURL(url, header);
         if (uiSourceCode)
             this._bindUISourceCode(uiSourceCode, header);
         WebInspector.cssWorkspaceBinding.updateLocations(header);
     },
 
     /**
-     * @param {!WebInspector.CSSStyleSheetHeader} header
+     * @param {!WebInspector.Event} event
      */
-    removeHeader: function(header)
+    _styleSheetRemoved: function(event)
     {
+        var header = /** @type {!WebInspector.CSSStyleSheetHeader} */(event.data);
         var url = header.resourceURL();
         if (!url)
             return;
 
         var map = this._urlToHeadersByFrameId.get(url);
         console.assert(map);
         var headersById = map.get(header.frameId);
         console.assert(headersById);
         headersById.delete(header.id);
 
@@ skipping 157 matching lines @@
          * @param {!WebInspector.UISourceCode} uiSourceCode
          * @param {?string} content
          * @this {WebInspector.StylesSourceMapping}
          */
         function callback(uiSourceCode, content)
         {
             var styleFile = this._styleFiles.get(uiSourceCode);
             if (styleFile)
                 styleFile.addRevision(content || "");
         }
+    },
+
+    dispose: function()
+    {
+        WebInspector.EventTarget.removeEventListeners(this._eventListeners);
     }
 }
 
 /**
  * @constructor
  * @param {!WebInspector.UISourceCode} uiSourceCode
  * @param {!WebInspector.StylesSourceMapping} mapping
  */
 WebInspector.StyleFile = function(uiSourceCode, mapping)
 {
@@ skipping 64 matching lines @@
     },
 
     dispose: function()
     {
         if (this._terminated)
             return;
         this._terminated = true;
         WebInspector.EventTarget.removeEventListeners(this._eventListeners);
     }
 }