DevTools: [CSS] remove StyleId and RuleId types from protocol.json

Source/devtools/front_end/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 255 matching lines @@
         {
             this._pendingCommandsMajorState.pop();
             if (error) {
                 failureCallback();
                 return;
             }
             this._domModel.markUndoableState();
             this._computeMatchingSelectors(rulePayload, nodeId, successCallback, failureCallback);
         }
 
+        if (!rule.styleSheetId)
+            throw "No rule stylesheet id";
         this._pendingCommandsMajorState.push(true);
-        this._agent.setRuleSelector(rule.id.styleSheetId, rule.selectorRange, newSelector, callback.bind(this, nodeId, successCallback, failureCallback, newSelector));
+        this._agent.setRuleSelector(rule.styleSheetId, rule.selectorRange, newSelector, callback.bind(this, nodeId, successCallback, failureCallback, newSelector));
     },
 
     /**
      * @param {!CSSAgent.CSSRule} rulePayload
      * @param {!DOMAgent.NodeId} nodeId
      * @param {function(!WebInspector.CSSRule)} successCallback
      * @param {function()} failureCallback
      */
     _computeMatchingSelectors: function(rulePayload, nodeId, successCallback, failureCallback)
     {
@@ skipping 433 matching lines @@
 }
 
 /**
  * @constructor
  * @param {!WebInspector.CSSStyleModel} cssModel
  * @param {!CSSAgent.CSSStyle} payload
  */
 WebInspector.CSSStyleDeclaration = function(cssModel, payload)
 {
     this._cssModel = cssModel;
-    this.id = payload.styleId;
+    this.styleSheetId = payload.styleSheetId;
     this.width = payload.width;
     this.height = payload.height;
     this.range = payload.range ? WebInspector.TextRange.fromObject(payload.range) : null;
     this._shorthandValues = WebInspector.CSSStyleDeclaration.buildShorthandValueMap(payload.shorthandEntries);
     this._livePropertyMap = {}; // LIVE properties (source-based or style-based) : { name -> CSSProperty }
     this._allProperties = []; // ALL properties: [ CSSProperty ]
     this.__disabledProperties = {}; // DISABLED properties: { index -> CSSProperty }
     var payloadPropertyCount = payload.cssProperties.length;
 
 
@@ skipping 58 matching lines @@
 }
 
 WebInspector.CSSStyleDeclaration.prototype = {
     /**
      * @param {string} styleSheetId
      * @param {!WebInspector.TextRange} oldRange
      * @param {!WebInspector.TextRange} newRange
      */
     sourceStyleSheetEdited: function(styleSheetId, oldRange, newRange)
     {
-        if (!this.id || this.id.styleSheetId !== styleSheetId)
+        if (this.styleSheetId !== styleSheetId)
             return;
         if (this.range)
             this.range = this.range.rebaseAfterTextEdit(oldRange, newRange);
         for (var i = 0; i < this._allProperties.length; ++i)
             this._allProperties[i].sourceStyleSheetEdited(styleSheetId, oldRange, newRange);
     },
 
     _computeActiveProperties: function()
     {
         var activeProperties = {};
@@ skipping 136 matching lines @@
             if (!userCallback)
                 return;
 
             if (error) {
                 console.error(error);
                 userCallback(null);
             } else
                 userCallback(WebInspector.CSSStyleDeclaration.parsePayload(this._cssModel, payload));
         }
 
-        if (!this.id)
-            throw "No style id";
+        if (!this.styleSheetId)
+            throw "No stylesheet id";
 
         this._cssModel._pendingCommandsMajorState.push(true);
-        this._cssModel._agent.setPropertyText(this.id.styleSheetId, this._insertionRange(index), name + ": " + value + ";", callback.bind(this));
+        this._cssModel._agent.setPropertyText(this.styleSheetId, this._insertionRange(index), name + ": " + value + ";", callback.bind(this));
     },
 
     /**
      * @param {string} name
      * @param {string} value
      * @param {function(?WebInspector.CSSStyleDeclaration)=} userCallback
      */
     appendProperty: function(name, value, userCallback)
     {
         this.insertPropertyAt(this.allProperties.length, name, value, userCallback);
     }
 }
 
 /**
  * @constructor
  * @param {!WebInspector.CSSStyleModel} cssModel
  * @param {!CSSAgent.CSSRule} payload
  * @param {!Array.<number>=} matchingSelectors
  */
 WebInspector.CSSRule = function(cssModel, payload, matchingSelectors)
 {
     this._cssModel = cssModel;
-    this.id = payload.ruleId;
+    this.styleSheetId = payload.styleSheetId;
     if (matchingSelectors)
         this.matchingSelectors = matchingSelectors;
     this.selectors = payload.selectorList.selectors;
     for (var i = 0; i < this.selectors.length; ++i) {
         var selector = this.selectors[i];
         if (selector.range)
             selector.range = WebInspector.TextRange.fromObject(selector.range);
     }
     this.selectorText = this.selectors.select("value").join(", ");
 
@@ skipping 23 matching lines @@
 }
 
 WebInspector.CSSRule.prototype = {
     /**
      * @param {string} styleSheetId
      * @param {!WebInspector.TextRange} oldRange
      * @param {!WebInspector.TextRange} newRange
      */
     sourceStyleSheetEdited: function(styleSheetId, oldRange, newRange)
     {
-        if (this.id && this.id.styleSheetId === styleSheetId) {
+        if (this.styleSheetId === styleSheetId) {
             if (this.selectorRange)
                 this.selectorRange = this.selectorRange.rebaseAfterTextEdit(oldRange, newRange);
             for (var i = 0; i < this.selectors.length; ++i) {
                 var selector = this.selectors[i];
                 if (selector.range)
                     selector.range = selector.range.rebaseAfterTextEdit(oldRange, newRange);
             }
         }
         if (this.media) {
             for (var i = 0; i < this.media.length; ++i)
                 this.media[i].sourceStyleSheetEdited(styleSheetId, oldRange, newRange);
         }
         this.style.sourceStyleSheetEdited(styleSheetId, oldRange, newRange);
     },
 
     _setRawLocationAndFrameId: function()
     {
-        if (!this.id)
+        if (!this.styleSheetId)
             return;
-        var styleSheetHeader = this._cssModel.styleSheetHeaderForId(this.id.styleSheetId);
+        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));
     },
 
     /**
      * @return {string}
      */
     resourceURL: function()
     {
-        if (!this.id)
+        if (!this.styleSheetId)
             return "";
-        var styleSheetHeader = this._cssModel.styleSheetHeaderForId(this.id.styleSheetId);
+        var styleSheetHeader = this._cssModel.styleSheetHeaderForId(this.styleSheetId);
         return styleSheetHeader.resourceURL();
     },
 
     /**
      * @param {number} selectorIndex
      * @return {number}
      */
     lineNumberInSource: function(selectorIndex)
     {
         var selector = this.selectors[selectorIndex];
-        if (!selector || !selector.range)
+        if (!selector || !selector.range || !this.styleSheetId)
             return 0;
-        var styleSheetHeader = this._cssModel.styleSheetHeaderForId(this.id.styleSheetId);
+        var styleSheetHeader = this._cssModel.styleSheetHeaderForId(this.styleSheetId);
         return styleSheetHeader.lineNumberInSource(selector.range.startLine);
     },
 
     /**
      * @param {number} selectorIndex
      * @return {number|undefined}
      */
     columnNumberInSource: function(selectorIndex)
     {
         var selector = this.selectors[selectorIndex];
-        if (!selector || !selector.range)
+        if (!selector || !selector.range || !this.styleSheetId)
             return undefined;
-        var styleSheetHeader = this._cssModel.styleSheetHeaderForId(this.id.styleSheetId);
+        var styleSheetHeader = this._cssModel.styleSheetHeaderForId(this.styleSheetId);
         console.assert(styleSheetHeader);
         return styleSheetHeader.columnNumberInSource(selector.range.startLine, selector.range.startColumn);
     },
 
     get isUserAgent()
     {
         return this.origin === "user-agent";
     },
 
     get isUser()
@@ skipping 58 matching lines @@
 }
 
 WebInspector.CSSProperty.prototype = {
     /**
      * @param {string} styleSheetId
      * @param {!WebInspector.TextRange} oldRange
      * @param {!WebInspector.TextRange} newRange
      */
     sourceStyleSheetEdited: function(styleSheetId, oldRange, newRange)
     {
-        if (!this.ownerStyle.id || this.ownerStyle.id.styleSheetId !== styleSheetId)
+        if (this.ownerStyle.styleSheetId !== styleSheetId)
             return;
         if (this.range)
             this.range = this.range.rebaseAfterTextEdit(oldRange, newRange);
     },
 
     /**
      * @param {boolean} active
      */
     _setActive: function(active)
     {
@@ skipping 69 matching lines @@
                     userCallback(style);
             } else {
                 if (userCallback)
                     userCallback(null);
             }
         }
 
         if (!this.ownerStyle)
             throw "No ownerStyle for property";
 
-        if (!this.ownerStyle.id)
+        if (!this.ownerStyle.styleSheetId)
             throw "No owner style id";
 
         // An index past all the properties adds a new property to the style.
         var cssModel = this.ownerStyle._cssModel;
         cssModel._pendingCommandsMajorState.push(majorChange);
         var range = /** @type {!WebInspector.TextRange} */ (this.range);
-        cssModel._agent.setPropertyText(this.ownerStyle.id.styleSheetId, overwrite ? range : range.collapseToStart(), propertyText, callback.bind(this));
+        cssModel._agent.setPropertyText(this.ownerStyle.styleSheetId, overwrite ? range : range.collapseToStart(), propertyText, callback.bind(this));
     },
 
     /**
      * @param {string} newValue
      * @param {boolean} majorChange
      * @param {boolean} overwrite
      * @param {function(?WebInspector.CSSStyleDeclaration)=} userCallback
      */
     setValue: function(newValue, majorChange, overwrite, userCallback)
     {
@@ skipping 426 matching lines @@
             for (var i = 0; i < callbacks.length; ++i)
                 callbacks[i](computedStyle);
         }
     }
 }
 
 /**
  * @type {!WebInspector.CSSStyleModel}
  */
 WebInspector.cssModel;