[DevTools] Do not inherit ObjectPopoverHelper from PopoverHelper.

third_party/WebKit/Source/devtools/front_end/profiler/HeapSnapshotView.js

 /*
  * Copyright (C) 2011 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 135 matching lines @@
     this._filterSelect.setVisible(false);
     this._updateFilterOptions();
 
     this._classNameFilter = new UI.ToolbarInput('Class filter');
     this._classNameFilter.setVisible(false);
     this._constructorsDataGrid.setNameFilter(this._classNameFilter);
     this._diffDataGrid.setNameFilter(this._classNameFilter);
 
     this._selectedSizeText = new UI.ToolbarText();
 
-    this._popoverHelper = new ObjectUI.ObjectPopoverHelper(
-        this.element, this._getHoverAnchor.bind(this), this._resolveObjectForPopover.bind(this), undefined, true);
+    this._popoverHelper = new UI.PopoverHelper(this.element, true);
+    this._popoverHelper.initializeCallbacks(
+        this._getHoverAnchor.bind(this), this._showObjectPopover.bind(this), this._onHidePopover.bind(this));
+    this._popoverHelper.setHasPadding(true);
+    this.element.addEventListener('scroll', this._popoverHelper.hidePopover.bind(this._popoverHelper), true);
 
     this._currentPerspectiveIndex = 0;
     this._currentPerspective = this._perspectives[0];
     this._currentPerspective.activate(this);
     this._dataGrid = this._currentPerspective.masterGrid(this);
 
     this._populate();
     this._searchThrottler = new Common.Throttler(0);
   }
 
@@ skipping 440 matching lines @@
     var span = target.enclosingNodeOrSelfWithNodeName('span');
     if (!span)
       return;
     var row = target.enclosingNodeOrSelfWithNodeName('tr');
     if (!row)
       return;
     span.node = row._dataGridNode;
     return span;
   }
 
-  _resolveObjectForPopover(element, showCallback, objectGroupName) {
-    if (!this._profile.target())
-      return;
-    if (!element.node)
-      return;
-    element.node.queryObjectContent(this._profile.target(), showCallback, objectGroupName);
+  /**
+   * @param {!Element|!AnchorBox} element
+   * @param {!UI.GlassPane} popover
+   * @return {!Promise<boolean>}
+   */
+  _showObjectPopover(element, popover) {
+    if (!this._profile.target() || !element.node)
+      return Promise.resolve(false);
+
+    var fulfill;
+    var promise = new Promise(x => fulfill = x);
+    element.node.queryObjectContent(this._profile.target(), onObjectResolved.bind(this), 'popover');
+    return promise;
+
+    /**
+     * @param {?SDK.RemoteObject} result
+     * @this {Profiler.HeapSnapshotView}
+     */
+    function onObjectResolved(result) {
+      if (!result) {
+        fulfill(false);
+        return;
+      }
+      ObjectUI.ObjectPopoverHelper.buildObjectPopover(result, popover).then(objectPopoverHelper => {
+        if (!objectPopoverHelper) {
+          this._onHidePopover();  // Cleanup object resolving artifacts.
+          fulfill(false);
+          return;
+        }
+        this._objectPopoverHelper = objectPopoverHelper;
+        fulfill(true);
+      });
+    }
+  }
+
+  _onHidePopover() {
+    if (this._objectPopoverHelper) {
+      this._objectPopoverHelper.dispose();
+      delete this._objectPopoverHelper;
+    }
+    this._profile.target().runtimeModel.releaseObjectGroup('popover');
   }
 
   _updatePerspectiveOptions() {
     const multipleSnapshots = this._profiles().length > 1;
     this._perspectiveSelect.removeOptions();
     this._perspectives.forEach((perspective, index) => {
       if (multipleSnapshots || perspective !== this._comparisonPerspective)
         this._perspectiveSelect.createOption(perspective.title(), '', String(index));
     });
   }
@@ skipping 1463 matching lines @@
       var name = frameDiv.createChild('div');
       name.textContent = UI.beautifyFunctionName(frame.functionName);
       if (frame.scriptId) {
         var urlElement = this._linkifier.linkifyScriptLocation(
             this._target, String(frame.scriptId), frame.scriptName, frame.line - 1, frame.column - 1);
         frameDiv.appendChild(urlElement);
       }
     }
   }
 };