DevTools: Decouple CSS model from UI entities

Source/devtools/front_end/sdk/SASSSourceMapping.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 401 matching lines @@
         delete this._completeSourceMapURLForCSSURL[sourceURL];
         for (var sassURL in this._cssURLsForSASSURL) {
             var urls = this._cssURLsForSASSURL[sassURL];
             urls.remove(sourceURL);
             if (!urls.length)
                 delete this._cssURLsForSASSURL[sassURL];
         }
         var completeSourceMapURL = WebInspector.ParsedURL.completeURL(sourceURL, header.sourceMapURL);
         if (completeSourceMapURL)
             delete this._sourceMapByURL[completeSourceMapURL];
-        header.updateLocations();
+        WebInspector.cssWorkspaceBinding.updateLocations(header);
     },
 
     /**
      * @param {!Array.<!WebInspector.CSSStyleSheetHeader>} headersWithSameSourceURL
      * @param {boolean} forceRebind
      * @param {string} completeSourceMapURL
      */
     _loadSourceMapAndBindUISourceCode: function(headersWithSameSourceURL, forceRebind, completeSourceMapURL)
     {
         console.assert(headersWithSameSourceURL.length);
         var sourceURL = headersWithSameSourceURL[0].sourceURL;
         this._loadSourceMapForStyleSheet(completeSourceMapURL, sourceURL, forceRebind, sourceMapLoaded.bind(this));
 
         /**
          * @param {?WebInspector.SourceMap} sourceMap
          * @this {WebInspector.SASSSourceMapping}
          */
         function sourceMapLoaded(sourceMap)
         {
             if (!sourceMap)
                 return;
 
             this._sourceMapByStyleSheetURL[sourceURL] = sourceMap;
             for (var i = 0; i < headersWithSameSourceURL.length; ++i) {
                 if (forceRebind)
-                    headersWithSameSourceURL[i].updateLocations();
+                    WebInspector.cssWorkspaceBinding.updateLocations(headersWithSameSourceURL[i]);
                 else
                     this._bindUISourceCode(headersWithSameSourceURL[i], sourceMap);
             }
         }
     },
 
     /**
      * @param {string} cssURL
      * @param {string} sassURL
      */
@@ skipping 53 matching lines @@
                 callbacks[i](sourceMap);
         }
     },
 
     /**
      * @param {!WebInspector.CSSStyleSheetHeader} header
      * @param {!WebInspector.SourceMap} sourceMap
      */
     _bindUISourceCode: function(header, sourceMap)
     {
-        header.pushSourceMapping(this);
+        WebInspector.cssWorkspaceBinding.pushSourceMapping(header, this);
         var rawURL = header.sourceURL;
         var sources = sourceMap.sources();
         for (var i = 0; i < sources.length; ++i) {
             var url = sources[i];
             this._addCSSURLforSASSURL(rawURL, url);
             if (!this._workspace.hasMappingForURL(url) && !this._workspace.uiSourceCodeForURL(url)) {
                 var contentProvider = sourceMap.sourceContentProvider(url, WebInspector.resourceTypes.Stylesheet);
                 this._networkWorkspaceBinding.addFileForURL(url, contentProvider);
             }
         }
@@ skipping 63 matching lines @@
     _uiSourceCodeAdded: function(event)
     {
         var uiSourceCode = /** @type {!WebInspector.UISourceCode} */ (event.data);
         var cssURLs = this._cssURLsForSASSURL[uiSourceCode.url];
         if (!cssURLs)
             return;
         for (var i = 0; i < cssURLs.length; ++i) {
             var ids = this._cssModel.styleSheetIdsForURL(cssURLs[i]);
             for (var j = 0; j < ids.length; ++j) {
                 var header = this._cssModel.styleSheetHeaderForId(ids[j]);
-                console.assert(header);
-                header.updateLocations();
+                if (!header)
+                    throw new Error("Header not found for id=" + ids[j]);

[vsevik, 2014/07/22 14:59:01]

This should never happen and we used to assert in such cases.

[apavlov, 2014/07/22 16:19:53]

Done.

+                WebInspector.cssWorkspaceBinding.updateLocations(header);
             }
         }
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _uiSourceCodeContentCommitted: function(event)
     {
         var uiSourceCode = /** @type {!WebInspector.UISourceCode} */ (event.data.uiSourceCode);
         if (uiSourceCode.project().type() === WebInspector.projectTypes.FileSystem)
             this._sassFileSaved(uiSourceCode.url, true);
     },
 
     _reset: function()
     {
         this._addingRevisionCounter = 0;
         this._completeSourceMapURLForCSSURL = {};
         this._cssURLsForSASSURL = {};
         /** @type {!Object.<string, !Array.<function(?WebInspector.SourceMap)>>} */
         this._pendingSourceMapLoadingCallbacks = {};
         /** @type {!Object.<string, !{deadlineMs: number, dataByURL: !Object.<string, !{timer: number, previousPoll: number}>}>} */
         this._pollDataForSASSURL = {};
         /** @type {!Object.<string, !WebInspector.SourceMap>} */
         this._sourceMapByURL = {};
         this._sourceMapByStyleSheetURL = {};
     }
 }