DevTools: Bring Sass support from behind the experiment

Source/devtools/front_end/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 26 matching lines @@
  */
 WebInspector.SASSSourceMapping = function(cssModel, workspace, networkWorkspaceProvider)
 {
     this.pollPeriodMs = 5000;
     this.pollIntervalMs = 200;
 
     this._cssModel = cssModel;
     this._workspace = workspace;
     this._networkWorkspaceProvider = networkWorkspaceProvider;
     this._addingRevisionCounter = 0;
+    this._mappingsEnabled = WebInspector.settings.cssSourceMapsEnabled.get();

[vsevik, 2013/07/12 13:07:08]

not needed

     this._reset();
     WebInspector.fileManager.addEventListener(WebInspector.FileManager.EventTypes.SavedURL, this._fileSaveFinished, this);
+    WebInspector.settings.cssSourceMapsEnabled.addChangeListener(this._toggleSourceMapSupport, this)
     this._cssModel.addEventListener(WebInspector.CSSStyleModel.Events.StyleSheetChanged, this._styleSheetChanged, this);
     this._workspace.addEventListener(WebInspector.Workspace.Events.UISourceCodeAdded, this._uiSourceCodeAdded, this);
     this._workspace.addEventListener(WebInspector.Workspace.Events.UISourceCodeContentCommitted, this._uiSourceCodeContentCommitted, this);
     this._workspace.addEventListener(WebInspector.Workspace.Events.ProjectWillReset, this._reset, this);
 }
 
 WebInspector.SASSSourceMapping.prototype = {
     /**
      * @param {WebInspector.Event} event
      */
     _styleSheetChanged: function(event)
     {
         var id = /** @type {!CSSAgent.StyleSheetId} */ (event.data.styleSheetId);
         if (this._addingRevisionCounter) {
             --this._addingRevisionCounter;
             return;
         }
         var header = this._cssModel.styleSheetHeaderForId(id);
-        if (!header || !WebInspector.experimentsSettings.sass.isEnabled())
+        if (!header)
             return;
 
-        var wasHeaderKnown = header.sourceURL && !!this._completeSourceMapURLForCSSURL[header.sourceURL];
         this.removeHeader(header);
-        if (wasHeaderKnown)
-            header.updateLocations();
     },
 
     /**
+     * @param {WebInspector.Event} event
+     */
+    _toggleSourceMapSupport: function(event)
+    {
+        var enabled = /** @type {boolean} */ (event.data);
+        if (enabled === this._mappingsEnabled)
+            return;
+        this._mappingsEnabled = enabled;
+        var headers = this._cssModel.styleSheetHeaders();
+        for (var i = 0; i < headers.length; ++i) {
+            if (enabled)
+                this.addHeader(headers[i]);
+            else
+                this.removeHeader(headers[i]);
+        }
+    },
+
+    /**
      * @param {WebInspector.Event} event
      */
     _fileSaveFinished: function(event)
     {
         var sassURL = /** @type {string} */ (event.data);
         this._sassFileSaved(sassURL, false);
     },
 
     /**
      * @param {string} headerName
@@ skipping 275 matching lines @@
         for (var i = 0; i < ids.length; ++i)
             this._loadSourceMapAndBindUISourceCode(headers, true, completeSourceMapURL);
         callback(cssURL, sassURL, true);
     },
 
     /**
      * @param {WebInspector.CSSStyleSheetHeader} header
      */
     addHeader: function(header)
     {
-        if (!header.sourceMapURL || !header.sourceURL || header.isInline || !WebInspector.experimentsSettings.sass.isEnabled())
+        if (!header.sourceMapURL || !header.sourceURL || header.isInline || !WebInspector.settings.cssSourceMapsEnabled.get())
             return;
         var completeSourceMapURL = WebInspector.ParsedURL.completeURL(header.sourceURL, header.sourceMapURL);
         if (!completeSourceMapURL)
             return;
         this._completeSourceMapURLForCSSURL[header.sourceURL] = completeSourceMapURL;
         this._loadSourceMapAndBindUISourceCode([header], false, completeSourceMapURL);
     },
 
     /**
      * @param {WebInspector.CSSStyleSheetHeader} header
      */
     removeHeader: function(header)
     {
         var sourceURL = header.sourceURL;
         if (!sourceURL || !header.sourceMapURL || header.isInline || !this._completeSourceMapURLForCSSURL[sourceURL])
             return;
         delete this._sourceMapByStyleSheetURL[sourceURL];
         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();
     },
 
     /**
      * @param {Array.<WebInspector.CSSStyleSheetHeader>} headersWithSameSourceURL
      * @param {boolean} forceRebind
      * @param {string} completeSourceMapURL
      */
     _loadSourceMapAndBindUISourceCode: function(headersWithSameSourceURL, forceRebind, completeSourceMapURL)
     {
         console.assert(headersWithSameSourceURL.length);
@@ skipping 175 matching lines @@
         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 = {};
     }
 }