Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1589)

Unified Diff: Source/devtools/front_end/ObjectPopoverHelper.js

Issue 220903002: DevTools: wrap DebuggerAgent.Location with DebuggerModel.Location. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: All tests!!! Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/devtools/front_end/Main.js ('k') | Source/devtools/front_end/ObjectPropertiesSection.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/devtools/front_end/ObjectPopoverHelper.js
diff --git a/Source/devtools/front_end/ObjectPopoverHelper.js b/Source/devtools/front_end/ObjectPopoverHelper.js
index 55c322e05cd6ba6a467c7383fe0f25d209effb54..a161fb7bcdfdeef9bf6ce63a49e20c9070410f6a 100644
--- a/Source/devtools/front_end/ObjectPopoverHelper.js
+++ b/Source/devtools/front_end/ObjectPopoverHelper.js
@@ -62,18 +62,17 @@ WebInspector.ObjectPopoverHelper.prototype = {
_showObjectPopover: function(element, popover)
{
/**
+ * @param {!WebInspector.Target} target
* @param {!Element} anchorElement
* @param {!Element} popoverContentElement
- * @param {?Protocol.Error} error
- * @param {!DebuggerAgent.FunctionDetails} response
+ * @param {?DebuggerAgent.FunctionDetails} response
* @this {WebInspector.ObjectPopoverHelper}
*/
- function didGetDetails(anchorElement, popoverContentElement, error, response)
+ function didGetDetails(target, anchorElement, popoverContentElement, response)
{
- if (error) {
- console.error(error);
+ if (!response)
return;
- }
+
var container = document.createElement("div");
container.className = "inline-block";
@@ -82,7 +81,7 @@ WebInspector.ObjectPopoverHelper.prototype = {
functionName.textContent = response.functionName || WebInspector.UIString("(anonymous function)");
this._linkifier = new WebInspector.Linkifier();
- var rawLocation = /** @type {!WebInspector.DebuggerModel.Location} */ (response.location);
+ var rawLocation = WebInspector.DebuggerModel.Location.fromPayload(target, response.location);
var link = this._linkifier.linkifyRawLocation(rawLocation, "function-location-link");
if (link)
title.appendChild(link);
@@ -117,7 +116,7 @@ WebInspector.ObjectPopoverHelper.prototype = {
popoverContentElement.style.whiteSpace = "pre";
popoverContentElement.textContent = description;
if (result.type === "function") {
- DebuggerAgent.getFunctionDetails(result.objectId, didGetDetails.bind(this, anchorElement, popoverContentElement));
+ result.functionDetails(didGetDetails.bind(this, result.target(), anchorElement, popoverContentElement));
return;
}
if (result.type === "string")
« no previous file with comments | « Source/devtools/front_end/Main.js ('k') | Source/devtools/front_end/ObjectPropertiesSection.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698