[DevTools] Simplify Popover API

third_party/WebKit/Source/devtools/front_end/object_ui/ObjectPopoverHelper.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 24 matching lines @@
   /**
    * @param {!Element} panelElement
    * @param {function(!Element, !Event):(!Element|!AnchorBox|undefined)} getAnchor
    * @param {function(!Element, function(!SDK.RemoteObject, boolean, !Element=):undefined, string):undefined} queryObject
    * @param {function()=} onHide
    * @param {boolean=} disableOnClick
    */
   constructor(panelElement, getAnchor, queryObject, onHide, disableOnClick) {
     super(panelElement, disableOnClick);
     this.initializeCallbacks(getAnchor, this._showObjectPopover.bind(this), this._onHideObjectPopover.bind(this));
+    this.setHasPadding(true);
     this._queryObject = queryObject;
     this._onHideCallback = onHide;
     this._popoverObjectGroup = 'popover';
     panelElement.addEventListener('scroll', this.hidePopover.bind(this), true);
   }
 
   /**
    * @param {!Element} element
-   * @param {!UI.Popover} popover
+   * @param {!UI.GlassPane} popover
+   * @return {!Promise<boolean>}
    */
   _showObjectPopover(element, popover) {
+    var fulfill;
+    var promise = new Promise(x => fulfill = x);
+
     /**
      * @param {!SDK.RemoteObject} funcObject
      * @param {!Element} popoverContentElement
      * @param {!Element} popoverValueElement
-     * @param {!Element} anchorElement
      * @param {?Array.<!SDK.RemoteObjectProperty>} properties
      * @param {?Array.<!SDK.RemoteObjectProperty>} internalProperties
      * @this {ObjectUI.ObjectPopoverHelper}
      */
     function didGetFunctionProperties(
-        funcObject, popoverContentElement, popoverValueElement, anchorElement, properties, internalProperties) {
+        funcObject, popoverContentElement, popoverValueElement, properties, internalProperties) {
       if (internalProperties) {
         for (var i = 0; i < internalProperties.length; i++) {
           if (internalProperties[i].name === '[[TargetFunction]]') {
             funcObject = internalProperties[i].value;
             break;
           }
         }
       }
       ObjectUI.ObjectPropertiesSection.formatObjectAsFunction(funcObject, popoverValueElement, true);
       funcObject.debuggerModel()
           .functionDetailsPromise(funcObject)
-          .then(didGetFunctionDetails.bind(this, popoverContentElement, anchorElement));
+          .then(didGetFunctionDetails.bind(this, popoverContentElement));
     }
 
     /**
      * @param {!Element} popoverContentElement
-     * @param {!Element} anchorElement
      * @param {?SDK.DebuggerModel.FunctionDetails} response
      * @this {ObjectUI.ObjectPopoverHelper}
      */
-    function didGetFunctionDetails(popoverContentElement, anchorElement, response) {
-      if (!response || this._disposed)
+    function didGetFunctionDetails(popoverContentElement, response) {
+      if (!response || this._disposed) {
+        fulfill(false);
         return;
+      }
 
       var container = createElementWithClass('div', 'object-popover-container');
       var title = container.createChild('div', 'function-popover-title source-code');
       var functionName = title.createChild('span', 'function-name');
       functionName.textContent = UI.beautifyFunctionName(response.functionName);
 
       var rawLocation = response.location;
       var linkContainer = title.createChild('div', 'function-title-link-container');
       var sourceURL = rawLocation && rawLocation.script() ? rawLocation.script().sourceURL : null;
       if (rawLocation && sourceURL)
         linkContainer.appendChild(this._lazyLinkifier().linkifyRawLocation(rawLocation, sourceURL));
       container.appendChild(popoverContentElement);
-      popover.showForAnchor(container, anchorElement);
+      popover.contentElement.appendChild(container);
+      fulfill(true);
     }
 
     /**
      * @param {!SDK.RemoteObject} result
      * @param {boolean} wasThrown
-     * @param {!Element=} anchorOverride
+     * @param {!Element|!AnchorBox=} anchorOverride
      * @this {ObjectUI.ObjectPopoverHelper}
      */
     function didQueryObject(result, wasThrown, anchorOverride) {
-      if (this._disposed)
+      if (this._disposed) {
+        fulfill(false);
         return;
+      }
       if (wasThrown) {
         this.hidePopover();
+        fulfill(false);
         return;
       }
       this._objectTarget = result.target();
-      var anchorElement = anchorOverride || element;
+      var anchor = anchorOverride || element;
+      popover.setContentAnchorBox(anchor instanceof AnchorBox ? anchor : anchor.boxInWindow());
       var description = result.description.trimEnd(ObjectUI.ObjectPopoverHelper.MaxPopoverTextLength);
       var popoverContentElement = null;
       if (result.type !== 'object') {
         popoverContentElement = createElement('span');
         UI.appendStyle(popoverContentElement, 'object_ui/objectValue.css');
         UI.appendStyle(popoverContentElement, 'object_ui/objectPopover.css');
         var valueElement = popoverContentElement.createChild('span', 'monospace object-value-' + result.type);
         valueElement.style.whiteSpace = 'pre';
 
         if (result.type === 'string')
           valueElement.createTextChildren('"', description, '"');
         else if (result.type !== 'function')
           valueElement.textContent = description;
 
         if (result.type === 'function') {
           result.getOwnProperties(
               false /* generatePreview */,
-              didGetFunctionProperties.bind(this, result, popoverContentElement, valueElement, anchorElement));
+              didGetFunctionProperties.bind(this, result, popoverContentElement, valueElement));
           return;
         }
-        popover.showForAnchor(popoverContentElement, anchorElement);
+        popover.contentElement.appendChild(popoverContentElement);
+        fulfill(true);
       } else {
         if (result.subtype === 'node') {
           SDK.DOMModel.highlightObjectAsDOMNode(result);
           this._resultHighlightedAsDOM = true;
         }
 
         if (result.customPreview()) {
           var customPreviewComponent = new ObjectUI.CustomPreviewComponent(result);
           customPreviewComponent.expandIfPossible();
           popoverContentElement = customPreviewComponent.element;
         } else {
           popoverContentElement = createElementWithClass('div', 'object-popover-content');
           UI.appendStyle(popoverContentElement, 'object_ui/objectPopover.css');
           var titleElement = popoverContentElement.createChild('div', 'monospace object-popover-title');
           titleElement.createChild('span').textContent = description;
           var section = new ObjectUI.ObjectPropertiesSection(result, '', this._lazyLinkifier());
           section.element.classList.add('object-popover-tree');
           section.titleLessMode();
           popoverContentElement.appendChild(section.element);
         }
         popover.setMaxContentSize(new UI.Size(300, 250));
         popover.setSizeBehavior(UI.GlassPane.SizeBehavior.SetExactSize);
-        popover.showForAnchor(popoverContentElement, anchorElement);
+        popover.contentElement.appendChild(popoverContentElement);
+        fulfill(true);
       }
     }
     this._disposed = false;
     this._queryObject(element, didQueryObject.bind(this), this._popoverObjectGroup);
+    return promise;
   }
 
   _onHideObjectPopover() {
     this._disposed = true;
     if (this._resultHighlightedAsDOM) {
       SDK.DOMModel.hideDOMNodeHighlight();
       delete this._resultHighlightedAsDOM;
     }
     if (this._linkifier) {
       this._linkifier.dispose();
@@ skipping 11 matching lines @@
    * @return {!Components.Linkifier}
    */
   _lazyLinkifier() {
     if (!this._linkifier)
       this._linkifier = new Components.Linkifier();
     return this._linkifier;
   }
 };
 
 ObjectUI.ObjectPopoverHelper.MaxPopoverTextLength = 10000;