DevTools: teach TabbedPane.setTabIcon to accept UI.Icon instances

third_party/WebKit/Source/devtools/front_end/ui/TabbedPane.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 331 matching lines @@
   lastOpenedTabIds(tabsCount) {
     function tabToTabId(tab) {
       return tab.id;
     }
 
     return this._tabsHistory.slice(0, tabsCount).map(tabToTabId);
   }
 
   /**
    * @param {string} id
-   * @param {string} iconType
-   * @param {string=} iconTooltip
+   * @param {?UI.Icon} icon
    */
-  setTabIcon(id, iconType, iconTooltip) {
+  setTabIcon(id, icon) {
     var tab = this._tabsById.get(id);
-    if (tab._setIconType(iconType, iconTooltip))
-      this._updateTabElements();
+    tab._setIcon(icon);
+    this._updateTabElements();
   }
 
   /**
    * @param {string} id
    * @param {boolean} enabled
    */
   setTabEnabled(id, enabled) {
     var tab = this._tabsById.get(id);
     tab.tabElement.classList.toggle('disabled', !enabled);
   }
@@ skipping 486 matching lines @@
    * @param {string=} tooltip
    */
   constructor(tabbedPane, id, title, closeable, view, tooltip) {
     this._closeable = closeable;
     this._tabbedPane = tabbedPane;
     this._id = id;
     this._title = title;
     this._tooltip = tooltip;
     this._view = view;
     this._shown = false;
-    /** @type {number} */ this._measuredWidth;
-    /** @type {!Element|undefined} */ this._tabElement;
+    /** @type {number} */
+    this._measuredWidth;
+    /** @type {!Element|undefined} */
+    this._tabElement;
+    /** @type {?Element} */
+    this._iconContainer = null;
   }
 
   /**
    * @return {string}
    */
   get id() {
     return this._id;
   }
 
   /**
@@ skipping 16 matching lines @@
   }
 
   /**
    * @return {boolean}
    */
   isCloseable() {
     return this._closeable;
   }
 
   /**
-   * @param {string} iconType
-   * @param {string=} iconTooltip
-   * @return {boolean}
+   * @param {?UI.Icon} icon
    */
-  _setIconType(iconType, iconTooltip) {
-    if (iconType === this._iconType && iconTooltip === this._iconTooltip)
-      return false;
-    this._iconType = iconType;
-    this._iconTooltip = iconTooltip;
+  _setIcon(icon) {
+    this._icon = icon;
     if (this._tabElement)
-      this._createIconElement(this._tabElement, this._titleElement);
+      this._createIconElement(this._tabElement, this._titleElement, false);
     delete this._measuredWidth;
-    return true;
   }
 
   /**
    * @param {string} className
    * @param {boolean=} force
    * @return {boolean}
    */
   _toggleClass(className, force) {
     var element = this.tabElement;
     var hasClass = element.classList.contains(className);
@@ skipping 62 matching lines @@
   /**
    * @param {!UI.TabbedPaneTabDelegate} delegate
    */
   setDelegate(delegate) {
     this._delegate = delegate;
   }
 
   /**
    * @param {!Element} tabElement
    * @param {!Element} titleElement
+   * @param {boolean} measuring
    */
-  _createIconElement(tabElement, titleElement) {
-    if (tabElement.__iconElement)
+  _createIconElement(tabElement, titleElement, measuring) {
+    if (tabElement.__iconElement) {
       tabElement.__iconElement.remove();
-    if (!this._iconType)
+      tabElement.__iconElement = null;
+    }
+    if (!this._icon)
       return;
 
-    var iconElement = createElementWithClass('label', 'tabbed-pane-header-tab-icon', 'dt-icon-label');
-    iconElement.type = this._iconType;
-    if (this._iconTooltip)
-      iconElement.title = this._iconTooltip;
-    tabElement.insertBefore(iconElement, titleElement);
-    tabElement.__iconElement = iconElement;
+    var iconContainer = createElementWithClass('span', 'tabbed-pane-header-tab-icon');
+    var iconNode = measuring ? this._icon.cloneNode(true) : this._icon;
+    iconContainer.appendChild(iconNode);
+    tabElement.insertBefore(iconContainer, titleElement);
+    tabElement.__iconElement = iconContainer;
   }
 
   /**
    * @param {boolean} measuring
    * @return {!Element}
    */
   _createTabElement(measuring) {
     var tabElement = createElementWithClass('div', 'tabbed-pane-header-tab');
     tabElement.id = 'tab-' + this._id;
     tabElement.tabIndex = -1;
     tabElement.setAttribute('role', 'tab');
     tabElement.setAttribute('aria-selected', 'false');
     tabElement.selectTabForTest = this._tabbedPane.selectTab.bind(this._tabbedPane, this.id, true);
 
     var titleElement = tabElement.createChild('span', 'tabbed-pane-header-tab-title');
     titleElement.textContent = this.title;
     titleElement.title = this.tooltip || '';
-    this._createIconElement(tabElement, titleElement);
+    this._createIconElement(tabElement, titleElement, measuring);
     if (!measuring)
       this._titleElement = titleElement;
 
     if (this._closeable)
       tabElement.createChild('div', 'tabbed-pane-close-button', 'dt-close-button').gray = true;
 
     if (measuring) {
       tabElement.classList.add('measuring');
     } else {
       tabElement.addEventListener('click', this._tabClicked.bind(this), false);
@@ skipping 172 matching lines @@
    * @param {!Array.<string>} ids
    */
   closeTabs(tabbedPane, ids) {},
 
   /**
    * @param {string} tabId
    * @param {!UI.ContextMenu} contextMenu
    */
   onContextMenu(tabId, contextMenu) {}
 };