DevTools: Inject styleSheetId in WebInspector.CSSLocation constructor

Source/devtools/front_end/sdk/CSSStyleModel.js

 /*
  * Copyright (C) 2010 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 714 matching lines @@
     },
 
     __proto__: WebInspector.LiveLocation.prototype
 }
 
 /**
  * @constructor
  * @implements {WebInspector.RawLocation}
  * @extends {WebInspector.SDKObject}
  * @param {!WebInspector.Target} target
+ * @param {?CSSAgent.StyleSheetId} styleSheetId
  * @param {string} url
  * @param {number} lineNumber
  * @param {number=} columnNumber
  */
-WebInspector.CSSLocation = function(target, url, lineNumber, columnNumber)
+WebInspector.CSSLocation = function(target, styleSheetId, url, lineNumber, columnNumber)
 {
     WebInspector.SDKObject.call(this, target);
     this._cssModel = target.cssModel;
+    this._styleSheetId = styleSheetId;
     this.url = url;
     this.lineNumber = lineNumber;
     this.columnNumber = columnNumber || 0;
 }
 
 WebInspector.CSSLocation.prototype = {
     /**
-     * @param {?CSSAgent.StyleSheetId} styleSheetId
      * @param {function(!WebInspector.UILocation):(boolean|undefined)} updateDelegate
      * @return {?WebInspector.LiveLocation}
      */
-    createLiveLocation: function(styleSheetId, updateDelegate)
+    createLiveLocation: function(updateDelegate)
     {
-        var header = styleSheetId ? this._cssModel.styleSheetHeaderForId(styleSheetId) : null;
+        var header = this._styleSheetId ? this._cssModel.styleSheetHeaderForId(this._styleSheetId) : null;
         return new WebInspector.CSSStyleModel.LiveLocation(this._cssModel, header, this, updateDelegate);
     },
 
     /**
      * @return {?WebInspector.UILocation}
      */
     toUILocation: function()
     {
         return this._cssModel.rawLocationToUILocation(this);
     },
@@ skipping 335 matching lines @@
 
     _setRawLocationAndFrameId: function()
     {
         if (!this.styleSheetId)
             return;
         var styleSheetHeader = this._cssModel.styleSheetHeaderForId(this.styleSheetId);
         this.frameId = styleSheetHeader.frameId;
         var url = styleSheetHeader.resourceURL();
         if (!url)
             return;
-        this.rawLocation = new WebInspector.CSSLocation(this._cssModel.target(), url, this.lineNumberInSource(0), this.columnNumberInSource(0));
+        this.rawLocation = new WebInspector.CSSLocation(this._cssModel.target(), this.styleSheetId, url, this.lineNumberInSource(0), this.columnNumberInSource(0));
     },
 
     /**
      * @return {string}
      */
     resourceURL: function()
     {
         if (!this.styleSheetId)
             return "";
         var styleSheetHeader = this._cssModel.styleSheetHeaderForId(this.styleSheetId);
@@ skipping 231 matching lines @@
         else
             this.setText(this.text.substring(2, this.text.length - 2).trim(), true, true, userCallback);
     },
 
     /**
      * @param {boolean} forName
      * @return {?WebInspector.UILocation}
      */
     uiLocation: function(forName)
     {
-        if (!this.range || !this.ownerStyle || !this.ownerStyle.parentRule)
+        if (!this.range || !this.ownerStyle || !this.ownerStyle.parentRule || !this.ownerStyle.styleSheetId)
             return null;
 
         var url = this.ownerStyle.parentRule.resourceURL();
         if (!url)
             return null;
 
         var range = this.range;
         var line = forName ? range.startLine : range.endLine;
         // End of range is exclusive, so subtract 1 from the end offset.
         var column = forName ? range.startColumn : range.endColumn - (this.text && this.text.endsWith(";") ? 2 : 1);
-        var rawLocation = new WebInspector.CSSLocation(this.ownerStyle._cssModel.target(), url, line, column);
+        var rawLocation = new WebInspector.CSSLocation(this.ownerStyle._cssModel.target(), this.ownerStyle.styleSheetId, url, line, column);
         return rawLocation.toUILocation();
     }
 }
 
 /**
  * @constructor
  * @param {!CSSAgent.MediaQueryExpression} payload
  */
 WebInspector.CSSMediaQueryExpression = function(payload)
 {
@@ skipping 144 matching lines @@
 
     /**
      * @return {?WebInspector.CSSStyleSheetHeader}
      */
     header: function()
     {
         return this.parentStyleSheetId ? this._cssModel.styleSheetHeaderForId(this.parentStyleSheetId) : null;
     },
 
     /**
+     * @return {?WebInspector.CSSLocation}
+     */
+    rawLocation: function()
+    {
+        if (!this.header() || typeof this.lineNumberInSource() === "undefined")
+            return null;
+
+        var lineNumber = Number(this.lineNumberInSource());
+        return new WebInspector.CSSLocation(this._cssModel.target(), this.header().id, this.sourceURL, lineNumber, this.columnNumberInSource());
+    },
+
+    /**
      * @return {?WebInspector.UILocation}
      */
     uiLocation: function()
     {
         var styleSheetHeader = this.header();
         var lineNumber = this.lineNumberInSource();
         var columnNumber = this.columnNumberInSource();
-        if (!styleSheetHeader || typeof lineNumber !== "number")
+        if (typeof lineNumber !== "number")
             return null;
-        return styleSheetHeader.rawLocationToUILocation(/** @type {number} */(lineNumber), columnNumber);
+        if (styleSheetHeader)
+            return styleSheetHeader.rawLocationToUILocation(lineNumber, columnNumber);
+        var uiSourceCode = WebInspector.workspace.uiSourceCodeForURL(this.sourceURL);
+        if (!uiSourceCode)
+            return null;
+        return uiSourceCode.uiLocation(lineNumber, columnNumber);
     }
 }
 
 /**
  * @constructor
  * @implements {WebInspector.ContentProvider}
  * @param {!WebInspector.CSSStyleModel} cssModel
  * @param {!CSSAgent.CSSStyleSheetHeader} payload
  */
 WebInspector.CSSStyleSheetHeader = function(cssModel, payload)
@@ skipping 50 matching lines @@
     },
 
     /**
      * @param {number} lineNumber
      * @param {number=} columnNumber
      * @return {?WebInspector.UILocation}
      */
     rawLocationToUILocation: function(lineNumber, columnNumber)
     {
         var uiLocation = null;
-        var rawLocation = new WebInspector.CSSLocation(this._cssModel.target(), this.resourceURL(), lineNumber, columnNumber);
+        var rawLocation = new WebInspector.CSSLocation(this._cssModel.target(), this.id, this.resourceURL(), lineNumber, columnNumber);
         for (var i = this._sourceMappings.length - 1; !uiLocation && i >= 0; --i)
             uiLocation = this._sourceMappings[i].rawLocationToUILocation(rawLocation);
         return uiLocation;
     },
 
     /**
      * @param {!WebInspector.SourceMapping} sourceMapping
      */
     pushSourceMapping: function(sourceMapping)
     {
@@ skipping 209 matching lines @@
             for (var i = 0; i < callbacks.length; ++i)
                 callbacks[i](computedStyle);
         }
     }
 }
 
 /**
  * @type {!WebInspector.CSSStyleModel}
  */
 WebInspector.cssModel;