[DevTools] Explicitly require ResourceTreeModel

third_party/WebKit/Source/devtools/front_end/sdk/CSSModel.js

Index: third_party/WebKit/Source/devtools/front_end/sdk/CSSModel.js
diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/CSSModel.js b/third_party/WebKit/Source/devtools/front_end/sdk/CSSModel.js
index 4a2f10217bd766b2a4f6d8d32591b94c5aa0d011..38b1d3638427a3c7dff58096c2622bb6cc6bb9e6 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/CSSModel.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/CSSModel.js
@@ -32,14 +32,15 @@
  * @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>} */
@@ -236,7 +237,7 @@ WebInspector.CSSModel.prototype = {
      */
     domModel: function()
     {
-        return /** @type {!WebInspector.DOMModel} */(this._domModel);
+        return this._domModel;
     },
 
     /**
@@ -723,11 +724,11 @@ WebInspector.CSSModel.prototype = {
 
     /**
      * @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];
@@ -939,8 +940,13 @@ WebInspector.CSSModel.prototype = {
             .catchException(/** @type {string} */(""));
     },
 
-    _mainFrameNavigated: function()
+    /**
+     * @param {!WebInspector.Event} event
+     */
+    _mainFrameNavigated: function(event)
     {
+        if (event.data.target() !== this.target())
+            return;
         this._resetStyleSheets();
     },