DevTools: CSS.getMatchedStylesForNode protocol command to return inline styles

Source/devtools/front_end/elements/StylesSidebarPane.js

 /*
  * Copyright (C) 2007 Apple Inc.  All rights reserved.
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 314 matching lines @@
     {
         var node = this.node();
         if (!node)
             return Promise.resolve(/** @type {?{matched: !WebInspector.SectionCascade, pseudo: !Map.<number, !WebInspector.SectionCascade>}} */(null));
         if (!this._matchedCascadePromise)
             this._matchedCascadePromise = this._matchedStylesForNode(node).then(buildMatchedCascades.bind(this, node));
         return this._matchedCascadePromise;
 
         /**
          * @param {!WebInspector.DOMNode} node
-         * @param {!WebInspector.StylesSidebarPane.MatchedRulesPayload} payload
+         * @param {?WebInspector.CSSStyleModel.MatchedStyleResult} matchedStyles
          * @return {?{matched: !WebInspector.SectionCascade, pseudo: !Map.<number, !WebInspector.SectionCascade>}}
          * @this {WebInspector.StylesSidebarPane}
          */
-        function buildMatchedCascades(node, payload)
+        function buildMatchedCascades(node, matchedStyles)
         {
-            if (node !== this.node() || !payload.fulfilled())
+            if (!matchedStyles || node !== this.node())
+                return null;
+            if (!matchedStyles.matchedCSSRules || !matchedStyles.pseudoElements || !matchedStyles.inherited)
                 return null;
 
             return {
-                matched: this._buildMatchedRulesSectionCascade(node, payload),
-                pseudo: this._buildPseudoCascades(node, payload)
+                matched: this._buildMatchedRulesSectionCascade(node, matchedStyles),
+                pseudo: this._buildPseudoCascades(node, matchedStyles)
             };
         }
     },
 
     /**
      * @param {!WebInspector.DOMNode} node
-     * @return {!Promise.<!WebInspector.StylesSidebarPane.MatchedRulesPayload>}
+     * @return {!Promise.<?WebInspector.CSSStyleModel.MatchedStyleResult>}
      */
     _matchedStylesForNode: function(node)
     {
-        var payload = new WebInspector.StylesSidebarPane.MatchedRulesPayload();
         var cssModel = this.cssModel();
         if (!cssModel)
-            return Promise.resolve(payload);
-
-        var promises = [
-            cssModel.inlineStylesPromise(node.id).then(inlineCallback),
-            cssModel.matchedStylesPromise(node.id).then(matchedCallback)
-        ];
-        return Promise.all(promises).then(returnPayload);
-
-        /**
-         * @param {?WebInspector.CSSStyleModel.InlineStyleResult} inlineStyleResult
-         */
-        function inlineCallback(inlineStyleResult)
-        {
-            if (!inlineStyleResult)
-                return;
-            payload.inlineStyle = inlineStyleResult.inlineStyle;
-            payload.attributesStyle = inlineStyleResult.attributesStyle;
-        }
-
-        /**
-         * @param {?WebInspector.CSSStyleModel.MatchedStyleResult} matchedResult
-         */
-        function matchedCallback(matchedResult)
-        {
-            if (matchedResult) {
-                payload.matchedCSSRules = matchedResult.matchedCSSRules;
-                payload.pseudoElements = matchedResult.pseudoElements;
-                payload.inherited = matchedResult.inherited;
-            }
-        }
-
-        /**
-         * @return {!WebInspector.StylesSidebarPane.MatchedRulesPayload}
-         */
-        function returnPayload()
-        {
-            return payload;
-        }
+            return Promise.resolve(/** @type {?WebInspector.CSSStyleModel.MatchedStyleResult} */(null));
+        return cssModel.matchedStylesPromise(node.id)
     },
 
     /**
      * @param {boolean} editing
      */
     setEditingStyle: function(editing)
     {
         if (this._isEditingStyle === editing)
             return;
         this._isEditingStyle = editing;
@@ skipping 70 matching lines @@
         }
 
         if (this._filterRegex)
             this._updateFilter();
 
         this._nodeStylesUpdatedForTest(node, true);
     },
 
     /**
      * @param {!WebInspector.DOMNode} node
-     * @param {!WebInspector.StylesSidebarPane.MatchedRulesPayload} styles
+     * @param {!WebInspector.CSSStyleModel.MatchedStyleResult} styles
      * @return {!Map<number, !WebInspector.SectionCascade>}
      */
     _buildPseudoCascades: function(node, styles)
     {
         var pseudoCascades = new Map();
         for (var i = 0; i < styles.pseudoElements.length; ++i) {
             var pseudoElementCSSRules = styles.pseudoElements[i];
             var pseudoId = pseudoElementCSSRules.pseudoId;
 
             // Add rules in reverse order to match the cascade order.
@@ skipping 11 matching lines @@
      * @param {!WebInspector.DOMNode} node
      * @param {boolean} rebuild
      */
     _nodeStylesUpdatedForTest: function(node, rebuild)
     {
         // For sniffing in tests.
     },
 
     /**
      * @param {!WebInspector.DOMNode} node
-     * @param {!WebInspector.StylesSidebarPane.MatchedRulesPayload} styles
+     * @param {!WebInspector.CSSStyleModel.MatchedStyleResult} styles
      * @return {!WebInspector.SectionCascade}
      */
     _buildMatchedRulesSectionCascade: function(node, styles)
     {
         var cascade = new WebInspector.SectionCascade();
 
         function addAttributesStyle()
         {
             if (!styles.attributesStyle)
                 return;
@@ skipping 2546 matching lines @@
         var hasResource = hrefUrl && !!WebInspector.resourceForURL(hrefUrl);
         // FIXME: WebInspector.linkifyURLAsNode() should really use baseURI.
         container.appendChild(WebInspector.linkifyURLAsNode(hrefUrl || url, url, undefined, !hasResource));
         container.createTextChild(")");
         return container;
     }
 }
 
 /**
  * @constructor
- */
-WebInspector.StylesSidebarPane.MatchedRulesPayload = function()
-{
-    /** @type {?WebInspector.CSSStyleDeclaration} */
-    this.inlineStyle = null;
-    /** @type {?WebInspector.CSSStyleDeclaration} */
-    this.attributesStyle = null;
-    /** @type {?Array.<!WebInspector.CSSRule>} */
-    this.matchedCSSRules = null;
-    /** @type {?Array.<!WebInspector.CSSStyleModel.PseudoElementMatches>} */
-    this.pseudoElements = null;
-    /** @type {?Array.<!WebInspector.CSSStyleModel.InheritedMatches>} */
-    this.inherited = null;
-}
-
-WebInspector.StylesSidebarPane.MatchedRulesPayload.prototype = {
-    /**
-     * @return {boolean}
-     */
-    fulfilled: function()
-    {
-        return !!(this.matchedCSSRules && this.pseudoElements && this.inherited);
-    }
-}
-
-/**
- * @constructor
  * @extends {WebInspector.Widget}
  * @param {!WebInspector.ToolbarItem} toolbarItem
  */
 WebInspector.StylesSidebarPane.BaseToolbarPaneWidget = function(toolbarItem)
 {
     WebInspector.Widget.call(this);
     this._toolbarItem = toolbarItem;
     WebInspector.context.addFlavorChangeListener(WebInspector.DOMNode, this._nodeChanged, this);
 }
 
@@ skipping 59 matching lines @@
 
     /**
      * @override
      * @return {?WebInspector.ToolbarItem}
      */
     item: function()
     {
         return this._button;
     }
 }