[DevTools] Explicitly require ResourceTreeModel

third_party/WebKit/Source/devtools/front_end/sdk/CSSModel.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 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /**
  * @constructor
  * @extends {WebInspector.SDKModel}
  * @param {!WebInspector.Target} target
+ * @param {!WebInspector.DOMModel} domModel
  */
-WebInspector.CSSModel = function(target)
+WebInspector.CSSModel = function(target, domModel)
 {
     WebInspector.SDKModel.call(this, WebInspector.CSSModel, target);
-    this._domModel = WebInspector.DOMModel.fromTarget(target);
+    this._domModel = domModel;
     this._agent = target.cssAgent();
     this._styleLoader = new WebInspector.CSSModel.ComputedStyleLoader(this);
-    target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this);
+    WebInspector.targetManager.addEventListener(WebInspector.TargetManager.Events.MainFrameNavigated, this._mainFrameNavigated, this);
     target.registerCSSDispatcher(new WebInspector.CSSDispatcher(this));
     this._agent.enable().then(this._wasEnabled.bind(this));
     /** @type {!Map.<string, !WebInspector.CSSStyleSheetHeader>} */
     this._styleSheetIdToHeader = new Map();
     /** @type {!Map.<string, !Object.<!PageAgent.FrameId, !Array.<!CSSAgent.StyleSheetId>>>} */
     this._styleSheetIdsForURL = new Map();
 
     /** @type {!Map.<!WebInspector.CSSStyleSheetHeader, !Promise<string>>} */
     this._originalStyleSheetText = new Map();
 
@@ skipping 176 matching lines @@
         if (!this._sourceMapURLToHeaders.has(header.sourceMapURL))
             this._sourceMapByURL.delete(header.sourceMapURL);
         this.dispatchEventToListeners(WebInspector.CSSModel.Events.SourceMapDetached, header);
     },
 
     /**
      * @return {!WebInspector.DOMModel}
      */
     domModel: function()
     {
-        return /** @type {!WebInspector.DOMModel} */(this._domModel);
+        return this._domModel;
     },
 
     /**
      * @param {!CSSAgent.StyleSheetId} styleSheetId
      * @param {!WebInspector.TextRange} range
      * @param {string} text
      * @param {boolean} majorChange
      * @return {!Promise<boolean>}
      */
     setStyleText: function(styleSheetId, range, text, majorChange)
@@ skipping 466 matching lines @@
                 return null;
             this._domModel.markUndoableState();
             var edit = new WebInspector.CSSModel.Edit(styleSheetId, ruleLocation, ruleText, rulePayload);
             this._fireStyleSheetChanged(styleSheetId, edit);
             return new WebInspector.CSSStyleRule(this, rulePayload);
         }
     },
 
     /**
      * @param {!WebInspector.DOMNode} node
+     * @param {string} frameId
      * @param {function(?WebInspector.CSSStyleSheetHeader)} userCallback
      */
-    requestViaInspectorStylesheet: function(node, userCallback)
+    requestViaInspectorStylesheet: function(node, frameId, userCallback)
     {
-        var frameId = node.frameId() || this.target().resourceTreeModel.mainFrame.id;
         var headers = this._styleSheetIdToHeader.valuesArray();
         for (var i = 0; i < headers.length; ++i) {
             var styleSheetHeader = headers[i];
             if (styleSheetHeader.frameId === frameId && styleSheetHeader.isViaInspector()) {
                 userCallback(styleSheetHeader);
                 return;
             }
         }
 
         /**
          * @param {?Protocol.Error} error
          * @param {?CSSAgent.StyleSheetId} styleSheetId
          * @return {?WebInspector.CSSStyleSheetHeader}
          * @this {WebInspector.CSSModel}
          */
         function innerCallback(error, styleSheetId)
         {
             return !error && styleSheetId ? this._styleSheetIdToHeader.get(styleSheetId) || null : null;
         }
 
         this._agent.createStyleSheet(frameId, innerCallback.bind(this))

[pfeldman, 2016/07/27 17:54:35]

We should be able to send document node id here.

[eostroukhov-old, 2016/08/05 18:32:03]

We discussed this offline and no change will be made here for now.

             .catchException(null)
             .then(userCallback)
     },
 
     mediaQueryResultChanged: function()
     {
         this.dispatchEventToListeners(WebInspector.CSSModel.Events.MediaQueryResultChanged);
     },
 
     /**
@@ skipping 170 matching lines @@
                 text = "";
                 // Fall through.
             }
             return WebInspector.CSSModel.trimSourceURL(text);
         }
 
         return this._agent.getStyleSheetText(styleSheetId, textCallback)
             .catchException(/** @type {string} */(""));
     },
 
-    _mainFrameNavigated: function()
+    /**
+     * @param {!WebInspector.Event} event
+     */
+    _mainFrameNavigated: function(event)
     {
+        if (event.data.target() !== this.target())
+            return;
         this._resetStyleSheets();
     },
 
     _resetStyleSheets: function()
     {
         var headers = this._styleSheetIdToHeader.valuesArray();
         this._styleSheetIdsForURL.clear();
         this._styleSheetIdToHeader.clear();
         for (var i = 0; i < headers.length; ++i) {
             this._detachSourceMap(headers[i]);
@@ skipping 254 matching lines @@
 /**
  * @constructor
  * @param {?WebInspector.CSSStyleDeclaration} inlineStyle
  * @param {?WebInspector.CSSStyleDeclaration} attributesStyle
  */
 WebInspector.CSSModel.InlineStyleResult = function(inlineStyle, attributesStyle)
 {
     this.inlineStyle = inlineStyle;
     this.attributesStyle = attributesStyle;
 }